diff --git a/install/phpnuxbill.sql b/install/phpnuxbill.sql
index c2c2127b..eb97d56c 100644
--- a/install/phpnuxbill.sql
+++ b/install/phpnuxbill.sql
@@ -65,22 +65,6 @@ CREATE TABLE
 
 --
 
--- Struktur dari tabel `tbl_language`
-
---
-
-CREATE TABLE
-    `tbl_language` (
-        `id` int(10) NOT NULL,
-        `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-        `folder` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-        `author` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL
-    ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
-
--- --------------------------------------------------------
-
---
-
 -- Struktur dari tabel `tbl_logs`
 
 --
@@ -345,14 +329,6 @@ ALTER TABLE `tbl_customers` ADD PRIMARY KEY (`id`);
 
 --
 
--- Indeks untuk tabel `tbl_language`
-
---
-
-ALTER TABLE `tbl_language` ADD PRIMARY KEY (`id`);
-
---
-
 -- Indeks untuk tabel `tbl_logs`
 
 --
@@ -466,15 +442,6 @@ ALTER TABLE
 
 --
 
--- AUTO_INCREMENT untuk tabel `tbl_language`
-
---
-
-ALTER TABLE
-    `tbl_language` MODIFY `id` int(10) NOT NULL AUTO_INCREMENT;
-
---
-
 -- AUTO_INCREMENT untuk tabel `tbl_logs`
 
 --
@@ -610,39 +577,4 @@ VALUES (
         'Active',
         '2022-09-06 16:09:50',
         '2014-06-23 01:43:07'
-    );
-
---
-
--- Dumping data untuk tabel `tbl_language`
-
---
-
-INSERT INTO
-    `tbl_language` (
-        `id`,
-        `name`,
-        `folder`,
-        `author`
-    )
-VALUES (
-        1,
-        'Indonesia',
-        'indonesia',
-        'Ismail Marzuqi'
-    ), (
-        2,
-        'English',
-        'english',
-        'Ismail Marzuqi'
-    ), (
-        3,
-        'Spanish',
-        'spanish',
-        'Luis Hernandez'
-    ), (
-        4,
-        'Türkçe',
-        'turkish',
-        'Goktug Bogac Ogel'
     );
\ No newline at end of file
diff --git a/system/controllers/settings.php b/system/controllers/settings.php
index b152eec8..5e261713 100644
--- a/system/controllers/settings.php
+++ b/system/controllers/settings.php
@@ -31,8 +31,14 @@ switch ($action) {
         if ($admin['user_type'] != 'Admin') {
             r2(U . "dashboard", 'e', $_L['Do_Not_Access']);
         }
-        $lan = ORM::for_table('tbl_language')->find_many();
-        $ui->assign('lan', $lan);
+        $folders = [];
+        $files = scandir('system/lan/');
+        foreach ($files as $file) {
+            if(is_dir('system/lan/'.$file) && !in_array($file,['.','..'])){
+                $folders[] = $file;
+            }
+        }
+        $ui->assign('lan', $folders);
 
         $timezonelist = Timezone::timezoneList();
         $ui->assign('tlist', $timezonelist);
diff --git a/system/lan/indonesia/common.lan.php b/system/lan/indonesia/common.lan.php
index 8a197d45..f24fbd1c 100644
--- a/system/lan/indonesia/common.lan.php
+++ b/system/lan/indonesia/common.lan.php
@@ -338,3 +338,5 @@ $_L['Country_Code_Phone'] = 'Kode Negara Telepon';
 $_L['Voucher_activation_menu_will_be_hidden'] = 'Info Pembelian Voucher dan Redeem akan disembunyikan';
 $_L['Customer_can_deposit_money_to_buy_voucher'] = 'Pelanggan dapat topup saldo untuk langganan Internet';
 $_L['Allow_balance_transfer_between_customers'] = 'Bolehkan transfer saldo antar pelanggan';
+$_L['Refill_Balance'] = 'Refill Balance';
+$_L['Balance_Plans'] = 'Balance Plans';
diff --git a/system/lan/spanish/common.lan.php b/system/lan/spanish/common.lan.php
index ec13dfd0..c4ca672a 100644
--- a/system/lan/spanish/common.lan.php
+++ b/system/lan/spanish/common.lan.php
@@ -340,4 +340,5 @@ $_L['Invoice'] = 'Invoice';
 $_L['Country_Code_Phone'] = 'Country Code Phone';
 $_L['Voucher_activation_menu_will_be_hidden'] = 'Voucher activation menu will be hidden';
 $_L['Customer_can_deposit_money_to_buy_voucher'] = 'Customer can deposit money to buy voucher';
-$_L['Allow_balance_transfer_between_customers'] = 'Allow balance transfer between customers';
\ No newline at end of file
+$_L['Allow_balance_transfer_between_customers'] = 'Allow balance transfer between customers';$_L['Refill_Balance'] = 'Refill Balance';
+$_L['Balance_Plans'] = 'Balance Plans';
diff --git a/system/updates.json b/system/updates.json
index 6269b896..b400aaad 100644
--- a/system/updates.json
+++ b/system/updates.json
@@ -17,5 +17,8 @@
     "2023.8.28" : [
         "ALTER TABLE `tbl_user_recharges` ADD `recharged_time` time NOT NULL DEFAULT '00:00:00' AFTER `recharged_on`;",
         "ALTER TABLE `tbl_transactions` ADD `recharged_time` time NOT NULL DEFAULT '00:00:00' AFTER `recharged_on`;"
+    ],
+    "2023.9.5" : [
+        "DROP TABLE `tbl_language`;"
     ]
 }
\ No newline at end of file
diff --git a/ui/ui/app-localisation.tpl b/ui/ui/app-localisation.tpl
index a5ca2ba5..0adf9961 100644
--- a/ui/ui/app-localisation.tpl
+++ b/ui/ui/app-localisation.tpl
@@ -45,18 +45,16 @@
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">{$_L['Default_Language']}</label>
-                        <div class="col-md-4">
+                        <div class="col-md-6">
                             <select class="form-control" name="lan" id="lan">
                                 {foreach $lan as $lans}
-                                    <option value="{$lans['folder']}" {if $_c['language'] eq $lans['folder']}
-                                        selected="selected" {/if}>{$lans['name']}</option>
+                                    <option value="{$lans}" {if $_c['language'] eq $lans}
+                                        selected="selected" {/if}>{$lans}</option>
                                 {/foreach}
                             </select>
                         </div>
-                        <div class="col-md-2">
-                            <a href="{$_url}settings/language" type="button"
-                                class="btn btn-line-success btn-icon-inline"><i
-                                    class="ion ion-android-add"></i>{$_L['Add_Language']}</a>
+                        <div class="col-md-4 help-block">
+                            To add new Language, just add the folder, it will automatically detected
                         </div>
                     </div>
                     <div class="form-group">
@@ -78,8 +76,8 @@
                         <div class="col-md-6">
                             <input type="text" class="form-control" id="currency_code" name="currency_code"
                                 value="{$_c['currency_code']}">
-                            <span class="help-block">{$_L['currency_help']}</span>
                         </div>
+                        <span class="help-block col-md-4">{$_L['currency_help']}</span>
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Country Code Phone')}</label>
diff --git a/ui/ui/community.tpl b/ui/ui/community.tpl
index 9d673bf1..e685e913 100644
--- a/ui/ui/community.tpl
+++ b/ui/ui/community.tpl
@@ -142,8 +142,7 @@
             <div class="box-footer" id="latestVersion">ver</div>
             <div class="box-footer">
                 <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                    <a href="./update.php" target="_blank" class="btn btn-success btn-sm btn-block">Install Latest
-                        Version</a>
+                    <a href="./update.php" class="btn btn-success btn-sm btn-block">Install Latest Version</a>
                     <a href="https://github.com/hotspotbilling/phpnuxbill/archive/refs/heads/master.zip" target="_blank"
                         class="btn btn-warning btn-sm btn-block">Download Latest Version</a>
                 </div>