diff --git a/AquaNet/.env b/AquaNet/.env
new file mode 100644
index 00000000..dbc79813
--- /dev/null
+++ b/AquaNet/.env
@@ -0,0 +1,9 @@
+VITE_AQUA_HOST=https://aquadx.net/aqua
+VITE_DATA_HOST=https://aquadx.net
+
+VITE_AQUA_CONNECTION=aquadx.hydev.org
+
+VITE_TURNSTILE_SITE_KEY=0x4AAAAAAASGA2KQEIelo9P9
+VITE_DISCORD_INVITE=https://discord.gg/FNgveqFF7s
+VITE_TELEGRAM_INVITE=https://t.me/+zBL4RZdyfvUzZGU1
+VITE_QQ_INVITE=https://qm.qq.com/q/wvNXbXbHbO
diff --git a/AquaNet/.gitignore b/AquaNet/.gitignore
index 20ffbea5..69166fea 100644
--- a/AquaNet/.gitignore
+++ b/AquaNet/.gitignore
@@ -32,4 +32,7 @@ dist-ssr
 !.yarn/sdks
 !.yarn/versions
 
-public/chu3
\ No newline at end of file
+public/chu3
+
+# local env file
+*.local
\ No newline at end of file
diff --git a/AquaNet/public/assets/icons/AquaDX Cat.psd b/AquaNet/psd/icons/AquaDX Cat.psd
similarity index 100%
rename from AquaNet/public/assets/icons/AquaDX Cat.psd
rename to AquaNet/psd/icons/AquaDX Cat.psd
diff --git a/AquaNet/public/assets/icons/Icon.psd b/AquaNet/psd/icons/Icon.psd
similarity index 100%
rename from AquaNet/public/assets/icons/Icon.psd
rename to AquaNet/psd/icons/Icon.psd
diff --git a/AquaNet/public/assets/imgs/All Perfect.psd b/AquaNet/psd/imgs/All Perfect.psd
similarity index 100%
rename from AquaNet/public/assets/imgs/All Perfect.psd
rename to AquaNet/psd/imgs/All Perfect.psd
diff --git a/AquaNet/public/assets/imgs/Full Combo.psd b/AquaNet/psd/imgs/Full Combo.psd
similarity index 100%
rename from AquaNet/public/assets/imgs/Full Combo.psd
rename to AquaNet/psd/imgs/Full Combo.psd
diff --git a/AquaNet/public/assets/imgs/no_cover.psd b/AquaNet/psd/imgs/no_cover.psd
similarity index 100%
rename from AquaNet/public/assets/imgs/no_cover.psd
rename to AquaNet/psd/imgs/no_cover.psd
diff --git a/AquaNet/public/assets/imgs/no_profile.psd b/AquaNet/psd/imgs/no_profile.psd
similarity index 100%
rename from AquaNet/public/assets/imgs/no_profile.psd
rename to AquaNet/psd/imgs/no_profile.psd
diff --git a/AquaNet/src/libs/config.ts b/AquaNet/src/libs/config.ts
index da9e5e70..3f62b182 100644
--- a/AquaNet/src/libs/config.ts
+++ b/AquaNet/src/libs/config.ts
@@ -1,15 +1,15 @@
 import type { ChusanMatchingOption } from "./generalTypes"
 
-export const AQUA_HOST = 'https://aquadx.net/aqua'
-export const DATA_HOST = 'https://aquadx.net'
+export const AQUA_HOST = import.meta.env.VITE_AQUA_HOST
+export const DATA_HOST = import.meta.env.VITE_DATA_HOST
 
 // This will be displayed for users to connect from the client
-export const AQUA_CONNECTION = 'aquadx.hydev.org'
+export const AQUA_CONNECTION = import.meta.env.VITE_AQUA_CONNECTION
 
-export const TURNSTILE_SITE_KEY = '0x4AAAAAAASGA2KQEIelo9P9'
-export const DISCORD_INVITE = 'https://discord.gg/FNgveqFF7s'
-export const TELEGRAM_INVITE = 'https://t.me/+zBL4RZdyfvUzZGU1'
-export const QQ_INVITE = 'https://qm.qq.com/q/wvNXbXbHbO'
+export const TURNSTILE_SITE_KEY = import.meta.env.VITE_TURNSTILE_SITE_KEY
+export const DISCORD_INVITE = import.meta.env.VITE_DISCORD_INVITE
+export const TELEGRAM_INVITE = import.meta.env.VITE_TELEGRAM_INVITE
+export const QQ_INVITE = import.meta.env.VITE_QQ_INVITE
 
 // UI
 export const FADE_OUT = { duration: 200 }
diff --git a/AquaNet/src/pages/Welcome.svelte b/AquaNet/src/pages/Welcome.svelte
index 1af1ae4c..669c56eb 100644
--- a/AquaNet/src/pages/Welcome.svelte
+++ b/AquaNet/src/pages/Welcome.svelte
@@ -51,7 +51,7 @@
       return submitting = false
     }
 
-    if (turnstile === "") {
+    if (TURNSTILE_SITE_KEY && turnstile === "") {
       // Sleep for 100ms to allow Turnstile to finish
       error = t("welcome.waiting-turnstile")
       return setTimeout(submit, 100)
@@ -137,11 +137,13 @@
             {isSignup ? t('welcome.btn-signup') : t('welcome.btn-login')}
           {/if}
         </button>
+        {#if TURNSTILE_SITE_KEY}
         <Turnstile siteKey={TURNSTILE_SITE_KEY} bind:reset={turnstileReset}
                    on:turnstile-callback={e => console.log(turnstile = e.detail.token)}
                    on:turnstile-error={_ => console.log(error = t("welcome.turnstile-error"))}
                    on:turnstile-expired={_ => window.location.reload()}
                    on:turnstile-timeout={_ => console.log(error = t('welcome.turnstile-timeout'))} />
+        {/if}
       </div>
     {:else if state === "verify"}
       <div class="login-form" transition:slide>