Upkeep/Income bug fixed

Terrain and position uncommented

data/themes/default.cfg

@@ -127,7 +127,7 @@ height=600
 	# income icon
 	[label]
 	icon=misc/income.png
-	text=upkeep
+	text=income
 	rect=580,3,612,19
 	xanchor=proportional
 	yanchor=fixed
@@ -135,7 +135,7 @@ height=600
 	# upkeep icon
 	[label]
 	icon=misc/upkeep.png
-	text=income
+	text=upkeep
 	rect=685,3,717,19
 	xanchor=proportional
 	yanchor=fixed
@@ -198,20 +198,18 @@ height=600
 		prefix=
 		prefix_literal=""
 		[/upkeep]
-	[comment]
 		[terrain]
 		font_size=12
-		rect=735,4,890,20
+		rect=790,4,890,20
 		xanchor=proportional
 		yanchor=fixed
 		[/terrain]
 		[position]
 		font_size=12
-		rect=890,4,1024,20
+		rect=890,4,990,20
 		xanchor=proportional
 		yanchor=fixed
 		[/position]
-	[/comment]
 
 		#put the side playing indicator next to the turn indicator
 		[side_playing]