diff --git a/app/GameSaveHelper.js b/app/GameSaveHelper.js
index 40402e0..c48b0e3 100644
--- a/app/GameSaveHelper.js
+++ b/app/GameSaveHelper.js
@@ -3,6 +3,24 @@ export class GameSaveHelper {
         standard: 'Standard',
         inverted: 'Inverted'
     }
+    static itemShuffleOptions = {
+        standard : {
+            id:'standard',
+            label: 'Standard'
+        },
+        mc: {
+            id:'mc',
+            label: 'Maps and Compasses'
+        },
+        mcsk: {
+            id: 'mcsk',
+            label: 'Maps, Compasses and Small Keys'
+        },
+        keysanity: {
+            id: 'keysanity',
+            label: 'Keysanity'
+        }
+    }
     constructor() {
     }
 
@@ -19,8 +37,8 @@ export class GameSaveHelper {
                 g.timestamp = this.parseDate(modelManager.gameSaves[key].timestamp);
                 g.valid = modelManager.validateGame(modelManager.gameSaves[key]);
                 g.loaded = modelManager.settings.gameSlot === key;
-                g.gameMode = this.labels[modelManager.settings.gameMode];
-                g.itemShuffle = this.labels[modelManager.settings.itemShuffle];
+                g.gameMode = this.labels[modelManager.gameSaves[key].settings.gameMode];
+                g.itemShuffle = this.itemShuffleOptions[modelManager.gameSaves[key].settings.itemShuffle].id;
             }
             retval[key]=g;
             i++;
diff --git a/app/components/DarkMap.vue b/app/components/DarkMap.vue
index 101cb42..0a7bd22 100644
--- a/app/components/DarkMap.vue
+++ b/app/components/DarkMap.vue
@@ -83,7 +83,7 @@
                     dungeons: this.$modelManager.map.darkworld.dungeons,
                     bosses: this.$modelManager.map.darkworld.bosses,
                     dungeonValues: this.$modelManager.dungeons,
-                    staticDungeonValues: this.$sol.getStaticDungeons(this.$modelManager.getGameMode()),
+                    staticDungeonValues: this.$sol.getStaticDungeons(this.$modelManager.getGameMode(), this.$modelManager.getItemShuffle()),
                     centerKey: undefined
                 },
                 mapWidth:1500,
diff --git a/app/components/Dungeons.vue b/app/components/Dungeons.vue
index 961985c..7c5e346 100644
--- a/app/components/Dungeons.vue
+++ b/app/components/Dungeons.vue
@@ -19,7 +19,8 @@
 </template>
 
 <script>
-    //import {staticDungeons} from "~/standard/staticDungeons";
+
+    import {GameSaveHelper} from "~/GameSaveHelper";
 
     export default {
         data: function() {
@@ -40,14 +41,14 @@
                 } else if (typeof this.$modelManager.getDungeonValue(key, item) === "number") {
                     let val = -1;
                     let max = 'max'+item.substr(0, 1).toUpperCase()+item.substr(1);
-                    if(item === 'chests' || item === 'smallkeys') {
+                    if(item === 'chests' || (item === 'smallkeys' && this.$modelManager.getItemShuffle() === GameSaveHelper.itemShuffleOptions.standard.id)) {
                         val = this.$modelManager.getDungeonValue(key, item) - 1;
                         if(val < 0) {
-                            val = this.$sol.getStaticDungeons(this.$modelManager.getGameMode())[key][max];
+                            val = this.$sol.getStaticDungeons(this.$modelManager.getGameMode(), this.$modelManager.getItemShuffle())[key][max];
                         }
                     } else {
                         val = this.$modelManager.getDungeonValue(key, item) + 1;
-                        if(val > this.$sol.getStaticDungeons(this.$modelManager.getGameMode())[key][max]) {
+                        if(val > this.$sol.getStaticDungeons(this.$modelManager.getGameMode(), this.$modelManager.getItemShuffle())[key][max]) {
                             val = 0;
                         }
                     }
@@ -72,13 +73,13 @@
                 const keys = this.$modelManager.getDungeonKeys();
                 for(const key of keys) {
                     retval.bosses[key] = '~/img/dungeons/'+key+'_boss'+(dungeons[key].boss ? '1' : '0')+'.png';
-                    retval.crystals[key] = this.$sol.getStaticDungeons(this.$modelManager.getGameMode())[key].maxCrystal === 0 ? '~/img/dungeons/blank.png' : '~/img/dungeons/crystal'+dungeons[key].crystal+'.png';
+                    retval.crystals[key] = this.$sol.getStaticDungeons(this.$modelManager.getGameMode(), this.$modelManager.getItemShuffle())[key].maxCrystal === 0 ? '~/img/dungeons/blank.png' : '~/img/dungeons/crystal'+dungeons[key].crystal+'.png';
                     retval.chests[key] = '~/img/dungeons/chest'+dungeons[key].chests+'.png';
                     retval.bosskeys[key] = key === 'aga' ? '~/img/dungeons/blank.png' : '~/img/dungeons/bosskey'+(dungeons[key].bosskey ? '1' : '0')+'.png';
                     retval.maps[key] = key === 'aga' ? '~/img/dungeons/blank.png' : '~/img/dungeons/map'+(dungeons[key].map ? '1' : '0')+'.png';
                     retval.compasses[key] = key === 'aga' ? '~/img/dungeons/blank.png' : '~/img/dungeons/compass'+(dungeons[key].compass ? '1' : '0')+'.png';
                     retval.smallkeys[key] = '~/img/dungeons/smallkey'+dungeons[key].smallkeys+'.png';
-                    retval.medallion[key] = this.$sol.getStaticDungeons(this.$modelManager.getGameMode())[key].maxMedallion === 0 ? '~/img/dungeons/blank.png' : '~/img/dungeons/medallion'+dungeons[key].medallion+'.png';
+                    retval.medallion[key] = this.$sol.getStaticDungeons(this.$modelManager.getGameMode(), this.$modelManager.getItemShuffle())[key].maxMedallion === 0 ? '~/img/dungeons/blank.png' : '~/img/dungeons/medallion'+dungeons[key].medallion+'.png';
                 }
                 return retval;
             },
diff --git a/app/components/GameEdit.vue b/app/components/GameEdit.vue
index 7af166b..1d9324b 100644
--- a/app/components/GameEdit.vue
+++ b/app/components/GameEdit.vue
@@ -1,65 +1,153 @@
 <template>
     <Page backgroundColor="black">
         <Navbar></Navbar>
-        <StackLayout orientation="vertical" class="save-wrapper"
-                     :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">
-            <Label :text="game.name +(game.loaded ? ': Active Game':'')" fontSize="24" />
-            <Label v-if="!game.timestamp" text="Game Slot Empty"/>
-            <Label v-if="game.timestamp" :text="'Game Mode: '+game.gameMode"/>
-            <Label v-if="game.timestamp" :text="'Item Shuffle: '+game.itemShuffle"/>
-            <Label height="15"/>
-            <Button v-if="!game.loaded && game.valid && game.timestamp" class="btn" @tap="loadGame"
-                    :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Load Game</Button>
-            <Button v-if="!game.timestamp" class="btn" @tap="createGame"
-                    :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Create New Game</Button>
-            <Button v-if="allowDelete && game.timestamp && !game.loaded" class="btn" @tap="deleteGame"
-                    :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Delete</Button>
-            <Button v-if="game.loaded" class="btn" @tap="resetItems"
-                    :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Reset Items</Button>
-            <Button v-if="game.loaded" class="btn" @tap="resetDungeons"
-                    :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Reset Dungeons</Button>
-            <Button v-if="game.loaded" class="btn" @tap="resetMap"
-                    :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Reset Map</Button>
-            <Button class="btn" @tap="cancel"
-                    :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Back</Button>
-            <Label height="15"/>
-            <Label v-if="!game.timestamp" textWrap="true" fontSize="16" textAlignment="center"
-                   text="NOTE: Game options coming soon! For now all games are Standard."/>
-            <Label v-if="allowDelete && game.timestamp && game.loaded" textWrap="true" fontSize="16" textAlignment="center"
-                   text="NOTE: You cannot delete the active game. Load another game before deleting this one."/>
-            <Label v-if="!allowDelete && game.timestamp" textWrap="true" fontSize="16" textAlignment="center"
-                   text="NOTE: At least one game must be active. Create another game using an empty game slot before deleting this game."/>
-
-        </StackLayout>
+        <GridLayout>
+            <StackLayout v-if="(game.timestamp && game.valid)" :key="updateKey"
+                         orientation="vertical" class="save-wrapper" :class="game.loaded ? 'loaded' : 'valid'">
+                <Label :text="game.name +(game.loaded ? ': Active Game':'')" fontSize="24" />
+                <Label :text="'Game Mode: '+game.gameMode"/>
+                <Label :text="'Item Shuffle: '+itemShuffleOptions[game.itemShuffle].label"/>
+                <Label height="15"/>
+                <Button :visibility="!game.loaded && game.valid && game.timestamp ? 'visible': 'collapsed'" class="btn" @tap="loadGame"
+                        :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Load Game</Button>
+                <Button :visibility="allowDelete && game.timestamp && !game.loaded ? 'visible': 'collapsed'" class="btn" @tap="openModal('deleteGame')"
+                        :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Delete</Button>
+                <Button :visibility="game.loaded ? 'visible': 'collapsed'" class="btn" @tap="openModal('resetItems')"
+                        :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Reset Items</Button>
+                <Button :visibility="game.loaded ? 'visible': 'collapsed'" class="btn" @tap="openModal('resetDungeons')"
+                        :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Reset Dungeons</Button>
+                <Button :visibility="game.loaded ? 'visible': 'collapsed'" class="btn" @tap="openModal('resetMap')"
+                        :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Reset Map</Button>
+                <Button class="btn" @tap="cancel"
+                        :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'">Back</Button>
+                <Label height="15"/>
+                <Label :visibility="allowDelete && game.timestamp && game.loaded ? 'visible': 'collapsed'" textWrap="true" fontSize="16" textAlignment="center"
+                       text="NOTE: You cannot delete the active game. Load another game before deleting this one."/>
+                <Label :visibility="!allowDelete && game.timestamp ? 'visible': 'collapsed'" textWrap="true" fontSize="16" textAlignment="center"
+                       text="NOTE: At least one game must be active. Create another game using an empty game slot before deleting this game."/>
+            </StackLayout>
+            <StackLayout v-if="(game.timestamp && !game.valid)" :key="updateKey"
+                         orientation="vertical" class="save-wrapper invalid">
+                <Label :text="game.name" fontSize="24" />
+                <Label :text="'Game Mode: '+game.gameMode"/>
+                <Label :text="'Item Shuffle: '+itemShuffleOptions[game.itemShuffle].label"/>
+                <Button :visibility="allowDelete && game.timestamp && !game.loaded ? 'visible': 'collapsed'"
+                        class="btn invalid" @tap="deleteGame">Delete</Button>
+                <Label textWrap="true" fontSize="16" textAlignment="center"
+                       text="NOTE: This game is based on an old version. You must delete this game."/>
+                <Label :visibility="!allowDelete && game.timestamp ? 'visible': 'collapsed'" textWrap="true" fontSize="16" textAlignment="center"
+                       text="NOTE: At least one game must be active. Create another game using an empty game slot before deleting this game."/>
+            </StackLayout>
+            <StackLayout v-if="!game.timestamp" orientation="vertical" class="save-wrapper empty" :key="updateKey">
+                <Label :text="game.name" fontSize="24" />
+                <Label text="Game Slot Empty"/>
+                <StackLayout orientation="vertical">
+                    <Label text="Game Mode: Standard"/>
+                    <Label text="Item Shuffle:"/>
+                    <StackLayout orientation="horizontal" v-for="key in itemShuffleKeys" @tap="clickItemShuffle(key)">
+                        <Image :key="updateKey" :src="getItemShuffleCheckImage(key)" width="20" height="20" />
+                        <Label :text="itemShuffleOptions[key].label" verticalAlignment="center" marginLeft="5" fontSize="20" />
+                    </StackLayout>
+                </StackLayout>
+                <Label height="15"/>
+                <Button class="btn empty" @tap="createGame">Create New Game</Button>
+                <Button class="btn empty" @tap="cancel">Back</Button>
+                <Label height="15"/>
+                <Label textWrap="true" fontSize="16" textAlignment="center"
+                       text="NOTE: More game options coming soon!"/>
+            </StackLayout>
+            <AbsoluteLayout class="modal-wrapper" :class="{'open': modalOpen, 'closed':!modalAnimating}">
+                <AbsoluteLayout class="modal-bg" @tap="interceptClick"/>
+                <StackLayout orientation="vertical" class="modal-dialog" :width="modalWidth" :class="{'open': modalOpen}">
+                    <Label :visibility="modalAction === 'deleteGame' ? 'visible':'collapsed'" textWrap="true"
+                           textAlignment="center" style="padding-bottom: 10"
+                           text="Are you sure you want to delete this game?"/>
+                    <Label :visibility="modalAction === 'resetItems' ? 'visible':'collapsed'" textWrap="true"
+                           textAlignment="center" style="padding-bottom: 10"
+                           text="Are you sure you want to reset the item data for this game?"/>
+                    <Label :visibility="modalAction === 'resetDungeons' ? 'visible':'collapsed'" textWrap="true"
+                           textAlignment="center" style="padding-bottom: 10"
+                           text="Are you sure you want to reset the dungeon data for this game?"/>
+                    <Label :visibility="modalAction === 'resetMap' ? 'visible':'collapsed'" textWrap="true"
+                           textAlignment="center" style="padding-bottom: 10"
+                           text="Are you sure you want to reset the map data for this game?"/>
+                    <Label text="This cannot be undone!" textAlignment="center" style="padding-bottom: 10"/>
+                    <Button class="btn invalid" @tap="closeModal(true)">OK</Button>
+                    <Button class="btn invalid" @tap="closeModal(false)">Cancel</Button>
+                </StackLayout>
+            </AbsoluteLayout>
+        </GridLayout>
     </Page>
 </template>
 
 <script>
     import SaveList from "~/components/SaveList";
     import {GameSaveHelper} from "~/GameSaveHelper";
+    import {screen} from 'tns-core-modules/platform';
 
     export default {
-        props:['game'],
+        props:['game_id'],
         data: function() {
             return {
-                allowDelete: this.$modelManager.allowGameDelete()
+                allowDelete: this.$modelManager.allowGameDelete(),
+                itemShuffleOptions: GameSaveHelper.itemShuffleOptions,
+                itemShuffleKeys: Object.keys(GameSaveHelper.itemShuffleOptions),
+                game: GameSaveHelper.parseGameSaves(this.$modelManager)[this.$props.game_id],
+                updateKey:Date.now(),
+                modalOpen:false,
+                screen: screen,
+                modalWidth: 0,
+                modalAnimating: false,
+                modalAction: undefined
             }
         },
+        created() {
+            this.checkEmptyGameState();
+            this.modalWidth = (this.screen.mainScreen.widthPixels / this.screen.mainScreen.scale) - 40;
+            console.log(this.modalWidth);
+        },
         mounted() {
 
         },
         methods: {
+            interceptClick() {
+                console.log('no clicky!');
+            },
+            openModal(opt) {
+                this.modalAction = opt;
+                this.modalOpen = true;
+                this.modalAnimating=true;
+            },
+            closeModal(doAction) {
+                if(doAction){
+                    if(this.modalAction === 'deleteGame') {
+                        this.deleteGame();
+                    } else if(this.modalAction === 'resetItems'){
+                        this.resetItems();
+                    } else if(this.modalAction === 'resetDungeons'){
+                        this.resetDungeons();
+                    } else if(this.modalAction === 'resetMap'){
+                        this.resetMap();
+                    }
+                }
+                this.modalAction = undefined;
+                this.modalOpen = false;
+                setTimeout(()=>{this.modalAnimating=false;},500);
+            },
             loadGame() {
                 this.$modelManager.loadGame(this.game.id);
                 this.$navigateTo(SaveList);
             },
             createGame() {
-                this.$modelManager.createGame(this.game.id);
+                if(!this.game.itemShuffle) {return; }
+                this.$modelManager.createGame(this.game.id, this.game.itemShuffle);
                 this.game = GameSaveHelper.parseGameSaves(this.$modelManager)[this.game.id];
+                this.updateKey = Date.now();
             },
             deleteGame() {
                 this.$modelManager.deleteGame(this.game.id);
                 this.game = GameSaveHelper.parseGameSaves(this.$modelManager)[this.game.id];
+                this.checkEmptyGameState();
             },
             cancel() {
                 this.$navigateTo(SaveList);
@@ -72,6 +160,19 @@
             },
             resetMap() {
                 this.$modelManager.resetMap();
+            },
+            clickItemShuffle(id) {
+                this.game.itemShuffle = id;
+                this.updateKey = Date.now();
+            },
+            checkEmptyGameState(){
+                if(!this.game.timestamp) {
+                    this.game.itemShuffle = this.itemShuffleOptions.standard.id;
+                }
+                this.updateKey = Date.now();
+            },
+            getItemShuffleCheckImage(key) {
+                return this.game.itemShuffle === key ? '~/img/checked.png' : '~/img/unchecked.png';
             }
         }
     };
@@ -133,4 +234,62 @@
             background-color: darkred;
         }
     }
+    .modal-wrapper {
+        visibility: visible;
+        width: 100%;
+        height: 100%;
+        background-color: transparent;
+        animation-name:fade-out;
+        animation-duration: 500ms;
+        animation-fill-mode: forwards;
+        &.closed {
+            visibility: collapsed;
+        }
+        &.open {
+            visibility: visible;
+            animation-duration: 500ms;
+            animation-name:fade-in;
+            animation-fill-mode: forwards;
+        }
+    }
+    .modal-bg {
+        background-color: black;
+        opacity: 0.4;
+        width: 100%;
+        height: 100%;
+    }
+    .modal-dialog {
+        background-color: darkred;
+        border-width: 2px;
+        border-color: #004c00;
+        padding: 10;
+        margin: 20;
+        color: white;
+        font-family: "Return of Ganon", "ReturnofGanon";
+        font-size: 20;
+        animation-name:slide-up;
+        animation-duration: 500ms;
+        animation-fill-mode: forwards;
+        &.open {
+            animation-duration: 1s;
+            animation-name:slide-down;
+            animation-fill-mode: forwards;
+        }
+    }
+    @keyframes fade-out {
+        from {opacity: 1;}
+        to {opacity: 0;}
+    }
+    @keyframes fade-in {
+        from {opacity: 0;}
+        to {opacity: 1;}
+    }
+    @keyframes slide-up {
+        from {transform:translate(0,0);}
+        to {transform:translate(0,-400);}
+    }
+    @keyframes slide-down {
+        from {transform:translate(0,-400);}
+        to {transform:translate(0,0);}
+    }
 </style>
diff --git a/app/components/LightMap.vue b/app/components/LightMap.vue
index f76da75..d627a0c 100644
--- a/app/components/LightMap.vue
+++ b/app/components/LightMap.vue
@@ -83,7 +83,7 @@
                     dungeons: this.$modelManager.map.lightworld.dungeons,
                     bosses: this.$modelManager.map.lightworld.bosses,
                     dungeonValues: this.$modelManager.dungeons,
-                    staticDungeonValues: this.$sol.getStaticDungeons(this.$modelManager.getGameMode()),
+                    staticDungeonValues: this.$sol.getStaticDungeons(this.$modelManager.getGameMode(), this.$modelManager.getItemShuffle()),
                     centerKey: undefined
                 },
                 mapWidth:1500,
diff --git a/app/components/ModelManager.js b/app/components/ModelManager.js
index ac99167..3b33e8e 100644
--- a/app/components/ModelManager.js
+++ b/app/components/ModelManager.js
@@ -17,6 +17,7 @@ import {defaultSettings} from "~/defaultSettings";
 
 import {StaticObjectLoader} from "~/components/StaticObjectLoader";
 import {defaultGameSaves} from "~/defaultGameSaves";
+import {GameSaveHelper} from "~/GameSaveHelper";
 
 export class ModelManager  {
     items = {};
@@ -178,7 +179,7 @@ export class ModelManager  {
                 retval = retval + dwMap[key].itemCount;
             }
         }
-        const dungeons = this.sol.getStaticDungeons(this.settings.gameMode);
+        const dungeons = this.sol.getStaticDungeons(this.settings.gameMode, this.settings.itemShuffle);
         const dgnKeys = Object.keys(dungeons);
         const savedDgn = this.dungeons;
         for(const key of dgnKeys) {
@@ -202,7 +203,10 @@ export class ModelManager  {
     }
     getItemMax() {
         if(this.settings.gameMode === this.sol.STANDARD) {
-            return 152;
+            return this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.standard.id ? 152
+                : this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.mc.id ? (152 + 20)
+                : this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.mcsk.id ? (152 + 20 + 28)
+                : (152 + 30 + 28);
         }
     }
     saveItems() {
@@ -213,10 +217,10 @@ export class ModelManager  {
     }
     resetDungeons() {
         this.dungeons = JSON.parse(JSON.stringify(defaultDungeons.data));
-        const staticDungeons = this.sol.getStaticDungeons(this.settings.gameMode);
+        const staticDungeons = this.sol.getStaticDungeons(this.settings.gameMode, this.settings.itemShuffle);
         const keys = Object.keys(this.dungeons);
         for(const key of keys){
-            this.dungeons[key].smallkeys = staticDungeons[key].maxSmallkeys;
+            this.dungeons[key].smallkeys = this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.standard.id ? staticDungeons[key].maxSmallkeys : 0;
             this.dungeons[key].chests = staticDungeons[key].maxChests;
         }
 
@@ -291,12 +295,15 @@ export class ModelManager  {
     getGameMode() {
         return this.settings.gameMode;
     }
+    getItemShuffle() {
+        return this.settings.itemShuffle;
+    }
     getGameModeMap() {
         if(this.settings.gameMode === this.sol.STANDARD) {
             return this.sol.STANDARD;
         }
     }
-    createGame(id) {
+    createGame(id, itemShuffle) {
         const game = {
             items: JSON.parse(JSON.stringify(defaultItems.data)),
             dungeons: JSON.parse(JSON.stringify(defaultDungeons.data)),
@@ -311,7 +318,13 @@ export class ModelManager  {
             }
         };
         game.settings.gameSlot = id;
-        console.log(game.settings);
+        game.settings.itemShuffle = itemShuffle;
+        const staticDungeons = this.sol.getStaticDungeons(game.settings.gameMode, game.settings.itemShuffle);
+        const keys = Object.keys(game.dungeons);
+        for(const key of keys){
+            game.dungeons[key].smallkeys = game.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.standard.id ? staticDungeons[key].maxSmallkeys : 0;
+            game.dungeons[key].chests = staticDungeons[key].maxChests;
+        }
         this.gameSaves[id]=game;
         const d = JSON.parse(JSON.stringify(defaultGameSaves));
         d.data = this.gameSaves;
diff --git a/app/components/SaveList.vue b/app/components/SaveList.vue
index 07a351e..a5e2c30 100644
--- a/app/components/SaveList.vue
+++ b/app/components/SaveList.vue
@@ -3,7 +3,7 @@
         <Navbar></Navbar>
         <ScrollView orientation="vertical">
             <StackLayout orientation="vertical">
-                <GridLayout columns="52,*" rows="*" orientation="horizontal" class="save-wrapper" v-for="game in gameSaves" v-bind="game.id"
+                <GridLayout columns="52,*" rows="*" orientation="horizontal" class="save-wrapper" v-for="game in gameSaves" v-bind:key="game.id"
                              :class="game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid'"
                               @tap="navToEdit(game)" >
                     <Image :src="'~/img/game-'+(game.loaded ? 'loaded' : !game.timestamp ? 'empty' : game.valid ? 'valid': 'invalid')+'.png'"
@@ -13,7 +13,7 @@
                         <Label v-else text="Empty"/>
                         <Label v-if="game.timestamp" :text="'Game Mode: '+game.gameMode" fontSize="16"/>
                         <Label v-else text="Create New Game" fontSize="16" />
-                        <Label v-if="game.timestamp" :text="'Item Shuffle: '+game.itemShuffle" fontSize="16"/>
+                        <Label v-if="game.timestamp" :text="'Item Shuffle: '+itemShuffleOptions[game.itemShuffle].label" fontSize="16"/>
                         <Label v-if="game.timestamp" :text="'Last Saved: '+game.timestamp" fontSize="16" verticalAlignment="bottom"/>
                         <Label v-else text=" " fontSize="16" verticalAlignment="bottom" />
                     </StackLayout>
@@ -30,7 +30,8 @@
     export default {
         data: function() {
             return {
-                gameSaves: GameSaveHelper.parseGameSaves(this.$modelManager)
+                gameSaves: GameSaveHelper.parseGameSaves(this.$modelManager),
+                itemShuffleOptions: GameSaveHelper.itemShuffleOptions,
             }
         },
         mounted() {
@@ -40,7 +41,7 @@
             navToEdit(game) {
                 this.$navigateTo(GameEdit, {
                     props:{
-                        game:game
+                        game_id:game.id
                     }
                 })
             }
diff --git a/app/components/StaticObjectLoader.js b/app/components/StaticObjectLoader.js
index be83bbd..0913af5 100644
--- a/app/components/StaticObjectLoader.js
+++ b/app/components/StaticObjectLoader.js
@@ -32,9 +32,40 @@ export class StaticObjectLoader {
             return standardStaticMapDungeonsDW;
         }
     }
-    getStaticDungeons(gm) {
+    getStaticDungeons(gm, iShuff) {
+        if(!iShuff) {throw new Error('itemShuffle value required!')}
+        let retval = undefined;
         if(gm === this.STANDARD) {
-            return standardStaticDungeons;
+            retval = JSON.parse(JSON.stringify(standardStaticDungeons));
+        }
+        if(iShuff === 'standard'){
+            return retval;
+        } else if(iShuff === 'mc') {
+            const keys = Object.keys(retval);
+            for(const key of keys) {
+                if(key !== 'aga') {
+                    retval[key].maxChests = retval[key].maxChests + 2;
+                }
+            }
+            return retval;
+        } else if(iShuff === 'mcsk') {
+            const keys = Object.keys(retval);
+            for(const key of keys) {
+                if(key !== 'aga') {
+                    retval[key].maxChests = retval[key].maxChests + 2;
+                }
+                retval[key].maxChests = retval[key].maxChests + retval[key].chestSmallkeys;
+            }
+            return retval;
+        } else if(iShuff === 'keysanity') {
+            const keys = Object.keys(retval);
+            for(const key of keys) {
+                if(key !== 'aga') {
+                    retval[key].maxChests = retval[key].maxChests + 3;
+                }
+                retval[key].maxChests = retval[key].maxChests + retval[key].chestSmallkeys;
+            }
+            return retval;
         }
     }
     getStaticItems(gm) {
diff --git a/app/img/dungeons/chest21.png b/app/img/dungeons/chest21.png
new file mode 100644
index 0000000..2fed32a
Binary files /dev/null and b/app/img/dungeons/chest21.png differ
diff --git a/app/img/dungeons/chest22.png b/app/img/dungeons/chest22.png
new file mode 100644
index 0000000..708b98d
Binary files /dev/null and b/app/img/dungeons/chest22.png differ
diff --git a/app/img/dungeons/chest23.png b/app/img/dungeons/chest23.png
new file mode 100644
index 0000000..8d5e051
Binary files /dev/null and b/app/img/dungeons/chest23.png differ
diff --git a/app/img/dungeons/chest24.png b/app/img/dungeons/chest24.png
new file mode 100644
index 0000000..53e6d17
Binary files /dev/null and b/app/img/dungeons/chest24.png differ
diff --git a/app/img/dungeons/chest25.png b/app/img/dungeons/chest25.png
new file mode 100644
index 0000000..ac1a179
Binary files /dev/null and b/app/img/dungeons/chest25.png differ
diff --git a/app/img/dungeons/chest26.png b/app/img/dungeons/chest26.png
new file mode 100644
index 0000000..313cd25
Binary files /dev/null and b/app/img/dungeons/chest26.png differ
diff --git a/app/img/dungeons/chest27.png b/app/img/dungeons/chest27.png
new file mode 100644
index 0000000..9e7f595
Binary files /dev/null and b/app/img/dungeons/chest27.png differ
diff --git a/app/img/dungeons/chest28.png b/app/img/dungeons/chest28.png
new file mode 100644
index 0000000..29dc379
Binary files /dev/null and b/app/img/dungeons/chest28.png differ
diff --git a/app/img/dungeons/chest29.png b/app/img/dungeons/chest29.png
new file mode 100644
index 0000000..f1c655e
Binary files /dev/null and b/app/img/dungeons/chest29.png differ
diff --git a/app/img/dungeons/chest30.png b/app/img/dungeons/chest30.png
new file mode 100644
index 0000000..4a2a2cf
Binary files /dev/null and b/app/img/dungeons/chest30.png differ
diff --git a/app/img/dungeons/crystal3.png b/app/img/dungeons/crystal3.png
index b0aace2..498d3ab 100644
Binary files a/app/img/dungeons/crystal3.png and b/app/img/dungeons/crystal3.png differ
diff --git a/app/img/dungeons/crystal4.png b/app/img/dungeons/crystal4.png
index 617b1cf..0d72c69 100644
Binary files a/app/img/dungeons/crystal4.png and b/app/img/dungeons/crystal4.png differ
diff --git a/app/img/items/jar0.png b/app/img/items/jar0.png
index 4e63272..e07274b 100644
Binary files a/app/img/items/jar0.png and b/app/img/items/jar0.png differ
diff --git a/app/standard/staticDungeons.js b/app/standard/staticDungeons.js
index 333a59e..3a6ba93 100644
--- a/app/standard/staticDungeons.js
+++ b/app/standard/staticDungeons.js
@@ -3,72 +3,84 @@ export const staticDungeons  = {
         maxCrystal: 4,
         maxChests: 3,
         maxSmallkeys: 2,
-        maxMedallion: 0
+        maxMedallion: 0,
+        chestSmallkeys: 0,
     },
     dp:{
         maxCrystal: 4,
         maxChests: 2,
         maxSmallkeys: 4,
-        maxMedallion: 0
+        maxMedallion: 0,
+        chestSmallkeys: 1
     },
     toh:{
         maxCrystal: 4,
         maxChests: 2,
         maxSmallkeys: 1,
-        maxMedallion: 0
+        maxMedallion: 0,
+        chestSmallkeys: 1
     },
     aga:{
         maxCrystal: 0,
         maxChests: 0,
         maxSmallkeys: 4,
-        maxMedallion: 0
+        maxMedallion: 0,
+        chestSmallkeys: 2
     },
     pod:{
         maxCrystal: 4,
         maxChests: 5,
         maxSmallkeys: 6,
-        maxMedallion: 0
+        maxMedallion: 0,
+        chestSmallkeys: 6
     },
     sp:{
         maxCrystal: 4,
         maxChests: 6,
         maxSmallkeys: 5,
-        maxMedallion: 0
+        maxMedallion: 0,
+        chestSmallkeys: 1
     },
     sw:{
         maxCrystal: 4,
         maxChests: 2,
         maxSmallkeys: 5,
-        maxMedallion: 0
+        maxMedallion: 0,
+        chestSmallkeys: 3
     },
     tt:{
         maxCrystal: 4,
         maxChests: 4,
         maxSmallkeys: 3,
-        maxMedallion: 0
+        maxMedallion: 0,
+        chestSmallkeys: 1
     },
     ip:{
         maxCrystal: 4,
         maxChests: 3,
         maxSmallkeys: 6,
-        maxMedallion: 0
+        maxMedallion: 0,
+        chestSmallkeys: 2
     },
     mm:{
         maxCrystal: 4,
         maxChests: 2,
         maxSmallkeys: 6,
-        maxMedallion: 3
+        maxMedallion: 3,
+        chestSmallkeys: 3
     },
     tr:{
         maxCrystal: 4,
         maxChests: 5,
         maxSmallkeys: 6,
-        maxMedallion: 3
+        maxMedallion: 3,
+        chestSmallkeys: 4
     },
     gt:{
         maxCrystal: 0,
         maxChests: 20,
         maxSmallkeys: 8,
-        maxMedallion: 0
+        maxMedallion: 0,
+        chestSmallkeys: 4
     }
 }