diff --git a/AquaNet/src/components/settings/OngekiSettings.svelte b/AquaNet/src/components/settings/OngekiSettings.svelte
new file mode 100644
index 00000000..a7abea16
--- /dev/null
+++ b/AquaNet/src/components/settings/OngekiSettings.svelte
@@ -0,0 +1,9 @@
+<script>
+  import { fade } from "svelte/transition";
+  import { FADE_IN, FADE_OUT } from "../../libs/config";
+  import GameSettingFields from "./GameSettingFields.svelte";
+</script>
+
+<div out:fade={FADE_OUT} in:fade={FADE_IN}>
+  <GameSettingFields game="ongeki"/>
+</div>
diff --git a/AquaNet/src/libs/i18n/en_ref.ts b/AquaNet/src/libs/i18n/en_ref.ts
index 3b2ec3a0..8255e12c 100644
--- a/AquaNet/src/libs/i18n/en_ref.ts
+++ b/AquaNet/src/libs/i18n/en_ref.ts
@@ -127,6 +127,7 @@ export const EN_REF_SETTINGS = {
   'settings.tabs.game': 'Game',
   'settings.tabs.chu3': 'Chuni',
   'settings.tabs.mai2': 'Mai',
+  'settings.tabs.ongeki': 'Ongeki',
   'settings.tabs.wacca': 'Wacca',
   'settings.fields.unlockMusic.name': 'Unlock All Music',
   'settings.fields.unlockMusic.desc': 'Unlock all music and master difficulty in game.',
@@ -148,6 +149,8 @@ export const EN_REF_SETTINGS = {
   'settings.fields.chusanMatchingReflector.desc': 'URL of the national matching server\'s UDP reflector.',
   'settings.fields.chusanMatchingServer.name': 'Matching Server',
   'settings.fields.chusanMatchingServer.desc': 'URL of the national matching server.',
+  'settings.fields.ongekiInfiniteKaika.name': 'Infinite Kaika',
+  'settings.fields.ongekiInfiniteKaika.desc': 'Set Kaika to 999',
   'settings.fields.rounding.name': 'Score Rounding',
   'settings.fields.rounding.desc': 'Round the score to one decimal place',
   'settings.fields.gameUsername.name': 'In-Game Username',
@@ -164,6 +167,7 @@ export const EN_REF_SETTINGS = {
   'settings.profile.name': 'Display Name',
   'settings.profile.username': 'Username',
   'settings.profile.password': 'Password',
+  'settings.profile.country': 'Country',
   'settings.profile.location': 'Location',
   'settings.profile.bio': 'Bio',
   'settings.profile.unset': 'Unset',
diff --git a/AquaNet/src/libs/i18n/zh.ts b/AquaNet/src/libs/i18n/zh.ts
index b81ffc6e..591f6b35 100644
--- a/AquaNet/src/libs/i18n/zh.ts
+++ b/AquaNet/src/libs/i18n/zh.ts
@@ -137,6 +137,7 @@ const zhSettings: typeof EN_REF_SETTINGS = {
   'settings.tabs.game': '游戏设置',
   'settings.tabs.chu3': '中二',
   'settings.tabs.mai2': '舞萌',
+  'settings.tabs.ongeki': '音击',
   'settings.tabs.wacca': '华卡',
   'settings.fields.unlockMusic.name': '解锁谱面',
   'settings.fields.unlockMusic.desc': '在游戏中解锁所有曲目和大师难度谱面。',
@@ -158,6 +159,8 @@ const zhSettings: typeof EN_REF_SETTINGS = {
   'settings.fields.chusanMatchingReflector.desc': '全国对战服务器的 UDP 反射服务器的 URL',
   'settings.fields.chusanMatchingServer.name': '全国对战服务器',
   'settings.fields.chusanMatchingServer.desc': '全国对战服务器的 URL',
+  'settings.fields.ongekiInfiniteKaika.name': '无限解花',
+  'settings.fields.ongekiInfiniteKaika.desc': '将解花数量设置为 999。',
   'settings.fields.rounding.name': '分数舍入',
   'settings.fields.rounding.desc': '把分数四舍五入到一位小数',
   'settings.fields.gameUsername.name': '游戏用户名',
@@ -174,6 +177,7 @@ const zhSettings: typeof EN_REF_SETTINGS = {
   'settings.profile.name': '昵称',
   'settings.profile.username': '用户名',
   'settings.profile.password': '密码',
+  'settings.profile.country': '国家',
   'settings.profile.location': '位置',
   'settings.profile.bio': '简介',
   'settings.profile.unset': '未设置',
diff --git a/AquaNet/src/pages/User/Settings.svelte b/AquaNet/src/pages/User/Settings.svelte
index cac1ee32..75f0b9dd 100644
--- a/AquaNet/src/pages/User/Settings.svelte
+++ b/AquaNet/src/pages/User/Settings.svelte
@@ -14,6 +14,7 @@
   import Mai2Settings from "../../components/settings/Mai2Settings.svelte";
   import WaccaSettings from "../../components/settings/WaccaSettings.svelte";
   import GeneralGameSettings from "../../components/settings/GeneralGameSettings.svelte";
+  import OngekiSettings from "../../components/settings/OngekiSettings.svelte";
 
   USER.ensureLoggedIn()
 
@@ -27,6 +28,7 @@
     [ 'displayName', t('settings.profile.name') ],
     [ 'username', t('settings.profile.username') ],
     [ 'password', t('settings.profile.password') ],
+    [ 'country', t('settings.profile.country') ],
     [ 'profileLocation', t('settings.profile.location') ],
     [ 'profileBio', t('settings.profile.bio') ],
   ] as const
@@ -50,6 +52,9 @@
       if (games.wacca && !tabs.includes('wacca')) {
         tabs = [...tabs, 'wacca']
       }
+      if (games.ongeki && !tabs.includes('ongeki')) {
+        tabs = [...tabs, 'ongeki']
+      }
     })
   }).catch(e => error = e.message)
   getMe()
@@ -193,6 +198,8 @@
     <Mai2Settings username={me.username} />
   {:else if tabs[tab] === 'wacca'}
     <WaccaSettings />
+  {:else if tabs[tab] === 'ongeki'}
+    <OngekiSettings />
   {:else if tabs[tab] === 'game'}
     <GeneralGameSettings />
   {/if}