diff --git a/res/keyboard/cs_CZ.kbd.cfg b/res/keyboard/cs_CZ.kbd.cfg
index d4e2e274bbf..a06a9cc04b3 100644
--- a/res/keyboard/cs_CZ.kbd.cfg
+++ b/res/keyboard/cs_CZ.kbd.cfg
@@ -128,13 +128,19 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
-ViewMenu_ShowMicrophone Ctrl+2
-ViewMenu_ShowVinylControl Ctrl+3
-ViewMenu_ShowPreviewDeck Ctrl+4
-ViewMenu_ShowEffects Ctrl+5
-ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
+ViewMenu_Show4Decks Ctrl+1
+ViewMenu_ShowPreviewDeck Ctrl+2
+ViewMenu_ShowLibrary Ctrl+3
+ViewMenu_ShowMicrophone Ctrl+4
+ViewMenu_ShowEffects Ctrl+5
+ViewMenu_ShowSamplers Ctrl+6
+ViewMenu_ShowVinylControl Ctrl+7
+ViewMenu_ShowSpinnies Ctrl+8
+ViewMenu_ShowMixer Ctrl+9
+ViewMenu_ShowEqs Ctrl+0
+ViewMenu_ShowXFader Ctrl+'
+ViewMenu_ShowCoverArt Ctrl+´
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+y
 OptionsMenu_EnableVinyl2 Ctrl+u
diff --git a/res/keyboard/da_DK.kbd.cfg b/res/keyboard/da_DK.kbd.cfg
index 664690fc2f5..f692243a768 100644
--- a/res/keyboard/da_DK.kbd.cfg
+++ b/res/keyboard/da_DK.kbd.cfg
@@ -128,13 +128,19 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
-ViewMenu_ShowMicrophone Ctrl+2
-ViewMenu_ShowVinylControl Ctrl+3
-ViewMenu_ShowPreviewDeck Ctrl+4
-ViewMenu_ShowEffects Ctrl+5
-ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
+ViewMenu_Show4Decks Ctrl+1
+ViewMenu_ShowPreviewDeck Ctrl+2
+ViewMenu_ShowLibrary Ctrl+3
+ViewMenu_ShowMicrophone Ctrl+4
+ViewMenu_ShowEffects Ctrl+5
+ViewMenu_ShowSamplers Ctrl+6
+ViewMenu_ShowVinylControl Ctrl+7
+ViewMenu_ShowSpinnies Ctrl+8
+ViewMenu_ShowMixer Ctrl+9
+ViewMenu_ShowEqs Ctrl+0
+ViewMenu_ShowXFader Ctrl+'
+ViewMenu_ShowCoverArt Ctrl+´
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+y
 OptionsMenu_EnableVinyl2 Ctrl+u
diff --git a/res/keyboard/de_CH.kbd.cfg b/res/keyboard/de_CH.kbd.cfg
index 681ac2aa23c..1760b3d7f28 100644
--- a/res/keyboard/de_CH.kbd.cfg
+++ b/res/keyboard/de_CH.kbd.cfg
@@ -125,13 +125,19 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
-ViewMenu_ShowMicrophone Ctrl+2
-ViewMenu_ShowVinylControl Ctrl+3
-ViewMenu_ShowPreviewDeck Ctrl+4
-ViewMenu_ShowEffects Ctrl+5
-ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
+ViewMenu_Show4Decks Ctrl+1
+ViewMenu_ShowPreviewDeck Ctrl+2
+ViewMenu_ShowLibrary Ctrl+3
+ViewMenu_ShowMicrophone Ctrl+4
+ViewMenu_ShowEffects Ctrl+5
+ViewMenu_ShowSamplers Ctrl+6
+ViewMenu_ShowVinylControl Ctrl+7
+ViewMenu_ShowSpinnies Ctrl+8
+ViewMenu_ShowMixer Ctrl+9
+ViewMenu_ShowEqs Ctrl+0
+ViewMenu_ShowXFader Ctrl+'
+ViewMenu_ShowCoverArt Ctrl+^
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+t
 OptionsMenu_EnableVinyl2 Ctrl+y
diff --git a/res/keyboard/de_DE.kbd.cfg b/res/keyboard/de_DE.kbd.cfg
index d7d08ffd3de..4a98133d722 100644
--- a/res/keyboard/de_DE.kbd.cfg
+++ b/res/keyboard/de_DE.kbd.cfg
@@ -128,13 +128,19 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
-ViewMenu_ShowMicrophone Ctrl+2
-ViewMenu_ShowVinylControl Ctrl+3
-ViewMenu_ShowPreviewDeck Ctrl+4
-ViewMenu_ShowEffects Ctrl+5
-ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
+ViewMenu_Show4Decks Ctrl+1
+ViewMenu_ShowPreviewDeck Ctrl+2
+ViewMenu_ShowLibrary Ctrl+3
+ViewMenu_ShowMicrophone Ctrl+4
+ViewMenu_ShowEffects Ctrl+5
+ViewMenu_ShowSamplers Ctrl+6
+ViewMenu_ShowVinylControl Ctrl+7
+ViewMenu_ShowSpinnies Ctrl+8
+ViewMenu_ShowMixer Ctrl+9
+ViewMenu_ShowEqs Ctrl+0
+ViewMenu_ShowXFader Ctrl++
+ViewMenu_ShowCoverArt Ctrl+´
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+z
 OptionsMenu_EnableVinyl2 Ctrl+u
diff --git a/res/keyboard/el_GR.kbd.cfg b/res/keyboard/el_GR.kbd.cfg
index 71bd7a69aa8..b5d5c2961e3 100644
--- a/res/keyboard/el_GR.kbd.cfg
+++ b/res/keyboard/el_GR.kbd.cfg
@@ -128,13 +128,19 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
-ViewMenu_ShowMicrophone Ctrl+2
-ViewMenu_ShowVinylControl Ctrl+3
-ViewMenu_ShowPreviewDeck Ctrl+4
-ViewMenu_ShowEffects Ctrl+5
-ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
+ViewMenu_Show4Decks Ctrl+1
+ViewMenu_ShowPreviewDeck Ctrl+2
+ViewMenu_ShowLibrary Ctrl+3
+ViewMenu_ShowMicrophone Ctrl+4
+ViewMenu_ShowEffects Ctrl+5
+ViewMenu_ShowSamplers Ctrl+6
+ViewMenu_ShowVinylControl Ctrl+7
+ViewMenu_ShowSpinnies Ctrl+8
+ViewMenu_ShowMixer Ctrl+9
+ViewMenu_ShowEqs Ctrl+0
+ViewMenu_ShowXFader Ctrl++
+ViewMenu_ShowCoverArt Ctrl+=
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+y
 OptionsMenu_EnableVinyl2 Ctrl+u
diff --git a/res/keyboard/en_US.kbd.cfg b/res/keyboard/en_US.kbd.cfg
index 89e9acc27a8..39083526e84 100644
--- a/res/keyboard/en_US.kbd.cfg
+++ b/res/keyboard/en_US.kbd.cfg
@@ -125,13 +125,19 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
-ViewMenu_ShowMicrophone Ctrl+2
-ViewMenu_ShowVinylControl Ctrl+3
-ViewMenu_ShowPreviewDeck Ctrl+4
-ViewMenu_ShowEffects Ctrl+5
-ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
+ViewMenu_Show4Decks Ctrl+1
+ViewMenu_ShowPreviewDeck Ctrl+2
+ViewMenu_ShowLibrary Ctrl+3
+ViewMenu_ShowMicrophone Ctrl+4
+ViewMenu_ShowEffects Ctrl+5
+ViewMenu_ShowSamplers Ctrl+6
+ViewMenu_ShowVinylControl Ctrl+7
+ViewMenu_ShowSpinnies Ctrl+8
+ViewMenu_ShowMixer Ctrl+9
+ViewMenu_ShowEqs Ctrl+0
+ViewMenu_ShowXFader Ctrl+'
+ViewMenu_ShowCoverArt Ctrl+=
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+t
 OptionsMenu_EnableVinyl2 Ctrl+y
diff --git a/res/keyboard/es_ES.kbd.cfg b/res/keyboard/es_ES.kbd.cfg
index 356aff120bb..aec45cd5a4f 100644
--- a/res/keyboard/es_ES.kbd.cfg
+++ b/res/keyboard/es_ES.kbd.cfg
@@ -128,13 +128,19 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
-ViewMenu_ShowMicrophone Ctrl+2
-ViewMenu_ShowVinylControl Ctrl+3
-ViewMenu_ShowPreviewDeck Ctrl+4
-ViewMenu_ShowEffects Ctrl+5
-ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
+ViewMenu_Show4Decks Ctrl+1
+ViewMenu_ShowPreviewDeck Ctrl+2
+ViewMenu_ShowLibrary Ctrl+3
+ViewMenu_ShowMicrophone Ctrl+4
+ViewMenu_ShowEffects Ctrl+5
+ViewMenu_ShowSamplers Ctrl+6
+ViewMenu_ShowVinylControl Ctrl+7
+ViewMenu_ShowSpinnies Ctrl+8
+ViewMenu_ShowMixer Ctrl+9
+ViewMenu_ShowEqs Ctrl+0
+ViewMenu_ShowXFader Ctrl+'
+ViewMenu_ShowCoverArt Ctrl+¡
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+y
 OptionsMenu_EnableVinyl2 Ctrl+u
diff --git a/res/keyboard/fi_FI.kbd.cfg b/res/keyboard/fi_FI.kbd.cfg
index 92d4382c101..d8d4d45192e 100644
--- a/res/keyboard/fi_FI.kbd.cfg
+++ b/res/keyboard/fi_FI.kbd.cfg
@@ -128,13 +128,19 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
-ViewMenu_ShowMicrophone Ctrl+2
-ViewMenu_ShowVinylControl Ctrl+3
-ViewMenu_ShowPreviewDeck Ctrl+4
-ViewMenu_ShowEffects Ctrl+5
-ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
+ViewMenu_Show4Decks Ctrl+1
+ViewMenu_ShowPreviewDeck Ctrl+2
+ViewMenu_ShowLibrary Ctrl+3
+ViewMenu_ShowMicrophone Ctrl+4
+ViewMenu_ShowEffects Ctrl+5
+ViewMenu_ShowSamplers Ctrl+6
+ViewMenu_ShowVinylControl Ctrl+7
+ViewMenu_ShowSpinnies Ctrl+8
+ViewMenu_ShowMixer Ctrl+9
+ViewMenu_ShowEqs Ctrl+0
+ViewMenu_ShowXFader Ctrl++
+ViewMenu_ShowCoverArt Ctrl+´
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+y
 OptionsMenu_EnableVinyl2 Ctrl+u
diff --git a/res/keyboard/fr_CH.kbd.cfg b/res/keyboard/fr_CH.kbd.cfg
index 9e82c10ab31..88938472731 100644
--- a/res/keyboard/fr_CH.kbd.cfg
+++ b/res/keyboard/fr_CH.kbd.cfg
@@ -125,13 +125,19 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
-ViewMenu_ShowMicrophone Ctrl+2
-ViewMenu_ShowVinylControl Ctrl+3
-ViewMenu_ShowPreviewDeck Ctrl+4
-ViewMenu_ShowEffects Ctrl+5
-ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
+ViewMenu_Show4Decks Ctrl+1
+ViewMenu_ShowPreviewDeck Ctrl+2
+ViewMenu_ShowLibrary Ctrl+3
+ViewMenu_ShowMicrophone Ctrl+4
+ViewMenu_ShowEffects Ctrl+5
+ViewMenu_ShowSamplers Ctrl+6
+ViewMenu_ShowVinylControl Ctrl+7
+ViewMenu_ShowSpinnies Ctrl+8
+ViewMenu_ShowMixer Ctrl+9
+ViewMenu_ShowEqs Ctrl+0
+ViewMenu_ShowXFader Ctrl+'
+ViewMenu_ShowCoverArt Ctrl+^
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+t
 OptionsMenu_EnableVinyl2 Ctrl+y
diff --git a/res/keyboard/fr_FR.kbd.cfg b/res/keyboard/fr_FR.kbd.cfg
index 056c5334dd6..6465c658969 100644
--- a/res/keyboard/fr_FR.kbd.cfg
+++ b/res/keyboard/fr_FR.kbd.cfg
@@ -128,13 +128,19 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
-ViewMenu_ShowMicrophone Ctrl+2
-ViewMenu_ShowVinylControl Ctrl+3
-ViewMenu_ShowPreviewDeck Ctrl+4
-ViewMenu_ShowEffects Ctrl+5
-ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
+ViewMenu_Show4Decks Ctrl+1
+ViewMenu_ShowPreviewDeck Ctrl+2
+ViewMenu_ShowLibrary Ctrl+3
+ViewMenu_ShowMicrophone Ctrl+4
+ViewMenu_ShowEffects Ctrl+5
+ViewMenu_ShowSamplers Ctrl+6
+ViewMenu_ShowVinylControl Ctrl+7
+ViewMenu_ShowSpinnies Ctrl+8
+ViewMenu_ShowMixer Ctrl+9
+ViewMenu_ShowEqs Ctrl+0
+ViewMenu_ShowXFader Ctrl+'
+ViewMenu_ShowCoverArt Ctrl+=
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+y
 OptionsMenu_EnableVinyl2 Ctrl+u
diff --git a/res/keyboard/it_IT.kbd.cfg b/res/keyboard/it_IT.kbd.cfg
index e15c28509a2..312dc7d6be0 100644
--- a/res/keyboard/it_IT.kbd.cfg
+++ b/res/keyboard/it_IT.kbd.cfg
@@ -128,13 +128,19 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
-ViewMenu_ShowMicrophone Ctrl+2
-ViewMenu_ShowVinylControl Ctrl+3
-ViewMenu_ShowPreviewDeck Ctrl+4
-ViewMenu_ShowEffects Ctrl+5
-ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
+ViewMenu_Show4Decks Ctrl+1
+ViewMenu_ShowPreviewDeck Ctrl+2
+ViewMenu_ShowLibrary Ctrl+3
+ViewMenu_ShowMicrophone Ctrl+4
+ViewMenu_ShowEffects Ctrl+5
+ViewMenu_ShowSamplers Ctrl+6
+ViewMenu_ShowVinylControl Ctrl+7
+ViewMenu_ShowSpinnies Ctrl+8
+ViewMenu_ShowMixer Ctrl+9
+ViewMenu_ShowEqs Ctrl+0
+ViewMenu_ShowXFader Ctrl+'
+ViewMenu_ShowCoverArt Ctrl+ì
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+y
 OptionsMenu_EnableVinyl2 Ctrl+u
diff --git a/res/keyboard/ru_RU.kbd.cfg b/res/keyboard/ru_RU.kbd.cfg
index 9c266e73bab..b55554ca837 100644
--- a/res/keyboard/ru_RU.kbd.cfg
+++ b/res/keyboard/ru_RU.kbd.cfg
@@ -128,13 +128,19 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
-ViewMenu_ShowMicrophone Ctrl+2
-ViewMenu_ShowVinylControl Ctrl+3
-ViewMenu_ShowPreviewDeck Ctrl+4
-ViewMenu_ShowEffects Ctrl+5
-ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
+ViewMenu_Show4Decks Ctrl+1
+ViewMenu_ShowPreviewDeck Ctrl+2
+ViewMenu_ShowLibrary Ctrl+3
+ViewMenu_ShowMicrophone Ctrl+4
+ViewMenu_ShowEffects Ctrl+5
+ViewMenu_ShowSamplers Ctrl+6
+ViewMenu_ShowVinylControl Ctrl+7
+ViewMenu_ShowSpinnies Ctrl+8
+ViewMenu_ShowMixer Ctrl+9
+ViewMenu_ShowEqs Ctrl+0
+ViewMenu_ShowXFader Ctrl+-
+ViewMenu_ShowCoverArt Ctrl+=
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+y
 OptionsMenu_EnableVinyl2 Ctrl+u
diff --git a/res/skins/LateNight/deck_row_5.xml b/res/skins/LateNight/deck_row_5.xml
index ee199ec8523..15cc35a1b38 100644
--- a/res/skins/LateNight/deck_row_5.xml
+++ b/res/skins/LateNight/deck_row_5.xml
@@ -54,25 +54,6 @@
             <ObjectName>ToggleRowOne</ObjectName>
             <Layout>horizontal</Layout>
             <Children>
-              <PushButton>
-	              <TooltipId>show_spinny</TooltipId>
-	              <Style></Style>
-	              <NumberStates>2</NumberStates>
-	              <State>
-		              <Number>0</Number>
-		              <Pressed>btn_spinny1.png</Pressed>
-		              <Unpressed>btn_spinny1.png</Unpressed>
-	              </State>
-	              <State>
-		              <Number>1</Number>
-		              <Pressed>btn_spinny1_over.png</Pressed>
-		              <Unpressed>btn_spinny1_over.png</Unpressed>
-	              </State>
-	              <Connection>
-		              <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
-		              <ButtonState>LeftButton</ButtonState>
-	              </Connection>
-              </PushButton>
               <PushButton>
 	              <TooltipId>repeat</TooltipId>
 	              <Style></Style>
@@ -110,45 +91,26 @@
     	    <WidgetGroup>
     	      <Layout>horizontal</Layout>
     	      <Children>
-		          <PushButton>
-			          <TooltipId>beats_translate_curpos</TooltipId>
-			          <Style></Style>
-			          <NumberStates>1</NumberStates>
-			          <State>
-				          <Number>0</Number>
-				          <Pressed>btn_beatgrid2_over.png</Pressed>
-				          <Unpressed>btn_beatgrid2.png</Unpressed>
-			          </State>
-			          <Pos>0,23</Pos>
-			          <Connection>
-				          <ConfigKey>[Channel<Variable name="channum"/>],beats_translate_curpos</ConfigKey>
-				          <ButtonState>LeftButton</ButtonState>
-			          </Connection>
-			          <Connection>
-				          <ConfigKey>[Channel<Variable name="channum"/>],beats_translate_match_alignment</ConfigKey>
-				          <ButtonState>RightButton</ButtonState>
-			          </Connection>
-		          </PushButton>
-		          <PushButton>
-			          <TooltipId>quantize</TooltipId>
-			          <Style></Style>
-			          <NumberStates>2</NumberStates>
-			          <State>
-				          <Number>0</Number>
-				          <Pressed>btn_quantize2.png</Pressed>
-				          <Unpressed>btn_quantize2.png</Unpressed>
-			          </State>
-			          <State>
-				          <Number>1</Number>
-				          <Pressed>btn_quantize2_over.png</Pressed>
-				          <Unpressed>btn_quantize2_over.png</Unpressed>
-			          </State>
-			          <Pos>26,23</Pos>
-			          <Connection>
-				          <ConfigKey>[Channel<Variable name="channum"/>],quantize</ConfigKey>
-				          <ButtonState>LeftButton</ButtonState>
-			          </Connection>
-		          </PushButton>
+              <PushButton>
+                  <TooltipId>quantize</TooltipId>
+                  <Style></Style>
+                  <NumberStates>2</NumberStates>
+                  <State>
+                      <Number>0</Number>
+                      <Pressed>btn_quantize2.png</Pressed>
+                      <Unpressed>btn_quantize2.png</Unpressed>
+                  </State>
+                  <State>
+                      <Number>1</Number>
+                      <Pressed>btn_quantize2_over.png</Pressed>
+                      <Unpressed>btn_quantize2_over.png</Unpressed>
+                  </State>
+                  <Pos>26,23</Pos>
+                  <Connection>
+                      <ConfigKey>[Channel<Variable name="channum"/>],quantize</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                  </Connection>
+              </PushButton>
 		          <PushButton>
 			          <TooltipId>keylock</TooltipId>
 			          <Style></Style>
diff --git a/res/skins/LateNight/fx_samplers_container_small.xml b/res/skins/LateNight/fx_samplers_container_small.xml
index a68acd504f9..cccbf6bec26 100644
--- a/res/skins/LateNight/fx_samplers_container_small.xml
+++ b/res/skins/LateNight/fx_samplers_container_small.xml
@@ -6,7 +6,7 @@
         <Children>
             <WidgetStack currentpage="[Master],view_curpage" persist="true">
                 <Children>
-                    <WidgetGroup trigger="[Library],show_library_tab_small" persist="true">
+                    <WidgetGroup trigger="[Library],show_library" persist="true">
                         <Layout>vertical</Layout>
                         <Children>
                             <SingletonContainer>
@@ -43,4 +43,4 @@
             </WidgetStack>
         </Children>
     </WidgetGroup>
-</Template>
\ No newline at end of file
+</Template>
diff --git a/res/skins/LateNight/lower_half.xml b/res/skins/LateNight/lower_half.xml
index 8daca3f54b0..baead5517c0 100644
--- a/res/skins/LateNight/lower_half.xml
+++ b/res/skins/LateNight/lower_half.xml
@@ -9,68 +9,40 @@
                 <MaximumSize>1920,249</MaximumSize>
                 <Children>
                     <Template src="skin:fx_samplers_container_small.xml"/>
-                    <Template src="skin:toolbar_small.xml"/>
+                    <WidgetGroup> <!-- Vertical spacer-->
+                        <SizePolicy>me,me</SizePolicy>
+                        <Children/>
+                    </WidgetGroup>
+                    <Template src="skin:toolbar.xml"/>
                 </Children>
             </WidgetGroup>
             <WidgetGroup>
                 <ObjectName>UILowerHalf</ObjectName>
                 <Layout>vertical</Layout>
-                <SizePolicy>min,i</SizePolicy>
+                <SizePolicy>min,me</SizePolicy>
                 <MinimumSize>0,250</MinimumSize>
                 <MaximumSize>1920,419</MaximumSize>
                 <Children>
                     <Template src="skin:fx_samplers_container_med.xml"/>
                     <SingletonContainer>
                         <ObjectName>LibrarySingleton</ObjectName>
-                        <Connection>
-                            <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                        </Connection>
                     </SingletonContainer>
-                    <WidgetGroup>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>me,me</SizePolicy>
-                        <Children/>
-                        <Connection>
-                            <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                            <Transform>
-                              <Not/>
-                            </Transform>
-                        </Connection>
-                    </WidgetGroup>
-                    <Template src="skin:toolbar_med.xml"/>
+                    <Template src="skin:toolbar_no_library_button.xml"/>
                 </Children>
             </WidgetGroup>
             <WidgetGroup>
                 <ObjectName>UILowerHalf</ObjectName>
                 <Layout>vertical</Layout>
-                <SizePolicy>min,i</SizePolicy>
+                <SizePolicy>min,me</SizePolicy>
                 <MinimumSize>0,420</MinimumSize>
                 <Children>
                     <Template src="skin:fx_samplers_container_full.xml"/>
                     <SingletonContainer>
                         <ObjectName>LibrarySingleton</ObjectName>
-                        <Connection>
-                            <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                        </Connection>
                     </SingletonContainer>
-                    <WidgetGroup>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>me,me</SizePolicy>
-                        <Children/>
-                        <Connection>
-                            <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                            <Transform>
-                              <Not/>
-                            </Transform>
-                        </Connection>
-                    </WidgetGroup>
-                    <Template src="skin:toolbar_full.xml"/>
+                    <Template src="skin:toolbar_no_library_button.xml"/>
                 </Children>
             </WidgetGroup>
         </Children>
     </SizeAwareStack>
-</Template>
\ No newline at end of file
+</Template>
diff --git a/res/skins/LateNight/mixer.xml b/res/skins/LateNight/mixer.xml
index 05c098838ca..83cf31fb6bc 100644
--- a/res/skins/LateNight/mixer.xml
+++ b/res/skins/LateNight/mixer.xml
@@ -197,6 +197,10 @@
 											</Connection>
 										</SliderComposed>
 									</Children>
+	      	                      <Connection>
+									<ConfigKey>[Master],show_xfader</ConfigKey>
+									<BindProperty>visible</BindProperty>
+								  </Connection>
 								</WidgetGroup>
         					</Children>
         				  </WidgetGroup>
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index 3472d31f7ca..42da112eae7 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -39,10 +39,6 @@
     <attributes>
       <!-- Set skin defaults. -->
       <attribute config_key="[Master],num_decks">4</attribute>
-      <attribute persist="true" config_key="[Spinny1],show_spinny">1</attribute>
-      <attribute persist="true" config_key="[Spinny2],show_spinny">1</attribute>
-      <attribute persist="true" config_key="[Spinny3],show_spinny">1</attribute>
-      <attribute persist="true" config_key="[Spinny4],show_spinny">1</attribute>
       <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
       <attribute persist="true" config_key="[MicrophoneRack],show">0</attribute>
       <attribute persist="true" config_key="[EffectRack1],show">0</attribute>
@@ -57,7 +53,8 @@
       <attribute persist="true" config_key="[Library],show_current">1</attribute>
       <attribute persist="true" config_key="[Master],show_4decks">0</attribute>
       <attribute persist="true" config_key="[Spinny],show_spinnies">1</attribute>
-      <attribute config_key="[Library],show_library">1</attribute>
+      <attribute persist="true" config_key="[Library],show_library">1</attribute>
+      <attribute persist="true" config_key="[Master],show_xfader">1</attribute>
       <attribute config_key="[Master],maximize_library">0</attribute>
     </attributes>
   </manifest>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 048b542d72e..8c556363ecd 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -147,14 +147,21 @@
 
 #ClockWidget {
   qproperty-layoutAlignment: 'AlignVCenter | AlignHCenter';
+  margin-bottom: 2px;
 }
 
 #LatencyMeter {
   margin: 1px;
+  padding-right: 4px;
+  padding-left: 4px;
+}
+
+#LatencyLabel {
+  padding-bottom: 2px;
 }
 
 #PrimaryMixer {
-  qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   padding: 0px;
   margin: 0px;
   border: 1px solid #585858;
@@ -800,9 +807,8 @@
 #ToolbarTop {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   border: 1px solid #585858;
-  border-top: 0px;
   padding: 0px;
-  background-color: #1e1e1e;
+  background-color: #0f0f0f;
 }
 
 #WaveformMixerContainer {
diff --git a/res/skins/LateNight/toolbar.xml b/res/skins/LateNight/toolbar.xml
new file mode 100644
index 00000000000..5ea15f55775
--- /dev/null
+++ b/res/skins/LateNight/toolbar.xml
@@ -0,0 +1,471 @@
+<Template>
+    <WidgetGroup>
+        <ObjectName>UIButtons</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>e,min</SizePolicy>
+        <Children>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>80f,20f</Size>
+                        <TooltipId>maximize_library</TooltipId>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>BIG LIBRARY</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>BIG LIBRARY</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Master],maximize_library</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey>[Master],maximize_library</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Divider -->
+                  <Layout>vertical</Layout>
+                  <Size>min,min</Size>
+                  <Children>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                  </Children>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>50f,20f</Size>
+                        <TooltipId>toggle_4decks</TooltipId>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>4 DECKS</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>4 DECKS</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Master],show_4decks</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey>[Master],show_4decks</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>40f,20f</Size>
+                        <TooltipId>toggle_4decks</TooltipId>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>MIXER</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>MIXER</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Master],show_mixer</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey>[Master],show_mixer</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>40f,20f</Size>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>EQ</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>EQ</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Master],show_eqs</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey>[Master],show_eqs</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>55f,20f</Size>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>PREVIEW</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>PREVIEW</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>55f,20f</Size>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>SPINNIES</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>SPINNIES</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>40f,20f</Size>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>VINYL</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>VINYL</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Divider -->
+                  <Layout>vertical</Layout>
+                  <Size>min,min</Size>
+                  <Children>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                  </Children>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>50f,20f</Size>
+                        <TooltipId>show_library</TooltipId>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>LIBRARY</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>LIBRARY</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[Library],show_library</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[Library],show_library</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>55f,20f</Size>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>MIC/AUX</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>MIC/AUX</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>55f,20f</Size>
+                        <TooltipId>show_effects</TooltipId>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>EFFECTS</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>EFFECTS</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>62f,20f</Size>
+                        <TooltipId>show_samplers</TooltipId>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>SAMPLERS</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>SAMPLERS</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+
+            <!-- Spacer -->
+            <WidgetGroup>
+              <Layout>horizontal</Layout>
+              <Size>me,min</Size>
+              <Children/>
+            </WidgetGroup>
+
+            <WidgetGroup>
+              <ObjectName>ClockWidget</ObjectName>
+              <Layout>horizontal</Layout>
+              <SizePolicy>min,min</SizePolicy>
+              <Children>
+                <Time>
+                  <TooltipId>time</TooltipId>
+                  <Style>QLabel { font: bold 13px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+                            background-color: transparent; color: #EECE33;}
+                  </Style>
+                  <ShowSeconds>false</ShowSeconds>
+                </Time>
+              </Children>
+            </WidgetGroup>
+
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Divider -->
+                  <Layout>vertical</Layout>
+                  <Size>min,min</Size>
+                  <Children>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                  </Children>
+            </WidgetGroup>
+
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+
+            <WidgetGroup>
+              <Layout>horizontal</Layout>
+              <SizePolicy>min,min</SizePolicy>
+              <Children>
+                <WidgetGroup>
+                    <ObjectName>LatencyLabel</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                        <Label>
+                          <Style>QLabel { font: bold 10px/10px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+                                    background-color: transparent; color: #EECE33;}
+                          </Style>
+                          <Text>CPU</Text>
+                        </Label>
+                    </Children>
+                </WidgetGroup>
+                <Template src="skin:vumeter_latency.xml">
+                  <SetVariable name="TooltipId">audio_latency_usage</SetVariable>
+                  <SetVariable name="group">[Master]</SetVariable>
+                  <SetVariable name="control">audio_latency_usage</SetVariable>
+                </Template>
+              </Children>
+            </WidgetGroup>
+        </Children>
+    </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/toolbar_big_library.xml b/res/skins/LateNight/toolbar_big_library.xml
index 2b4dec1cd05..71e9404d303 100644
--- a/res/skins/LateNight/toolbar_big_library.xml
+++ b/res/skins/LateNight/toolbar_big_library.xml
@@ -4,12 +4,6 @@
         <Layout>horizontal</Layout>
         <SizePolicy>e,min</SizePolicy>
         <Children>
-            <WidgetGroup>  <!-- spacer -->
-                <ObjectName>UIButtonMargin</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children></Children>
-            </WidgetGroup>
             <WidgetGroup>
                 <ObjectName>GuiToggleContainer</ObjectName>
                 <Layout>vertical</Layout>
@@ -38,6 +32,90 @@
                     </PushButton>
                 </Children>
             </WidgetGroup>
+
+            <!-- Spacer -->
+            <WidgetGroup>
+              <Layout>horizontal</Layout>
+              <Size>me,min</Size>
+              <Children/>
+            </WidgetGroup>
+
+            <WidgetGroup>
+              <ObjectName>ClockWidget</ObjectName>
+              <Layout>horizontal</Layout>
+              <SizePolicy>min,min</SizePolicy>
+              <Children>
+                <Time>
+                  <TooltipId>time</TooltipId>
+                  <Style>QLabel { font: bold 13px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+                            background-color: transparent; color: #EECE33;}
+                  </Style>
+                  <ShowSeconds>false</ShowSeconds>
+                </Time>
+              </Children>
+            </WidgetGroup>
+
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Divider -->
+                  <Layout>vertical</Layout>
+                  <Size>min,min</Size>
+                  <Children>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                  </Children>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+
+            <WidgetGroup>
+              <Layout>horizontal</Layout>
+              <SizePolicy>min,min</SizePolicy>
+              <Children>
+                <WidgetGroup>
+                    <ObjectName>LatencyLabel</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                        <Label>
+                          <Style>QLabel { font: bold 10px/10px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+                                    background-color: transparent; color: #EECE33;}
+                          </Style>
+                          <Text>CPU</Text>
+                        </Label>
+                    </Children>
+                </WidgetGroup>
+                <Template src="skin:vumeter_latency.xml">
+                  <SetVariable name="TooltipId">audio_latency_usage</SetVariable>
+                  <SetVariable name="group">[Master]</SetVariable>
+                  <SetVariable name="control">audio_latency_usage</SetVariable>
+                </Template>
+              </Children>
+            </WidgetGroup>
         </Children>
     </WidgetGroup>
-</Template>
\ No newline at end of file
+</Template>
diff --git a/res/skins/LateNight/toolbar_full.xml b/res/skins/LateNight/toolbar_full.xml
deleted file mode 100644
index 1220aa9e27f..00000000000
--- a/res/skins/LateNight/toolbar_full.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<Template>
-    <WidgetGroup>
-        <ObjectName>UIButtons</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>e,min</SizePolicy>
-        <Children>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>50f,20f</Size>
-                        <TooltipId>show_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>55f,20f</Size>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>MIC/AUX</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>MIC/AUX</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>55f,20f</Size>
-                        <TooltipId>show_effects</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>EFFECTS</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>EFFECTS</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>62f,20f</Size>
-                        <TooltipId>show_samplers</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>SAMPLERS</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>SAMPLERS</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>  <!-- spacer -->
-                <ObjectName>UIButtonMargin</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children></Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>80f,20f</Size>
-                        <TooltipId>maximize_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-        </Children>
-    </WidgetGroup>
-</Template>
\ No newline at end of file
diff --git a/res/skins/LateNight/toolbar_med.xml b/res/skins/LateNight/toolbar_med.xml
deleted file mode 100644
index 1220aa9e27f..00000000000
--- a/res/skins/LateNight/toolbar_med.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<Template>
-    <WidgetGroup>
-        <ObjectName>UIButtons</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>e,min</SizePolicy>
-        <Children>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>50f,20f</Size>
-                        <TooltipId>show_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>55f,20f</Size>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>MIC/AUX</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>MIC/AUX</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>55f,20f</Size>
-                        <TooltipId>show_effects</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>EFFECTS</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>EFFECTS</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>62f,20f</Size>
-                        <TooltipId>show_samplers</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>SAMPLERS</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>SAMPLERS</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>  <!-- spacer -->
-                <ObjectName>UIButtonMargin</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children></Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>80f,20f</Size>
-                        <TooltipId>maximize_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-        </Children>
-    </WidgetGroup>
-</Template>
\ No newline at end of file
diff --git a/res/skins/LateNight/toolbar_no_library_button.xml b/res/skins/LateNight/toolbar_no_library_button.xml
new file mode 100644
index 00000000000..178c19ac402
--- /dev/null
+++ b/res/skins/LateNight/toolbar_no_library_button.xml
@@ -0,0 +1,444 @@
+<Template>
+    <WidgetGroup>
+        <ObjectName>UIButtons</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>e,min</SizePolicy>
+        <Children>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>80f,20f</Size>
+                        <TooltipId>maximize_library</TooltipId>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>BIG LIBRARY</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>BIG LIBRARY</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Master],maximize_library</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey>[Master],maximize_library</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Divider -->
+                  <Layout>vertical</Layout>
+                  <Size>min,min</Size>
+                  <Children>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                  </Children>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>50f,20f</Size>
+                        <TooltipId>toggle_4decks</TooltipId>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>4 DECKS</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>4 DECKS</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Master],show_4decks</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey>[Master],show_4decks</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>40f,20f</Size>
+                        <TooltipId>toggle_4decks</TooltipId>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>MIXER</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>MIXER</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Master],show_mixer</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey>[Master],show_mixer</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>40f,20f</Size>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>EQ</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>EQ</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Master],show_eqs</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey>[Master],show_eqs</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>55f,20f</Size>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>PREVIEW</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>PREVIEW</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>55f,20f</Size>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>SPINNIES</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>SPINNIES</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>40f,20f</Size>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>VINYL</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>VINYL</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Divider -->
+                  <Layout>vertical</Layout>
+                  <Size>min,min</Size>
+                  <Children>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                  </Children>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>55f,20f</Size>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>MIC/AUX</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>MIC/AUX</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <visible>false</visible>
+                <Children>
+                    <PushButton>
+                        <Size>55f,20f</Size>
+                        <TooltipId>show_effects</TooltipId>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>EFFECTS</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>EFFECTS</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>GuiToggleContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                    <PushButton>
+                        <Size>62f,20f</Size>
+                        <TooltipId>show_samplers</TooltipId>
+                        <ObjectName>GuiToggleButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>SAMPLERS</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>SAMPLERS</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+                        </Connection>
+                    </PushButton>
+                </Children>
+            </WidgetGroup>
+
+            <!-- Spacer -->
+            <WidgetGroup>
+              <Layout>horizontal</Layout>
+              <Size>me,min</Size>
+              <Children/>
+            </WidgetGroup>
+
+            <WidgetGroup>
+              <ObjectName>ClockWidget</ObjectName>
+              <Layout>horizontal</Layout>
+              <SizePolicy>min,min</SizePolicy>
+              <Children>
+                <Time>
+                  <TooltipId>time</TooltipId>
+                  <Style>QLabel { font: bold 13px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+                            background-color: transparent; color: #EECE33;}
+                  </Style>
+                  <ShowSeconds>false</ShowSeconds>
+                </Time>
+              </Children>
+            </WidgetGroup>
+
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+            <WidgetGroup> <!-- Divider -->
+                  <Layout>vertical</Layout>
+                  <Size>min,min</Size>
+                  <Children>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Children/>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                          <Layout>Vertical</Layout>
+                          <Size>3f,3f</Size>
+                          <Style>
+                              QGroupBox {background: #585858;}
+                          </Style>
+                          <Children/>
+                      </WidgetGroup>
+                  </Children>
+            </WidgetGroup>
+
+            <WidgetGroup> <!-- Spacer -->
+                  <Layout>horizontal</Layout>
+                  <Size>5f,min</Size>
+                  <Children/>
+            </WidgetGroup>
+
+            <WidgetGroup>
+              <Layout>horizontal</Layout>
+              <SizePolicy>min,min</SizePolicy>
+              <Children>
+                <WidgetGroup>
+                    <ObjectName>LatencyLabel</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                        <Label>
+                          <Style>QLabel { font: bold 10px/10px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+                                    background-color: transparent; color: #EECE33;}
+                          </Style>
+                          <Text>CPU</Text>
+                        </Label>
+                    </Children>
+                </WidgetGroup>
+                <Template src="skin:vumeter_latency.xml">
+                  <SetVariable name="TooltipId">audio_latency_usage</SetVariable>
+                  <SetVariable name="group">[Master]</SetVariable>
+                  <SetVariable name="control">audio_latency_usage</SetVariable>
+                </Template>
+              </Children>
+            </WidgetGroup>
+        </Children>
+    </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/toolbar_small.xml b/res/skins/LateNight/toolbar_small.xml
deleted file mode 100644
index 8a06ed7f9f8..00000000000
--- a/res/skins/LateNight/toolbar_small.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<Template>
-    <!-- vertical spacer -->
-    <WidgetGroup>
-        <SizePolicy>me,me</SizePolicy>
-        <Children/>
-    </WidgetGroup>
-    <WidgetGroup>
-        <ObjectName>UIButtons</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>e,min</SizePolicy>
-        <Children>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>50f,20f</Size>
-                        <TooltipId>show_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Library],show_library_tab_small</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Library],show_library_tab_small</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>55f,20f</Size>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>MIC/AUX</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>MIC/AUX</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>55f,20f</Size>
-                        <TooltipId>show_effects</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>EFFECTS</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>EFFECTS</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>62f,20f</Size>
-                        <TooltipId>show_samplers</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>SAMPLERS</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>SAMPLERS</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>  <!-- spacer -->
-                <ObjectName>UIButtonMargin</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children></Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>80f,20f</Size>
-                        <TooltipId>maximize_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-        </Children>
-    </WidgetGroup>
-</Template>
\ No newline at end of file
diff --git a/res/skins/LateNight/waveform_and_mixer.xml b/res/skins/LateNight/waveform_and_mixer.xml
index 284fc6ed18c..d25d33e8f87 100644
--- a/res/skins/LateNight/waveform_and_mixer.xml
+++ b/res/skins/LateNight/waveform_and_mixer.xml
@@ -7,203 +7,8 @@
             <WidgetGroup>
                 <Layout>horizontal</Layout>
                 <ObjectName>ToolbarTop</ObjectName>
-                <SizePolicy>me,min</SizePolicy>
+                <Size>me,12f</Size>
                 <Children>
-                    <WidgetGroup>
-                        <ObjectName>GuiToggleContainer</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <Size>50f,20f</Size>
-                                <TooltipId>toggle_4decks</TooltipId>
-                                <ObjectName>GuiToggleButton</ObjectName>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>4 DECKS</Text>
-                                </State>
-                                <State>
-                                  <Number>1</Number>
-                                  <Text>4 DECKS</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey>[Master],show_4decks</ConfigKey>
-                                  <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey>[Master],show_4decks</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>GuiToggleContainer</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <Size>40f,20f</Size>
-                                <TooltipId>show_mixer</TooltipId>
-                                <ObjectName>GuiToggleButton</ObjectName>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>MIXER</Text>
-                                </State>
-                                <State>
-                                  <Number>1</Number>
-                                  <Text>MIXER</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey>[Master],show_mixer</ConfigKey>
-                                  <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey>[Master],show_mixer</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>GuiToggleContainer</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <Size>40f,20f</Size>
-                                <ObjectName>GuiToggleButton</ObjectName>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>EQ</Text>
-                                </State>
-                                <State>
-                                  <Number>1</Number>
-                                  <Text>EQ</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey>[Master],show_eqs</ConfigKey>
-                                  <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey>[Master],show_eqs</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>GuiToggleContainer</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <Size>55f,20f</Size>
-                                <ObjectName>GuiToggleButton</ObjectName>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>PREVIEW</Text>
-                                </State>
-                                <State>
-                                  <Number>1</Number>
-                                  <Text>PREVIEW</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
-                                  <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>GuiToggleContainer</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <Size>55f,20f</Size>
-                                <ObjectName>GuiToggleButton</ObjectName>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>SPINNIES</Text>
-                                </State>
-                                <State>
-                                  <Number>1</Number>
-                                  <Text>SPINNIES</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
-                                  <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>GuiToggleContainer</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <Size>40f,20f</Size>
-                                <TooltipId>show_vinylcontrol</TooltipId>
-                                <ObjectName>GuiToggleButton</ObjectName>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>VINYL</Text>
-                                </State>
-                                <State>
-                                  <Number>1</Number>
-                                  <Text>VINYL</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
-                                  <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>  <!-- spacer -->
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>me,min</SizePolicy>
-                        <Children></Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                      <Layout>vertical</Layout>
-                      <SizePolicy>min,min</SizePolicy>
-                      <Children>
-                        <WidgetGroup>
-                          <ObjectName>ClockWidget</ObjectName>
-                          <Layout>horizontal</Layout>
-                          <SizePolicy>min,max</SizePolicy>
-                          <Children>
-                            <Time>
-                              <TooltipId>time</TooltipId>
-                              <Style>QLabel { font: bold 13px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
-                                        background-color: transparent; color: #EECE33;}
-                              </Style>
-                              <ShowSeconds>false</ShowSeconds>
-                            </Time>
-                          </Children>
-                        </WidgetGroup>
-                        <Template src="skin:vumeter_latency.xml">
-                          <SetVariable name="TooltipId">audio_latency_usage</SetVariable>
-                          <SetVariable name="group">[Master]</SetVariable>
-                          <SetVariable name="control">audio_latency_usage</SetVariable>
-                        </Template>
-                      </Children>
-                    </WidgetGroup>
                 </Children>
             </WidgetGroup>
 			<WidgetGroup>
diff --git a/res/skins/Shade/deck.xml b/res/skins/Shade/deck.xml
index cf9a51a5356..0bd7b1d212b 100644
--- a/res/skins/Shade/deck.xml
+++ b/res/skins/Shade/deck.xml
@@ -184,7 +184,7 @@
 												</Spinny>
 											</Children>
 											<Connection>
-												<ConfigKey>[Spinny<Variable name="channum"/>],show_spinny</ConfigKey>
+												<ConfigKey>[Spinny],show_spinnies</ConfigKey>
 												<BindProperty>visible</BindProperty>
 											</Connection>
 										</WidgetGroup>
@@ -351,7 +351,7 @@
 						</NumberBpm>
 						
 						
-												<!--
+                        <!--
 						**********************************************
 						Text- Key number display
 						**********************************************
@@ -570,29 +570,29 @@
 								<ButtonState>RightButton</ButtonState>
 							</Connection>
 						</PushButton>
-	
-						<!--
+
+                        <!--
 						**********************************************
-						Button - Show spinning Vinyl widget
+						Button - Quantize
 						**********************************************
 						-->
 						<PushButton>
-							<TooltipId>show_spinny</TooltipId>
+							<TooltipId>quantize</TooltipId>
 							<Style></Style>
 							<NumberStates>2</NumberStates>
 							<State>
 								<Number>0</Number>
-								<Pressed>btn_spinny1.png</Pressed>
-								<Unpressed>btn_spinny1.png</Unpressed>
+								<Pressed>btn_quantize1.png</Pressed>
+								<Unpressed>btn_quantize1.png</Unpressed>
 							</State>
 							<State>
 								<Number>1</Number>
-								<Pressed>btn_spinny1_over.png</Pressed>
-								<Unpressed>btn_spinny1_over.png</Unpressed>
+								<Pressed>btn_quantize1_over.png</Pressed>
+								<Unpressed>btn_quantize1_over.png</Unpressed>
 							</State>
 							<Pos>253,161</Pos>
 							<Connection>
-								<ConfigKey>[Spinny<Variable name="channum"/>],show_spinny</ConfigKey>
+								<ConfigKey>[Channel<Variable name="channum"/>],quantize</ConfigKey>
 								<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 								<ButtonState>LeftButton</ButtonState>
 							</Connection>
@@ -650,32 +650,37 @@
 							</Connection>
 						</PushButton>
 	
-						<!--
-						**********************************************
-						Button - Quantize
-						**********************************************
-						-->
-						<PushButton>
-							<TooltipId>quantize</TooltipId>
-							<Style></Style>
-							<NumberStates>2</NumberStates>
-							<State>
-								<Number>0</Number>
-								<Pressed>btn_quantize1.png</Pressed>
-								<Unpressed>btn_quantize1.png</Unpressed>
-							</State>
-							<State>
-								<Number>1</Number>
-								<Pressed>btn_quantize1_over.png</Pressed>
-								<Unpressed>btn_quantize1_over.png</Unpressed>
-							</State>
-							<Pos>274,180</Pos>
-							<Connection>
-								<ConfigKey>[Channel<Variable name="channum"/>],quantize</ConfigKey>
-								<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-								<ButtonState>LeftButton</ButtonState>
-							</Connection>
-						</PushButton>
+                        <!--
+                        **********************************************
+                        Button- Mix Orientation (Routing)
+                        **********************************************
+                        -->
+                        <PushButton>
+                            <TooltipId>orientation</TooltipId>
+                            <Style></Style>
+                            <NumberStates>3</NumberStates>
+                            <State>
+                                <Number>0</Number>
+                                <Pressed>btn_orientation_sampler_left_over.png</Pressed>
+                                <Unpressed>btn_orientation_sampler_left_over.png</Unpressed>
+                            </State>
+                            <State>
+                                <Number>1</Number>
+                                <Pressed>btn_orientation_sampler_master.png</Pressed>
+                                <Unpressed>btn_orientation_sampler_master.png</Unpressed>
+                            </State>
+                            <State>
+                                <Number>2</Number>
+                                <Pressed>btn_orientation_sampler_right_over.png</Pressed>
+                                <Unpressed>btn_orientation_sampler_right_over.png</Unpressed>
+                            </State>
+                            <Pos>274,180</Pos>
+                            <Connection>
+                                <ConfigKey>[Channel<Variable name="channum"/>],orientation</ConfigKey>
+                                <EmitOnDownPress>true</EmitOnDownPress>
+                                <ButtonState>LeftButton</ButtonState>
+                            </Connection>
+                        </PushButton>
 	
 						<!--
 						**********************************************
diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml
index a87f53ee59b..10c90537618 100644
--- a/res/skins/Shade/mixer_panel.xml
+++ b/res/skins/Shade/mixer_panel.xml
@@ -137,6 +137,10 @@
 								<ConfigKey>[Master],crossfader</ConfigKey>
 								<EmitOnDownPress>false</EmitOnDownPress>
 							</Connection>
+                            <Connection>
+                                <ConfigKey>[Master],show_xfader</ConfigKey>
+                                <BindProperty>visible</BindProperty>
+                            </Connection>
 						</SliderComposed>
 
 						<!--
diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml
index 4a33042afb6..1259f5c6a34 100644
--- a/res/skins/Shade/skin.xml
+++ b/res/skins/Shade/skin.xml
@@ -70,6 +70,7 @@
 			<attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
 			<attribute persist="true" config_key="[Library],show_coverart">0</attribute>
 			<attribute persist="true" config_key="[Vinylcontrol],show_vinylcontrol">0</attribute>
+            <attribute persist="true" config_key="[Master],show_xfader">1</attribute>
 		</attributes>
 	</manifest>
 
diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
index ebba447f076..bff0059e7b2 100644
--- a/src/controllers/controlpickermenu.cpp
+++ b/src/controllers/controlpickermenu.cpp
@@ -730,6 +730,9 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
     addControl("[Library]", "show_coverart",
                tr("Cover Art Show/Hide"),
                tr("Show/hide cover art"), guiMenu);
+    addControl("[Master]", "show_xfader",
+               tr("Crossfader Show/Hide"),
+               tr("Show/hide the crossfader"), guiMenu);
 
     QString spinnyTitle = tr("Vinyl Spinner Show/Hide");
     QString spinnyDescription = tr("Show/hide spinning vinyl widget");
diff --git a/src/skin/tooltips.cpp b/src/skin/tooltips.cpp
index 457a5531c77..dcdfacac2ce 100644
--- a/src/skin/tooltips.cpp
+++ b/src/skin/tooltips.cpp
@@ -227,6 +227,10 @@ void Tooltips::addStandardTooltips() {
             << tr("Toggle 4 Decks")
             << tr("Switches between showing 2 decks and 4 decks.");
 
+    add("show_xfader")
+            << tr("Crossfader")
+            << tr("Show/hide the crossfader");
+
     add("show_library")
             << tr("Show Library")
             << tr("Show or hide the track library.");
diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp
index dd02fde5136..97a2ee3f758 100644
--- a/src/widget/wmainmenubar.cpp
+++ b/src/widget/wmainmenubar.cpp
@@ -176,19 +176,74 @@ void WMainMenuBar::initialize() {
     QMenu* pViewMenu = new QMenu(tr("&View"));
 
     QString mayNotBeSupported = tr("May not be supported on all skins.");
-    QString showSamplersTitle = tr("Show Samplers");
-    QString showSamplersText = tr("Show the sample deck section of the Mixxx interface.") +
+
+    QString maximizeLibraryTitle = tr("Maximize Library");
+    QString maximizeLibraryText = tr("Maximize the track library to take up all the available screen space.") +
             " " + mayNotBeSupported;
-    QAction* pViewShowSamplers = new QAction(showSamplersTitle, this);
-    pViewShowSamplers->setCheckable(true);
-    pViewShowSamplers->setShortcut(
+    QAction* pViewMaximizeLibrary = new QAction(maximizeLibraryTitle, this);
+    pViewMaximizeLibrary->setCheckable(true);
+    pViewMaximizeLibrary->setShortcut(
         QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
-                                                  "ViewMenu_ShowSamplers"),
-                                                  tr("Ctrl+1", "Menubar|View|Show Samplers"))));
-    pViewShowSamplers->setStatusTip(showSamplersText);
-    pViewShowSamplers->setWhatsThis(buildWhatsThis(showSamplersTitle, showSamplersText));
-    createVisibilityControl(pViewShowSamplers, ConfigKey("[Samplers]", "show_samplers"));
-    pViewMenu->addAction(pViewShowSamplers);
+                                                  "ViewMenu_MaximizeLibrary"),
+                                                  tr("Space", "Menubar|View|Maximize Library"))));
+    pViewMaximizeLibrary->setStatusTip(maximizeLibraryText);
+    pViewMaximizeLibrary->setWhatsThis(buildWhatsThis(maximizeLibraryTitle, maximizeLibraryText));
+    createVisibilityControl(pViewMaximizeLibrary, ConfigKey("[Master]", "maximize_library"));
+    pViewMenu->addAction(pViewMaximizeLibrary);
+
+
+    pViewMenu->addSeparator();
+
+
+    QString show4DecksTitle = tr("Show 4 Decks");
+    QString show4DecksText = tr("Show 4 Decks on the Mixxx interface.") +
+            " " + mayNotBeSupported;
+    QAction* pViewShow4Decks = new QAction(show4DecksTitle, this);
+    pViewShow4Decks->setCheckable(true);
+    pViewShow4Decks->setShortcut(
+        QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
+                                                  "ViewMenu_Show4Decks"),
+                                                  tr("Ctrl+1", "Menubar|View|Show 4 Decks"))));
+    pViewShow4Decks->setStatusTip(show4DecksText);
+    pViewShow4Decks->setWhatsThis(buildWhatsThis(show4DecksTitle, show4DecksText));
+    connect(pViewShow4Decks, SIGNAL(toggled(bool)),
+            this, SLOT(slotViewShow4Decks(bool)));
+    createVisibilityControl(pViewShow4Decks, ConfigKey("[Master]", "show_4decks"));
+    pViewMenu->addAction(pViewShow4Decks);
+
+
+    QString showPreviewDeckTitle = tr("Show Preview Deck");
+    QString showPreviewDeckText = tr("Show the preview deck in the Mixxx interface.") +
+            " " + mayNotBeSupported;
+    QAction* pViewShowPreviewDeck = new QAction(showPreviewDeckTitle, this);
+    pViewShowPreviewDeck->setCheckable(true);
+    pViewShowPreviewDeck->setShortcut(
+        QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
+                                                  "ViewMenu_ShowPreviewDeck"),
+                                                  tr("Ctrl+2", "Menubar|View|Show Preview Deck"))));
+    pViewShowPreviewDeck->setStatusTip(showPreviewDeckText);
+    pViewShowPreviewDeck->setWhatsThis(buildWhatsThis(showPreviewDeckTitle, showPreviewDeckText));
+    createVisibilityControl(pViewShowPreviewDeck, ConfigKey("[PreviewDeck]", "show_previewdeck"));
+    pViewMenu->addAction(pViewShowPreviewDeck);
+
+
+    pViewMenu->addSeparator();
+
+
+    QString showLibraryTitle = tr("Show Library");
+    QString showLibraryText = tr("Show the library of the Mixxx interfce.") +
+            " " + mayNotBeSupported;
+    QAction* pViewShowLibrary = new QAction(showLibraryTitle, this);
+    pViewShowLibrary->setCheckable(true);
+    pViewShowLibrary->setShortcut(
+        QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
+                                                  "ViewMenu_ShowLibrary"),
+                                                  tr("Ctrl+3", "Menubar|View|Show Library"))));
+    pViewShowLibrary->setStatusTip(showLibraryText);
+    pViewShowLibrary->setWhatsThis(buildWhatsThis(showLibraryTitle, showLibraryText));
+    createVisibilityControl(pViewShowLibrary, ConfigKey("[Library]", "show_library"));
+    pViewMenu->addAction(pViewShowLibrary);
+
 
     QString showMicrophoneTitle = tr("Show Microphone Section");
     QString showMicrophoneText = tr("Show the microphone section of the Mixxx interface.") +
@@ -198,12 +253,46 @@ void WMainMenuBar::initialize() {
     pViewShowMicrophone->setShortcut(
         QKeySequence(m_pKbdConfig->getValueString(
             ConfigKey("[KeyboardShortcuts]", "ViewMenu_ShowMicrophone"),
-            tr("Ctrl+2", "Menubar|View|Show Microphone Section"))));
+            tr("Ctrl+4", "Menubar|View|Show Microphone Section"))));
     pViewShowMicrophone->setStatusTip(showMicrophoneText);
     pViewShowMicrophone->setWhatsThis(buildWhatsThis(showMicrophoneTitle, showMicrophoneText));
     createVisibilityControl(pViewShowMicrophone, ConfigKey("[Microphone]", "show_microphone"));
     pViewMenu->addAction(pViewShowMicrophone);
 
+
+    QString showEffectsTitle = tr("Show Effect Rack");
+    QString showEffectsText = tr("Show the effect rack in the Mixxx interface.") +
+    " " + mayNotBeSupported;
+    QAction* pViewShowEffects = new QAction(showEffectsTitle, this);
+    pViewShowEffects->setCheckable(true);
+    pViewShowEffects->setShortcut(
+        QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
+                                                  "ViewMenu_ShowEffects"),
+                                                  tr("Ctrl+5", "Menubar|View|Show Effect Rack"))));
+    pViewShowEffects->setStatusTip(showEffectsText);
+    pViewShowEffects->setWhatsThis(buildWhatsThis(showEffectsTitle, showEffectsText));
+    createVisibilityControl(pViewShowEffects, ConfigKey("[EffectRack1]", "show"));
+    pViewMenu->addAction(pViewShowEffects);
+
+
+    QString showSamplersTitle = tr("Show Samplers");
+    QString showSamplersText = tr("Show the sample deck section of the Mixxx interface.") +
+            " " + mayNotBeSupported;
+    QAction* pViewShowSamplers = new QAction(showSamplersTitle, this);
+    pViewShowSamplers->setCheckable(true);
+    pViewShowSamplers->setShortcut(
+        QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
+                                                  "ViewMenu_ShowSamplers"),
+                                                  tr("Ctrl+6", "Menubar|View|Show Samplers"))));
+    pViewShowSamplers->setStatusTip(showSamplersText);
+    pViewShowSamplers->setWhatsThis(buildWhatsThis(showSamplersTitle, showSamplersText));
+    createVisibilityControl(pViewShowSamplers, ConfigKey("[Samplers]", "show_samplers"));
+    pViewMenu->addAction(pViewShowSamplers);
+
+
+    pViewMenu->addSeparator();
+
+
 #ifdef __VINYLCONTROL__
     QString showVinylControlTitle = tr("Show Vinyl Control Section");
     QString showVinylControlText = tr("Show the vinyl control section of the Mixxx interface.") +
@@ -213,40 +302,73 @@ void WMainMenuBar::initialize() {
     pViewVinylControl->setShortcut(
         QKeySequence(m_pKbdConfig->getValueString(
             ConfigKey("[KeyboardShortcuts]", "ViewMenu_ShowVinylControl"),
-            tr("Ctrl+3", "Menubar|View|Show Vinyl Control Section"))));
+            tr("Ctrl+7", "Menubar|View|Show Vinyl Control Section"))));
     pViewVinylControl->setStatusTip(showVinylControlText);
     pViewVinylControl->setWhatsThis(buildWhatsThis(showVinylControlTitle, showVinylControlText));
     createVisibilityControl(pViewVinylControl, ConfigKey(VINYL_PREF_KEY, "show_vinylcontrol"));
     pViewMenu->addAction(pViewVinylControl);
 #endif
 
-    QString showPreviewDeckTitle = tr("Show Preview Deck");
-    QString showPreviewDeckText = tr("Show the preview deck in the Mixxx interface.") +
+
+    QString showSpinniesTitle = tr("Show Spinning Vinyl");
+    QString showSpinniesText = tr("Show the spinnining vinyl widget on the Mixxx interface.") +
             " " + mayNotBeSupported;
-    QAction* pViewShowPreviewDeck = new QAction(showPreviewDeckTitle, this);
-    pViewShowPreviewDeck->setCheckable(true);
-    pViewShowPreviewDeck->setShortcut(
+    QAction* m_pViewShowSpinnies = new QAction(showSpinniesTitle, this);
+    m_pViewShowSpinnies->setCheckable(true);
+    m_pViewShowSpinnies->setShortcut(
         QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
-                                                  "ViewMenu_ShowPreviewDeck"),
-                                                  tr("Ctrl+4", "Menubar|View|Show Preview Deck"))));
-    pViewShowPreviewDeck->setStatusTip(showPreviewDeckText);
-    pViewShowPreviewDeck->setWhatsThis(buildWhatsThis(showPreviewDeckTitle, showPreviewDeckText));
-    createVisibilityControl(pViewShowPreviewDeck, ConfigKey("[PreviewDeck]", "show_previewdeck"));
-    pViewMenu->addAction(pViewShowPreviewDeck);
+                                                  "ViewMenu_ShowSpinnies"),
+                                                  tr("Ctrl+8", "Menubar|View|Show Spinning Vinyl"))));
+    m_pViewShowSpinnies->setStatusTip(showSpinniesText);
+    m_pViewShowSpinnies->setWhatsThis(buildWhatsThis(showSpinniesTitle, showSpinniesText));
+    createVisibilityControl(m_pViewShowSpinnies, ConfigKey("[Spinny]", "show_spinnies"));
+    pViewMenu->addAction(m_pViewShowSpinnies);
 
-    QString showEffectsTitle = tr("Show Effect Rack");
-    QString showEffectsText = tr("Show the effect rack in the Mixxx interface.") +
-    " " + mayNotBeSupported;
-    QAction* pViewShowEffects = new QAction(showEffectsTitle, this);
-    pViewShowEffects->setCheckable(true);
-    pViewShowEffects->setShortcut(
+
+
+    QString showMixerTitle = tr("Show Mixer");
+    QString showMixerText = tr("Show the mixer section.") +
+            " " + mayNotBeSupported;
+    QAction* pViewShowMixer = new QAction(showMixerTitle, this);
+    pViewShowMixer->setCheckable(true);
+    pViewShowMixer->setShortcut(
         QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
-                                                  "ViewMenu_ShowEffects"),
-                                                  tr("Ctrl+5", "Menubar|View|Show Effect Rack"))));
-    pViewShowEffects->setStatusTip(showEffectsText);
-    pViewShowEffects->setWhatsThis(buildWhatsThis(showEffectsTitle, showEffectsText));
-    createVisibilityControl(pViewShowEffects, ConfigKey("[EffectRack1]", "show"));
-    pViewMenu->addAction(pViewShowEffects);
+                                                  "ViewMenu_ShowMixer"),
+                                                  tr("Ctrl+9", "Menubar|View|Show Mixer"))));
+    pViewShowMixer->setStatusTip(showMixerText);
+    pViewShowMixer->setWhatsThis(buildWhatsThis(showMixerTitle, showMixerText));
+    createVisibilityControl(pViewShowMixer, ConfigKey("[Master]", "show_mixer"));
+    pViewMenu->addAction(pViewShowMixer);
+
+
+    QString showEqsTitle = tr("Show Eqs");
+    QString showEqsText = tr("Show the equalizers on the mixer section.") +
+            " " + mayNotBeSupported;
+    QAction* pViewShowEqs = new QAction(showEqsTitle, this);
+    pViewShowEqs->setCheckable(true);
+    pViewShowEqs->setShortcut(
+        QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
+                                                  "ViewMenu_ShowEqs"),
+                                                  tr("Ctrl+0", "Menubar|View|Show Eqs"))));
+    pViewShowEqs->setStatusTip(showEqsText);
+    pViewShowEqs->setWhatsThis(buildWhatsThis(showEqsTitle, showEqsText));
+    createVisibilityControl(pViewShowEqs, ConfigKey("[Master]", "show_eqs"));
+    pViewMenu->addAction(pViewShowEqs);
+
+
+    QString showXFaderTitle = tr("Show Crossfader");
+    QString showXFaderText = tr("Show the crossfader on the mixer section.") +
+            " " + mayNotBeSupported;
+    QAction* m_pViewShowXFader = new QAction(showXFaderTitle, this);
+    m_pViewShowXFader->setCheckable(true);
+    m_pViewShowXFader->setShortcut(
+        QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
+                                                  "ViewMenu_ShowXFader"),
+                                                  tr("Ctrl+'", "Menubar|View|Show Crossfader"))));
+    m_pViewShowXFader->setStatusTip(showXFaderText);
+    m_pViewShowXFader->setWhatsThis(buildWhatsThis(showXFaderTitle, showXFaderText));
+    createVisibilityControl(m_pViewShowXFader, ConfigKey("[Master]", "show_xfader"));
+    pViewMenu->addAction(m_pViewShowXFader);
 
 
     QString showCoverArtTitle = tr("Show Cover Art");
@@ -257,28 +379,13 @@ void WMainMenuBar::initialize() {
     pViewShowCoverArt->setShortcut(
         QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
                                                   "ViewMenu_ShowCoverArt"),
-                                                  tr("Ctrl+6", "Menubar|View|Show Cover Art"))));
+                                                  tr("Ctrl+¡", "Menubar|View|Show Cover Art"))));
     pViewShowCoverArt->setStatusTip(showCoverArtText);
     pViewShowCoverArt->setWhatsThis(buildWhatsThis(showCoverArtTitle, showCoverArtText));
     createVisibilityControl(pViewShowCoverArt, ConfigKey("[Library]", "show_coverart"));
     pViewMenu->addAction(pViewShowCoverArt);
 
 
-    QString maximizeLibraryTitle = tr("Maximize Library");
-    QString maximizeLibraryText = tr("Maximize the track library to take up all the available screen space.") +
-            " " + mayNotBeSupported;
-    QAction* pViewMaximizeLibrary = new QAction(maximizeLibraryTitle, this);
-    pViewMaximizeLibrary->setCheckable(true);
-    pViewMaximizeLibrary->setShortcut(
-        QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
-                                                  "ViewMenu_MaximizeLibrary"),
-                                                  tr("Space", "Menubar|View|Maximize Library"))));
-    pViewMaximizeLibrary->setStatusTip(maximizeLibraryText);
-    pViewMaximizeLibrary->setWhatsThis(buildWhatsThis(maximizeLibraryTitle, maximizeLibraryText));
-    createVisibilityControl(pViewMaximizeLibrary, ConfigKey("[Master]", "maximize_library"));
-    pViewMenu->addAction(pViewMaximizeLibrary);
-
-
     pViewMenu->addSeparator();
 
 
@@ -302,6 +409,7 @@ void WMainMenuBar::initialize() {
 
     addMenu(pViewMenu);
 
+
     // OPTIONS MENU
     QMenu* pOptionsMenu = new QMenu(tr("&Options"));