diff --git a/_jofrehud/resource/#bases/baseaction_grip.res b/_jofrehud/resource/#bases/baseaction_grip.res
index 85dbc7bb2..cbdf0b1bd 100644
--- a/_jofrehud/resource/#bases/baseaction_grip.res
+++ b/_jofrehud/resource/#bases/baseaction_grip.res
@@ -1,4 +1,7 @@
 #base "#bases/1grip.res"
+#base "../../#uni_base/filesv1/label1/label1_main.res"
+#base "../../#uni_base/filesv1/label1/label1_west.res"
+#base "../../#uni_base/filesv1/label1/label1_autoresize.res"
 "Resource/baseaction_grip.res"
 {
 	"TopLeftGrip"
@@ -59,19 +62,12 @@
 	}
 	"Label1"
 	{
-		"ControlName"		"Label"
-		"fieldName"		"Label1"
 		"xpos"		"17"
 		"ypos"		"37"
 		"wide"		"64"
 		"tall"		"24"
-		"autoResize"		"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"Name:"
-		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
 	}
diff --git a/_jofrehud/resource/optionssubaudiothirdpartydlg.res b/_jofrehud/resource/optionssubaudiothirdpartydlg.res
index 35b044aaa..adda2697a 100644
--- a/_jofrehud/resource/optionssubaudiothirdpartydlg.res
+++ b/_jofrehud/resource/optionssubaudiothirdpartydlg.res
@@ -1,17 +1,13 @@
+#base "../#uni_base/filesv1/label1/label1_main.res"
+#base "../#uni_base/filesv1/label1/label1_autoresize.res"
 "resource/OptionsSubAudioThirdPartyDlg.res"
 {
 	"Label1"
 	{
-		"ControlName"		"Label"
-		"fieldName"		"Label1"
 		"xpos"		"15"
 		"ypos"		"50"
 		"wide"		"440"
 		"tall"		"40"
-		"autoResize"		"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"#GameUI_Miles_Audio"
 		"textAlignment"		"north-west"
diff --git a/_jofrehud/resource/optionssubmouse.res b/_jofrehud/resource/optionssubmouse.res
index 153ecf0e5..c0ab890c9 100644
--- a/_jofrehud/resource/optionssubmouse.res
+++ b/_jofrehud/resource/optionssubmouse.res
@@ -1,5 +1,7 @@
 #base "#bases/buildmodedialog_base.res"
-#base "../../#uni_base/filesv1/divider1/divider1_main.res"
+#base "../#uni_base/filesv1/divider1/divider1_main.res"
+#base "../#uni_base/filesv1/label1/label1_main.res"
+#base "../#uni_base/filesv1/label1/label1_west.res"
 "Resource/OptionsSubMouse.res"
 {
 	"ReverseMouse"
@@ -485,22 +487,16 @@
 	}
 	"Label1"
 	{
-		"ControlName"		"Label"
-		"fieldName"		"Label1"
 		"xpos"		"182"
 		"ypos"		"167"
 		"wide"		"301"
 		"tall"		"24"
-		"autoResize"		"0"
-		"pinCorner"		"0"
 		"RoundedCorners"		"15"
 		"pin_corner_to_sibling"		"0"
 		"pin_to_sibling_corner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"#GameUI_HudQuickInfo_Info"
-		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
 		"wrap"		"0"
diff --git a/_jofrehud/resource/optionssubmultiplayer.res b/_jofrehud/resource/optionssubmultiplayer.res
index a0fa2c6bd..4a2675c82 100644
--- a/_jofrehud/resource/optionssubmultiplayer.res
+++ b/_jofrehud/resource/optionssubmultiplayer.res
@@ -1,4 +1,5 @@
-
+#base "../#uni_base/filesv1/label1/label1_main.res"
+#base "../#uni_base/filesv1/label1/label1_west.res"
 "Resource/OptionsSubMultiplayer.res"
 {
 	"OptionsSubMultiplayer"
@@ -762,22 +763,16 @@
 	}
 	"Label1"
 	{
-		"ControlName"		"Label"
-		"fieldName"		"Label1"
 		"xpos"		"40"
 		"ypos"		"98"
 		"wide"		"152"
 		"tall"		"24"
-		"autoResize"		"0"
-		"pinCorner"		"0"
 		"RoundedCorners"		"15"
 		"pin_corner_to_sibling"		"0"
 		"pin_to_sibling_corner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"#GameUI_PlayerModel"
-		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
 		"wrap"		"0"
diff --git a/_jofrehud/resource/optionssubvideoadvanceddlg.res b/_jofrehud/resource/optionssubvideoadvanceddlg.res
index 581cd72c5..26d6cf267 100644
--- a/_jofrehud/resource/optionssubvideoadvanceddlg.res
+++ b/_jofrehud/resource/optionssubvideoadvanceddlg.res
@@ -2,6 +2,9 @@
 #base "#bases/baseaction_frames.res"
 #base "../#uni_base/filesv1/divider1/divider1_main.res"
 #base "../#uni_base/filesv1/divider1/divider1_auto-pin0.res"
+#base "../#uni_base/filesv1/label1/label1_main.res"
+#base "../#uni_base/filesv1/label1/label1_autoresize.res"
+#base "../#uni_base/filesv1/label1/label1_west.res"
 "resource/OptionsSubVideoAdvancedDlg.res"
 {
 	"OptionsSubVideoAdvancedDlg"
@@ -342,17 +345,12 @@
 	}
 	"Label1"
 	{
-		"ControlName"		"Label"
-		"fieldName"		"Label1"
 		"xpos"		"22"
 		"ypos"		"385"
 		"wide"		"288"
 		"tall"		"24"
-		"autoResize"		"0"
-		"pinCorner"		"0"
 		"visible"		"1" [!$POSIX]
 		"visible"		"0" [$POSIX]
-		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"#GameUI_DX_Level"
 		"textAlignment"		"east"
diff --git a/_jofrehud/resource/optionssubvoice.res b/_jofrehud/resource/optionssubvoice.res
index a470f959e..fb37f1838 100644
--- a/_jofrehud/resource/optionssubvoice.res
+++ b/_jofrehud/resource/optionssubvoice.res
@@ -126,7 +126,7 @@
 	"ReceiveLabel"
 	{
 		"ControlName"		"Label"
-		"fieldName"		"Label1"
+		"fieldName"		"ReceiveLabel"
 		"xpos"		"246"
 		"ypos"		"70"
 		"wide"		"180"
diff --git a/_jofrehud/resource/perfocclusionuipanel.res b/_jofrehud/resource/perfocclusionuipanel.res
index 206fb2ef8..a016ee8fd 100644
--- a/_jofrehud/resource/perfocclusionuipanel.res
+++ b/_jofrehud/resource/perfocclusionuipanel.res
@@ -1,4 +1,4 @@
-#base "perfocclusion_base.res"
+#base "res_base/perfocclusion_base.res"
 "Resource/PerfPropFadeUIPanel.res"
 {
 	"VisualizeLabel"
diff --git a/_jofrehud/resource/perfpropfadeuipanel.res b/_jofrehud/resource/perfpropfadeuipanel.res
index fdb7ce744..a45105a12 100644
--- a/_jofrehud/resource/perfpropfadeuipanel.res
+++ b/_jofrehud/resource/perfpropfadeuipanel.res
@@ -1,4 +1,4 @@
-#base "perfocclusion_base.res"
+#base "res_base/perfocclusion_base.res"
 "Resource/PerfPropFadeUIPanel.res"
 {
 	"MinFadeSizeLabel"
diff --git a/_jofrehud/resource/res_base/buguipanel.res b/_jofrehud/resource/res_base/buguipanel.res
index ac9497273..a9fbd0bff 100644
--- a/_jofrehud/resource/res_base/buguipanel.res
+++ b/_jofrehud/resource/res_base/buguipanel.res
@@ -1,5 +1,8 @@
 #base "../#bases/buildmodedialog_base.res"
 #base "../#bases/baseaction_frames.res"
+#base "../../#uni_base/filesv1/label1/label1_main.res"
+#base "../../#uni_base/filesv1/label1/label1_west.res"
+#base "../../#uni_base/filesv1/label1/label1_autoresize.res"
 "Resource\BugUIPanel.res"
 {
 	"BuildModeDialog"
@@ -616,19 +619,13 @@
 	}
 	"Label1"
 	{
-		"ControlName"		"Label"
-		"fieldName"		"Label1"
 		"xpos"		"10"
 		"ypos"		"35"
 		"wide"		"64"
 		"tall"		"24"
-		"autoResize"		"0"
-		"pinCorner"		"0"
-		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"Title:"
-		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
 		"wrap"		"0"
diff --git a/_jofrehud/resource/perfocclusion_base.res b/_jofrehud/resource/res_base/perfocclusion_base.res
similarity index 100%
rename from _jofrehud/resource/perfocclusion_base.res
rename to _jofrehud/resource/res_base/perfocclusion_base.res
diff --git a/_jofrehud/resource/toolperforce_base.res b/_jofrehud/resource/res_base/toolperforce_base.res
similarity index 100%
rename from _jofrehud/resource/toolperforce_base.res
rename to _jofrehud/resource/res_base/toolperforce_base.res
diff --git a/_jofrehud/resource/toolperforcequery.res b/_jofrehud/resource/toolperforcequery.res
index 0297a0c6d..15af124e8 100644
--- a/_jofrehud/resource/toolperforcequery.res
+++ b/_jofrehud/resource/toolperforcequery.res
@@ -1,4 +1,4 @@
-#base "toolperforce_base.res"
+#base "res_base/toolperforce_base.res"
 "resource/ToolPerforceQuery.res"
 {
 	"PerforceQuery"
diff --git a/_jofrehud/resource/toolsavedocumentquery.res b/_jofrehud/resource/toolsavedocumentquery.res
index 38db40e36..0665c03c9 100644
--- a/_jofrehud/resource/toolsavedocumentquery.res
+++ b/_jofrehud/resource/toolsavedocumentquery.res
@@ -1,4 +1,4 @@
-#base "toolperforce_base.res"
+#base "res_base/toolperforce_base.res"
 "resource/ToolSaveDocumentQuery.res"
 {
 	"SaveDocumentQuery"
diff --git a/_jofrehud/resource/valvecdkeyentrydialog.res b/_jofrehud/resource/valvecdkeyentrydialog.res
index f54836366..7453b4be9 100644
--- a/_jofrehud/resource/valvecdkeyentrydialog.res
+++ b/_jofrehud/resource/valvecdkeyentrydialog.res
@@ -1,4 +1,7 @@
 #base "#bases/1sysmenu.res"
+#base "../#uni_base/filesv1/label1/label1_main.res"
+#base "../#uni_base/filesv1/label1/label1_west.res"
+#base "../#uni_base/filesv1/label1/label1_autoresize.res"
 "Resource/ValveCDKeyEntryDialog.res"
 {
 	"CDKeyEntryDialog"
@@ -147,16 +150,10 @@
 	}
 	"Label1"
 	{
-		"ControlName"		"Label"
-		"fieldName"		"Label1"
 		"xpos"		"26"
 		"ypos"		"44"
 		"wide"		"344"
 		"tall"		"48"
-		"autoResize"		"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"#GameUI_EnterCDKey"
 		"textAlignment"		"north-west"