diff --git a/src/citymania/cm_commands_gui.cpp b/src/citymania/cm_commands_gui.cpp
index 89e31b0c60..8a47d8d5fe 100644
--- a/src/citymania/cm_commands_gui.cpp
+++ b/src/citymania/cm_commands_gui.cpp
@@ -792,9 +792,9 @@ static const NWidgetPart _nested_login_window_widgets[] = {
 		NWidget(NWID_VERTICAL, NWidContainerFlag::EqualSize), SetPadding(10),
 			//novapolis
 			NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-				NWidget(WWT_TEXT, COLOUR_BROWN, LWW_USERNAME), SetToolTip(CM_STR_LOGIN_WINDOW_USERNAME),
+				NWidget(WWT_TEXT, INVALID_COLOUR, LWW_USERNAME), SetToolTip(CM_STR_LOGIN_WINDOW_USERNAME),
 				NWidget(NWID_SPACER), SetMinimalSize(20, 0),
-				NWidget(WWT_TEXT, COLOUR_BROWN, LWW_PASSWORD), SetToolTip(CM_STR_LOGIN_WINDOW_PASSWORD),
+				NWidget(WWT_TEXT, INVALID_COLOUR, LWW_PASSWORD), SetToolTip(CM_STR_LOGIN_WINDOW_PASSWORD),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(0, 5),
 			NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
@@ -807,9 +807,9 @@ static const NWidgetPart _nested_login_window_widgets[] = {
 			NWidget(NWID_SPACER), SetMinimalSize(0, 10),
 			//n-ice
 			NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-				NWidget(WWT_TEXT, COLOUR_BROWN, LWW_USERNAME), SetToolTip(CM_STR_LOGIN_WINDOW_USERNAME),
+				NWidget(WWT_TEXT, INVALID_COLOUR, LWW_USERNAME), SetToolTip(CM_STR_LOGIN_WINDOW_USERNAME),
 				NWidget(NWID_SPACER), SetMinimalSize(20, 0),
-				NWidget(WWT_TEXT, COLOUR_BROWN, LWW_PASSWORD), SetToolTip(CM_STR_LOGIN_WINDOW_PASSWORD),
+				NWidget(WWT_TEXT, INVALID_COLOUR, LWW_PASSWORD), SetToolTip(CM_STR_LOGIN_WINDOW_PASSWORD),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(0, 5),
 			NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
@@ -822,9 +822,9 @@ static const NWidgetPart _nested_login_window_widgets[] = {
 			NWidget(NWID_SPACER), SetMinimalSize(0, 10),
 			//btpro
 			NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-				NWidget(WWT_TEXT, COLOUR_BROWN, LWW_USERNAME), SetToolTip(CM_STR_LOGIN_WINDOW_USERNAME),
+				NWidget(WWT_TEXT, INVALID_COLOUR, LWW_USERNAME), SetToolTip(CM_STR_LOGIN_WINDOW_USERNAME),
 				NWidget(NWID_SPACER), SetMinimalSize(20, 0),
-				NWidget(WWT_TEXT, COLOUR_BROWN, LWW_PASSWORD), SetToolTip(CM_STR_LOGIN_WINDOW_PASSWORD),
+				NWidget(WWT_TEXT, INVALID_COLOUR, LWW_PASSWORD), SetToolTip(CM_STR_LOGIN_WINDOW_PASSWORD),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(0, 5),
 			NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
diff --git a/src/citymania/cm_town_gui.cpp b/src/citymania/cm_town_gui.cpp
index 86a18baf03..2618fa05a8 100644
--- a/src/citymania/cm_town_gui.cpp
+++ b/src/citymania/cm_town_gui.cpp
@@ -432,7 +432,7 @@ static const NWidgetPart _nested_cb_town_widgets[] = {
 		NWidget(NWID_VERTICAL),
 			NWidget(NWID_SPACER), SetMinimalSize(0, 5),  SetResize(1, 0), SetFill(1, 0),
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_DETAILS), SetMinimalSize(66, 0), SetResize(1, 0), SetFill(1, 0),
+				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CB_DETAILS), SetMinimalSize(66, 0), SetResize(1, 0), SetFill(1, 0),
 				NWidget(NWID_VERTICAL),
 					NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
 						NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CB_ADVERT),SetMinimalSize(33, 12),SetFill(1, 0), SetStringTip(CM_STR_CB_LARGE_ADVERTISING_CAMPAIGN),
@@ -458,14 +458,14 @@ static const NWidgetPart _nested_cb_town_widgets[] = {
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(0, 5),  SetResize(1, 0), SetFill(1, 0),
 			NWidget(NWID_SELECTION, INVALID_COLOUR, WID_CB_SELECT_REQUIREMENTS),
-				NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_GOALS),SetMinimalSize(50 + 35 + 35 + 40 + 35 + 30, 0), SetResize(1, 0), SetFill(1, 0),
+				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CB_GOALS),SetMinimalSize(50 + 35 + 35 + 40 + 35 + 30, 0), SetResize(1, 0), SetFill(1, 0),
 				NWidget(NWID_HORIZONTAL),
-					NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_CARGO_NAME),SetMinimalSize(50, 0), SetResize(0, 0), SetFill(1, 0),
-					NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_CARGO_AMOUNT),SetMinimalSize(35, 0), SetResize(1, 0), SetFill(0, 0),
-					NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_CARGO_REQ),SetMinimalSize(35, 0), SetResize(1, 0), SetFill(0, 0),
-					NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_CARGO_PREVIOUS),SetMinimalSize(40, 0),  SetResize(1, 0), SetFill(0, 0),
-					NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_CARGO_STORE),SetMinimalSize(35, 0), SetResize(1, 0), SetFill(0, 0),
-					NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_CARGO_STORE_PCT),SetMinimalSize(30, 0), SetResize(1, 0), SetFill(0, 0),
+					NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CB_CARGO_NAME),SetMinimalSize(50, 0), SetResize(0, 0), SetFill(1, 0),
+					NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CB_CARGO_AMOUNT),SetMinimalSize(35, 0), SetResize(1, 0), SetFill(0, 0),
+					NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CB_CARGO_REQ),SetMinimalSize(35, 0), SetResize(1, 0), SetFill(0, 0),
+					NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CB_CARGO_PREVIOUS),SetMinimalSize(40, 0),  SetResize(1, 0), SetFill(0, 0),
+					NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CB_CARGO_STORE),SetMinimalSize(35, 0), SetResize(1, 0), SetFill(0, 0),
+					NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CB_CARGO_STORE_PCT),SetMinimalSize(30, 0), SetResize(1, 0), SetFill(0, 0),
 				EndContainer(),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(0, 0), SetResize(1, 0), SetFill(1, 1),