diff --git a/artsrc/d2k/chrome.psd b/artsrc/d2k/chrome.psd
new file mode 100644
index 0000000000..bd429fa3cd
Binary files /dev/null and b/artsrc/d2k/chrome.psd differ
diff --git a/artsrc/d2k/tabs.psd b/artsrc/d2k/tabs.psd
deleted file mode 100644
index 10c2575272..0000000000
Binary files a/artsrc/d2k/tabs.psd and /dev/null differ
diff --git a/mods/d2k/chrome.yaml b/mods/d2k/chrome.yaml
index a3274fce3b..9c9761fe29 100644
--- a/mods/d2k/chrome.yaml
+++ b/mods/d2k/chrome.yaml
@@ -1,167 +1,91 @@
-chrome-atreides: chrome-atreides.png
-	specialbin-top: 0,0,30,51
-	specialbin-middle: 0,51,30,51
-	specialbin-bottom: 0,153,30,39
-	moneybin: 192,0,320,31
-	radar: 297,31,210,222
-	tooltip-bg: 0,288,272,136
+sidebar: chrome.png
+	background-top: 0,0,226,295
+	background-iconrow: 0,295,226,48
+	background-bottom: 0,343,226,13
+	background-supportoverlay: 236,212,60,48
 
-sidebar-bits: chrome-atreides.png
-	power-indicator: 187,4,4,7
+sidebar-button: chrome.png
+	background: 0,357,25,25
+sidebar-button-hover: chrome.png
+	background: 25,357,25,25
+sidebar-button-pressed: chrome.png
+	background: 25,357,25,25
+sidebar-button-highlighted: chrome.png
+	background: 25,357,25,25
+sidebar-button-highlighted-hover: chrome.png
+	background: 25,357,25,25
+sidebar-button-highlighted-pressed: chrome.png
+	background: 25,357,25,25
+sidebar-button-disabled: chrome.png
+	background: 50,357,25,25
+sidebar-button-highlighted-disabled: chrome.png
+	background: 50,357,25,25
 
-palette-atreides: chrome-atreides.png
-	top: 297,288,201,9
-	dock-top: 498,274,14,23
-	bottom: 297,489,201,9
-	dock-bottom: 498,489,14,23
-	bg-0: 297,297,201,48
-	dock-0: 498,297,14,48
-	bg-1: 297,345,201,48
-	dock-1: 498,345,14,48
-	bg-2: 297,393,201,48
-	dock-2: 498,393,14,48
-	bg-3: 297,441,201,48
-	dock-3: 498,441,14,48
- 
-digits-atreides: chrome-atreides.png
-	0: 32,0,13,17
-	1: 45,0,13,17
-	2: 58,0,13,17
-	3: 71,0,13,17
-	4: 84,0,13,17
-	5: 97,0,13,17
-	6: 110,0,13,17
-	7: 123,0,13,17
-	8: 136,0,13,17
-	9: 149,0,13,17
+sidebar-bits: chrome.png
+	production-tooltip-time: 476,0,16,16
+	production-tooltip-power: 444,0,16,16
+	production-tooltip-cost: 412,0,16,16
+	production-iconoverlay: 236,112,226,48
 
-chrome-harkonnen: chrome-harkonnen.png
-	specialbin-top: 0,0,30,51
-	specialbin-middle: 0,51,30,51
-	specialbin-bottom: 0,153,30,39
-	moneybin: 192,0,320,31
-	radar: 297,31,210,222
-	tooltip-bg: 0,288,272,136
+minimap: chrome.png
+	overlapping-elements: 227,0,202,202
 
-palette-harkonnen: chrome-harkonnen.png
-	top: 297,288,201,9
-	dock-top: 498,274,14,23
-	bottom: 297,489,201,9
-	dock-bottom: 498,489,14,23
-	bg-0: 297,297,201,48
-	dock-0: 498,297,14,48
-	bg-1: 297,345,201,48
-	dock-1: 498,345,14,48
-	bg-2: 297,393,201,48
-	dock-2: 498,393,14,48
-	bg-3: 297,441,201,48
-	dock-3: 498,441,14,48
+radar-atreides: chrome.png
+	insignia: 236,268,100,106
+radar-harkonnen: chrome.png
+	insignia: 341,377,100,106
+radar-ordos: chrome.png
+	insignia: 341,266,100,106
 
-digits-harkonnen: chrome-harkonnen.png
-	0: 32,0,13,17
-	1: 45,0,13,17
-	2: 58,0,13,17
-	3: 71,0,13,17
-	4: 84,0,13,17
-	5: 97,0,13,17
-	6: 110,0,13,17
-	7: 123,0,13,17
-	8: 136,0,13,17
-	9: 149,0,13,17
+power-icons: chrome.png
+	power-normal: 430,176,16,16
+	power-critical: 478,176,16,16
 
-chrome-ordos: chrome-ordos.png
-	specialbin-top: 0,0,30,51
-	specialbin-middle: 0,51,30,51
-	specialbin-bottom: 0,153,30,39
-	moneybin: 192,0,320,31
-	radar: 297,31,210,222
-	tooltip-bg: 0,288,272,136
+production-icons: chrome.png
+	building: 430,0,16,16
+	building-disabled: 446,0,16,16
+	building-alert: 462,0,16,16
+	infantry: 430,32,16,16
+	infantry-disabled: 446,32,16,16
+	infantry-alert: 462,32,16,16
+	vehicle: 430,96,16,16
+	vehicle-disabled: 446,96,16,16
+	vehicle-alert: 462,96,16,16
+	armor: 430,48,16,16
+	armor-disabled: 446,48,16,16
+	armor-alert: 462,48,16,16
+	aircraft: 430,64,16,16
+	aircraft-disabled: 446,64,16,16
+	aircraft-alert: 462,64,16,16
+	starport: 430,144,16,16
+	starport-disabled: 446,144,16,16
+	starport-alert: 462,144,16,16
 
-palette-ordos: chrome-ordos.png
-	top: 297,288,201,9
-	dock-top: 498,274,14,23
-	bottom: 297,489,201,9
-	dock-bottom: 498,489,14,23
-	bg-0: 297,297,201,48
-	dock-0: 498,297,14,48
-	bg-1: 297,345,201,48
-	dock-1: 498,345,14,48
-	bg-2: 297,393,201,48
-	dock-2: 498,393,14,48
-	bg-3: 297,441,201,48
-	dock-3: 498,441,14,48
-
-digits-ordos: chrome-ordos.png
-	0: 32,0,13,17
-	1: 45,0,13,17
-	2: 58,0,13,17
-	3: 71,0,13,17
-	4: 84,0,13,17
-	5: 97,0,13,17
-	6: 110,0,13,17
-	7: 123,0,13,17
-	8: 136,0,13,17
-	9: 149,0,13,17
-
-tabs-selected: tabs.png
-	atreides-Building: 0,0,27,41
-	atreides-Armor: 0,40,27,41
-	atreides-Infantry: 0,80,27,41
-	atreides-Vehicle: 0,120,27,41
-	atreides-Aircraft: 0,160,27,41
-	atreides-Starport: 0,200,27,41
-	harkonnen-Building: 80,0,27,41
-	harkonnen-Armor: 80,40,27,41
-	harkonnen-Infantry: 80,80,27,41
-	harkonnen-Vehicle: 80,120,27,41
-	harkonnen-Aircraft: 80,160,27,41
-	harkonnen-Starport: 80,200,27,41
-	ordos-Building: 160,0,27,41
-	ordos-Armor: 160,40,27,41
-	ordos-Infantry: 160,80,27,41
-	ordos-Vehicle: 160,120,27,41
-	ordos-Aircraft: 160,160,27,41
-	ordos-Starport: 160,200,27,41
-
-tabs-ready: tabs.png
-	atreides-Building: 27,0,27,41
-	atreides-Armor: 27,40,27,41
-	atreides-Infantry: 27,80,27,41
-	atreides-Vehicle: 27,120,27,41
-	atreides-Aircraft: 27,160,27,41
-	atreides-Starport: 27,200,27,41
-	harkonnen-Building: 107,0,27,41
-	harkonnen-Armor: 107,40,27,41
-	harkonnen-Infantry: 107,80,27,41
-	harkonnen-Vehicle: 107,120,27,41
-	harkonnen-Aircraft: 107,160,27,41
-	harkonnen-Starport: 107,200,27,41
-	ordos-Building: 187,0,27,41
-	ordos-Armor: 187,40,27,41
-	ordos-Infantry: 187,80,27,41
-	ordos-Vehicle: 187,120,27,41
-	ordos-Aircraft: 187,160,27,41
-	ordos-Starport: 187,200,27,41
-
-tabs-normal: tabs.png
-	atreides-Building: 54,0,27,41
-	atreides-Armor: 54,40,27,41
-	atreides-Infantry: 54,80,27,41
-	atreides-Vehicle: 54,120,27,41
-	atreides-Aircraft: 54,160,27,41
-	atreides-Starport: 54,200,27,41
-	harkonnen-Building: 134,0,27,41
-	harkonnen-Armor: 134,40,27,41
-	harkonnen-Infantry: 134,80,27,41
-	harkonnen-Vehicle: 134,120,27,41
-	harkonnen-Aircraft: 134,160,27,41
-	harkonnen-Starport: 134,200,27,41
-	ordos-Building: 214,0,27,41
-	ordos-Armor: 214,40,27,41
-	ordos-Infantry: 214,80,27,41
-	ordos-Vehicle: 214,120,27,41
-	ordos-Aircraft: 214,160,27,41
-	ordos-Starport: 214,200,27,41
+order-icons: chrome.png
+	debug: 10,388,34,35
+	debug-disabled: 10,428,34,35
+	debug-active: 10,468,34,35
+	guard: 49,388,34,35
+	guard-disabled: 49,428,34,35
+	guard-active: 49,468,34,35
+	repair: 88,388,34,35
+	repair-disabled: 88,428,34,35
+	repair-active: 88,468,34,35
+	sell: 127,388,34,35
+	sell-disabled: 127,428,34,35
+	sell-active: 127,468,34,35
+	options: 165,388,40,38
+	options-disabled: 165,428,40,38
+	options-active: 165,468,40,38   
+	beacon: 209,388,36,35
+	beacon-disabled: 209,428,36,35
+	beacon-active: 209,468,36,35
+	power: 248,388,34,35
+	power-disabled: 248,428,36,35
+	power-active: 248,468,36,35
+	diplomacy: 288,388,34,35
+	diplomacy-disabled: 288,428,34,35
+	diplomacy-active: 288,468,34,35
 
 flags: buttons.png
 	atreides: 0,114,22,21
@@ -180,9 +104,9 @@ dialog: dialog.png
 	corner-tl: 191,480,9,9
 	corner-tr: 200,480,9,9
 	corner-bl: 191,489,9,9
-	corner-br: 200,489,9,9	
+	corner-br: 200,489,9,9
 
-# Same as a normal button 		
+# Same as a normal button
 dialog2: dialog.png
 	background: 513,1,126,126
 	border-r: 639,1,1,126
@@ -194,7 +118,7 @@ dialog2: dialog.png
 	corner-bl: 512,127,1,1
 	corner-br: 639,127,1,1
 
-# Same as a pressed button 	
+# Same as a pressed button
 dialog3: dialog.png
 	background: 641,1,126,126
 	border-r: 767,1,1,126
@@ -206,7 +130,7 @@ dialog3: dialog.png
 	corner-bl: 640,127,1,1
 	corner-br: 767,127,1,1
 
-# Same as the half transparent frame used in the Asset Browser	
+# Same as the half transparent frame used in the Asset Browser
 dialog4: dialog.png
 	background: 517,392,54,54
 	border-t: 517,387,54,6
@@ -231,20 +155,6 @@ strategic: strategic.png
 	enemy_owned: 32,32,32,32
 	player_owned: 96,0,32,32
 
-order-icons: buttons.png
-	sell: 0,0,34,28
-	sell-disabled: 68,0,34,28
-	sell-active: 34,0,34,28
-	repair: 0,28,34,28
-	repair-disabled: 68,28,34,28
-	repair-active: 34,28,34,28
-	power: 0,56,34,28
-	power-disabled: 68,56,34,28
-	power-active: 34,56,34,28
-	beacon: 0,84,34,28
-	beacon-disabled: 68,84,34,28
-	beacon-active: 34,84,34,28
-
 music: musicplayer.png
 	pause: 0,0,25,25
 	stop: 28,0,25,25
@@ -367,7 +277,7 @@ button-highlighted-pressed: dialog.png
 	corner-bl: 896,127,1,1
 	corner-br: 1023,127,1,1
 
-# A copy of	button-highlighted
+# A copy of button-highlighted
 button-highlighted-disabled: dialog.png
 	background: 769,1,126,126
 	border-r: 639,1,1,126
diff --git a/mods/d2k/chrome/ingame-player.yaml b/mods/d2k/chrome/ingame-player.yaml
index 4ecbb6598b..ee8ad938ff 100644
--- a/mods/d2k/chrome/ingame-player.yaml
+++ b/mods/d2k/chrome/ingame-player.yaml
@@ -3,128 +3,366 @@ Container@PLAYER_WIDGETS:
 		LogicKeyListener@CONTROLGROUP_KEYHANDLER:
 			Logic: ControlGroupLogic
 		LogicTicker@SIDEBAR_TICKER:
-		MenuButton@OPTIONS_BUTTON:
-			Logic: OrderButtonsChromeLogic
-			X: 0
-			Y: 0
-			Width: 160
-			Height: 25
-			Text: Options (Esc)
-			Font: Bold
-			Key: escape
-		MenuButton@DIPLOMACY_BUTTON:
-			Logic: OrderButtonsChromeLogic
-			MenuContainer: INGAME_DIPLOMACY_BG
-			HideIngameUI: False
-			X: 162
-			Y: 0
-			Width: 160
-			Height: 25
-			Text: Diplomacy (P)
-			Font: Bold
-			Key: p
-		MenuButton@DEBUG_BUTTON:
-			Logic: OrderButtonsChromeLogic
-			MenuContainer: INGAME_MENU
-			X: 324
-			Y: 0
-			Width: 160
-			Height: 25
-			Text: Debug (Shift + Esc)
-			Font: Bold
-			Key: escape Shift
-		SlidingContainer@INGAME_RADAR_BIN:
-			Logic: SlidingRadarBinLogic
-			X: WINDOW_RIGHT-215
-			Y: 0
-			OpenOffset: 0,29
-			ClosedOffset: 0,-166
-			AnimationLength: 15
+		Container@SUPPORT_POWERS:
+			Logic: SupportPowerBinLogic
+			X: 10
+			Y: 10
 			Children:
-				LogicTicker@RADAR_TICKER:
-				Image@RADAR_BIN_BG:
-					ImageName: radar
-				Radar@RADAR_MINIMAP:
-					WorldInteractionController: INTERACTION_CONTROLLER
-					X: 9
-					Width: 192
-					Height: 192
-				ResourceBar@POWERBAR:
-					Logic: IngamePowerBarLogic
-					X: 42
-					Y: 205
-					Width: 138
-					Height: 5
+				SupportPowers@SUPPORT_PALETTE:
+					IconSize: 60, 48
+					IconSpriteOffset: -1, -1
+					TooltipContainer: TOOLTIP_CONTAINER
+					ReadyText: READY
+					HoldText: ON HOLD
+				Container@PALETTE_FOREGROUND:
+					Children:
+						Image@ICON_TEMPLATE:
+							X:0-2
+							Y:0-2
+							Width: 60
+							Height: 48
+							IgnoreMouseOver: true
+							ImageCollection: sidebar
+							ImageName: background-supportoverlay
+		Image@SIDEBAR_BACKGROUND_TOP:
+			X: WINDOW_RIGHT - 226
+			Y: 0
+			Width: 226
+			Height: 295
+			ImageCollection: sidebar
+			ImageName: background-top
+			ClickThrough: false
+			Children:
+				Container@TOP_BUTTONS:
+					Logic: OrderButtonsChromeLogic
+					X: 16
+					Y: 236
+					Children:
+						MenuButton@DEBUG_BUTTON:
+							Key: escape Shift
+							X: 4
+							Width: 34
+							Height: 35
+							Background:
+							TooltipText: Debug Menu
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 0
+									Y: 0
+									ImageCollection: order-icons
+									ImageName: debug
+						Button@REPAIR_BUTTON:
+							X: 29
+							Width: 34
+							Height: 35
+							Background:
+							TooltipText: Repair
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 0
+									Y: 0
+									ImageCollection: order-icons
+						Button@SELL_BUTTON:
+							X: 54
+							Width: 34
+							Height: 35
+							Background:
+							TooltipText: Sell
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 0
+									Y: 0
+									ImageCollection: order-icons
+						Button@BEACON_BUTTON:
+							X: 108
+							Width: 36
+							Height: 35
+							Background:
+							TooltipText: Place Beacon
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 0
+									Y: 0
+									ImageCollection: order-icons
+
+						Button@POWER_BUTTON:
+							X: 133
+							Width: 36
+							Height: 35
+							Background:
+							TooltipText: Power Down
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 0
+									Y: 0
+									ImageCollection: order-icons
+						MenuButton@DIPLOMACY_BUTTON:
+							MenuContainer: INGAME_DIPLOMACY_BG
+							HideIngameUI: false
+							Pause: false
+							Key: P
+							X: 159
+							Width: 25
+							Height: 25
+							Background:
+							TooltipText: Diplomacy
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 0
+									Y: 0
+									ImageCollection: order-icons
+									ImageName: diplomacy
+						MenuButton@OPTIONS_BUTTON:
+							Key: escape
+							X: 78
+							Y: 1
+							Width: 40
+							Height: 38
+							Background:
+							TooltipText: Options
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 0
+									Y: 0
+									ImageCollection: order-icons
+									ImageName: options
+				Container@RADAR:
+					Logic: IngameRadarDisplayLogic
+					Children:
+						LogicTicker@RADAR_TICKER:
+						ColorBlock@RADAR_FADETOBLACK:
+							X: 12
+							Y: 34
+							Width: 202
+							Height: 202
+						Radar@RADAR_MINIMAP:
+							WorldInteractionController: INTERACTION_CONTROLLER
+							X: 12
+							Y: 34
+							Width: 202
+							Height: 202
+							Children:
+						Image@MINIMAP:
+							X: 12
+							Y: 34
+							ImageName: overlapping-elements
+							ImageCollection: minimap
+						Image@INSIGNIA:
+							Logic: AddRaceSuffixLogic
+							X: 60
+							Y: 75
+							ImageCollection: radar
+							ImageName: insignia
+				Label@GAME_TIMER:
+					Logic: GameTimerLogic
+					X: 10
+					Y: 2
+					Width: PARENT_RIGHT
+					Height: 22
+					Align: Center
+					Font: TinyBold
+				LabelWithTooltip@CASH:
+					Logic: IngameCashCounterLogic
+					X: 29
+					Y: 2
+					Width: 50
+					Height: 22
+					Font: Bold
+					Text: {0}
 					TooltipContainer: TOOLTIP_CONTAINER
 					TooltipTemplate: SIMPLE_TOOLTIP
-					IndicatorImage: power-indicator
-					Orientation: Horizontal
-					Style: Bevelled
-		MoneyBin@INGAME_MONEY_BIN:
-			Logic: OrderButtonsChromeLogic
-			X: WINDOW_RIGHT - WIDTH
-			Width: 320
-			Height: 32
+				LabelWithTooltip@POWER:
+					Logic: IngamePowerCounterLogic
+					X: PARENT_RIGHT - WIDTH - 30
+					Y: 2
+					Width: 50
+					Height: 22
+					Align: Right
+					Font: Bold
+					Text: {0}
+					TooltipContainer: TOOLTIP_CONTAINER
+					TooltipTemplate: SIMPLE_TOOLTIP
+					Children:
+						Image@POWER_ICON:
+							X: PARENT_RIGHT + 0
+							Y: 5
+							ImageCollection: power-icons
+							ImageName: power-normal
+		Container@SIDEBAR_PRODUCTION:
+			Logic: ClassicProductionLogic
+			X: WINDOW_RIGHT - 226
+			Y: 279
+			Width: 226
+			Height: 250
 			Children:
-				Button@BEACON_BUTTON:
-					X: 3-36
-					Width: 34
-					Height: 28
-					TooltipText: Place Beacon
-					TooltipContainer: TOOLTIP_CONTAINER
-					VisualHeight: 0
+				Container@PALETTE_BACKGROUND:
 					Children:
-						Image@ICON:
-							ImageCollection: order-icons
-				Button@SELL_BUTTON:
-					X: 3
-					Width: 34
-					Height: 28
-					TooltipText: Sell
-					TooltipContainer: TOOLTIP_CONTAINER
-					VisualHeight: 0
-					Children:
-						Image@ICON:
-							ImageCollection: order-icons
-				Button@POWER_BUTTON:
+						Image@ROW_TEMPLATE:
+							Width: 226
+							Height: 48
+							ClickThrough: false
+							ImageCollection: sidebar
+							ImageName: background-iconrow
+						Image@BOTTOM_CAP:
+							Width: 250
+							Height: 13
+							ClickThrough: false
+							ImageCollection: sidebar
+							ImageName: background-bottom
+				LogicTicker@PRODUCTION_TICKER:
+				ProductionPalette@PRODUCTION_PALETTE:
 					X: 39
-					Width: 34
-					Height: 28
-					TooltipText: Power Down
+					Y: 1
 					TooltipContainer: TOOLTIP_CONTAINER
-					VisualHeight: 0
+					ReadyText: READY
+					HoldText: ON HOLD
+					IconSize: 58, 48
+					IconMargin: 2, 0
+					IconSpriteOffset: 0, 0
+				Container@PALETTE_FOREGROUND:
+					X: 64
+					Y: 0
 					Children:
-						Image@ICON:
-							ImageCollection: order-icons
-				Button@REPAIR_BUTTON:
-					X: 75
-					Width: 34
-					Height: 28
-					TooltipText: Repair
-					TooltipContainer: TOOLTIP_CONTAINER
-					VisualHeight: 0
+						Image@ROW_TEMPLATE:
+							Width: 226
+							Height: 48
+							IgnoreMouseOver: true
+							ImageCollection: sidebar-bits
+							ImageName: production-iconoverlay
+				Container@PRODUCTION_TYPES:
+					X: 6
+					Y: 2
+					Width: 25
+					Height: 243
 					Children:
-						Image@ICON:
-							ImageCollection: order-icons
-		SupportPowerBin@INGAME_POWERS_BIN:
-			X: 0
-			Y: 25
-			IconWidth: 60
-			IconHeight: 47
-			ReadyText: READY
-			HoldText: ON HOLD
-		BuildPalette@INGAME_BUILD_PALETTE:
-			X: WINDOW_RIGHT - 250
-			Y: 280
-			Width: 238
-			Height: 500
-			ReadyText: READY
-			ReadyTextStyle: AlternatingColor
-			ReadyTextAltColor: 50,205,50
-			HoldText: ON HOLD
-			RequiresText: Requires {0}
-			IconWidth: 60
-			IconHeight: 47
-			Columns: 3
-			Rows: 4
-
+						ProductionTypeButton@BUILDING:
+							Key: e
+							Width: 25
+							Height: 25
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Buildings
+							TooltipContainer: TOOLTIP_CONTAINER
+							ProductionGroup: Building
+							Children:
+								Image@ICON:
+									X: 5
+									Y: 5
+									ImageCollection: production-icons
+						ProductionTypeButton@INFANTRY:
+							Key: t
+							Y: 31
+							Width: 25
+							Height: 25
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Infantry
+							TooltipContainer: TOOLTIP_CONTAINER
+							ProductionGroup: Infantry
+							Children:
+								Image@ICON:
+									X: 5
+									Y: 5
+									ImageCollection: production-icons
+						ProductionTypeButton@VEHICLE:
+							Key: y
+							Y: 62
+							Width: 25
+							Height: 25
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Vehicles
+							TooltipContainer: TOOLTIP_CONTAINER
+							ProductionGroup: Vehicle
+							Children:
+								Image@ICON:
+									X: 5
+									Y: 5
+									ImageCollection: production-icons
+						ProductionTypeButton@TANKS:
+							Key: y
+							Y: 93
+							Width: 25
+							Height: 25
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Tanks
+							TooltipContainer: TOOLTIP_CONTAINER
+							ProductionGroup: Armor
+							Children:
+								Image@ICON:
+									X: 5
+									Y: 5
+									ImageCollection: production-icons
+						ProductionTypeButton@AIRCRAFT:
+							Key: y
+							Y: 124
+							Width: 25
+							Height: 25
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Aircraft
+							TooltipContainer: TOOLTIP_CONTAINER
+							ProductionGroup: Aircraft
+							Children:
+								Image@ICON:
+									X: 5
+									Y: 5
+									ImageCollection: production-icons
+						ProductionTypeButton@STARPORT:
+							Key: y
+							Y: 155
+							Width: 25
+							Height: 25
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Starport
+							TooltipContainer: TOOLTIP_CONTAINER
+							ProductionGroup: Starport
+							Children:
+								Image@ICON:
+									X: 5
+									Y: 5
+									ImageCollection: production-icons
+						Button@SCROLL_UP_BUTTON:
+							Y: 186
+							Width: 25
+							Height: 25
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Scroll up
+							TooltipContainer: TOOLTIP_CONTAINER
+							Children:
+								Image@ICON:
+									X: 5
+									Y: 5
+									ImageCollection: scrollbar
+									ImageName: up_arrow
+						Button@SCROLL_DOWN_BUTTON:
+							Y: 217
+							Width: 25
+							Height: 25
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Scroll down
+							TooltipContainer: TOOLTIP_CONTAINER
+							Children:
+								Image@ICON:
+									X: 5
+									Y: 5
+									ImageCollection: scrollbar
+									ImageName: down_arrow
diff --git a/mods/d2k/chrome/tooltips.yaml b/mods/d2k/chrome/tooltips.yaml
index ed7ddc860a..1be6cd1480 100644
--- a/mods/d2k/chrome/tooltips.yaml
+++ b/mods/d2k/chrome/tooltips.yaml
@@ -108,3 +108,81 @@ Background@CLIENT_TOOLTIP:
 			Height: 10
 			Font: TinyBold
 
+Background@PRODUCTION_TOOLTIP:
+	Logic: ProductionTooltipLogic
+	Background: dialog4
+	Width: 200
+	Height: 65
+	Children:
+		Label@NAME:
+			X: 7
+			Y: 2
+			Height: 23
+			Font: Bold
+		Label@HOTKEY:
+			Visible: false
+			Y: 2
+			Height: 23
+			TextColor: 255,255,0
+			Font: Bold
+		Label@REQUIRES:
+			X: 7
+			Y: 21
+			Height: 23
+			Font: TinyBold
+			Text: Requires {0}
+		Label@DESC:
+			X: 7
+			Y: 41
+			Height: 23
+			Font: TinyBold
+			VAlign: Top
+		Image@COST_ICON:
+			Y: 5
+			Width: 16
+			ImageCollection: sidebar-bits
+			ImageName: production-tooltip-cost
+		Label@COST:
+			Height: 23
+			Font: Bold
+		Image@TIME_ICON:
+			X: 3
+			Y: 26
+			Width: 16
+			ImageCollection: sidebar-bits
+			ImageName: production-tooltip-time
+		Label@TIME:
+			Y: 21
+			Height: 23
+			Font: Bold
+		Image@POWER_ICON:
+			Y: 46
+			Width: 16
+			ImageCollection: sidebar-bits
+			ImageName: production-tooltip-power
+		Label@POWER:
+			Y: 41
+			Height: 23
+			Font: Bold
+
+Background@SUPPORT_POWER_TOOLTIP:
+	Logic: SupportPowerTooltipLogic
+	Background: dialog4
+	Width: 200
+	Height: 29
+	Children:
+		Label@NAME:
+			X: 7
+			Y: 2
+			Height: 20
+			Font: Bold
+		Label@TIME:
+			X: 20
+			Y: 8
+			Font: TinyBold
+			VAlign: Top
+		Label@DESC:
+			X: 7
+			Y: 22
+			Font: TinyBold
+			VAlign: Top
\ No newline at end of file
diff --git a/mods/d2k/rules/world.yaml b/mods/d2k/rules/world.yaml
index 3b89b63125..e138f0b2b6 100644
--- a/mods/d2k/rules/world.yaml
+++ b/mods/d2k/rules/world.yaml
@@ -8,7 +8,8 @@ World:
 	LoadWidgetAtGameStart:
 	ScreenShaker:
 	BuildingInfluence:
-	ChooseBuildTabOnSelect:
+	ProductionQueueFromSelection:
+		ProductionPaletteWidget: PRODUCTION_PALETTE
 	WormManager:
 	CrateSpawner:
 		Minimum: 0
diff --git a/mods/d2k/uibits/chrome-atreides.png b/mods/d2k/uibits/chrome-atreides.png
deleted file mode 100644
index 9a74f1e03c..0000000000
Binary files a/mods/d2k/uibits/chrome-atreides.png and /dev/null differ
diff --git a/mods/d2k/uibits/chrome-harkonnen.png b/mods/d2k/uibits/chrome-harkonnen.png
deleted file mode 100644
index 8063bd39db..0000000000
Binary files a/mods/d2k/uibits/chrome-harkonnen.png and /dev/null differ
diff --git a/mods/d2k/uibits/chrome-ordos.png b/mods/d2k/uibits/chrome-ordos.png
deleted file mode 100644
index 2884b3b0eb..0000000000
Binary files a/mods/d2k/uibits/chrome-ordos.png and /dev/null differ
diff --git a/mods/d2k/uibits/chrome.png b/mods/d2k/uibits/chrome.png
new file mode 100644
index 0000000000..6e9922b7f1
Binary files /dev/null and b/mods/d2k/uibits/chrome.png differ
diff --git a/mods/d2k/uibits/tabs.png b/mods/d2k/uibits/tabs.png
deleted file mode 100644
index f9b1092e1d..0000000000
Binary files a/mods/d2k/uibits/tabs.png and /dev/null differ