diff --git a/mk/shared/glestkeys.ini b/mk/shared/glestkeys.ini
index 4cf311b1e..1a5fd285c 100644
--- a/mk/shared/glestkeys.ini
+++ b/mk/shared/glestkeys.ini
@@ -11,7 +11,7 @@ CameraModeRight=right
 CameraModeUp=up
 CameraModeDown=down
 PauseGame=P
-ChangeFontColor=C
+ChangeFontColor=O
 GameSpeedIncrease='+'
 GameSpeedDecrease='-'
 ExitKey=escape
@@ -40,6 +40,8 @@ CommandKey7=D
 CommandKey8=F
 CommandKey9=Z
 CommandKey10=X
+CommandKey11=C
+CommandKey12=V
 HotKeyCenterCameraOnSelection=G
 HotKeySelectIdleHarvesterUnit=I
 HotKeySelectBuiltBuilding=B
@@ -48,7 +50,7 @@ HotKeyDumpWorldToLog=\
 HotKeyRotateUnitDuringPlacement=R
 HotKeySelectDamagedUnit=U
 HotKeySelectStoreUnit=T
-HotKeySelectedUnitsAttack=V
+HotKeySelectedUnitsAttack=,
 HotKeySelectedUnitsStop=;
 HotKeyToggleOSMouseEnabled=/
 ChatTeamMode=H
diff --git a/source/glest_game/gui/gui.cpp b/source/glest_game/gui/gui.cpp
index 0450fa045..b8367171b 100644
--- a/source/glest_game/gui/gui.cpp
+++ b/source/glest_game/gui/gui.cpp
@@ -449,7 +449,7 @@ void Gui::hotKey(SDL_KeyboardEvent key) {
 		clickCommonCommand(ccStop);
 	}
 
-	for (int i=0; i<10; i++) {
+	for (int i=0; i<commandKeys; i++) {
 		string name = "CommandKey" + intToStr(i+1);
 		if(isKeyPressed(configKeys.getSDLKey(name.c_str()),key) == true) {
 			if(activeCommandType != NULL && activeCommandType->getClass() == ccBuild)  {
@@ -800,7 +800,7 @@ void Gui::computeInfoString(int posDisplay){
 
 	if(posDisplay!=invalidPos && selection.isCommandable()){
 		string hotkey = "";
-		if (posDisplay < 10) { // there's 10 configurable command hotkeys
+		if (posDisplay < commandKeys) {
 			hotkey=lang.getString("HotKey")+": "+SDL_GetKeyName(configKeys.getSDLKey(commandKeyName.c_str())) +"\n\n";
 		}
 		if(!selectingBuilding){
diff --git a/source/glest_game/gui/gui.h b/source/glest_game/gui/gui.h
index 8711b3d6f..a731d26ea 100644
--- a/source/glest_game/gui/gui.h
+++ b/source/glest_game/gui/gui.h
@@ -95,6 +95,7 @@ class SelectionQuad{
 
 class Gui {
 public:
+	static const int commandKeys= 12;
 	static const int maxSelBuff= 128*5;
 	static const int upgradeDisplayIndex= 8;