diff --git a/package.json b/package.json
index d7c363a7..663f988e 100644
--- a/package.json
+++ b/package.json
@@ -48,5 +48,5 @@
         "preview:https": "serve dist",
         "reinstall": "rm -rf node_modules; yarn; vue-tsc --noEmit"
     },
-    "version": "5.0.0-alpha.284"
+    "version": "5.0.0-alpha.285"
 }
diff --git a/src/components/units/AppGameVariants.vue b/src/components/units/AppGameVariants.vue
index 83e54437..695541c0 100644
--- a/src/components/units/AppGameVariants.vue
+++ b/src/components/units/AppGameVariants.vue
@@ -123,7 +123,7 @@
 
 <i18n lang="json">
 {
-    "cn": {
+    "zh": {
         "gameVariantsTitle": "请选择游戏变体"
     },
     "en-US": {
diff --git a/src/components/units/AppUpdates.vue b/src/components/units/AppUpdates.vue
index c62fbed9..c1457e27 100644
--- a/src/components/units/AppUpdates.vue
+++ b/src/components/units/AppUpdates.vue
@@ -115,7 +115,7 @@
 
 <i18n lang="json">
 {
-    "cn": {
+    "zh": {
         "title": "又更新了！？",
         "message0": "如果页脚显示的版本号落后于此处",
         "message1": "的最新版本， 请尝试使用",
diff --git a/src/components/units/AppWelcome.vue b/src/components/units/AppWelcome.vue
index 075b29f8..fe4b1410 100644
--- a/src/components/units/AppWelcome.vue
+++ b/src/components/units/AppWelcome.vue
@@ -106,10 +106,10 @@ button {
 
 <i18n lang="json">
     {
-        "cn": {
+        "zh": {
             "title": "欢迎！"
         },
-        "en": {
+        "en-US": {
             "title": "Welcome! "
         },
         "es": {
diff --git a/src/components/units/DemoMode/AppDemo.vue b/src/components/units/DemoMode/AppDemo.vue
index 1c8da0d6..862102dd 100644
--- a/src/components/units/DemoMode/AppDemo.vue
+++ b/src/components/units/DemoMode/AppDemo.vue
@@ -1,7 +1,11 @@
 <template>
     <div id="app-demo">
-        <AppDemoBody />
-        <AppGameVvh />
+        <div class="dbody">
+            <AppDemoBody />
+        </div>
+        <div class="dvvh">
+            <AppGameVvh />
+        </div>
     </div>
 </template>
 
@@ -14,38 +18,70 @@
 
     const store = useStore();
     const games = [
+        { gameId: "tictactoe", variantId: "regular", isDrawGame: false },
+        { gameId: "chinesechess", variantId: "regular", isDrawGame: false, startPosition: "1_---k---------------------P---------------------------R-------------n------------------K---" },
+        { gameId: "topitop", variantId: "regular", isDrawGame: false },
+        { gameId: "quarto", variantId: "regular", isDrawGame: false },
+        { gameId: "kayles", variantId: "12", isDrawGame: false },
+        { gameId: "lewthwaitesgame", variantId: "standard", isDrawGame: false },
+        { gameId: "nim", variantId: "7_8_11_13_15", isDrawGame: false },
+        { gameId: "rubiksmagic", variantId: "regular", isDrawGame: false },
+        { gameId: "joust", variantId: "5x4", isDrawGame: false },
+        { gameId: "domineering", variantId: "6", isDrawGame: false },
+        { gameId: "chopsticks", variantId: "0", isDrawGame: true },
+        { gameId: "change", variantId: "regular", isDrawGame: false },
+        { gameId: "nutictactoe", variantId: "regular", isDrawGame: true },
+        { gameId: "oddoreven", variantId: "regular", isDrawGame: false },
+        { gameId: "ponghauki", variantId: "regular", isDrawGame: true },
+        { gameId: "squaredance", variantId: "regular", isDrawGame: false },
+        { gameId: "fourfieldkono", variantId: "standard", isDrawGame: true },
+        { gameId: "foxandhounds", variantId: "regular", isDrawGame: false },
+        { gameId: "graphgame", variantId: "2", isDrawGame: false },
+        { gameId: "0to10by1or2", variantId: "regular", isDrawGame: false },
+        { gameId: "allqueenschess", variantId: "standard", isDrawGame: false },
+        { gameId: "lightsout", variantId: "8", isDrawGame: false },
+        { gameId: "nqueens", variantId: "8", isDrawGame: false },
+        { gameId: "pegsolitaire", variantId: "triangle", isDrawGame: false },
+        { gameId: "rushhour", variantId: "expert", isDrawGame: false },
+        { gameId: "npuzzle", variantId: "3", isDrawGame: false },
+        { gameId: "toadsandfrogspuzzle", variantId: "4", isDrawGame: false },
+        { gameId: "towersofhanoi", variantId: "3_6", isDrawGame: false },
+        { gameId: "rubikscube", variantId: "2x2x2", isDrawGame: false },
+        { gameId: "bishoppuzzle", variantId: "4x5_8", isDrawGame: false },
+        { gameId: "quickcross", variantId: "regular", isDrawGame: true },
+        { gameId: "dao", variantId: "regular", isDrawGame: true },
+        { gameId: "sim", variantId: "regular", isDrawGame: false },
+        { gameId: "snake", variantId: "regular", isDrawGame: false },
+        { gameId: "tactix", variantId: "regular", isDrawGame: false },
+        { gameId: "mutorere", variantId: "regular", isDrawGame: true },
+        { gameId: "dragonsandswans", variantId: "3", isDrawGame: false },
+        { gameId: "shifttactoe", variantId: "default", isDrawGame: false },
+        { gameId: "y", variantId: "dim5", isDrawGame: false },    
+        { gameId: "lgame", variantId: "regular", isDrawGame: true },
+        { gameId: "tictactwo", variantId: "regular", isDrawGame: false },
+        { gameId: "chungtoi", variantId: "regular", isDrawGame: true },
+        { gameId: "dawsonschess", variantId: "15", isDrawGame: true },
+        { gameId: "tootandotto", variantId: "6", isDrawGame: false },
         { gameId: "1dchess", variantId: "regular", isDrawGame: false },
         { gameId: "fivefieldkono", variantId: "delta", isDrawGame: true },
-        { gameId: "chinesechess", variantId: "regular", isDrawGame: false, startPosition: "1_---k---------------------P---------------------------R-------------n------------------K---" },
         { gameId: "3spot", variantId: "regular", isDrawGame: false },
         { gameId: "achi", variantId: "regular", isDrawGame: false },
         { gameId: "beeline", variantId: "regular", isDrawGame: true },
         { gameId: "chomp", variantId: "4x7", isDrawGame: false },
-        { gameId: "369mm", variantId: "regular", isDrawGame: true },
-        { gameId: "connect4c", variantId: "6x7", isDrawGame: false },
+        { gameId: "ninemensmorris", variantId: "regular", isDrawGame: true },
+        { gameId: "connect4", variantId: "6x7", isDrawGame: false },
         { gameId: "dinododgem", variantId: "regular", isDrawGame: true },
         { gameId: "dodgem", variantId: "regular", isDrawGame: false },
-        { gameId: "gameofy", variantId: "dim5", isDrawGame: false },
-        { gameId: "haregame", variantId: "m-hounds-first", isDrawGame: false },
+        { gameId: "hareandhounds", variantId: "m-hounds-first", isDrawGame: false },
         { gameId: "baghchal", variantId: "regular", isDrawGame: true },
         { gameId: "lite3", variantId: "three-in-a-row", isDrawGame: false },
-        { gameId: "Lgame", variantId: "regular", isDrawGame: true },
         { gameId: "notakto", variantId: "board3", isDrawGame: false },
-        { gameId: "othello", variantId: "regular", isDrawGame: false },
-        { gameId: "quarto", variantId: "regular", isDrawGame: false },
-        { gameId: "quickcross", variantId: "regular", isDrawGame: true },
-        { gameId: "quickchess", variantId: "regular", isDrawGame: false },
-        { gameId: "stt", variantId: "default", isDrawGame: false },
-        { gameId: "dao", variantId: "regular", isDrawGame: true },
-        { gameId: "tactix", variantId: "regular", isDrawGame: false },
-        { gameId: "ttt", variantId: "regular", isDrawGame: false },
-        { gameId: "mutorere", variantId: "regular", isDrawGame: true },
-        { gameId: "tttwo", variantId: "regular", isDrawGame: false },
-        { gameId: "topitop", variantId: "regular", isDrawGame: false },
+        { gameId: "othello", variantId: "regular", isDrawGame: false }
     ];
 
     const currentGameIndex = ref(0);
     const initiateCurrentGame = async () => {
+        store.dispatch(actionTypes.exitMatch);
         await store.dispatch(actionTypes.initiateMatch, {
             gameId: games[currentGameIndex.value].gameId,
             variantId: games[currentGameIndex.value].variantId,
@@ -63,7 +99,7 @@
     const currRep = ref(0);
     const gameOverTimeoutMilisec = 5000;
     const isEndOfDrawMatch = computed(() => games[currentGameIndex.value].isDrawGame && store.getters.currentRoundId > 21);
-    const isEndOfMatch = computed(() => store.getters.isEndOfMatch || isEndOfDrawMatch.value);
+    const isEndOfMatch = computed(() => store.getters.isEndOfMatch || isEndOfDrawMatch.value || store.getters.currentRoundId > 99);
     watch(
         () => isEndOfMatch.value,
         async () => {
@@ -74,7 +110,7 @@
             store.commit(mutationTypes.setLeftPlayerIsComputer, false);
             store.commit(mutationTypes.setRightPlayerIsComputer, false);
             await new Promise((resolve) => setTimeout(resolve, gameOverTimeoutMilisec));
-            if (++currRep.value == repeat) {
+            if (++currRep.value >= repeat) {
                 /* If reached max repeat times, load the next game in list. */
                 currRep.value = 0;
                 currentGameIndex.value = (currentGameIndex.value + 1) % games.length;
@@ -102,5 +138,11 @@
         > * {
             margin: 1rem;
         }
+        > .dvvh {
+            width: 60%;
+        }
+        > .dbody {
+            width: 35%;
+        }
     }
 </style>
diff --git a/src/components/units/DemoMode/AppDemoBody.vue b/src/components/units/DemoMode/AppDemoBody.vue
index e0dd0f53..281ed418 100644
--- a/src/components/units/DemoMode/AppDemoBody.vue
+++ b/src/components/units/DemoMode/AppDemoBody.vue
@@ -3,6 +3,7 @@
         <AppGameBodyHeaderTitle />
         <br/>
         <AppDemoBodyStatistics />
+        <br/>
         <h3>Computer Move Duration (milliseconds)</h3>
         <VueSlider id="slider"
             v-model="options.computerMoveDuration"
diff --git a/src/components/units/GameBody/AppGameBodyHeaderInstructions.vue b/src/components/units/GameBody/AppGameBodyHeaderInstructions.vue
index 804af9fc..984645fb 100644
--- a/src/components/units/GameBody/AppGameBodyHeaderInstructions.vue
+++ b/src/components/units/GameBody/AppGameBodyHeaderInstructions.vue
@@ -9,11 +9,12 @@
 </template>
 
 <script lang="ts" setup>
-    import { computed, watch } from "vue";
+    import { computed } from "vue";
     import VueMarkdownIt from "vue3-markdown-it";
     import MarkdownItLinkAttributes from "markdown-it-link-attributes";
     import { actionTypes, mutationTypes, useStore } from "../../../scripts/plugins/store";
     import UniPopupWindow from "../../templates/UniPopupWindow.vue";
+    import { useI18n } from "vue-i18n";
 
     const store = useStore();
     const options = computed(() => store.getters.options);
diff --git a/src/components/units/GameBody/CustomGUIQuarto.vue b/src/components/units/GameBody/CustomGUIQuarto.vue
index ec8ed1b7..5e246a4b 100644
--- a/src/components/units/GameBody/CustomGUIQuarto.vue
+++ b/src/components/units/GameBody/CustomGUIQuarto.vue
@@ -49,7 +49,7 @@
                 <g v-for="(token, i) in richPositionData.tokens" :key="'token' + i"
                     :class="'quarto-move'"
                     :style="'--xorigin: ' + centers[token.to][0] + 'px ' + centers[token.to][1] + 'px'"
-                    @click="movesAreClickable && store.dispatch(actionTypes.runMove, { move: token.move.str })">
+                    @click="movesAreClickable && store.dispatch(actionTypes.runMove, { autoguiMove: token.move.str })">
                     <rect width="16" height="16" rx="2" ry="2"
                         :x="centers[token.to][0] - 8" :y="centers[token.to][1] - 8" 
                         :class="'quarto-hint ' + getBoardMoveElementHintClass(token.move)"
@@ -74,7 +74,7 @@
                 <g v-for="(token, i) in richPositionData.tokens" :key="'token' + i"
                     :class="'quarto-move'"
                     :style="'--xorigin: ' + centers[token.to][0] + 'px ' + centers[token.to][1] + 'px'"
-                    @click="movesAreClickable && store.dispatch(actionTypes.runMove, { move: token.move.str })">
+                    @click="movesAreClickable && store.dispatch(actionTypes.runMove, { autoguiMove: token.move.str })">
                     <g v-if="token.token != '-'">
                         <rect width="5" height="5" rx="0.5" ry="0.5"
                             :x="centers[token.to][0] - 2.5" :y="centers[token.to][1] - 2.5"
@@ -122,7 +122,7 @@
     import { actionTypes, useStore } from "../../../scripts/plugins/store";
 
     interface GDefaultRegular2DMove {
-        str: string; // UWAPI move string
+        str: string; // Autogui move string
         hint: string;
         hintOpacity: number;
     }
@@ -158,7 +158,7 @@
                         token: matches[1],
                         to: parseInt(matches[2]),
                         move: {
-                            str: nextMoveData.move,
+                            str: nextMoveData.autoguiMove,
                             hint: nextMoveData.moveValue,
                             hintOpacity: nextMoveData.moveValueOpacity
                         },
diff --git a/src/components/units/GameBody/CustomGUISim.vue b/src/components/units/GameBody/CustomGUISim.vue
index 64813f8f..c1ed203c 100644
--- a/src/components/units/GameBody/CustomGUISim.vue
+++ b/src/components/units/GameBody/CustomGUISim.vue
@@ -8,7 +8,7 @@
                 :x2="vertices[move.to][0]" :y2="vertices[move.to][1]"
                 :class="'app-sim-move ' + getBoardMoveElementHintClass(move)"
                 :opacity="showNextMoveHints && showNextMoveDeltaRemotenesses ? move.hintOpacity : 1"
-                @click="movesAreClickable && store.dispatch(actionTypes.runMove, { move: move.str })">
+                @click="movesAreClickable && store.dispatch(actionTypes.runMove, { autoguiMove: move.str })">
                 <title>{{ moveButtonTitle(move.str) }}</title>
             </line>
         </g>
diff --git a/src/components/units/GameBody/CustomGUITicTacToe.vue b/src/components/units/GameBody/CustomGUITicTacToe.vue
index fee1b0bf..6c1bdc76 100644
--- a/src/components/units/GameBody/CustomGUITicTacToe.vue
+++ b/src/components/units/GameBody/CustomGUITicTacToe.vue
@@ -31,7 +31,7 @@
                     :opacity="showNextMoveDeltaRemotenesses ? board[cell].hintOpacity : 1"/>
                 <rect v-if="currentRemoteness && movesAreClickable"
                     cursor="pointer" fill="var(--backgroundColor)"
-                    @click="movesAreClickable && store.dispatch(actionTypes.runMove, { move: board[cell].move })"
+                    @click="movesAreClickable && store.dispatch(actionTypes.runMove, { autoguiMove: board[cell].move })"
                     width="20" height="20" fill-opacity="0" stroke-opacity="0"
                     :x="1 + xOffset(cell)" :y="1 + yOffset(cell)"
                 />
@@ -61,7 +61,7 @@
     const board = computed(() => {
         let board: BoardData = {};
         for (let cell: number = 0; cell < 9; cell++) board[cell] = { mark: currentPosition.value[2 + cell], move: "", hint: "", hintOpacity: 1 };
-        for (let availableMove in availableMoves.value) Object.assign(board[+availableMoves.value[availableMove].autoguiMove[4]], { move: availableMoves.value[availableMove].move, hint: availableMoves.value[availableMove].moveValue, hintOpacity: availableMoves.value[availableMove].moveValueOpacity });
+        for (let availableMove in availableMoves.value) Object.assign(board[+availableMoves.value[availableMove].autoguiMove[4]], { move: availableMoves.value[availableMove].autoguiMove, hint: availableMoves.value[availableMove].moveValue, hintOpacity: availableMoves.value[availableMove].moveValueOpacity });
         return board;
     });
     const getHintClass = (hint: string): string => (showNextMoveHints.value ? "hint-" + hint : "hint-" + turn.value);
diff --git a/src/components/units/GameBody/ImageAutoGUI.vue b/src/components/units/GameBody/ImageAutoGUI.vue
index d9cfce8e..234c203b 100644
--- a/src/components/units/GameBody/ImageAutoGUI.vue
+++ b/src/components/units/GameBody/ImageAutoGUI.vue
@@ -16,7 +16,7 @@
         :d="formatArrowPathPoints(arrow, arrowWidth)"
         :class="'iag-button-arrow ' + getBoardMoveElementHintClass(arrow.move)"
         :opacity="options.showNextMoveHints && options.showNextMoveDeltaRemotenesses ? arrow.move.hintOpacity : 1"
-        @click="movesAreClickable && store.dispatch(actionTypes.runMove, { move: arrow.move.str })">
+        @click="movesAreClickable && store.dispatch(actionTypes.runMove, { autoguiMove: arrow.move.str })">
         <title>{{ moveButtonTitle(arrow.move.str) }}</title>
       </path>
     </template>
@@ -59,7 +59,7 @@
               :opacity="options.showNextMoveHints && options.showNextMoveDeltaRemotenesses ? token.move.hintOpacity : 1"
               :style="'--tOrigin: ' + centers[token.center][0] + 'px ' + centers[token.center][1] + 'px'"
               :href="getImageSource(charImages[token.token].image) + '#MoveButtonSVG'"
-              @click="movesAreClickable && store.dispatch(actionTypes.runMove, { move: token.move.str })">
+              @click="movesAreClickable && store.dispatch(actionTypes.runMove, { autoguiMove: token.move.str })">
               <title>{{ moveButtonTitle(token.move.str) }}</title>
             </use>
           </g>
@@ -71,7 +71,7 @@
             :class="'iag-button-point ' + (token.move ? 'move ' : '') + getBoardMoveElementHintClass(token.move)"
             :opacity="options.showNextMoveHints && options.showNextMoveDeltaRemotenesses ? token.move.hintOpacity : 1"
             :style="'--tOrigin: ' + centers[token.center][0] + 'px ' + centers[token.center][1] + 'px;'"
-            @click="movesAreClickable && store.dispatch(actionTypes.runMove, { move: token.move.str })">
+            @click="movesAreClickable && store.dispatch(actionTypes.runMove, { autoguiMove: token.move.str })">
             <title>{{ moveButtonTitle(token.move.str) }}</title>
           </circle>
         </g>
@@ -83,7 +83,7 @@
         :class="'iag-button-point ' + (textButton.move ? 'move ' : '') + getBoardMoveElementHintClass(textButton.move)"
         :opacity="options.showNextMoveHints && options.showNextMoveDeltaRemotenesses ? textButton.move.hintOpacity : 1"
         :style="'font-size:' + textButtonFontSize + 'px;stroke:none;--tOrigin: ' + centers[textButton.center][0] + 'px ' + centers[textButton.center][1] + 'px'"
-        @click="movesAreClickable && store.dispatch(actionTypes.runMove, { move: textButton.move.str })">
+        @click="movesAreClickable && store.dispatch(actionTypes.runMove, { autoguiMove: textButton.move.str })">
         {{ textButton.text }}
         <title>{{ moveButtonTitle(textButton.move.str) }}</title>
       </text>
@@ -94,7 +94,7 @@
           :d="formatArrowPathPoints(arrow, arrowWidth)"
           :class="'iag-button-arrow ' + getBoardMoveElementHintClass(arrow.move)"
           :opacity="options.showNextMoveHints && options.showNextMoveDeltaRemotenesses ? arrow.move.hintOpacity : 1"
-          @click="movesAreClickable && store.dispatch(actionTypes.runMove, { move: arrow.move.str })">
+          @click="movesAreClickable && store.dispatch(actionTypes.runMove, { autoguiMove: arrow.move.str })">
           <title>{{ moveButtonTitle(arrow.move.str) }}</title>
         </path>
       </template>
@@ -108,7 +108,7 @@
         :stroke-width="lineWidth * widthFactor"
         :class="'iag-button-line ' + getBoardMoveElementHintClass(line.move)"
         :opacity="options.showNextMoveHints && options.showNextMoveDeltaRemotenesses ? line.move.hintOpacity : 1"
-        @click="movesAreClickable && store.dispatch(actionTypes.runMove, { move: line.move.str })">
+        @click="movesAreClickable && store.dispatch(actionTypes.runMove, { autoguiMove: line.move.str })">
         <title>{{ moveButtonTitle(line.move.str) }}</title>
       </line>
     </template>
@@ -125,7 +125,7 @@
       <div class="move" v-for="listedMove in listedMoves" :key="listedMove.move"
         :class="options.showNextMoveHints ? `uni-${listedMove.moveValue}` : ''"
         :style="{ opacity: options.showNextMoveDeltaRemotenesses ? listedMove.moveValueOpacity : 1 }"
-        @click="movesAreClickable && store.dispatch(actionTypes.runMove, { move: listedMove.move })">{{ listedMove.move }}
+        @click="movesAreClickable && store.dispatch(actionTypes.runMove, { autoguiMove: listedMove.autoguiMove })">{{ listedMove.move }}
       </div>
     </div>
   </div>
@@ -138,7 +138,7 @@
   const gimages = import.meta.globEager("../../../models/images/svg/**/*");
 
   interface IAGMove {
-    str: string; // UWAPI move string
+    str: string; // Autogui move string
     hint: string;
     hintOpacity: number;
     nextPosition: string;
@@ -221,7 +221,7 @@
 
       for (let moveObj of Object.values(currentAvailableMoves.value)) {        
         const move = {
-          str: moveObj.move,
+          str: moveObj.autoguiMove,
           hint: moveObj.moveValue,
           hintOpacity: !options.value.showNextMoves ? 0.001 : moveObj.moveValueOpacity,
           nextPosition: moveObj.position
diff --git a/src/components/units/GameMenu/AppGameMenuPosition.vue b/src/components/units/GameMenu/AppGameMenuPosition.vue
index 13a3e238..f4d188b6 100644
--- a/src/components/units/GameMenu/AppGameMenuPosition.vue
+++ b/src/components/units/GameMenu/AppGameMenuPosition.vue
@@ -68,15 +68,6 @@
             errorMsg.value = error.message;
         } else {
             errorMsg.value = "";
-            if (store.getters.currentGameId === "chopsticks") {
-                // Easter egg. You can remove this entire if statement if you wish.
-                for (var p = 8; p < 28; p += 4) {
-                    if (inputPos.value.substring(p, p + 4) === "-f--") {
-                        errorMsg.value = "Woah, there. Be careful with that gesture..."
-                        break;
-                    }
-                }
-            }
             inputPos.value = "";
         }
     };
diff --git a/src/components/units/Header/AppHeaderNavigations.vue b/src/components/units/Header/AppHeaderNavigations.vue
index 39801fca..b46c48da 100644
--- a/src/components/units/Header/AppHeaderNavigations.vue
+++ b/src/components/units/Header/AppHeaderNavigations.vue
@@ -58,7 +58,7 @@
 
 <i18n lang="json">
 {
-    "cn": {
+    "zh": {
         "Home": "首页",
         "Puzzles": "单人解谜",
         "Games": "双人游戏",
diff --git a/src/components/units/Header/AppHeaderPreferences.vue b/src/components/units/Header/AppHeaderPreferences.vue
index 848e3323..c8d606f1 100644
--- a/src/components/units/Header/AppHeaderPreferences.vue
+++ b/src/components/units/Header/AppHeaderPreferences.vue
@@ -63,7 +63,7 @@
     const preferences = computed(() => store.getters.preferences);
     const { t } = useI18n();
     const { locale } = useI18n({ useScope: "global" });
-    const appLocales = ["cn", "en-US", "es", "hi"];
+    const appLocales = ["zh", "en-US", "es", "hi"];
     const appLocale = ref("");
     const setActiveLocaleOptionStyle = (localeOption: string) => (localeOption === appLocale.value ? { background: "var(--themeColor)" } : { background: "var(--neutralColor)" });
     const setAppLocale = (newAppLocale: string) => {
@@ -124,9 +124,9 @@
 
 <i18n lang="json">
 {
-    "cn": {
+    "zh": {
         "appLocales": {
-            "cn": "🇨🇳 简体中文",
+            "zh": "🇨🇳 简体中文",
             "en-US": "🇺🇸 英文",
             "es": "🇲🇽 西班牙语",
             "hi": "🇮🇳 印地语"
@@ -159,7 +159,7 @@
             "25px": "25"
         },
         "appLocales": {
-            "cn": "🇨🇳 Simplified Chinese",
+            "zh": "🇨🇳 Simplified Chinese",
             "en-US": "🇺🇸 English",
             "es": "🇲🇽 Spanish",
             "hi": "🇮🇳 Hindi"
@@ -181,11 +181,17 @@
     },
     "es": {
         "appLocales": {
-            "es": "🇲🇽 Español"
+            "zh": "🇨🇳 chino",
+            "en-US": "🇺🇸 inglés",
+            "es": "🇲🇽 español",
+            "hi": "🇮🇳 hindi"
         }
     },
     "hi": {
         "appLocales": {
+            "zh": "🇨🇳 चीनी",
+            "en-US": "🇺🇸 अंग्रेज़ी",
+            "es": "🇲🇽 स्पेनिश",
             "hi": "🇮🇳 हिन्दी"
         }
     }
diff --git a/src/components/units/VVH/AppGameVvhBody.vue b/src/components/units/VVH/AppGameVvhBody.vue
index aea45f79..db1846e3 100644
--- a/src/components/units/VVH/AppGameVvhBody.vue
+++ b/src/components/units/VVH/AppGameVvhBody.vue
@@ -652,7 +652,7 @@
                                     :r="nextMovePositionValueSize"
                                     :stroke-width="4 * nextMovePositionValueSize"
                                     @click="roundNumber === currentValuedRoundId &&
-                                        store.dispatch(actionTypes.runMove, { move: nextMove.move })" />
+                                        store.dispatch(actionTypes.runMove, { autoguiMove: nextMove.autoguiMove })" />
                             </template>
                             <template v-else-if="nextMove.moveValue === 'tie'">
                                 <circle v-if="!isPuzzleGame"
@@ -663,7 +663,7 @@
                                     :r="nextMovePositionValueSize"
                                     :stroke-width="4 * nextMovePositionValueSize"
                                     @click="roundNumber === currentValuedRoundId &&
-                                        store.dispatch(actionTypes.runMove, { move: nextMove.move })" />
+                                        store.dispatch(actionTypes.runMove, { autoguiMove: nextMove.autoguiMove })" />
                                 <circle :class="{ clickable: roundNumber === currentValuedRoundId, tie: showNextMoveHints }"
                                     class="next-move-position-value"
                                     :cx="gridRight - nextMove.remoteness * columnWidth"
@@ -671,7 +671,7 @@
                                     :r="nextMovePositionValueSize"
                                     :stroke-width="4 * nextMovePositionValueSize"
                                     @click="roundNumber === currentValuedRoundId &&
-                                        store.dispatch(actionTypes.runMove, { move: nextMove.move })" />
+                                        store.dispatch(actionTypes.runMove, { autoguiMove: nextMove.autoguiMove })" />
                             </template>
                             <template v-else>
                                 <circle :class="[roundNumber === currentValuedRoundId ? 'clickable' : '',
@@ -685,7 +685,7 @@
                                         gridLeft + nextMove.remoteness * columnWidth"
                                     :cy="gridTop + roundNumber * rowHeight + rowHeight / 2" :r="nextMovePositionValueSize"
                                     :stroke-width="4 * nextMovePositionValueSize"
-                                    @click="roundNumber === currentValuedRoundId && store.dispatch(actionTypes.runMove, { move: nextMove.move })" />
+                                    @click="roundNumber === currentValuedRoundId && store.dispatch(actionTypes.runMove, { autoguiMove: nextMove.autoguiMove })" />
                             </template>
                         </template>
                     </template>
@@ -1001,7 +1001,7 @@
                                 :r="nextMovePositionValueSize"
                                 :stroke-width="4 * nextMovePositionValueSize"
                                 @click="roundNumber === currentValuedRoundId &&
-                                    store.dispatch(actionTypes.runMove, { move: nextMove.move })" />
+                                    store.dispatch(actionTypes.runMove, { autoguiMove: nextMove.autoguiMove })" />
                         </template>
                     </template>
                 </template>
diff --git a/src/models/datas/defaultApp.ts b/src/models/datas/defaultApp.ts
index 1ac9bdac..a2122bff 100644
--- a/src/models/datas/defaultApp.ts
+++ b/src/models/datas/defaultApp.ts
@@ -37,11 +37,11 @@ export const defaultAvailableMove: Types.Move = {
     drawRemoteness: -1
 };
 
-export const defaultAvailableMoveNames: Types.MoveNames = {};
+export const defaultMoveToAutoguiMove: Types.MoveNames = {};
 
 export const defaultPosition: Types.Position = {
     ...defaultUpdate,
-    availableMoveNames: {},
+    moveToAutoguiMove: {},
     availableMoves: {},
     position: "",
     autoguiPosition: "",
diff --git a/src/models/images/homebutton-github.png b/src/models/images/homebutton-github.png
index ac5a2a94..929ebdb6 100644
Binary files a/src/models/images/homebutton-github.png and b/src/models/images/homebutton-github.png differ
diff --git a/src/models/images/homebutton-info.png b/src/models/images/homebutton-info.png
index 16e9e747..4f8aaa99 100644
Binary files a/src/models/images/homebutton-info.png and b/src/models/images/homebutton-info.png differ
diff --git a/src/models/images/svg/lgame/B.svg b/src/models/images/svg/lgame/B.svg
index 7d35de0f..29150764 100644
--- a/src/models/images/svg/lgame/B.svg
+++ b/src/models/images/svg/lgame/B.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><path d="M0.25,0.25h24.5v24.5h-24.5z" fill="#F00" stroke-width="0.5" stroke="#D00"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?><svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><path d="M0.25,0.25h24.5v24.5h-24.5z" fill="#00F" stroke-width="0.5" stroke="#00D"/></svg>
\ No newline at end of file
diff --git a/src/models/images/svg/lgame/R.svg b/src/models/images/svg/lgame/R.svg
index 29150764..7d35de0f 100644
--- a/src/models/images/svg/lgame/R.svg
+++ b/src/models/images/svg/lgame/R.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><path d="M0.25,0.25h24.5v24.5h-24.5z" fill="#00F" stroke-width="0.5" stroke="#00D"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?><svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><path d="M0.25,0.25h24.5v24.5h-24.5z" fill="#F00" stroke-width="0.5" stroke="#D00"/></svg>
\ No newline at end of file
diff --git a/src/scripts/gamesmanUni/index.ts b/src/scripts/gamesmanUni/index.ts
index 008bac33..c506921b 100644
--- a/src/scripts/gamesmanUni/index.ts
+++ b/src/scripts/gamesmanUni/index.ts
@@ -6,7 +6,7 @@ import * as Defaults from "../../models/datas/defaultApp";
 import { handleMoveAnimation, animationEpilogue } from "./moveAnimation"
 import { playGameAmbience, pauseAllGameSounds } from "./audio"
 import { useStore } from "../plugins/store";
-const moveHistoryDelim = ':';
+export const moveHistoryDelim = ':';
 
 const deepcopy = (obj: Object) => {
     return JSON.parse(JSON.stringify(obj));
@@ -31,7 +31,7 @@ export const loadGames = async (app: Types.App) => {
 };
 
 export const addInstructions = async (app: Types.App, payload: {gameId: string, variantId: string}) => {
-    const instructions = await GCTAPI.loadInstructions(`${app.dataSources.gameAPI}${app.currentMatch.gameId}/${app.currentMatch.variantId}/instructions/?lang=${app.preferences.locale}`);
+    const instructions = await GCTAPI.loadInstructions(`${app.dataSources.gameAPI}${app.currentMatch.gameId}/${app.currentMatch.variantId}/instructions/?locale=${app.preferences.locale}`);
     app.games[payload.gameId].instructions[app.preferences.locale] = instructions ? instructions.instructions : "";
     return app;
 }
@@ -85,8 +85,8 @@ const loadPosition = async (app: Types.App, payload: { gameId: string; variantId
     positions[payload.position] = {
         position: updatedPosition.position,
         autoguiPosition: updatedPosition.autoguiPosition,
-        availableMoves: calculateMoveButtonOpacities(updatedPosition.moves),
-        availableMoveNames: formatMoveNames(updatedPosition.moves),
+        availableMoves: createAutoguiMoveToMoveObject(updatedPosition.moves),
+        moveToAutoguiMove: createMoveToAutoguiMove(updatedPosition.moves),
         positionValue: updatedPosition.positionValue,
         remoteness: updatedPosition.remoteness,
         winby: updatedPosition.winby,
@@ -152,17 +152,29 @@ export const initiateMatch = async (app: Types.App, payload: {
     return app;
 };
 
-const formatMoveNames = (moves: Array<GCTAPITypes.Move>) => {
-    const target: Types.MoveNames = { ...Defaults.defaultAvailableMoveNames };
+/**
+ * @param moves An array of move objects.
+ * @returns A dictionary such that each move object in the original
+ * input array is a key/value pair (key: moveObj.move, value: moveObj.autoguiMove).
+ * This dictionary is used when processing a user-entered move history. 
+ */
+const createMoveToAutoguiMove = (moves: Array<GCTAPITypes.Move>) => {
+    const target: Types.MoveNames = { ...Defaults.defaultMoveToAutoguiMove };
     for (const move in moves) {
-        target[moves[move].move] = moves[move].move;
+        target[moves[move].move] = moves[move].autoguiMove;
     }
     return target;
 };
 
 /** 
  * The input `moves` contains all legal moves from the current position,
- * sorted from best to worst according to value and remoteness.
+ * as an array of move objects sorted from best to worst according to 
+ * value and remoteness.
+ * 
+ * This function will take each move object and put it in a dictionary
+ * with its autoguiMove as the key and itself as the value.
+ * We also add a `moveValueOpacity` field for each move object.
+ * It will then return the dictionary. 
  * 
  * As a reminder, value/remoteness tuples are listed from best to worst as follows:
  *   Low-Remoteness Win, High-Remoteness Win, Low-Remoteness Tie, High-Remoteness Tie, 
@@ -178,17 +190,17 @@ const formatMoveNames = (moves: Array<GCTAPITypes.Move>) => {
  * - The move(s) with the third best remoteness will have an opacity of 0.5.
  * - All other moves will have an opacity of 0.25.
 */
-const calculateMoveButtonOpacities = (moves: Array<GCTAPITypes.Move>) => {
+const createAutoguiMoveToMoveObject = (moves: Array<GCTAPITypes.Move>) => {
     const formattedMoves: Types.Moves = {};
     if (moves.length) {
-        formattedMoves[moves[0].move] = { ...moves[0], moveValueOpacity: 1 };
+        formattedMoves[moves[0].autoguiMove] = { ...moves[0], moveValueOpacity: 1 };
     }
     for (let i = 1; i < moves.length; i++) {
-        if (!(moves[i].move in formattedMoves)) {
-            formattedMoves[moves[i].move] = { ...moves[i], moveValueOpacity: 1 };
+        if (!(moves[i].autoguiMove in formattedMoves)) {
+            formattedMoves[moves[i].autoguiMove] = { ...moves[i], moveValueOpacity: 1 };
         }
-        const previousMove = formattedMoves[moves[i - 1].move];
-        const currentMove = formattedMoves[moves[i].move];
+        const previousMove = formattedMoves[moves[i - 1].autoguiMove];
+        const currentMove = formattedMoves[moves[i].autoguiMove];
         if ((previousMove.moveValue === currentMove.moveValue) || (previousMove.moveValue === 'tie' && currentMove.moveValue === 'draw')) {
             if (previousMove.moveValueOpacity < 0.5 || previousMove.deltaRemoteness == currentMove.deltaRemoteness) {
                 currentMove.moveValueOpacity = previousMove.moveValueOpacity;
@@ -374,18 +386,18 @@ export const generateComputerMove = (round: Types.Round) => {
         var desiredRemoteness = (isDrawWin ? Math.min : Math.max)(...bestMoves.map((bestMove) => bestMove.drawRemoteness));
         bestMoves = bestMoves.filter((availableMove) => availableMove.drawRemoteness === desiredRemoteness);
     }
-    return bestMoves[Math.floor(Math.random() * bestMoves.length)].move;
+    return bestMoves[Math.floor(Math.random() * bestMoves.length)].autoguiMove;
 };
 
-export const runMove = async (app: Types.App, payload: { move: string }) => {
-    app.currentMatch.round.move = payload.move;
-    const moveObj = app.currentMatch.round.position.availableMoves[payload.move];
+export const runMove = async (app: Types.App, payload: { autoguiMove: string }) => {
+    app.currentMatch.round.autoguiMove = payload.autoguiMove;
+    const moveObj = app.currentMatch.round.position.availableMoves[payload.autoguiMove];
     const animationDuration = handleMoveAnimation(app.preferences.volume, app.currentMatch, moveObj);
     if (animationDuration > 0) {
         app.currentMatch.animationPlaying = true;
     }
     app.currentMatch.round.moveValue = moveObj.moveValue;
-    app.currentMatch.round.autoguiMove = moveObj.autoguiMove;
+    app.currentMatch.round.move = moveObj.move;
 
     // Rewrite history by deleting all subsequent moves made earlier.
     app.currentMatch.rounds.splice(
@@ -419,11 +431,11 @@ export const runMove = async (app: Types.App, payload: { move: string }) => {
             currentMatch.
             round.
             position.
-            availableMoves[payload.move].
+            availableMoves[payload.autoguiMove].
             position
         ]
     };
-    app.currentMatch.moveHistory += moveHistoryDelim + (moveObj.move ? moveObj.move : moveObj.move);
+    app.currentMatch.moveHistory += moveHistoryDelim + moveObj.move;
     let autoguiPosition = updatedPosition.autoguiPosition;
     if ((autoguiPosition.charAt(0) == '1' || autoguiPosition.charAt(0) == '2') && autoguiPosition.charAt(1) == '_') { // in proper autogui format
         app.currentMatch.round.firstPlayerTurn = autoguiPosition.charAt(0) == '1';
@@ -432,6 +444,7 @@ export const runMove = async (app: Types.App, payload: { move: string }) => {
     } else { // not in proper autogui format
         app.currentMatch.round.firstPlayerTurn = !app.currentMatch.round.firstPlayerTurn;
     }
+    app.currentMatch.round.autoguiMove = "";
     app.currentMatch.round.move = "";
     app.currentMatch.round.moveValue = "";
     app.currentMatch.round.id += 1;
@@ -481,6 +494,7 @@ const undoRedoAvailable = (app: Types.App, roundOffset: number) => {
 
 const gotoRoundId = (app: Types.App, roundId: number) => {
     app.currentMatch.round = deepcopy(app.currentMatch.rounds[roundId]);
+    app.currentMatch.round.autoguiMove = "";
     app.currentMatch.round.move = "";
     app.currentMatch.round.moveValue = "";
     return app;
@@ -509,9 +523,7 @@ export const redoMove = (app: Types.App) => {
     }
     // Modify move history before changing current round id.
     for (let i = currRoundId; i < toRoundId; ++i) {
-        app.currentMatch.moveHistory += moveHistoryDelim + (
-            app.currentMatch.rounds[i].move
-        );
+        app.currentMatch.moveHistory += moveHistoryDelim + app.currentMatch.rounds[i].move;
     }
     return gotoRoundId(app, toRoundId);
 };
@@ -589,40 +601,4 @@ export const loadCommits = async (app: Types.App, payload?: { force?: boolean })
         };
     }
     return app;
-};
-
-export const loadMoveHistory = async (app: Types.App, payload: { history: string }) => {
-    // Parse and load initial position, return undefined if initial position is invalid
-    payload.history = payload.history.replace(/(\r\n|\n|\r)/gm, "");
-    let parsed = payload.history.split(moveHistoryDelim);
-    if (parsed.length < 2) {
-        return Error("game name or start position missing");
-    }
-    let newApp: Types.App = deepcopy(app);
-    const updatedAppOrError = await updateMatchStartPosition(newApp, { position: parsed[1] });
-    if (updatedAppOrError instanceof Error) {
-        return updatedAppOrError;
-    }
-    exitMatch(newApp);
-    let updatedApp = await initiateMatch(newApp, {
-        gameId: app.currentMatch.gameId,
-        variantId: app.currentMatch.variantId,
-        startPosition: parsed[1]
-    });
-    if (!updatedApp) {
-        return Error("UNREACHED: initiateMatch failed");
-    }
-    // Do move one by one, return undefined if any move is invalid
-    for (let i = 2; i < parsed.length; ++i) {
-        const nextMove = newApp.currentMatch.round.position.availableMoveNames[parsed[i]];
-        if (!nextMove) {
-            return Error("invalid move [" + parsed[i] + "]");
-        }
-        updatedApp = await runMove(newApp, { move: nextMove });
-        if (!updatedApp) {
-            return Error("UNREACHED: runMove returned undefined");
-        }
-    }
-    // Load successful, update app.
-    return newApp;
-};
+};
\ No newline at end of file
diff --git a/src/scripts/gamesmanUni/types.ts b/src/scripts/gamesmanUni/types.ts
index f870b680..ae761130 100644
--- a/src/scripts/gamesmanUni/types.ts
+++ b/src/scripts/gamesmanUni/types.ts
@@ -61,7 +61,7 @@ export type Variant = {
 export type Positions = Record<string, Position>;
 
 export type Position = {
-    availableMoveNames: MoveNames;
+    moveToAutoguiMove: MoveNames;
     availableMoves: Moves;
     position: string;
     autoguiPosition: string;
diff --git a/src/scripts/plugins/store/index.ts b/src/scripts/plugins/store/index.ts
index c4540e21..b37b86d0 100644
--- a/src/scripts/plugins/store/index.ts
+++ b/src/scripts/plugins/store/index.ts
@@ -346,7 +346,7 @@ type Actions = {
     [actionTypes.exitMatch](context: ActionContext): void;
     [actionTypes.restartMatch](context: ActionContext): Promise<void>;
     [actionTypes.runMove](context: ActionContext, payload: {
-        move: string
+        autoguiMove: string
     }): Promise<void>;
     [actionTypes.runComputerMove](context: ActionContext): Promise<void>;
     [actionTypes.redoMove](context: ActionContext): Promise<void>;
@@ -403,7 +403,7 @@ const actions: Vuex.ActionTree<State, State> & Actions = {
         context.commit(mutationTypes.setApp, updatedApp);
         await store.dispatch(actionTypes.runComputerMove);
     },
-    runMove: async (context: ActionContext, payload: { move: string }) => {
+    runMove: async (context: ActionContext, payload: { autoguiMove: string }) => {
         context.state.app.currentMatch.computerMoving = true;
         context.state.app.currentMatch.backgroundLoading = true;
         const updatedApp = await GMU.runMove(context.state.app, payload);
@@ -425,7 +425,7 @@ const actions: Vuex.ActionTree<State, State> & Actions = {
             if (!context.state.app.currentMatch.gameType) return;
             context.state.app.currentMatch.backgroundLoading = true;
             const updatedApp = await GMU.runMove(context.state.app, {
-                move: GMU.generateComputerMove(context.state.app.currentMatch.round)
+                autoguiMove: GMU.generateComputerMove(context.state.app.currentMatch.round)
             });
             context.state.app.currentMatch.backgroundLoading = false;
             if (updatedApp) {
@@ -478,11 +478,28 @@ const actions: Vuex.ActionTree<State, State> & Actions = {
         if (updatedApp) context.commit(mutationTypes.setApp, updatedApp);
     },
     loadMoveHistory: async (context: ActionContext, payload: { history: string }) => {
-        const updatedAppOrError = await GMU.loadMoveHistory(context.state.app, payload);
-        if (updatedAppOrError instanceof Error) {
-            return updatedAppOrError;
-        } else {
-            context.commit(mutationTypes.setApp, updatedAppOrError);
+        // Parse and load initial position, return undefined if initial position is invalid
+        payload.history = payload.history.replace(/(\r\n|\n|\r)/gm, "");
+        let parsed = payload.history.split(GMU.moveHistoryDelim);
+        if (parsed.length < 2) {
+            return Error("Game Name or Start Position Missing");
+        }
+        const gameId = context.state.app.currentMatch.gameId;
+        const variantId = context.state.app.currentMatch.variantId;
+        store.dispatch(actionTypes.exitMatch);
+        await store.dispatch(actionTypes.initiateMatch, {
+            gameId: gameId,
+            variantId: variantId,
+            startPosition: parsed[1]
+        });
+        // Do move one by one, return undefined if any move is invalid
+        for (let i = 2; i < parsed.length; i++) {
+            const nextMove = context.state.app.currentMatch.round.position.moveToAutoguiMove[parsed[i]];
+            if (!nextMove) {
+                return Error("Invalid move [" + parsed[i] + "]");
+            } else {
+                await store.dispatch(actionTypes.runMove, {autoguiMove: nextMove})
+            }
         }
     }
 };