diff --git a/common/webapp/public/lang/id.conf b/common/webapp/public/lang/id.conf
new file mode 100644
index 000000000..73163e4fd
--- /dev/null
+++ b/common/webapp/public/lang/id.conf
@@ -0,0 +1,175 @@
+{
+  pageTitle: "BlueMap - {map}"
+  menu: {
+    title: "Menu"
+    tooltip: "Menu"
+  }
+  map: {
+    unloaded: "Peta tidak tersedia."
+    loading: "Memuat peta..."
+    errored: "Terjadi kesalahan saat memuat peta ini!"
+  }
+  maps: {
+    title: "Peta-Peta"
+    button: "Peta-Peta"
+    tooltip: "Daftar Peta"
+  }
+  markers: {
+    title: "Penanda"
+    button: "Penanda"
+    tooltip: "Daftar Penanda"
+    marker: "penanda | penanda"
+    markerSet: "set-penanda | set-penanda"
+    searchPlaceholder: "Cari..."
+    followPlayerTitle: "Ikuti Pemain"
+    sort {
+      title: "Urutkan berdasarkan"
+      by {
+        default: "bawaan"
+        label: "nama"
+        distance: "jarak"
+      }
+    }
+  }
+  settings: {
+    title: "Pengaturan"
+    button: "Pengaturan"
+  }
+  goFullscreen: {
+    button: "Layar Penuh"
+  }
+  resetCamera: {
+    button: "Atur Ulang Kamera"
+    tooltip: "Atur Ulang Kamera & Posisi"
+  }
+  updateMap: {
+    button: "Perbarui Peta"
+    tooltip: "Bersihkan Tembolok Ubin"
+  }
+  lighting: {
+    title: "Pencahayaan"
+    dayNightSwitch: {
+      tooltip: "Siang/Malam"
+    }
+    sunlight: "Cahaya Matahari"
+    ambientLight: "Cahaya Ambien"
+  }
+  resolution: {
+    title: "Resolusi"
+    high: "Tinggi (SSAA x2)"
+    normal: "Normal (Native x1)"
+    low: "Rendah (Upscaling x0.5)"
+  }
+  mapControls: {
+    title: "Kontrol Peta"
+    showZoomButtons: "Tampilkan Tombol Zum"
+  }
+  freeFlightControls: {
+    title: "Kontrol Free-Flight"
+    mouseSensitivity: "Sensitivitas Tetikus"
+    invertMouseY: "Balikkan Tetikus Y"
+  }
+  renderDistance: {
+    title: "Jarak Render"
+    hiresLayer: "Layer resolusi tinggi"
+    lowersLayer: "Layer resolusi rendah"
+    loadHiresWhileMoving: "Muat resolusi tinggi saat bergerak"
+    off: "Mati"
+  }
+  theme: {
+    title: "Tema"
+    default: "Bawaan (Sistem/Peramban)"
+    dark: "Gelap"
+    light: "Terang"
+    contrast: "Kontras"
+  }
+  chunkBorders: {
+    button: "Tampilkan batas bongkahan"
+  }
+  debug: {
+    button: "Awakutu"
+  }
+  resetAllSettings: {
+    button: "Reset Semua Pengaturan"
+  }
+  players: {
+    title: "Pemain"
+    tooltip: "Daftar Pemain"
+  }
+  compass: {
+    tooltip: "Kompas / Hadap Utara"
+  }
+  screenshot: {
+    title: "Screenshot"
+    button: "Ambil Tangkapan Layar"
+    clipboard: "Salin ke Papan Klip"
+  }
+  controls: {
+    title: "Tampilan / Kontrol"
+    perspective: {
+      button: "Perspektif"
+      tooltip: "Tampilan Perspektif"
+    }
+    flatView: {
+      button: "Datar"
+      tooltip: "Tampilan Ortografik / Datar"
+    }
+    freeFlight: {
+      button: "Free-Flight"
+      tooltip: "Mode Free-Flight / Spektator"
+    }
+  }
+  language: {
+    title: "Bahasa"
+  }
+  blockTooltip: {
+    block: "Blok"
+    position: "Posisi"
+    chunk: "Bongkahan"
+    region: {
+      region: "Wilayah"
+      file: "Berkas"
+    }
+    light: {
+      light: "Cahaya"
+      sun: "Matahari"
+      block: "Blok"
+    }
+    clipboard: "klik untuk menyalin"
+  }
+  info: {
+    title: "Info"
+    button: "Info"
+    content: """
+<img src="assets/logo.png" style="display: block; width: 40%; margin: 3em auto; border-radius: 50%">
+<p>
+    <h2>Kontrol Tetikus:</h2>
+    <table>
+        <tr><th>gerak</th><td><kbd>klik kiri</kbd> + seret</td></tr>
+        <tr><th>zoom</th><td><kbd>roda tetikus</kbd> (gulir)</td></tr>
+        <tr><th>putar / miringkan</th><td><kbd>klik kanan</kbd> + seret</td></tr>
+    </table>
+</p>
+<p>
+    <h2>Kontrol Keyboard:</h2>
+    <table>
+        <tr><th>gerak</th><td><kbd>wasd</kbd> / <kbd>tombol panah</kbd></td></tr>
+        <tr><th>zoom</th><td>Numpad: <kbd>+</kbd>/<kbd>-</kbd> atau <kbd>Ins</kbd>/<kbd>Home</kbd></td></tr>
+        <tr><th>putar / miringkan</th><td><kbd>Left-Alt</kbd> + <kbd>wasd</kbd> / <kbd>tombol panah</kbd> atau <kbd>Delete</kbd>/<kbd>End</kbd>/<kbd>Page Up</kbd>/<kbd>Page Down</kbd></td></tr>
+    </table>
+</p>
+<p>
+    <h2>Kontrol Sentuh:</h2>
+    <table>
+        <tr><th>gerak</th><td>sentuh + seret</td></tr>
+        <tr><th>zoom</th><td>sentuh dengan dua jari + cubit</td></tr>
+        <tr><th>putar / miringkan</th><td>sentuh dengan dua jari + putar / gerakkan ke atas/bawah</td></tr>
+    </table>
+</p>
+<br><hr>
+<p class="info-footer">
+    Peta ini dibuat dengan &#9829; menggunakan <a href="https://bluecolo.red/bluemap">BlueMap</a> {version}
+</p>
+"""
+  }
+}
diff --git a/common/webapp/public/lang/settings.conf b/common/webapp/public/lang/settings.conf
index 081e3bdce..63cb4d7ec 100644
--- a/common/webapp/public/lang/settings.conf
+++ b/common/webapp/public/lang/settings.conf
@@ -3,10 +3,12 @@
   useBrowserLanguage: true
   languages: [
     // remove the languages you don't need reorder them or add your own
-    { locale: "cs", name: "Czech" }
+    { locale: "id", name: "Bahasa Indonesia" }
+    { locale: "cs", name: "Čeština" }
     { locale: "de", name: "Deutsch" }
     { locale: "en", name: "English" }
-    { locale: "fr", name: "French" }
+    { locale: "es", name: "Español" }
+    { locale: "fr", name: "Français" }
     { locale: "hi", name: "हिन्दी" }
     { locale: "it", name: "Italiano" }
     { locale: "lv", name: "Latviešu" }
@@ -19,15 +21,14 @@
     { locale: "sr-Latn-RS", name: "Srpski (latinica)" }
     { locale: "sr-Cyrl-RS", name: "Српски (ћирилица)" }
     { locale: "fi", name: "Suomi" }
-    { locale: "es", name: "Spanish" }
     { locale: "sv", name: "Svenska" }
     { locale: "tr", name: "Türkçe" }
     { locale: "th", name: "ภาษาไทย" }
     { locale: "ua", name: "Українська" }
     { locale: "ja", name: "日本語" }
-    { locale: "zh-CN", name: "简体中文(中国大陆)" }
-    { locale: "zh-TW", name: "繁體中文(台灣)" }
-    { locale: "zh-HK", name: "繁體中文(香港特別行政區)" }
+    { locale: "zh-CN", name: "简体中文 (中国大陆)" }
+    { locale: "zh-TW", name: "繁體中文 (台灣)" }
+    { locale: "zh-HK", name: "繁體中文 (香港特別行政區)" }
     { locale: "ko", name: "한국어" }
     { locale: "vi", name: "Tiếng Việt"}
   ]