diff --git a/data/schema/core/addons.cfg b/data/schema/core/addons.cfg
index 7149f2d6a30..536b40a3770 100644
--- a/data/schema/core/addons.cfg
+++ b/data/schema/core/addons.cfg
@@ -531,8 +531,8 @@
 	[/tag]
 	{LINK_TAG "titlescreen_music/music"}
 	{LINK_TAG "terrain_graphics"}
-	{LINK_TAG "color_palette"}
-	{LINK_TAG "color_range"}
+	{LINK_TAG "game_config/color_palette"}
+	{LINK_TAG "game_config/color_range"}
 	# TODO: Document [menu_item] and [undo_stack]
 	[if]
 		map_generation=default
diff --git a/data/schema/core/config.cfg b/data/schema/core/config.cfg
index 07f44dd429e..9691108b7d7 100644
--- a/data/schema/core/config.cfg
+++ b/data/schema/core/config.cfg
@@ -12,21 +12,6 @@
 	{SIMPLE_KEY path string}
 [/tag]
 
-[tag]
-	name="color_range"
-	min=1
-	max=infinite
-	{REQUIRED_KEY id string}
-	{SIMPLE_KEY name t_string}
-	{SIMPLE_KEY rgb hex_list}
-	{DEFAULT_KEY default bool no}
-[/tag]
-[tag]
-	name="color_palette"
-	min=1
-	{ANY_KEY hex_list}
-[/tag]
-
 [tag]
 	name="game_config"
 	min=1
@@ -128,8 +113,20 @@
 			{ANY_KEY string}
 		[/tag]
 	[/tag]
-    {LINK_TAG "color_range"}
-	{LINK_TAG "color_palette"}
+	[tag]
+		name="color_range"
+		min=1
+		max=infinite
+		{REQUIRED_KEY id string}
+		{SIMPLE_KEY name t_string}
+		{SIMPLE_KEY rgb hex_list}
+		{DEFAULT_KEY default bool no}
+	[/tag]
+	[tag]
+		name="color_palette"
+		min=1
+		{ANY_KEY hex_list}
+	[/tag]
 [/tag]
 [tag]
 	name="titlescreen_music"
@@ -174,13 +171,10 @@
 		{SIMPLE_KEY description t_string}
 	[/tag]
 [/tag]
-[tag]
-	name="fonts"
-	min=1
-[/tag]
 [tag]
 	name="language"
 	min=1
+	max=infinite
 	{ANY_KEY t_string}
 [/tag]
 [tag]
@@ -208,7 +202,6 @@
 [/tag]
 [tag]
 	name="about"
-	min=1
 	max=infinite
 	{SIMPLE_KEY title t_string}
 	{SIMPLE_KEY text string}
diff --git a/data/schema/units/_main.cfg b/data/schema/units/_main.cfg
index 7626e5a9f9a..a0ddd04ca79 100644
--- a/data/schema/units/_main.cfg
+++ b/data/schema/units/_main.cfg
@@ -2,6 +2,7 @@
 [tag]
 	name="units"
 	min=1
+	max=infinite
 	[tag]
 		name="$modifications"
 		max=0
diff --git a/data/schema/units/modifications.cfg b/data/schema/units/modifications.cfg
index b7aa08a1048..4b611e49542 100644
--- a/data/schema/units/modifications.cfg
+++ b/data/schema/units/modifications.cfg
@@ -166,8 +166,8 @@
 				value=image_mod
 				{SIMPLE_KEY replace string}
 				{SIMPLE_KEY add string}
-				{LINK_TAG "color_range"}
-				{LINK_TAG "color_palette"}
+				{LINK_TAG "game_config/color_range"}
+				{LINK_TAG "game_config/color_palette"}
 			[/case]
 			[case]
 				value=overlay