30 files changed, 166 insertions, 217 deletions

diff --git a/apps/features.txt b/apps/features.txt
index 84edad1a61..118465a535 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -28,6 +28,14 @@ backlight_fade
 battery_types
 #endif
 
+#if defined(HAVE_BUTTON_LIGHT)
+button_light
+#endif
+
+#if defined(HAVE_BUTTONLIGHT_BRIGHTNESS)
+buttonlight_brightness
+#endif
+
 #if defined(HAVE_DIRCACHE)
 dircache
 #endif
diff --git a/apps/lang/arabic.lang b/apps/lang/arabic.lang
index a831484576..a369650e89 100644
--- a/apps/lang/arabic.lang
+++ b/apps/lang/arabic.lang
@@ -2485,15 +2485,15 @@
   user: 
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "قوة ضوء الزر"
+    buttonlight_brightness: "قوة ضوء الزر"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index b286fe0a5e..349c382c81 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -8879,15 +8879,15 @@
   user: 
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Яркост на осветяването на бутоните"
+    buttonlight_brightness: "Яркост на осветяването на бутоните"
   </dest>
   <voice>
     *: ""
-    gigabeatf,mrobe100: ""
+    buttonlight_brightness: ""
   </voice>
 </phrase>
 <phrase>
@@ -10220,18 +10220,18 @@
   user: 
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Изключване на осветяването на бутоните"
     e200*: "Изключване на осветяването на колелото"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Изключване на осветяването на бутоните"
   </dest>
   <voice>
     *: none
+    button_light: ""
     e200*: ""
-    clip,c200,gigabeatf,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index 7fe6e4b4d2..ae60e44e98 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -3827,18 +3827,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Apagat de llum de botons"
     e200*: "Apagat de llum de roda"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Apagat de llum de botons"
   </dest>
   <voice>
     *: none
+    button_light: "Apagat de llum de botons"
     e200*: "Apagat de llum de roda"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Apagat de llum de botons"
   </voice>
 </phrase>
 <phrase>
@@ -3847,15 +3847,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Brillantor Llum Botons"
+    buttonlight_brightness: "Brillantor Llum Botons"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Brillantor Llum Botons"
+    buttonlight_brightness: "Brillantor Llum Botons"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index 12a4aa0c3b..eee223ef07 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -10278,15 +10278,15 @@
   user: 
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "按键背光亮度"
+    buttonlight_brightness: "按键背光亮度"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "按键背光亮度"
+    buttonlight_brightness: "按键背光亮度"
   </voice>
 </phrase>
 <phrase>
@@ -10686,18 +10686,18 @@
   user: 
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "按键背光自动关闭时滞"
     e200*: "转盘背光自动关闭时滞"
-    clip,c200,gigabeatf,mrobe100,sa9200: "按键背光自动关闭时滞"
   </dest>
   <voice>
     *: none
+    button_light: "按键背光自动关闭时滞"
     e200*: "转盘背光自动关闭时滞"
-    clip,c200,gigabeatf,mrobe100,sa9200: "按键背光自动关闭时滞"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 7f2b3b3a98..e0c230baa5 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -10296,15 +10296,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "按鈕光度"
+    buttonlight_brightness: "按鈕光度"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </voice>
 </phrase>
 <phrase>
@@ -10704,18 +10704,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: ""
     e200*: "轉盤燈自動關時間"
-    clip,c200,gigabeatf,mrobe100,sa9200: ""
   </dest>
   <voice>
     *: none
+    button_light: ""
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index aea92debeb..c852813a11 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -3836,34 +3836,14 @@
   <source>
     *: none
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
     e200*: "Časový limit osvětlení kolečka"
-    clip,c200,gigabeatf,mrobe100,sa9200: ""
   </dest>
   <voice>
     *: none
     e200*: "Časový limit osvětlení kolečka"
-    clip,c200,gigabeatf,mrobe100,sa9200: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BUTTONLIGHT_BRIGHTNESS
-  desc: in settings_menu
-  user:
-  <source>
-    *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
-  </source>
-  <dest>
-    *: none
-    gigabeatf,mrobe100: ""
-  </dest>
-  <voice>
-    *: none
-    gigabeatf,mrobe100: ""
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index 0bc06cf13b..bd201da686 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -9932,18 +9932,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Knap-lys sluk"
     e200*: "Hjul-lys sluk"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Knap-lys sluk"
   </dest>
   <voice>
     *: none
+    button_light: "Knap-lys sluk"
     e200*: "Hjul-lys sluk"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Knap-lys sluk"
   </voice>
 </phrase>
 <phrase>
@@ -10194,15 +10194,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Knap-lys styrke"
+    buttonlight_brightness: "Knap-lys styrke"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Knap-lys styrke"
+    buttonlight_brightness: "Knap-lys styrke"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index faffb8071d..b05342d4c7 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -3849,18 +3849,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Tastenbeleuchtungsdauer"
     e200*: "Scrollradbeleuchtungsdauer"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Tastenbeleuchtungsdauer"
   </dest>
   <voice>
     *: none
+    button_light: "Tastenbeleuchtungsdauer"
     e200*: "Scrollradbeleuchtungsdauer"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Tastenbeleuchtungsdauer"
   </voice>
 </phrase>
 <phrase>
@@ -3869,15 +3869,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Tastenbeleuchtung: Helligkeit"
+    buttonlight_brightness: "Tastenbeleuchtung: Helligkeit"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Tastenbeleuchtung: Helligkeit"
+    buttonlight_brightness: "Tastenbeleuchtung: Helligkeit"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 66e15cc784..1531e613bd 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -3923,18 +3923,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </dest>
   <voice>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -3943,15 +3943,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 8766024b69..365c635da2 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -10811,15 +10811,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Brillo de la luz de los botones"
+    buttonlight_brightness: "Brillo de la luz de los botones"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Brillo de la luz de los botones"
+    buttonlight_brightness: "Brillo de la luz de los botones"
   </voice>
 </phrase>
 <phrase>
@@ -11180,18 +11180,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Tiempo de espera en la luz del botón"
     e200*: "Tiempo de espera en la luz de la rueda"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Tiempo de espera en la luz del botón"
   </dest>
   <voice>
     *: none
+    button_light: "Tiempo de espera en la luz del botón"
     e200*: "Tiempo de espera en la luz de la rueda"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Tiempo de espera en la luz del botón"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang
index b71f2e4d53..86c8853e90 100644
--- a/apps/lang/esperanto.lang
+++ b/apps/lang/esperanto.lang
@@ -15,7 +15,8 @@
 # KIND, either express or implied.
 #
 # Esperanto language file, translated by:
-# - Marc-André Moreau (aghaster@hotmail.com)
+# - Marc-André Moreau (aghaster
+hotmail.com)
 #
 # Original Release: 04/06/06
 # Last Update: 04/06/06
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index 215d18e16e..267f0d3930 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -9973,18 +9973,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Painikevalon aikakatkaisu"
     e200*: "Rullavalon aikakatkaisu"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Painikevalon aikakatkaisu"
   </dest>
   <voice>
     *: none
+    button_light: "Painikevalon aikakatkaisu"
     e200*: "Rullavalon aikakatkaisu"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Painikevalon aikakatkaisu"
   </voice>
 </phrase>
 <phrase>
@@ -9993,15 +9993,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Painikevalon kirkkaus"
+    buttonlight_brightness: "Painikevalon kirkkaus"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Painikevalon kirkkaus"
+    buttonlight_brightness: "Painikevalon kirkkaus"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index df6c5ee88e..ba6a456817 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -3879,18 +3879,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Durée de l'éclairage des touches"
     e200*: "Durée de l'éclairage de la molette"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Durée de l'éclairage des touches"
   </dest>
   <voice>
     *: none
+    button_light: "Durée de l'éclairage des touches"
     e200*: "Durée de l'éclairage de la molette"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Durée de l'éclairage des touches"
   </voice>
 </phrase>
 <phrase>
@@ -3899,15 +3899,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Intensité de l'éclairage des touches"
+    buttonlight_brightness: "Intensité de l'éclairage des touches"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Intensité de l'éclairage des touches"
+    buttonlight_brightness: "Intensité de l'éclairage des touches"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 4499e886e7..c5ba1f23e5 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -3837,18 +3837,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Χρόνος σβησίματος πλήκτρων"
     e200*: "Χρόνος σβησίματος τροχού"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Χρόνος σβησίματος πλήκτρων"
   </dest>
   <voice>
     *: none
+    button_light: "Χρόνος σβησίματος πλήκτρων"
     e200*: "Χρόνος σβησίματος τροχού"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Χρόνος σβησίματος πλήκτρων"
   </voice>
 </phrase>
 <phrase>
@@ -3857,15 +3857,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Φωτεινότητα πλήκτρων"
+    buttonlight_brightness: "Φωτεινότητα πλήκτρων"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Φωτεινότητα πλήκτρων"
+    buttonlight_brightness: "Φωτεινότητα πλήκτρων"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index c2ecee871c..b33c081a14 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -3831,18 +3831,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "זמן תאורת כפתור"
     e200*: "זמן תאורת הגלגל"
-    clip,c200,gigabeatf,mrobe100,sa9200: "זמן תאורת כפתור"
   </dest>
   <voice>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -3851,15 +3851,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "בהירות תאורת כפתור"
+    buttonlight_brightness: "בהירות תאורת כפתור"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index f66bd9ee1c..38daa868a7 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -3852,18 +3852,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Tempo di spegnimento illuminazione tasti"
     e200*: "Tempo di spegnimento illuminazione rotella"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Tempo di spegnimento illuminazione tasti"
   </dest>
   <voice>
     *: none
+    button_light: "Tempo di spegnimento illuminazione tasti"
     e200*: "Tempo di spegnimento illuminazione rotella"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Tempo di spegnimento illuminazione tasti"
   </voice>
 </phrase>
 <phrase>
@@ -3872,15 +3872,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Luminosità Tasti"
+    buttonlight_brightness: "Luminosità Tasti"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Luminosità Tasti"
+    buttonlight_brightness: "Luminosità Tasti"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 0039d2bc70..7eee5026db 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -3833,18 +3833,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "ボタンライトのタイムアウト"
     e200*: "ホイールライトのタイムアウト"
-    clip,c200,gigabeatf,mrobe100,sa9200: "ボタンライトのタイムアウト"
   </dest>
   <voice>
     *: none
+    button_light: "ボタンライトのタイムアウト"
     e200*: "ホイールライトのタイムアウト"
-    clip,c200,gigabeatf,mrobe100,sa9200: "ボタンライトのタイムアウト"
   </voice>
 </phrase>
 <phrase>
@@ -3853,15 +3853,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "ボタンライトの明るさ"
+    buttonlight_brightness: "ボタンライトの明るさ"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "ボタンライトの明るさ"
+    buttonlight_brightness: "ボタンライトの明るさ"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index 8179c01cef..73567bff20 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -10760,19 +10760,19 @@
   desc: in settings_menu
   user:
   <source>
-    *: ""
+    *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100: "Button Light Timeout"
   </source>
   <dest>
-    *: ""
+    *: none
+    button_light: "버튼 조명 시간"
     e200*: "휠버튼 조명 시간"
-    clip,c200,gigabeatf,mrobe100: "버튼 조명 시간"
   </dest>
   <voice>
-    *: ""
+    *: none
+    button_light: "버튼 조명 시간"
     e200*: "휠버튼 조명 시간"
-    clip,c200,gigabeatf,mrobe100: "버튼 조명 시간"
   </voice>
 </phrase>
 <phrase>
@@ -10780,16 +10780,16 @@
   desc: in settings_menu
   user:
   <source>
-    *: ""
-    gigabeatf: "Button Light Brightness"
+    *: none
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
-    *: ""
-    gigabeatf: "버튼 조명 밝기"
+    *: none
+    buttonlight_brightness: "버튼 조명 밝기"
   </dest>
   <voice>
-    *: ""
-    gigabeatf: "버튼 조명 밝기"
+    *: none
+    buttonlight_brightness: "버튼 조명 밝기"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index f23d06cf9c..98738c8fe5 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -10143,15 +10143,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Helderheid Licht Knoppen"
+    buttonlight_brightness: "Helderheid Licht Knoppen"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Helderheid Licht Knoppen"
+    buttonlight_brightness: "Helderheid Licht Knoppen"
   </voice>
 </phrase>
 <phrase>
@@ -10275,18 +10275,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Knoppen Licht Vertraging"
     e200*: "Wiel Licht Vertraging"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Knoppen Licht Vertraging"
   </dest>
   <voice>
     *: none
+    button_light: "Knoppen Licht Vertraging"
     e200*: "Wiel Licht Vertraging"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Knoppen Licht Vertraging"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index cdc9b35b3e..b0e018ea69 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -9870,18 +9870,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Avbrotstid for knappelys"
     e200*: "Avbrotstid for hjullys"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Avbrotstid for knappelys"
   </dest>
   <voice>
     *: none
+    button_light: "Avbrotstid for knappelys"
     e200*: "Avbrotstid for hjullys"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Avbrotstid for knappelys"
   </voice>
 </phrase>
 <phrase>
@@ -10713,15 +10713,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Lysstyrke for knappar"
+    buttonlight_brightness: "Lysstyrke for knappar"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Lysstyrke for knappar"
+    buttonlight_brightness: "Lysstyrke for knappar"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index 4e318b72d7..e4027e6f2f 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -10005,15 +10005,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Knapplysstyrke"
+    buttonlight_brightness: "Knapplysstyrke"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Knapplysstyrke"
+    buttonlight_brightness: "Knapplysstyrke"
   </voice>
 </phrase>
 <phrase>
@@ -10022,18 +10022,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Slukketid for knapplys"
     e200*: "Slukketid for hjullys"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Slukketid for knapplys"
   </dest>
   <voice>
     *: none
+    button_light: "Tid før lys på knapper slukker"
     e200*: "Tid før lys på hjul slukker"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Tid før lys på knapper slukker"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index 3481a5114b..f2e1ae1855 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -3840,18 +3840,18 @@
   user: 
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Wygaszanie klawiszy"
     e200*: "Wygaszanie koła sterującego"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Wygaszanie klawiszy"
   </dest>
   <voice>
     *: none
+    button_light: "Wygaszanie klawiszy"
     e200*: "Wygaszanie koła sterującego"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Wygaszanie klawiszy"
   </voice>
 </phrase>
 <phrase>
@@ -3860,15 +3860,15 @@
   user: 
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Jasność podświetlenia przycisków"
+    buttonlight_brightness: "Jasność podświetlenia przycisków"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Jasność podświetlenia przycisków"
+    buttonlight_brightness: "Jasność podświetlenia przycisków"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 356ac459c7..c1e256bdb7 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -3850,18 +3850,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Duração da Luz do Botão"
     e200*: "Duração da Luz da Roda"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Duração da Luz do Botão"
   </dest>
   <voice>
     *: none
+    button_light: "Duração da Luz do Botão"
     e200*: "Duração da Luz da Roda"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Duração da Luz do Botão"
   </voice>
 </phrase>
 <phrase>
@@ -3870,15 +3870,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Brilho da Luz do Botão"
+    buttonlight_brightness: "Brilho da Luz do Botão"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Brilho da Luz do Botão"
+    buttonlight_brightness: "Brilho da Luz do Botão"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index 6250902219..f0b63543a1 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -9020,15 +9020,15 @@
   user: 
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Luminozitatea Butoanelor"
+    buttonlight_brightness: "Luminozitatea Butoanelor"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Luminozitatea Butoanelor"
+    buttonlight_brightness: "Luminozitatea Butoanelor"
   </voice>
 </phrase>
 <phrase>
@@ -10302,18 +10302,18 @@
   user: 
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Timp iluminare butoane"
     e200*: "Timp iluminare rotita"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Timp iluminare butoane"
   </dest>
   <voice>
     *: none
+    button_light: "Timp iluminare butoane"
     e200*: "Timp iluminare rotita"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Timp iluminare butoane"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index 8612ed8921..cf80589a1d 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -10410,15 +10410,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Яркость Подсветки Клавиш"
+    buttonlight_brightness: "Яркость Подсветки Клавиш"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Яркость Подсветки Клавиш"
+    buttonlight_brightness: "Яркость Подсветки Клавиш"
   </voice>
 </phrase>
 <phrase>
@@ -10948,18 +10948,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Таймаут подсветки клавиш"
     e200*: "Таймаут подсветки колёсика"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Таймаут подсветки клавиш"
   </dest>
   <voice>
     *: none
+    button_light: "Таймаут подсветки клавиш"
     e200*: "Таймаут подсветки колёсика"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Таймаут подсветки клавиш"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index f0e7455162..ca75137b9a 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -3835,40 +3835,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUTTONLIGHT_TIMEOUT
-  desc: in settings_menu
-  user:
-  <source>
-    *: none
-    e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
-  </source>
-  <dest>
-    *: none
-    e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: ""
-  </dest>
-  <voice>
-    *: none
-    e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: ""
-  </voice>
-</phrase>
-<phrase>
   id: LANG_BUTTONLIGHT_BRIGHTNESS
   desc: in settings_menu
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Јачина светла за тастере"
+    buttonlight_brightness: "Јачина светла за тастере"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Јачина светла за тастере"
+    buttonlight_brightness: "Јачина светла за тастере"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index 2226180d32..7575053288 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -3834,18 +3834,18 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Knappbelysning"
     e200*: "Hjulbelysning"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Knappbelysning"
   </dest>
   <voice>
     *: none
+    button_light: "Knappbelysning"
     e200*: "Hjulbelysning"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Knappbelysning"
   </voice>
 </phrase>
 <phrase>
@@ -3854,15 +3854,15 @@
   user:
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Knappljusstyrka"
+    buttonlight_brightness: "Knappljusstyrka"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Knappljusstyrka"
+    buttonlight_brightness: "Knappljusstyrka"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index 27ca39a9f6..17c85ac68d 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -3840,18 +3840,18 @@
  user:
  <source>
     *: none
+    button_light: "Button Light Timeout"
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
  </source>
  <dest>
     *: none
+    button_light: "Pahintuin buttones sa ilaw"
     e200*: "Pahintuin gulong sa ilaw"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Pahintuin buttones sa ilaw"
  </dest>
  <voice>
     *: none
+    button_light: ""
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: ""
  </voice>
 </phrase>
 <phrase>
@@ -3860,15 +3860,15 @@
  user:
  <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    buttonlight_brightness: "Button Light Brightness"
  </source>
  <dest>
     *: none
-    gigabeatf,mrobe100: "Buttones liwanag sa ilaw"
+    buttonlight_brightness: "Buttones liwanag sa ilaw"
  </dest>
  <voice>
     *: none
-    gigabeatf,mrobe100: ""
+    buttonlight_brightness: ""
  </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index cd090d6818..2d13ffa09e 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -3835,34 +3835,14 @@
   <source>
     *: none
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
     e200*: "เวลาเปิดไฟล้อหมุน"
-    clip,c200,gigabeatf,mrobe100,sa9200: ""
   </dest>
   <voice>
     *: none
     e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BUTTONLIGHT_BRIGHTNESS
-  desc: in settings_menu
-  user:
-  <source>
-    *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
-  </source>
-  <dest>
-    *: none
-    gigabeatf,mrobe100: ""
-  </dest>
-  <voice>
-    *: none
-    gigabeatf,mrobe100: ""
   </voice>
 </phrase>
 <phrase>