diff --git a/.gitignore b/.gitignore
index a0dddc6f..96172bbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ node_modules
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+package-lock.json
 
 # Editor directories and files
 .idea
diff --git a/package.json b/package.json
index a02e2690..1da17ea5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "penguin-stats-frontend",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -62,4 +62,4 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/App.vue b/src/App.vue
index 03af8604..001612c1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,7 +10,13 @@
       style="max-height: calc(100vh - 36.76px)"
       width="300"
     >
-      <div class="drawer-logo blue darken-4">
+      <div 
+        :class="{
+          'drawer-logo blue': true,
+          'darken-4': dark,
+          'darken-3': !dark
+        }"
+      >
         <v-img
           :src="require('@/assets/logo.png')"
           aspect-ratio="1"
@@ -37,6 +43,7 @@
           <v-list-item
             v-if="!route.children || route.meta.forceSingle"
             :key="route.name"
+            :class="route.path === $route.path ? 'v-list-item--active' : ''"
             @click="onMenuItemClicked(route)"
           >
             <v-list-item-icon>
@@ -58,6 +65,7 @@
             :key="route.name"
             :value="route.meta.active"
             :prepend-icon="route.meta.icon"
+            color="grey"
             no-action
           >
             <template v-slot:activator>
@@ -67,6 +75,7 @@
             <v-list-item
               v-for="child in route.children.filter(el => !el.meta.hide)"
               :key="child.name"
+              :class="child.path === $route.path.split('/')[2] ? 'v-list-item--active' : ''"
               @click="onMenuItemClicked(child)"
             >
               <v-list-item-title>{{ $t(child.meta.i18n) }}</v-list-item-title>
@@ -84,25 +93,38 @@
           <v-row
             justify="end"
           >
-            <v-btn
-              icon
-              class="mx-1"
-              @click="refreshData"
-            >
-              <v-icon>mdi-database-refresh</v-icon>
-            </v-btn>
-
-            <v-btn
-              icon
-              class="mx-1"
-              @click="dark = !dark"
-            >
-              <v-icon>mdi-invert-colors</v-icon>
-            </v-btn>
+            <v-tooltip bottom>
+              <template v-slot:activator="{ on }">
+                <v-btn
+                  icon
+                  class="mx-1"
+                  v-on="on"
+                  @click="refreshData"
+                >
+                  <v-icon>mdi-database-refresh</v-icon>
+                </v-btn>
+              </template>
+              <span>{{ $t('menu.refreshData') }}</span>
+            </v-tooltip>
+            
+            <v-tooltip bottom>
+              <template v-slot:activator="{ on }">
+                <v-btn
+                  icon
+                  class="mx-1"
+                  v-on="on"
+                  @click="dark = !dark"
+                >
+                  <v-icon>mdi-invert-colors</v-icon>
+                </v-btn>
+              </template>
+              <span>{{ $t('menu.invertColors') }}</span>
+            </v-tooltip>
             
             <v-menu
               bottom
               left
+              open-on-hover
               transition="slide-y-transition"
             >
               <template v-slot:activator="{ on }">
@@ -378,11 +400,15 @@ export default {
             : imageUrl("croissant")
     },
     changeLocale (localeId, save=true) {
-      Console.debug("[i18n] locale changed to:", localeId, "| saving to vuex:", save);
-      this.$i18n.locale = localeId;
-      // this.$vuetify.lang.current = localeId;
-      if (save) this.$store.commit("changeLocale", localeId);
-      document.title = `${this.$t(this.$route.meta.i18n) + ' | ' || ''}${this.$t('app.name')}`;
+      if (localeId !== this.$i18n.locale) {
+        Console.debug("[i18n] locale changed to:", localeId, "| saving to vuex:", save);
+        this.$i18n.locale = localeId;
+        // this.$vuetify.lang.current = localeId;
+        if (save) this.$store.commit("changeLocale", localeId);
+        document.title = `${this.$t(this.$route.meta.i18n) + ' | ' || ''}${this.$t('app.name')}`;
+      } else {
+        Console.debug("[i18n] Same locale");
+      }
     },
     logRouteEvent (newValue) {
       if (newValue.name === "StatsByStage_Selected") {
diff --git a/src/components/stats/StageSelector.vue b/src/components/stats/StageSelector.vue
index cf83156e..2c5d374c 100644
--- a/src/components/stats/StageSelector.vue
+++ b/src/components/stats/StageSelector.vue
@@ -257,11 +257,13 @@
         },
         set (val) {
           this.internalStep = val;
+          if (val === 1) this.$emit("select", {zone: null, stage: null});
+
           if (!this.bindRouter) return;
           if (val === 1) {
             this.$router.push({
               name: this.routerNames.index
-            })
+            });
           } else if (val === 2) {
             this.$router.push({
               name: this.routerNames.details,
diff --git a/src/config/index.js b/src/config/index.js
index 924384f2..39842924 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -1,6 +1,6 @@
 const client = {
   source: "frontend-v2",
-  version: "v1.1.0"
+  version: "v1.1.1"
 };
 
 export default {
diff --git a/src/locales/en.json b/src/locales/en.json
index 94b50a08..9203071d 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -24,7 +24,9 @@
     },
     "planner": "ArkPlanner",
     "changelog": "Change Log",
-    "v1": "Visit Old Version"
+    "v1": "Visit Old Version",
+    "refreshData": "Refresh Data",
+    "invertColors": "Change Theme Color"
   },
   "meta": {
     "details": "Details",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index f0979582..bed38e6f 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -24,7 +24,9 @@
     },
     "planner": "周回計画作成ツール",
     "changelog": "更新履歴",
-    "v1": "旧バージョン"
+    "v1": "旧バージョン",
+    "refreshData": "データ更新",
+    "invertColors": "テーマ変更"
   },
   "meta": {
     "details": "詳細を見る",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 101bb1d4..6eaaf1fb 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -24,7 +24,9 @@
     },
     "planner": "刷图规划器",
     "changelog": "更新日志",
-    "v1": "访问旧版"
+    "v1": "访问旧版",
+    "refreshData": "刷新数据",
+    "invertColors": "转换主题"
   },
   "meta": {
     "details": "详细信息",
diff --git a/src/models/stages.js b/src/models/stages.js
index 5eab7359..47a01e71 100644
--- a/src/models/stages.js
+++ b/src/models/stages.js
@@ -6,6 +6,9 @@ const stages = new ObjectManager({
   api: '/stages',
   transform: [
     (object) => {
+      // object.push({"stageType":"ACTIVITY","stageId":"test01_001","zoneId":"test01","code":"测试活动 1","apCost":99,"normalDrop":["30011"],"specialDrop":[],"extraDrop":[], "isGacha": true})
+      // object.push({"stageType":"ACTIVITY","stageId":"test01_002","zoneId":"test01","code":"测试活动 2","apCost":99,"normalDrop":["30011"],"specialDrop":[],"extraDrop":[], "isGacha": true})
+
       object.forEach(el => {
         el.dropsSet = [...el.normalDrop, ...el.extraDrop, ...el.specialDrop]
       });
diff --git a/src/models/zones.js b/src/models/zones.js
index 84d7d1f1..f0f7ce8d 100644
--- a/src/models/zones.js
+++ b/src/models/zones.js
@@ -16,6 +16,8 @@ const zones = new ObjectManager({
   api: '/zones?i18n=true',
   transform: [
     (object) => {
+      // object.push({"zoneId":"test01","zoneIndex":0,"type":"ACTIVITY","zoneName":"测试活动","openTime":1577174400000,"closeTime":1598340799000,"stages":["test01_001","test01_002"],"zoneName_i18n":{"ja":"测试活动 ja","en":"测试活动 en","zh":"测试活动 zh"}})
+
       object.forEach((el) => {
         el.icon = getIcon(el.type);
 
diff --git a/src/views/About/Bulletin.vue b/src/views/About/Bulletin.vue
index 5f1e8384..e042b7a8 100644
--- a/src/views/About/Bulletin.vue
+++ b/src/views/About/Bulletin.vue
@@ -3,29 +3,29 @@
     "zh": {
       "bulletin": {
         "bulletin_0": "1月16日海外版正式上线，为了避免数据混淆，请只上传国服的掉落。",
-        "bulletin_1": "专用于海外版的素材统计站是否开放正在计划中。",
-        "bulletin_2": "另外，希望有会韩语的博士可以一起来完成网站韩语化工作。"
+        "bulletin_1": "专用于海外版的素材统计站是否开放正在计划中。"
       }
     },
     "en": {
       "bulletin": {
         "bulletin_0": "Arknights EN server was officially released on 1/16. In order not to mess up the data, please only submit drop data from CN server.",
-        "bulletin_1": "We are considering whether to open another website for overseas servers.",
-        "bulletin_2": "In addition, we are sincerely looking for someone who can help us translate the website into Korean."
+        "bulletin_1": "We are considering whether to open another website for overseas servers."
       }
     },
     "ja": {
       "bulletin": {
         "bulletin_0": "1月16日に海外版が正式にリリースされます。データの混雑を避けるために、当サイトでは大陸版のドロップデータのみをアップロードして下さい。",
-        "bulletin_1": "海外版のドロップまとめサイトを開設するかは現時点では思案中のみとなっています。",
-        "bulletin_2": "さらに、ウェブサイトを韓国語に翻訳する方を募集しています。"
+        "bulletin_1": "海外版のドロップまとめサイトを開設するかは現時点では思案中のみとなっています。"
       }
     }
   }
 </i18n>
 
 <template>
-  <v-card class="bkop-light pa-6">
+  <v-card
+    elevation="5"
+    class="bkop-light pa-6"
+  >
     <h1 class="headline font-weight-black">
       {{ $t('menu.about.bulletin') }}
     </h1>
@@ -38,8 +38,6 @@
         <span>{{ $t('bulletin.bulletin_0') }}</span>
         <br>
         <span>{{ $t('bulletin.bulletin_1') }}</span>
-        <br>
-        <span>{{ $t('bulletin.bulletin_2') }}</span>
       </v-col>
     </v-row>
   </v-card>
diff --git a/src/views/About/Changelog.vue b/src/views/About/Changelog.vue
index 189472c6..ac501efb 100644
--- a/src/views/About/Changelog.vue
+++ b/src/views/About/Changelog.vue
@@ -12,6 +12,7 @@
       <v-card
         class="bkop-light"
         data-aos="fade"
+        elevation="5"
       >
         <v-card-title class="title">
           {{ dateKey }}
@@ -35,6 +36,9 @@ export default {
   data() {
     return {
       logs: {
+        'v1.1.1': [
+          '“岁过华灯”等一系列开箱子的汇报支持批量上传'
+        ],
         'v1.1.0': [
           '作战选择界面重做',
           '对多语言更友好的支持',
diff --git a/src/views/About/Contact.vue b/src/views/About/Contact.vue
index c1f00994..378ca6ef 100644
--- a/src/views/About/Contact.vue
+++ b/src/views/About/Contact.vue
@@ -33,7 +33,10 @@
 </i18n>
 
 <template>
-  <v-card class="bkop-light pa-6">
+  <v-card 
+    elevation="5" 
+    class="bkop-light pa-6"
+  >
     <h1 class="headline">
       {{ $t('contact.contact_0') }}
     </h1>
diff --git a/src/views/About/Contribute.vue b/src/views/About/Contribute.vue
index 4e1fd8ac..6de9bcbc 100644
--- a/src/views/About/Contribute.vue
+++ b/src/views/About/Contribute.vue
@@ -28,7 +28,10 @@
 </i18n>
 
 <template>
-  <v-card class="bkop-light pa-6">
+  <v-card
+    elevation="5"
+    class="bkop-light pa-6"
+  >
     <h1 class="headline">
       {{ $t('menu.about.contribute') }}
     </h1>
diff --git a/src/views/About/Donate.vue b/src/views/About/Donate.vue
index c0121396..dfce8dd3 100644
--- a/src/views/About/Donate.vue
+++ b/src/views/About/Donate.vue
@@ -49,7 +49,10 @@
 </i18n>
 
 <template>
-  <v-card class="bkop-light pa-6">
+  <v-card 
+    elevation="5" 
+    class="bkop-light pa-6"
+  >
     <h1 class="headline">
       {{ $t('menu.about.donate') }}
     </h1>
diff --git a/src/views/About/Intro.vue b/src/views/About/Intro.vue
index 1a2f3161..b91b48d2 100644
--- a/src/views/About/Intro.vue
+++ b/src/views/About/Intro.vue
@@ -25,7 +25,10 @@
 </i18n>
 
 <template>
-  <v-card class="bkop-light px-6 py-1">
+  <v-card 
+    elevation="5" 
+    class="bkop-light px-6 py-1"
+  >
     <v-row
       align="center"
       justify="center"
diff --git a/src/views/About/Links.vue b/src/views/About/Links.vue
index 704aee05..e4eed8f2 100644
--- a/src/views/About/Links.vue
+++ b/src/views/About/Links.vue
@@ -15,7 +15,8 @@
           "generalRanking": "综合收益排行",
           "walkthrough": "通关攻略",
           "experience": "经验分享",
-          "ja_translation": "剧情日文翻译"
+          "ja_translation": "剧情日文翻译",
+          "jp_wiki": "日服Wiki"
         }
       }
     },
@@ -34,7 +35,8 @@
           "generalRanking": "General Ranking",
           "walkthrough": "Walkthrough",
           "experience": "Experience",
-          "ja_translation": "Japanese Translation of Main Story"
+          "ja_translation": "Japanese Translation of Main Story",
+          "jp_wiki": "JP Server Wiki"
         }
       }
     },
@@ -53,7 +55,8 @@
           "generalRanking": "総合収益順位表",
           "walkthrough": "ステージ攻略",
           "experience": "ゲームレビュー",
-          "ja_translation": "ストーリー和訳"
+          "ja_translation": "ストーリー和訳",
+          "jp_wiki": "日本版Wiki"
         }
       }
     }
@@ -214,40 +217,25 @@ export default {
           ],
           url: "https://ark-nights.com"
         },
-        // {
-        //   title: "刷素材一图流",
-        //   author: "Kindle",
-        //   features: [
-        //     {
-        //       name: "apRanking",
-        //       color: "grey"
-        //     },
-        //     {
-        //       name: "dropRateRanking",
-        //       color: "grey"
-        //     },
-        //     {
-        //       name: "generalRanking",
-        //       color: "grey"
-        //     }
-        //   ],
-        //   url: "https://dwz.cn/AkhN4Va6"
-        // },
-        // {
-        //   title: "酒馆攻略组",
-        //   author: "麻辣花蛤",
-        //   features: [
-        //     {
-        //       name: "walkthrough",
-        //       color: "brown"
-        //     },
-        //     {
-        //       name: "experience",
-        //       color: "brown"
-        //     }
-        //   ],
-        //   url: "https://www.pigeonpub.com"
-        // },
+        {
+          title: "刷素材推荐一图流",
+          author: "SrO²、根派",
+          features: [
+            {
+              name: "apRanking",
+              color: "grey"
+            },
+            {
+              name: "dropRateRanking",
+              color: "grey"
+            },
+            {
+              name: "generalRanking",
+              color: "grey"
+            }
+          ],
+          url: "https://arkonegraph.herokuapp.com/"
+        },
         {
           title: "ゲームの果て",
           author: "方舟航海図",
@@ -270,6 +258,24 @@ export default {
             }
           ],
           url: "https://smartgamecap.net"
+        },
+        {
+          title: "ANWiki",
+          features: [
+            {
+              name: "jp_wiki",
+              color: "blue-grey"
+            },
+            {
+              name: "walkthrough",
+              color: "brown"
+            },
+            {
+              name: "character",
+              color: "orange"
+            }
+          ],
+          url: "https://wiki.gamerclub.jp/anwiki"
         }
       ]
     };
diff --git a/src/views/Report.vue b/src/views/Report.vue
index e0ffc5b1..7cae9e80 100644
--- a/src/views/Report.vue
+++ b/src/views/Report.vue
@@ -25,7 +25,8 @@
         "rule_4": "请保证通关评价是3星；",
         "rule_5": "请只上传国服的掉落，谢谢。"
       },
-      "usage": "左键增加，右键减少"
+      "usage": "左键增加，右键减少",
+      "gacha": "本作战允许在一次汇报内包含多个结果。"
     },
     "en": {
       "stage": {
@@ -52,7 +53,8 @@
         "rule_4": "Please guarantee that you get a 3-stars score.",
         "rule_5": "Please only submit drop data from CN server, thanks."
       },
-      "usage": "Increase by left click, decrease by right click"
+      "usage": "Increase by left click, decrease by right click",
+      "gacha": "Multiple results are allowed in the reporting of this stage."
     },
     "ja": {
       "stage": {
@@ -79,7 +81,8 @@
         "rule_4": "クリア時の評価が☆3である場合のみ報告してください。",
         "rule_5": "大陸版のドロップデータのみをアップロードして下さい。ご協力ありがとうございます。"
       },
-      "usage": "左クリックで個数増加、右クリックで個数減少"
+      "usage": "左クリックで個数増加、右クリックで個数減少",
+      "gacha": "Multiple results are allowed in the reporting of this stage."
     }
   }
 </i18n>
@@ -165,7 +168,9 @@
           border="left"
         >
           <ol>
-            <li>{{ $t('rules.rule_1') }}</li>
+            <li v-if="!isGacha">
+              {{ $t('rules.rule_1') }}
+            </li>
             <li>{{ $t('rules.rule_2') }}</li>
             <li>{{ $t('rules.rule_3') }}</li>
             <li>{{ $t('rules.rule_4') }}</li>
@@ -183,6 +188,16 @@
           {{ $t('usage') }}
         </v-alert>
 
+        <v-alert
+          v-if="isGacha"
+          color="blue darken-2"
+          class="subtitle-1 pl-6 mb-4"
+          dark
+          border="left"
+        >
+          {{ $t('gacha') }}
+        </v-alert>
+
         <v-container
           v-for="stage in stageItems"
           :key="stage.id"
@@ -492,6 +507,10 @@ export default {
       return items
     },
 
+    isGacha () {
+      return this.selected.stage && get.stages.byStageId(this.selected.stage).isGacha
+    },
+
     /**
      * @typedef {{lower: number, upper: number, exceptions: number[]}} Limitation
      * @typedef {{id: string, quantity: number, limitation: Limitation, rate: number, message: string}} ItemOutlier
@@ -551,7 +570,7 @@ export default {
       }
 
       // check for type outlier
-      if (this.limitation["itemTypeBounds"]) {
+      if (!this.isGacha && this.limitation["itemTypeBounds"]) {
         let [rules, limitation] = this.generateVerificationRule("type");
         let quantity = this.results.length;
         let validation = validate(rules, quantity);
@@ -602,6 +621,10 @@ export default {
     select({ zone, stage }) {
       this.selected.zone = zone;
       this.selected.stage = stage;
+
+      if (!zone && !stage) {
+        this.reset();
+      }
     },
     getItem(itemId) {
       return get.items.byItemId(itemId)
@@ -628,7 +651,7 @@ export default {
       this.furniture = false
     },
     submit() {
-      if (!this.valid || this.results.length === 0) {
+      if (!this.isGacha && (!this.valid || this.results.length === 0)) {
         this.dialogs.first.enabled = true;
         this.$ga.event('report', 'show_warning', this.selected.stage, 1)
       } else {