diff --git a/mods/cnc/chrome/editor.yaml b/mods/cnc/chrome/editor.yaml
index 0824c4f9f8..e4bf279f02 100644
--- a/mods/cnc/chrome/editor.yaml
+++ b/mods/cnc/chrome/editor.yaml
@@ -635,7 +635,6 @@ Container@EDITOR_WORLD_ROOT:
 					Y: 0
 					Width: PARENT_RIGHT
 					Height: PARENT_BOTTOM
-					#Background: scrollpanel-bg
 					Children:
 						Label@AREA_EDIT_TITLE:
 							X: 6
@@ -1001,3 +1000,16 @@ ScrollPanel@CATEGORY_FILTER_PANEL:
 			Width: PARENT_RIGHT - 29
 			Height: 20
 			Visible: false
+
+ScrollPanel@OVERLAY_PANEL:
+	Width: 140
+	Height: 80
+	ItemSpacing: 5
+	TopBottomSpacing: 0
+	Children:
+		Checkbox@CATEGORY_TEMPLATE:
+			X: 5
+			Y: 5
+			Width: PARENT_RIGHT - 29
+			Height: 20
+			Visible: false
diff --git a/mods/cnc/chrome/tooltips.yaml b/mods/cnc/chrome/tooltips.yaml
index df548b6cde..9f8cb6f5d5 100644
--- a/mods/cnc/chrome/tooltips.yaml
+++ b/mods/cnc/chrome/tooltips.yaml
@@ -72,6 +72,29 @@ Background@BUTTON_TOOLTIP_FACTIONSUFFIX:
 			Font: TinyBold
 			VAlign: Top
 
+Background@BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP:
+	Logic: ButtonTooltipLogic
+	Background: panel-black
+	Height: 26
+	Children:
+		Label@LABEL:
+			X: 5
+			Y: 1
+			Height: 23
+			Font: Bold
+		Label@HOTKEY:
+			Y: 1
+			Visible: false
+			TextColor: FFFF00
+			Height: 23
+			Font: Bold
+		LabelWithHighlight@DESC:
+			X: 5
+			Y: 26
+			Height: 12
+			Font: TinyBold
+			VAlign: Top
+
 Background@BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP_FACTIONSUFFIX:
 	Logic: ButtonTooltipLogic, AddFactionSuffixLogic
 	Background: panel-black