diff --git a/res/skins/Deere/deck_text_row.xml b/res/skins/Deere/deck_text_row.xml
index d8809788a3b..f8e8ee52d84 100644
--- a/res/skins/Deere/deck_text_row.xml
+++ b/res/skins/Deere/deck_text_row.xml
@@ -41,7 +41,7 @@
               <WidgetGroup>
                 <ObjectName>TitleGutter</ObjectName>
                 <Layout>horizontal</Layout>
-                <SizePolicy>min,max</SizePolicy>
+                <SizePolicy>me,max</SizePolicy>
                 <Children>
 
                   <!-- We allow to hide track/artist info (aka AM-Mode) in the skin settings,
@@ -49,6 +49,7 @@
                   <TrackProperty>
                     <TooltipId>track_title</TooltipId>
                     <SizePolicy>me,min</SizePolicy>
+                    <MinimumSize>1</MinimumSize>
                     <Property>titleInfo</Property>
                     <Group><Variable name="group"/></Group>
                     <Elide>right</Elide>
@@ -72,254 +73,222 @@
                     </Connection>
                   </Label>
 
-                  <!-- Fake a click-able multi-state widget by stacking a
-                        transparent PushButton dummy (the trigger) on top of the
-                        individual WidgetGroups (the content). PushButton tracks
-                        the size of the active WidgetGroup and resizes. Notice
-                        that the trigger has the same TooltipId as the content.
-                        Description: BPM/Beatgrid edit widget -->
-                  <WidgetStack><!-- BpmEditRow -->
-                    <ObjectName>BpmKeyEditRow</ObjectName>
-                    <SizePolicy>max,</SizePolicy>
-                    <Style>
-                    </Style>
-                    <NextControl>[Deere],bpm_layout_next</NextControl>
-                    <PrevControl>[Deere],bpm_layout_prev</PrevControl>
+                  <WidgetGroup>
+                    <ObjectName>BpmKeyEditRowExpanded</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Size>164f,-1me</Size>
                     <Children>
-                      <WidgetGroup><!-- BpmEditRowCollapsed -->
-                        <ObjectName>BpmKeyEditRowCollapsed</ObjectName>
-                        <Layout>stacked</Layout>
+                      <SetVariable name="CoverName">BeatEditCover</SetVariable>
+                      <SetVariable name="cover_control"><Variable name="group"/>,bpmlock</SetVariable>
+
+                      <WidgetGroup>
+                        <ObjectName>HotcueShiftButtons</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>min,me</SizePolicy>
                         <Children>
-                          <PushButton>
-                            <ObjectName>BpmKeyEditTrigger</ObjectName>
-                            <TooltipId>visual_bpm</TooltipId>
-                            <NumberStates>1</NumberStates>
-                            <State>
-                              <Number>0</Number>
-                              <Pressed scalemode="STRETCH"></Pressed>
-                              <Unpressed scalemode="STRETCH"></Unpressed>
-                            </State>
-                            <Connection>
-                              <ConfigKey>[Deere],bpm_layout_next</ConfigKey>
-                            </Connection>
-                          </PushButton>
-
-                          <!-- We allow to hide the current BPM info in the skin settings,
-                                display just a label with asterixes instead.
-                                See https://github.com/mixxxdj/mixxx/issues/5783 -->
-                          <WidgetGroup>
-                            <Layout>horizontal</Layout>
-                            <Children>
-                              <Label>
-                                <Size>10f,20f</Size>
-                                <ObjectName>BpmKeyInfoShow</ObjectName>
-                              </Label>
-
-                              <NumberBpm>
-                                <ObjectName>BpmKeyEditTriggerLabel</ObjectName>
-                                <MinimumSize>60,20</MinimumSize>
-                                <Group><Variable name="group"/></Group>
-                                <Alignment>right</Alignment>
-                                <Connection>
-                                  <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey>[Deere],show_bpm_info</ConfigKey>
-                                  <BindProperty>visible</BindProperty>
-                                </Connection>
-                              </NumberBpm>
-
-                              <Label>
-                                <TooltipId>visual_bpm</TooltipId>
-                                <Size>me,min</Size>
-                                <ObjectName>HiddenBpmInfo</ObjectName>
-                                <Text>***.**</Text>
-                                <Connection>
-                                  <ConfigKey>[Deere],show_bpm_info</ConfigKey>
-                                  <BindProperty>visible</BindProperty>
-                                  <Transform>
-                                    <Not/>
-                                  </Transform>
-                                </Connection>
-                              </Label>
-                            </Children>
-                          </WidgetGroup>
+                          <Template src="skin:left_right_1state_button.xml">
+                            <SetVariable name="TooltipId">shift_cues_earlier</SetVariable>
+                            <SetVariable name="ObjectName">HotcuesEarlierButton</SetVariable>
+                            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                            <SetVariable name="state_0_text"></SetVariable>
+                            <SetVariable name="state_0_pressed">icon/ic_hotcues_earlier_48px.svg</SetVariable>
+                            <SetVariable name="state_0_unpressed">icon/ic_hotcues_earlier_48px.svg</SetVariable>
+                            <SetVariable name="left_connection_control"><Variable name="group"/>,shift_cues_earlier</SetVariable>
+                            <SetVariable name="right_connection_control"><Variable name="group"/>,shift_cues_earlier_small</SetVariable>
+                          </Template>
+
+                          <Template src="skin:left_right_1state_button.xml">
+                            <SetVariable name="TooltipId">shift_cues_later</SetVariable>
+                            <SetVariable name="ObjectName">HotcuesLaterButton</SetVariable>
+                            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                            <SetVariable name="state_0_text"></SetVariable>
+                            <SetVariable name="state_0_pressed">icon/ic_hotcues_later_48px.svg</SetVariable>
+                            <SetVariable name="state_0_unpressed">icon/ic_hotcues_later_48px.svg</SetVariable>
+                            <SetVariable name="left_connection_control"><Variable name="group"/>,shift_cues_later</SetVariable>
+                            <SetVariable name="right_connection_control"><Variable name="group"/>,shift_cues_later_small</SetVariable>
+                          </Template>
                         </Children>
-                      </WidgetGroup><!-- BpmEditTrigger -->
+                        <Connection>
+                          <ConfigKey>[Skin],timing_shift_buttons</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup>
+
+                      <Template src="skin:left_right_1state_button_optional.xml">
+                        <SetVariable name="TooltipId">beats_adjust_faster</SetVariable>
+                        <SetVariable name="ObjectName">BeatsAdjustFasterButton</SetVariable>
+                        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                        <SetVariable name="state_0_text"></SetVariable>
+                        <SetVariable name="state_0_pressed">icon/ic_beats_adjust_faster_48px.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">icon/ic_beats_adjust_faster_48px.svg</SetVariable>
+                        <SetVariable name="left_connection_control"><Variable name="group"/>,beats_adjust_faster</SetVariable>
+                      </Template>
+
+                      <Template src="skin:left_right_1state_button_optional.xml">
+                        <SetVariable name="TooltipId">beats_adjust_slower</SetVariable>
+                        <SetVariable name="ObjectName">BeatsAdjustSlowerButton</SetVariable>
+                        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                        <SetVariable name="state_0_text"></SetVariable>
+                        <SetVariable name="state_0_pressed">icon/ic_beats_adjust_slower_48px.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">icon/ic_beats_adjust_slower_48px.svg</SetVariable>
+                        <SetVariable name="left_connection_control"><Variable name="group"/>,beats_adjust_slower</SetVariable>
+                      </Template>
+
+                      <Template src="skin:left_right_1state_button_optional.xml">
+                        <SetVariable name="TooltipId">beats_translate_earlier</SetVariable>
+                        <SetVariable name="ObjectName">BeatsTranslateEarlierButton</SetVariable>
+                        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                        <SetVariable name="state_0_text"></SetVariable>
+                        <SetVariable name="state_0_pressed">icon/ic_beats_translate_earlier_48px.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">icon/ic_beats_translate_earlier_48px.svg</SetVariable>
+                        <SetVariable name="left_connection_control"><Variable name="group"/>,beats_translate_earlier</SetVariable>
+                      </Template>
+
+                      <Template src="skin:left_right_1state_button_optional.xml">
+                        <SetVariable name="TooltipId">beats_translate_later</SetVariable>
+                        <SetVariable name="ObjectName">BeatsTranslateLaterButton</SetVariable>
+                        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                        <SetVariable name="state_0_text"></SetVariable>
+                        <SetVariable name="state_0_pressed">icon/ic_beats_translate_later_48px.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">icon/ic_beats_translate_later_48px.svg</SetVariable>
+                        <SetVariable name="left_connection_control"><Variable name="group"/>,beats_translate_later</SetVariable>
+                      </Template>
+
+                      <Template src="skin:left_right_1state_button_optional.xml">
+                        <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
+                        <SetVariable name="ObjectName">BeatsTranslateCurposButton</SetVariable>
+                        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                        <SetVariable name="state_0_text"></SetVariable>
+                        <SetVariable name="state_0_pressed">icon/ic_beats_translate_curpos_48px.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">icon/ic_beats_translate_curpos_48px.svg</SetVariable>
+                        <SetVariable name="left_connection_control"><Variable name="group"/>,beats_translate_curpos</SetVariable>
+                        <SetVariable name="right_connection_control"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
+                      </Template>
+
+                      <Template src="skin:left_right_1state_button_optional.xml">
+                        <SetVariable name="TooltipId">tempo_tap_bpm_tap</SetVariable>
+                        <SetVariable name="ObjectName">BeatsTranslateCurposButton</SetVariable>
+                        <SetVariable name="MinimumSize">30,22</SetVariable>
+                        <SetVariable name="MaximumSize">60,22</SetVariable>
+                        <SetVariable name="SizePolicy">me,me</SetVariable>
+                        <SetVariable name="state_0_text">TAP</SetVariable>
+                        <SetVariable name="left_connection_control"><Variable name="group"/>,tempo_tap</SetVariable>
+                        <SetVariable name="right_connection_control"><Variable name="group"/>,bpm_tap</SetVariable>
+                      </Template>
+
+                      <!-- Can't use left_2state_button.xml since that emits on press & release -->
+                      <PushButton>
+                        <TooltipId>bpmlock</TooltipId>
+                        <ObjectName>BpmLockToggle</ObjectName>
+                        <MinimumSize><Variable name="SquareButtonMinimumSize"/></MinimumSize>
+                        <MaximumSize><Variable name="SquareButtonMaximumSize"/></MaximumSize>
+                        <SizePolicy><Variable name="SquareButtonSizePolicy"/></SizePolicy>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed scalemode="STRETCH_ASPECT">icon/ic_bpm_unlocked_48px.svg</Pressed>
+                          <Unpressed scalemode="STRETCH_ASPECT">icon/ic_bpm_unlocked_48px.svg</Unpressed>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Pressed scalemode="STRETCH_ASPECT">icon/ic_bpm_locked_48px.svg</Pressed>
+                          <Unpressed scalemode="STRETCH_ASPECT">icon/ic_bpm_locked_48px.svg</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,bpmlock</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                      </PushButton>
 
-                      <WidgetGroup><!-- BpmEditRowExpanded -->
-                        <ObjectName>BpmKeyEditRowExpanded</ObjectName>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Skin],show_beatgrid_controls</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- BpmEditRowExpanded -->
+
+                  <WidgetGroup>
+                    <ObjectName>BpmKeyEditTriggerRow</ObjectName>
+                    <Layout>stacked</Layout>
+                    <SizePolicy>max,</SizePolicy>
+                    <Children>
+                      <PushButton>
+                        <ObjectName>BpmKeyEditTrigger</ObjectName>
+                        <TooltipId>visual_bpm</TooltipId>
+                        <SizePolicy>min,</SizePolicy>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Skin],show_beatgrid_controls</ConfigKey>
+                        </Connection>
+                      </PushButton>
+                      <!-- We allow to hide the current BPM info in the skin settings,
+                            display just a label with asterixes instead.
+                            See https://github.com/mixxxdj/mixxx/issues/5783 -->
+                      <WidgetGroup>
                         <Layout>horizontal</Layout>
+                        <SizePolicy>min,</SizePolicy>
                         <Children>
-                          <WidgetGroup>
-                            <ObjectName>BpmKeyEditRowControls</ObjectName>
-                            <Layout>horizontal</Layout>
-                            <SizePolicy>p,me</SizePolicy>
-                            <MinimumSize>100,20</MinimumSize>
-                            <MaximumSize>228,30</MaximumSize>
-                            <Children>
-
-                              <WidgetGroup>
-                                <ObjectName>HotcueShiftButtons</ObjectName>
-                                <Layout>horizontal</Layout>
-                                <SizePolicy>min,me</SizePolicy>
-                                <Children>
-                                  <Template src="skin:left_right_1state_button.xml">
-                                    <SetVariable name="TooltipId">shift_cues_earlier</SetVariable>
-                                    <SetVariable name="ObjectName">HotcuesEarlierButton</SetVariable>
-                                    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                                    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                                    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                                    <SetVariable name="state_0_text"></SetVariable>
-                                    <SetVariable name="state_0_pressed">icon/ic_hotcues_earlier_48px.svg</SetVariable>
-                                    <SetVariable name="state_0_unpressed">icon/ic_hotcues_earlier_48px.svg</SetVariable>
-                                    <SetVariable name="left_connection_control"><Variable name="group"/>,shift_cues_earlier</SetVariable>
-                                    <SetVariable name="right_connection_control"><Variable name="group"/>,shift_cues_earlier_small</SetVariable>
-                                  </Template>
-
-                                  <Template src="skin:left_right_1state_button.xml">
-                                    <SetVariable name="TooltipId">shift_cues_later</SetVariable>
-                                    <SetVariable name="ObjectName">HotcuesLaterButton</SetVariable>
-                                    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                                    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                                    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                                    <SetVariable name="state_0_text"></SetVariable>
-                                    <SetVariable name="state_0_pressed">icon/ic_hotcues_later_48px.svg</SetVariable>
-                                    <SetVariable name="state_0_unpressed">icon/ic_hotcues_later_48px.svg</SetVariable>
-                                    <SetVariable name="left_connection_control"><Variable name="group"/>,shift_cues_later</SetVariable>
-                                    <SetVariable name="right_connection_control"><Variable name="group"/>,shift_cues_later_small</SetVariable>
-                                  </Template>
-                                </Children>
-                                <Connection>
-                                  <ConfigKey>[Skin],timing_shift_buttons</ConfigKey>
-                                  <BindProperty>visible</BindProperty>
-                                </Connection>
-                              </WidgetGroup>
-
-                              <Template src="skin:left_right_1state_button.xml">
-                                <SetVariable name="TooltipId">beats_adjust_faster</SetVariable>
-                                <SetVariable name="ObjectName">BeatsAdjustFasterButton</SetVariable>
-                                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                                <SetVariable name="state_0_text"></SetVariable>
-                                <SetVariable name="state_0_pressed">icon/ic_beats_adjust_faster_48px.svg</SetVariable>
-                                <SetVariable name="state_0_unpressed">icon/ic_beats_adjust_faster_48px.svg</SetVariable>
-                                <SetVariable name="left_connection_control"><Variable name="group"/>,beats_adjust_faster</SetVariable>
-                              </Template>
-
-                              <Template src="skin:left_right_1state_button.xml">
-                                <SetVariable name="TooltipId">beats_adjust_slower</SetVariable>
-                                <SetVariable name="ObjectName">BeatsAdjustSlowerButton</SetVariable>
-                                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                                <SetVariable name="state_0_text"></SetVariable>
-                                <SetVariable name="state_0_pressed">icon/ic_beats_adjust_slower_48px.svg</SetVariable>
-                                <SetVariable name="state_0_unpressed">icon/ic_beats_adjust_slower_48px.svg</SetVariable>
-                                <SetVariable name="left_connection_control"><Variable name="group"/>,beats_adjust_slower</SetVariable>
-                              </Template>
-
-                              <Template src="skin:left_right_1state_button.xml">
-                                <SetVariable name="TooltipId">beats_translate_earlier</SetVariable>
-                                <SetVariable name="ObjectName">BeatsTranslateEarlierButton</SetVariable>
-                                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                                <SetVariable name="state_0_text"></SetVariable>
-                                <SetVariable name="state_0_pressed">icon/ic_beats_translate_earlier_48px.svg</SetVariable>
-                                <SetVariable name="state_0_unpressed">icon/ic_beats_translate_earlier_48px.svg</SetVariable>
-                                <SetVariable name="left_connection_control"><Variable name="group"/>,beats_translate_earlier</SetVariable>
-                              </Template>
-
-                              <Template src="skin:left_right_1state_button.xml">
-                                <SetVariable name="TooltipId">beats_translate_later</SetVariable>
-                                <SetVariable name="ObjectName">BeatsTranslateLaterButton</SetVariable>
-                                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                                <SetVariable name="state_0_text"></SetVariable>
-                                <SetVariable name="state_0_pressed">icon/ic_beats_translate_later_48px.svg</SetVariable>
-                                <SetVariable name="state_0_unpressed">icon/ic_beats_translate_later_48px.svg</SetVariable>
-                                <SetVariable name="left_connection_control"><Variable name="group"/>,beats_translate_later</SetVariable>
-                              </Template>
-
-                              <Template src="skin:left_right_1state_button.xml">
-                                <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
-                                <SetVariable name="ObjectName">BeatsTranslateCurposButton</SetVariable>
-                                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                                <SetVariable name="state_0_text"></SetVariable>
-                                <SetVariable name="state_0_pressed">icon/ic_beats_translate_curpos_48px.svg</SetVariable>
-                                <SetVariable name="state_0_unpressed">icon/ic_beats_translate_curpos_48px.svg</SetVariable>
-                                <SetVariable name="left_connection_control"><Variable name="group"/>,beats_translate_curpos</SetVariable>
-                                <SetVariable name="right_connection_control"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
-                              </Template>
-
-                              <PushButton>
-                                <TooltipId>tempo_tap_bpm_tap</TooltipId>
-                                <MinimumSize>30,20</MinimumSize>
-                                <MaximumSize>60,30</MaximumSize>
-                                <SizePolicy>me,me</SizePolicy>
-                                <NumberStates>1</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>TAP</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey><Variable name="group"/>,tempo_tap</ConfigKey>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey><Variable name="group"/>,bpm_tap</ConfigKey>
-                                  <ButtonState>RightButton</ButtonState>
-                                </Connection>
-                              </PushButton>
-                            </Children>
-                          </WidgetGroup>
-
-                          <WidgetGroup>
-                            <Layout>stacked</Layout>
-                            <Children>
-                              <PushButton>
-                                <ObjectName>BpmKeyEditTrigger</ObjectName>
-                                <TooltipId>visual_bpm</TooltipId>
-                                <NumberStates>1</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Pressed scalemode="STRETCH"></Pressed>
-                                  <Unpressed scalemode="STRETCH"></Unpressed>
-                                </State>
-                                <Connection>
-                                  <ConfigKey>[Deere],bpm_layout_next</ConfigKey>
-                                </Connection>
-                              </PushButton>
-
-                              <WidgetGroup>
-                                <Layout>horizontal</Layout>
-                                <Children>
-                                  <Label>
-                                    <Size>10f,20f</Size>
-                                    <ObjectName>BpmKeyInfoHide</ObjectName>
-                                  </Label>
-
-                                  <NumberBpm>
-                                    <ObjectName>BpmKeyEditTriggerLabel</ObjectName>
-                                    <Group><Variable name="group"/></Group>
-                                    <Alignment>right</Alignment>
-                                    <Connection>
-                                      <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
-                                    </Connection>
-                                  </NumberBpm>
-                                </Children>
-                              </WidgetGroup>
-
-                            </Children>
-                          </WidgetGroup><!-- BpmEditTrigger -->
+                          <Label>
+                            <Size>10f,20f</Size>
+                            <ObjectName>BpmKeyInfoShowHide</ObjectName>
+                            <Connection>
+                              <ConfigKey>[Skin],show_beatgrid_controls</ConfigKey>
+                              <BindProperty>highlight</BindProperty>
+                            </Connection>
+                          </Label>
+
+                          <NumberBpm>
+                            <ObjectName>BpmKeyEditTriggerLabel</ObjectName>
+                            <MinimumSize>40,20</MinimumSize>
+                            <SizePolicy>min,me</SizePolicy>
+                            <Group><Variable name="group"/></Group>
+                            <Alignment>right</Alignment>
+                            <Connection>
+                              <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
+                            </Connection>
+                            <Connection>
+                              <ConfigKey>[Deere],show_bpm_info</ConfigKey>
+                              <BindProperty>visible</BindProperty>
+                            </Connection>
+                          </NumberBpm>
+
+                          <Label>
+                            <TooltipId>visual_bpm</TooltipId>
+                            <SizePolicy>min,me</SizePolicy>
+                            <ObjectName>HiddenBpmInfo</ObjectName>
+                            <Text>***.**</Text>
+                            <Connection>
+                              <ConfigKey>[Deere],show_bpm_info</ConfigKey>
+                              <BindProperty>visible</BindProperty>
+                              <Transform>
+                                <Not/>
+                              </Transform>
+                            </Connection>
+                          </Label>
                         </Children>
-                      </WidgetGroup><!-- BpmEditRowExpanded -->
+                      </WidgetGroup>
                     </Children>
-                  </WidgetStack><!-- BpmEditRow -->
+                  </WidgetGroup><!-- BpmKeyEditTriggerRow -->
                 </Children>
               </WidgetGroup><!-- TitleGutter -->
             </Children>
@@ -361,6 +330,7 @@
                         <TooltipId>track_artist</TooltipId>
                         <Property>artist</Property>
                         <SizePolicy>me,min</SizePolicy>
+                        <MinimumSize>1</MinimumSize>
                         <Elide>right</Elide>
                         <Group><Variable name="group"/></Group>
                         <Connection>
@@ -372,6 +342,7 @@
                       <Label>
                         <TooltipId>track_artist</TooltipId>
                         <Size>me,min</Size>
+                        <MinimumSize>1</MinimumSize>
                         <ObjectName>HiddenTrackArtistInfo</ObjectName>
                         <Text>***</Text>
                         <Connection>
@@ -414,175 +385,194 @@
                       </WidgetGroup>
                     </Children>
                   </WidgetGroup>
-                  <!-- Fake a click-able multi-state widget by stacking a
-                        transparent PushButton dummy (the trigger) on top of the
-                        individual WidgetGroups (the content). PushButton tracks
-                        the size of the active WidgetGroup and resizes. Notice
-                        that the trigger has the same TooltipId as the content.
-                        Description: Key edit widget -->
-                  <WidgetStack><!-- KeyEditRow -->
-                    <ObjectName>BpmKeyEditRow</ObjectName>
+
+                  <!-- BpmKeyEditRow -->
+
+                  <WidgetGroup><!-- KeyEditRowExpanded -->
+                    <ObjectName>BpmKeyEditRowExpanded</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>p,me</SizePolicy>
+                    <MinimumSize>80,20</MinimumSize>
+                    <MaximumSize>120,30</MaximumSize>
+                    <Children>
+                      <Template src="skin:left_right_1state_button.xml">
+                        <SetVariable name="TooltipId">pitch_down</SetVariable>
+                        <SetVariable name="ObjectName">PitchDownButton</SetVariable>
+                        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                        <SetVariable name="state_0_text"></SetVariable>
+                        <SetVariable name="state_0_pressed">icon/ic_remove_48px.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">icon/ic_remove_48px.svg</SetVariable>
+                        <SetVariable name="left_connection_control"><Variable name="group"/>,pitch_down</SetVariable>
+                        <SetVariable name="right_connection_control"><Variable name="group"/>,pitch_down_small</SetVariable>
+                      </Template>
+
+                      <Template src="skin:left_right_1state_button.xml">
+                        <SetVariable name="TooltipId">pitch_up</SetVariable>
+                        <SetVariable name="ObjectName">PitchUpButton</SetVariable>
+                        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                        <SetVariable name="state_0_text"></SetVariable>
+                        <SetVariable name="state_0_pressed">icon/ic_add_48px.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">icon/ic_add_48px.svg</SetVariable>
+                        <SetVariable name="left_connection_control"><Variable name="group"/>,pitch_up</SetVariable>
+                        <SetVariable name="right_connection_control"><Variable name="group"/>,pitch_up_small</SetVariable>
+                      </Template>
+
+                      <Template src="skin:left_right_1state_button.xml">
+                        <SetVariable name="TooltipId">sync_reset_key</SetVariable>
+                        <SetVariable name="ObjectName">SyncKeyButton</SetVariable>
+                        <SetVariable name="MinimumSize">46,22</SetVariable>
+                        <SetVariable name="MaximumSize">46,22</SetVariable>
+                        <SetVariable name="SizePolicy">f,f</SetVariable>
+                        <SetVariable name="state_0_text">Match</SetVariable>
+                        <SetVariable name="state_0_pressed"></SetVariable>
+                        <SetVariable name="state_0_unpressed"></SetVariable>
+                        <SetVariable name="left_connection_control"><Variable name="group"/>,sync_key</SetVariable>
+                        <SetVariable name="right_connection_control"><Variable name="group"/>,reset_key</SetVariable>
+                      </Template>
+
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Deere],show_key_controls</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- KeyEditRowExpanded -->
+
+
+                  <!-- KeyEditRowCollapsed -->
+                  <WidgetGroup>
+                    <ObjectName>BpmKeyEditTriggerRow</ObjectName>
+                    <Layout>stacked</Layout>
                     <SizePolicy>max,</SizePolicy>
-                    <NextControl>[Deere],key_layout_next</NextControl>
-                    <PrevControl>[Deere],key_layout_prev</PrevControl>
                     <Children>
-                      <WidgetGroup><!-- KeyEditRowCollapsed -->
-                        <ObjectName>BpmKeyEditRowCollapsed</ObjectName>
-                        <Layout>stacked</Layout>
+                      <PushButton>
+                        <ObjectName>BpmKeyEditTrigger</ObjectName>
+                        <TooltipId>visual_key</TooltipId>
+                        <SizePolicy>min,</SizePolicy>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Deere],show_key_controls</ConfigKey>
+                        </Connection>
+                      </PushButton>
+
+                      <WidgetGroup><!-- Key display with opt. cents -->
+                        <Layout>horizontal</Layout>
                         <Children>
-                          <PushButton>
-                            <ObjectName>BpmKeyEditTrigger</ObjectName>
-                            <TooltipId>visual_key</TooltipId>
-                            <NumberStates>1</NumberStates>
-                            <State>
-                              <Number>0</Number>
-                              <Pressed scalemode="STRETCH"></Pressed>
-                              <Unpressed scalemode="STRETCH"></Unpressed>
-                            </State>
+                          <Label>
+                            <Size>10f,20f</Size>
+                            <ObjectName>BpmKeyInfoShowHide</ObjectName>
                             <Connection>
-                              <ConfigKey>[Deere],key_layout_next</ConfigKey>
+                              <ConfigKey>[Deere],show_key_controls</ConfigKey>
+                              <BindProperty>highlight</BindProperty>
                             </Connection>
-                          </PushButton>
-
-                          <WidgetGroup>
-                            <Layout>horizontal</Layout>
-                            <Children>
-                              <Label>
-                                <Size>10f,20f</Size>
-                                <ObjectName>BpmKeyInfoShow</ObjectName>
-                              </Label>
-
-                              <Key>
-                                <ObjectName>BpmKeyEditTriggerLabel</ObjectName>
-                                <MinimumSize>30,20</MinimumSize>
-                                <Group><Variable name="group"/></Group>
-                                <SizePolicy>min,</SizePolicy>
-                                <DisplayCents>false</DisplayCents>
-                                <Connection>
-                                  <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
-                                </Connection>
-                              </Key>
-                            </Children>
-                          </WidgetGroup>
+                          </Label>
+
+                          <Key>
+                            <ObjectName>BpmKeyEditTriggerLabel</ObjectName>
+                            <Size>30min,20me</Size>
+                            <Group><Variable name="group"/></Group>
+                            <DisplayCents>false</DisplayCents>
+                            <Connection>
+                              <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
+                            </Connection>
+                          </Key>
                         </Children>
                       </WidgetGroup>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Deere],show_key_controls</ConfigKey>
+                      <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- BpmKeyEditRowCollapsed -->
 
-                      <WidgetGroup><!-- KeyEditRowExpanded -->
-                        <ObjectName>BpmKeyEditRowExpanded</ObjectName>
+                  <!-- KeyEditRowCollapsed -->
+                  <WidgetGroup>
+                    <ObjectName>BpmKeyEditTriggerRow</ObjectName>
+                    <Layout>stacked</Layout>
+                    <SizePolicy>f,</SizePolicy>
+                    <Children>
+                      <PushButton>
+                        <ObjectName>BpmKeyEditTrigger</ObjectName>
+                        <TooltipId>visual_key</TooltipId>
+                        <SizePolicy>min,</SizePolicy>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Deere],show_key_controls</ConfigKey>
+                        </Connection>
+                      </PushButton>
+
+                      <WidgetGroup><!-- Key display with opt. cents -->
                         <Layout>horizontal</Layout>
                         <Children>
-                          <WidgetGroup>
-                            <ObjectName>BpmKeyEditRowControls</ObjectName>
-                            <Layout>horizontal</Layout>
-                            <SizePolicy>p,me</SizePolicy>
-                            <MinimumSize>80,20</MinimumSize>
-                            <MaximumSize>120,30</MaximumSize>
-                            <Children>
-                              <Template src="skin:left_right_1state_button.xml">
-                                <SetVariable name="TooltipId">pitch_down</SetVariable>
-                                <SetVariable name="ObjectName">PitchDownButton</SetVariable>
-                                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                                <SetVariable name="state_0_text"></SetVariable>
-                                <SetVariable name="state_0_pressed">icon/ic_remove_48px.svg</SetVariable>
-                                <SetVariable name="state_0_unpressed">icon/ic_remove_48px.svg</SetVariable>
-                                <SetVariable name="left_connection_control"><Variable name="group"/>,pitch_down</SetVariable>
-                                <SetVariable name="right_connection_control"><Variable name="group"/>,pitch_down_small</SetVariable>
-                              </Template>
-
-                              <Template src="skin:left_right_1state_button.xml">
-                                <SetVariable name="TooltipId">pitch_up</SetVariable>
-                                <SetVariable name="ObjectName">PitchUpButton</SetVariable>
-                                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                                <SetVariable name="state_0_text"></SetVariable>
-                                <SetVariable name="state_0_pressed">icon/ic_add_48px.svg</SetVariable>
-                                <SetVariable name="state_0_unpressed">icon/ic_add_48px.svg</SetVariable>
-                                <SetVariable name="left_connection_control"><Variable name="group"/>,pitch_up</SetVariable>
-                                <SetVariable name="right_connection_control"><Variable name="group"/>,pitch_up_small</SetVariable>
-                              </Template>
-
-                              <Template src="skin:left_right_1state_button.xml">
-                                <SetVariable name="TooltipId">sync_reset_key</SetVariable>
-                                <SetVariable name="ObjectName">SyncKeyButton</SetVariable>
-                                <SetVariable name="MinimumSize">46,22</SetVariable>
-                                <SetVariable name="MaximumSize">46,22</SetVariable>
-                                <SetVariable name="SizePolicy">f,f</SetVariable>
-                                <SetVariable name="state_0_text">Match</SetVariable>
-                                <SetVariable name="state_0_pressed"></SetVariable>
-                                <SetVariable name="state_0_unpressed"></SetVariable>
-                                <SetVariable name="left_connection_control"><Variable name="group"/>,sync_key</SetVariable>
-                                <SetVariable name="right_connection_control"><Variable name="group"/>,reset_key</SetVariable>
-                              </Template>
-                            </Children>
-                          </WidgetGroup><!-- KeyEditRowControls -->
-
-                          <WidgetGroup>
-                            <!-- The key edit controls are aligned to the right because the key
-                                  widget widths can rapidly change, especially with traditional
-                                  notation selected in the preferences. The controls stay calm
-                                  this way. -->
-                            <Layout>stacked</Layout>
-                            <Size>100f,</Size>
-                            <Children>
-                              <PushButton>
-                                <ObjectName>BpmKeyEditTrigger</ObjectName>
-                                <TooltipId>visual_key</TooltipId>
-                                <NumberStates>1</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Pressed scalemode="STRETCH"></Pressed>
-                                  <Unpressed scalemode="STRETCH"></Unpressed>
-                                </State>
-                                <Connection>
-                                  <ConfigKey>[Deere],key_layout_next</ConfigKey>
-                                </Connection>
-                              </PushButton>
-
-                              <WidgetGroup>
-                                <ObjectName>KeyDisplay</ObjectName>
-                                <Layout>horizontal</Layout>
-                                <Size>100f,-1min</Size>
-                                <Children>
-                                  <Label>
-                                    <Size>10f,20f</Size>
-                                    <ObjectName>BpmKeyInfoHide</ObjectName>
-                                  </Label>
-
-                                  <Key>
-                                    <ObjectName>BpmKeyEditTriggerLabel</ObjectName>
-                                    <Group><Variable name="group"/></Group>
-                                    <SizePolicy>e,min</SizePolicy>
-                                    <DisplayKey>true</DisplayKey>
-                                    <DisplayCents>false</DisplayCents>
-                                    <Alignment>center</Alignment>
-                                    <Elide>right</Elide>
-                                    <Connection>
-                                      <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
-                                    </Connection>
-                                  </Key>
-
-                                  <Key>
-                                    <ObjectName>BpmKeyEditTriggerLabel</ObjectName>
-                                    <Group><Variable name="group"/></Group>
-                                    <SizePolicy>min,min</SizePolicy>
-                                    <DisplayKey>false</DisplayKey>
-                                    <DisplayCents>true</DisplayCents>
-                                    <Alignment>right</Alignment>
-                                    <Connection>
-                                      <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
-                                    </Connection>
-                                  </Key>
-                                </Children>
-                              </WidgetGroup>
-                            </Children>
-                          </WidgetGroup><!-- KeyEditTrigger -->
+                          <Label>
+                            <Size>10f,20f</Size>
+                            <ObjectName>BpmKeyInfoShowHide</ObjectName>
+                            <Connection>
+                              <ConfigKey>[Deere],show_key_controls</ConfigKey>
+                              <BindProperty>highlight</BindProperty>
+                            </Connection>
+                          </Label>
+
+                          <Key>
+                            <ObjectName>BpmKeyEditTriggerLabel</ObjectName>
+                            <Size>30me,20me</Size>
+                            <Group><Variable name="group"/></Group>
+                            <DisplayCents>false</DisplayCents>
+                            <Connection>
+                              <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
+                            </Connection>
+                          </Key>
+
+                          <Key>
+                            <ObjectName>BpmKeyEditTriggerLabel</ObjectName>
+                            <Group><Variable name="group"/></Group>
+                            <SizePolicy>min,min</SizePolicy>
+                            <DisplayKey>false</DisplayKey>
+                            <DisplayCents>true</DisplayCents>
+                            <Alignment>right</Alignment>
+                            <Connection>
+                              <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
+                            </Connection>
+                          </Key>
                         </Children>
-                      </WidgetGroup><!-- KeyEditRowExpanded -->
+                      </WidgetGroup>
+
+                      <!-- The key widget widths can rapidly change, especially with
+                           additional notation selected in the preferences.
+                           This spacer guarantuees the key controls aren't shifted.
+                           Width is set in the stylesheet per notation. -->
+                      <WidgetGroup>
+                        <ObjectName>KeyLabelExpander</ObjectName>
+                        <Children/>
+                        <Connection>
+                          <ConfigKey>[Library],key_notation</ConfigKey>
+                          <BindProperty>highlight</BindProperty>
+                        </Connection>
+                      </WidgetGroup>
+
                     </Children>
-                  </WidgetStack><!-- KeyEditRow -->
+                    <Connection>
+                      <ConfigKey>[Deere],show_key_controls</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- BpmKeyEditRowCollapsed -->
+
                 </Children>
               </WidgetGroup><!-- ArtistGutter -->
             </Children>
diff --git a/res/skins/Deere/icon/ic_bpm_locked_48px.svg b/res/skins/Deere/icon/ic_bpm_locked_48px.svg
new file mode 100644
index 00000000000..c1472707309
--- /dev/null
+++ b/res/skins/Deere/icon/ic_bpm_locked_48px.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="48" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+  <path d="m23.943434 10.844437c-3.227921 0.02215-5.435624 1.464847-6.531199 3.167696-1.095573 1.70285-1.217353 3.451894-1.209641 4.394743 0.01047 1.279801 0.0018 4.954621 0 5.800192h-1.48377c-0.92827 0-1.857976 0.924503-1.857976 1.849272v9.668437c0 0.924772 0.929728 1.849273 1.857976 1.849273h18.562352c0.92827 0 1.857976-0.924501 1.857976-1.849273v-9.668437c0-0.924769-0.929729-1.849272-1.857976-1.849272h-1.483769c3.86e-4 -0.66879 0.0021-3.510737 0-4.834218-0.0023-1.363696-0.134249-3.37058-1.244453-5.221478-1.110214-1.851104-3.388255-3.329077-6.60952-3.306935zm0.02611 3.341745c2.327362-0.01604 3.13012 0.707254 3.715953 1.683928 0.585828 0.976669 0.768387 2.419958 0.770167 3.50709 0.0021 1.31222 3.84e-4 4.16365 0 4.829868h-8.911323c2e-3 -0.846564 0.01092-4.477868 0-5.826298-0.0043-0.527918 0.125159-1.698026 0.678791-2.558525 0.553625-0.860496 1.389816-1.619894 3.746412-1.636063zm-6.653032 14.476547h13.366981c0.617106 0 1.113915 0.496806 1.113915 1.113915s-0.496809 1.113915-1.113915 1.113915h-13.366984c-0.617109 0-1.113915-0.496806-1.113915-1.113915s0.496806-1.113915 1.113915-1.113915zm0 4.45566h13.366981c0.617106 0 1.113915 0.496806 1.113915 1.113915s-0.496809 1.113915-1.113915 1.113915h-13.366984c-0.617109 0-1.113915-0.496806-1.113915-1.113915s0.496806-1.113915 1.113915-1.113915z" color="#000000" fill="#d2d2d2" stroke-width=".999996" style="-inkscape-stroke:none"/>
+</svg>
diff --git a/res/skins/Deere/icon/ic_bpm_unlocked_48px.svg b/res/skins/Deere/icon/ic_bpm_unlocked_48px.svg
new file mode 100644
index 00000000000..a0458df73bb
--- /dev/null
+++ b/res/skins/Deere/icon/ic_bpm_unlocked_48px.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="48" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+  <path d="m23.948031 10.875611c-3.219145 0.02222-5.425157 1.465201-6.517831 3.163379l2.803272 1.800957c0.552114-0.858165 1.386061-1.615461 3.736155-1.631635 2.3211-0.016 3.126053 0.709661 3.710161 1.683692 0.584263 0.974031 0.761983 2.413303 0.763738 3.497535 0.0021 1.308765 3.73e-4 4.152295 0 4.816832h-13.699532c-0.925752 0-1.852925 0.921997-1.852925 1.84426v9.642107c0 0.922263 0.927196 1.84426 1.852925 1.84426h18.511921c0.925752 0 1.852925-0.921997 1.852925-1.84426v-9.642107c0-0.922263-0.927196-1.84426-1.852925-1.84426h-1.479754c3.75e-4 -0.662892 0.0021-3.504423 0-4.825497-0.0022-1.360044-0.133863-3.36134-1.241067-5.207422-1.107227-1.845882-3.374671-3.320015-6.587151-3.298019zm-6.613368 17.774288h13.330716c0.615435 0 1.110893 0.495458 1.110893 1.110893 0 0.615434-0.495458 1.110892-1.110893 1.110892h-13.330716c-0.615434 0-1.110893-0.495458-1.110893-1.110892 0-0.615435 0.495459-1.110893 1.110893-1.110893zm0 4.443571h13.330716c0.615435 0 1.110893 0.495458 1.110893 1.110893s-0.495458 1.110894-1.110893 1.110894h-13.330716c-0.615434 0-1.110893-0.495459-1.110893-1.110894s0.495459-1.110893 1.110893-1.110893z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#d2d2d2" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke-width=".999997" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+</svg>
diff --git a/res/skins/Deere/left_right_1state_button_optional.xml b/res/skins/Deere/left_right_1state_button_optional.xml
new file mode 100644
index 00000000000..441981871b3
--- /dev/null
+++ b/res/skins/Deere/left_right_1state_button_optional.xml
@@ -0,0 +1,35 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    Wrapper for a single-state left-click and right-click push button.
+    Is cover if `cover_control` is > 0
+  Variables:
+    ObjectName: The object name.
+    Size: the button size.
+    state_0_text:
+    state_0_pressed:
+    state_0_unpressed:
+    left_connection_control:
+-->
+<Template>
+  <WidgetGroup><!-- Curr. pos & Lock -->
+    <Layout>stacked</Layout>
+    <MinimumSize><Variable name="MinimumSize"/></MinimumSize>
+    <MaximumSize><Variable name="MaximumSize"/></MaximumSize>
+    <SizePolicy><Variable name="SizePolicy"/></SizePolicy>
+    <Children>
+      <Label>
+        <TooltipId><Variable name="TooltipId"/></TooltipId>
+        <ObjectName><Variable name="CoverName"/></ObjectName>
+        <MinimumSize><Variable name="MinimumSize"/></MinimumSize>
+        <MaximumSize><Variable name="MaximumSize"/></MaximumSize>
+        <SizePolicy><Variable name="SizePolicy"/></SizePolicy>
+        <Connection>
+          <BindProperty>visible</BindProperty>
+          <ConfigKey><Variable name="cover_control"/></ConfigKey>
+        </Connection>
+      </Label>
+      <Template src="skin:left_right_1state_button.xml"/>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 7a18a01e101..990a9c57690 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -1111,8 +1111,7 @@ WBeatSpinBox,
 
 /* Start editable widgets in decks */
 /* emphasize editable widgets on hover */
-#BpmKeyEditRowCollapsed:hover,
-#BpmKeyEditRowExpanded:hover,
+#BpmKeyEditTriggerRow:hover,
 #PositionGutter:hover,
 #PlayPositionTextSmall:hover,
 #StarratingGutter:hover,
@@ -1120,28 +1119,32 @@ WTrackProperty:hover {
   background-color: rgba(255, 102, 0, 128);
   }
   #BpmKeyEditRowCollapsed:hover,
-  #BpmKeyEditRowExpanded:hover,
   WTrackProperty[selected="true"] {
     border: 1px solid #FF6600;
   }
 
-#BpmKeyEditRowCollapsed {
+#BpmKeyEditTriggerRow[value="1"] {
   qproperty-layoutAlignment: 'AlignCenter';
   /* emphasize active widget */
   border: 1px solid #666666;
+  border-left: 0px;
 }
 
 #BpmKeyEditRowExpanded {
   /* emphasize active widget */
   border: 1px solid #FF6600;
-  background-color: rgba(255, 102, 0, 64);
+  border-right: 0px;
   color: #D6D6D6;
 }
 
 #BpmKeyEditTrigger {
-  /* make trigger button transparent */
   background-color: none;
   border: none;
+  border-radius: 0px;
+}
+#BpmKeyEditTrigger[value="1"] {
+  border: 1px solid #FF6600;
+  border-left: 0px;
 }
 
 #BpmKeyEditRowControls {
@@ -1153,6 +1156,31 @@ WTrackProperty:hover {
   qproperty-layoutSpacing: 2;
 }
 
+#BeatEditCover {
+  background-color: rgba(51, 51, 51, 120);
+}
+
+/* This defines the width of the key/cents display per selected notation. */
+#KeyLabelExpander[highlight="0"],  /* Invalid */
+#KeyLabelExpander[highlight="1"],  /* Custom */
+#KeyLabelExpander[highlight="2"],  /* OpenKey */
+#KeyLabelExpander[highlight="3"] { /* Lancelot */
+  /* Widest key is 12A + cents */
+  min-width: 97px;
+  max-width: 97px;
+}
+#KeyLabelExpander[highlight="4"] { /*Traditional */
+  /* The widest key is "D#m/Ebm" + cents */
+  min-width: 138px;
+  max-width: 138px;
+}
+#KeyLabelExpander[highlight="5"],  /* OpenKeyAndTraditional */
+#KeyLabelExpander[highlight="6"] { /* LancelotAndTraditional */
+  /* The widest key is "7m (D#m/Ebm)" + cents */
+  min-width: 175px;
+  max-width: 175px;
+}
+
 #HotcueShiftButtons {
   qproperty-layoutSpacing: 2;
 }
@@ -1161,11 +1189,10 @@ WTrackProperty:hover {
   padding-right: 1px;
 }
 
-#BpmKeyInfoShow {
+#BpmKeyInfoShowHide[highlight="0"] {
   image: url(skin:/../Deere/icon/ic_chevron_left_24x48px.svg) center center;
 }
-
-#BpmKeyInfoHide {
+#BpmKeyInfoShowHide[highlight="1"] {
   image: url(skin:/../Deere/icon/ic_chevron_right_24x48px.svg) center center;
 }
 /* End editable widgets in decks */
@@ -1654,7 +1681,8 @@ WWidgetGroup {
  *******************************************************************************/
 
 WPushButton,
-WEffectChainPresetButton {
+WEffectChainPresetButton,
+#BpmLockToggle[value="1"] {
     color: #D2D2D2;
     background-color: #4B4B4B;
     border: 1px solid #4B4B4B;
@@ -1664,7 +1692,8 @@ WEffectChainPresetButton {
 
 WPushButton:hover,
 #PlayToggle:hover,
-WEffectChainPresetButton:hover {
+WEffectChainPresetButton:hover,
+#BpmLockToggle[value="1"]:hover {
     color: #D2D2D2;
     background-color: #5F5F5F;
     border: 1px solid #5F5F5F;
diff --git a/res/skins/LateNight/controls/button_1state_optional.xml b/res/skins/LateNight/controls/button_1state_optional.xml
index 88f49f1d24b..ec15bb0f06a 100644
--- a/res/skins/LateNight/controls/button_1state_optional.xml
+++ b/res/skins/LateNight/controls/button_1state_optional.xml
@@ -19,6 +19,7 @@ Variables:
     <Size><Variable name="Size"/></Size>
     <Children>
       <Label>
+        <TooltipId><Variable name="TooltipId"/></TooltipId>
         <ObjectName><Variable name="CoverName"/></ObjectName>
         <Size><Variable name="Size"/></Size>
         <Connection>
@@ -26,22 +27,9 @@ Variables:
           <ConfigKey><Variable name="CoverConfigKey"/></ConfigKey>
         </Connection>
       </Label>
-      <PushButton>
-        <TooltipId><Variable name="TooltipId"/></TooltipId>
-        <ObjectName><Variable name="ButtonName"/></ObjectName>
-        <Size><Variable name="Size"/></Size>
-        <NumberStates>1</NumberStates>
-        <State>
-          <Number>0</Number>
-          <Text><Variable name="state_0_text"/></Text>
-          <Alignment><Variable name="Align"/></Alignment>
-          <Unpressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
-          <Pressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
-        </State>
-        <Connection>
-          <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
-        </Connection>
-      </PushButton>
+      <Template src="skins:LateNight/controls/button_1state.xml">
+        <SetVariable name="ObjectName"><Variable name="ButtonName"/></SetVariable>
+      </Template>
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/controls/button_1state_right_optional.xml b/res/skins/LateNight/controls/button_1state_right_optional.xml
index dc98ea8a87e..60efd5f8efb 100644
--- a/res/skins/LateNight/controls/button_1state_right_optional.xml
+++ b/res/skins/LateNight/controls/button_1state_right_optional.xml
@@ -1,6 +1,6 @@
 <!--
 Description:
-  A button that has click or display controls.
+  Wrapper for a button that has click or display controls.
   It is covered by a label if a certain CO is 1
 Variables:
   ObjectName        : object name
@@ -19,6 +19,7 @@ Variables:
     <Size><Variable name="Size"/></Size>
     <Children>
       <Label>
+        <TooltipId><Variable name="TooltipId"/></TooltipId>
         <ObjectName><Variable name="CoverName"/></ObjectName>
         <Size><Variable name="Size"/></Size>
         <Connection>
@@ -26,27 +27,9 @@ Variables:
           <ConfigKey><Variable name="CoverConfigKey"/></ConfigKey>
         </Connection>
       </Label>
-      <PushButton>
-        <TooltipId><Variable name="TooltipId"/></TooltipId>
-        <ObjectName><Variable name="ButtonName"/></ObjectName>
-        <Size><Variable name="Size"/></Size>
-        <NumberStates>1</NumberStates>
-        <State>
-          <Number>0</Number>
-          <Text><Variable name="state_0_text"/></Text>
-          <Alignment><Variable name="Align"/></Alignment>
-          <Unpressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
-          <Pressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
-        </State>
-        <Connection>
-          <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-        <Connection>
-          <ConfigKey><Variable name="ConfigKeyRight"/></ConfigKey>
-          <ButtonState>RightButton</ButtonState>
-        </Connection>
-      </PushButton>
+      <Template src="skins:LateNight/controls/button_1state_right.xml">
+        <SetVariable name="ObjectName"><Variable name="ButtonName"/></SetVariable>
+      </Template>
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index 11748339353..2af82f4188b 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -242,14 +242,14 @@
                   <Children>
                     <Template src="skins:LateNight/controls/button_1state_right.xml">
                       <SetVariable name="TooltipId">shift_cues_earlier</SetVariable>
-                      <SetVariable name="ButtonName">HotcuesEarlier</SetVariable>
+                      <SetVariable name="ObjectName">HotcuesEarlier</SetVariable>
                       <SetVariable name="Size">26f,26f</SetVariable>
                       <SetVariable name="ConfigKey"><Variable name="Group"/>,shift_cues_earlier</SetVariable>
                       <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,shift_cues_earlier_small</SetVariable>
                     </Template>
                     <Template src="skins:LateNight/controls/button_1state_right.xml">
                       <SetVariable name="TooltipId">shift_cues_later</SetVariable>
-                      <SetVariable name="ButtonName">HotcuesLater</SetVariable>
+                      <SetVariable name="ObjectName">HotcuesLater</SetVariable>
                       <SetVariable name="Size">26f,26f</SetVariable>
                       <SetVariable name="ConfigKey"><Variable name="Group"/>,shift_cues_later</SetVariable>
                       <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,shift_cues_later_small</SetVariable>