diff --git a/.gitignore b/.gitignore
index 17ab4db28c..3ea1d95f24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,7 +82,15 @@ __pycache__
 /utils/bspatch/bspatch
 
 # imxtools
+/utils/imxtools/misc/io_pins
+/utils/imxtools/misc/wiki_gen
 /utils/imxtools/scsitools/scsitool
+/utils/imxtools/sbtools/elftosb
+/utils/imxtools/sbtools/elftosb1
+/utils/imxtools/sbtools/rsrctool
+/utils/imxtools/sbtools/sbloader
+/utils/imxtools/sbtools/sbtoelf
+/utils/mkimxboot/mkimxboot
 
 # /utils/rbutilqt/
 /utils/rbutilqt/build
@@ -100,16 +108,22 @@ __pycache__
 # /utils/rbutilqt/lang/
 /utils/rbutilqt/lang/*.qm
 
-# More rbutil
+# More target-specific utilities
 /utils/*/buildposix
 /utils/*/uninstall_script.[ch]
 /utils/*/install_script.[ch]
-/utils/mkimxboot/mkimxboot
+/utils/e200tool/e200load
 /utils/mknwzboot/mknwzboot
 /utils/mkzenboot/mkzenboot
 /utils/sansapatcher/sansapatcher
 /utils/jztool/jztool
 /utils/tools/bin2c
+/utils/rk27utils/nandextract/nandextract
+/utils/rk27utils/rk27load/rk27load
+/utils/rk27utils/rkwtool/rkwtool
+/utils/rk27utils/rkusbtool/rkusbtool
+/utils/mkmpioboot/mkmpioboot
+/utils/mktccboot/mktccboot
 
 # /tools/
 /tools/bdf2bmp
@@ -188,8 +202,9 @@ __pycache__
 # /utils/nwztools
 /utils/nwztools/scsitools/scsitool
 /utils/nwztools/upgtools/upgtool
+/utils/nwztools/emmctools/emmctool
 
-#  utils/rk27utils 
+#  utils/rk27utils
 /utils/rk27utils/rkboottool/rkboottool
 
 # /utils/themeeditor/
diff --git a/android/android.make b/android/android.make
index 246cd88f02..24a1b50b96 100644
--- a/android/android.make
+++ b/android/android.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 PACKAGE=org.rockbox
diff --git a/android/src/org/rockbox/Helper/Logger.java b/android/src/org/rockbox/Helper/Logger.java
index 0620175ef9..ee62a2527a 100644
--- a/android/src/org/rockbox/Helper/Logger.java
+++ b/android/src/org/rockbox/Helper/Logger.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Thomas Martitz
  *
diff --git a/android/src/org/rockbox/Helper/MediaButtonReceiver.java b/android/src/org/rockbox/Helper/MediaButtonReceiver.java
index a07e328c13..54ebd4d4d7 100644
--- a/android/src/org/rockbox/Helper/MediaButtonReceiver.java
+++ b/android/src/org/rockbox/Helper/MediaButtonReceiver.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/android/src/org/rockbox/RockboxActivity.java b/android/src/org/rockbox/RockboxActivity.java
index 8004046c1b..e9dc70d3a7 100644
--- a/android/src/org/rockbox/RockboxActivity.java
+++ b/android/src/org/rockbox/RockboxActivity.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/android/src/org/rockbox/RockboxFramebuffer.java b/android/src/org/rockbox/RockboxFramebuffer.java
index 9c4c6a5dc3..62b338baa6 100644
--- a/android/src/org/rockbox/RockboxFramebuffer.java
+++ b/android/src/org/rockbox/RockboxFramebuffer.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/android/src/org/rockbox/RockboxKeyboardInput.java b/android/src/org/rockbox/RockboxKeyboardInput.java
index 540ba12c22..b24e06d81f 100644
--- a/android/src/org/rockbox/RockboxKeyboardInput.java
+++ b/android/src/org/rockbox/RockboxKeyboardInput.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *
diff --git a/android/src/org/rockbox/RockboxPCM.java b/android/src/org/rockbox/RockboxPCM.java
index 10caa772b6..42f204c593 100644
--- a/android/src/org/rockbox/RockboxPCM.java
+++ b/android/src/org/rockbox/RockboxPCM.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/android/src/org/rockbox/RockboxService.java b/android/src/org/rockbox/RockboxService.java
index e38ff350a3..f8a5190c31 100644
--- a/android/src/org/rockbox/RockboxService.java
+++ b/android/src/org/rockbox/RockboxService.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/android/src/org/rockbox/RockboxYesno.java b/android/src/org/rockbox/RockboxYesno.java
index 818174ddfd..f8fb57deb5 100644
--- a/android/src/org/rockbox/RockboxYesno.java
+++ b/android/src/org/rockbox/RockboxYesno.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *
diff --git a/android/src/org/rockbox/monitors/BatteryMonitor.java b/android/src/org/rockbox/monitors/BatteryMonitor.java
index 0896a58242..abdda3b440 100644
--- a/android/src/org/rockbox/monitors/BatteryMonitor.java
+++ b/android/src/org/rockbox/monitors/BatteryMonitor.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Thomas Martitz
  *
diff --git a/android/src/org/rockbox/monitors/HeadphoneMonitor.java b/android/src/org/rockbox/monitors/HeadphoneMonitor.java
index 6b58b1dd80..ff7ba08131 100644
--- a/android/src/org/rockbox/monitors/HeadphoneMonitor.java
+++ b/android/src/org/rockbox/monitors/HeadphoneMonitor.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Thomas Martitz
  *
diff --git a/android/src/org/rockbox/monitors/TelephonyMonitor.java b/android/src/org/rockbox/monitors/TelephonyMonitor.java
index 6881f243af..cc15848ab5 100644
--- a/android/src/org/rockbox/monitors/TelephonyMonitor.java
+++ b/android/src/org/rockbox/monitors/TelephonyMonitor.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/android/src/org/rockbox/widgets/RockboxWidgetConfigure.java b/android/src/org/rockbox/widgets/RockboxWidgetConfigure.java
index 82cfc1553f..3a5d514613 100644
--- a/android/src/org/rockbox/widgets/RockboxWidgetConfigure.java
+++ b/android/src/org/rockbox/widgets/RockboxWidgetConfigure.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Antoine Cellerier <dionoea at videolan dot org>
  *
diff --git a/android/src/org/rockbox/widgets/RockboxWidgetProvider.java b/android/src/org/rockbox/widgets/RockboxWidgetProvider.java
index 377f8fdb18..3709e7ecde 100644
--- a/android/src/org/rockbox/widgets/RockboxWidgetProvider.java
+++ b/android/src/org/rockbox/widgets/RockboxWidgetProvider.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Antoine Cellerier <dionoea at videolan dot org>
  *
diff --git a/android/src/org/rockbox/widgets/RockboxWidgetProvider2x2.java b/android/src/org/rockbox/widgets/RockboxWidgetProvider2x2.java
index 183c4273ec..9cf07e9a62 100644
--- a/android/src/org/rockbox/widgets/RockboxWidgetProvider2x2.java
+++ b/android/src/org/rockbox/widgets/RockboxWidgetProvider2x2.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Antoine Cellerier <dionoea at videolan dot org>
  *
diff --git a/android/src/org/rockbox/widgets/RockboxWidgetProvider3x3.java b/android/src/org/rockbox/widgets/RockboxWidgetProvider3x3.java
index 1dc8f40150..d3b6d20f67 100644
--- a/android/src/org/rockbox/widgets/RockboxWidgetProvider3x3.java
+++ b/android/src/org/rockbox/widgets/RockboxWidgetProvider3x3.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Antoine Cellerier <dionoea at videolan dot org>
  *
diff --git a/android/src/org/rockbox/widgets/RockboxWidgetProvider4x1.java b/android/src/org/rockbox/widgets/RockboxWidgetProvider4x1.java
index 303c54c92b..b45907f4cc 100644
--- a/android/src/org/rockbox/widgets/RockboxWidgetProvider4x1.java
+++ b/android/src/org/rockbox/widgets/RockboxWidgetProvider4x1.java
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Antoine Cellerier <dionoea at videolan dot org>
  *
diff --git a/apps/abrepeat.c b/apps/abrepeat.c
index 886564aaa5..2ac5afdf32 100644
--- a/apps/abrepeat.c
+++ b/apps/abrepeat.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Ray Lambert
  *
diff --git a/apps/abrepeat.h b/apps/abrepeat.h
index 1542b24f47..7cc8d59d5d 100644
--- a/apps/abrepeat.h
+++ b/apps/abrepeat.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Ray Lambert
  *
diff --git a/apps/action.c b/apps/action.c
index c7dd74f60a..a9029457f8 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  * Copyright (C) 2017 William Wilgus
@@ -430,6 +429,7 @@ static inline bool get_action_touchscreen(action_last_t *last, action_cur_t *cur
     {
         intptr_t data = button_get_data();
         long now = current_tick;
+        last->repeated = false;
 
         if (has_flag(last->button, BUTTON_TOUCHSCREEN) &&
             !has_flag(last->button, BUTTON_REL))
@@ -439,7 +439,6 @@ static inline bool get_action_touchscreen(action_last_t *last, action_cur_t *cur
             if (!has_flag(cur->button, BUTTON_REL))
                 last->ts_data = data;
 
-            /* Historical baggage... may be unnecessary. */
             if (has_flag(cur->button, BUTTON_REPEAT))
                 last->repeated = true;
         }
diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c
index c7fe59547a..821eb7724a 100644
--- a/apps/alarm_menu.c
+++ b/apps/alarm_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Uwe Freese
  *
diff --git a/apps/alarm_menu.h b/apps/alarm_menu.h
index 9f6f1e1059..e7b5acc845 100644
--- a/apps/alarm_menu.h
+++ b/apps/alarm_menu.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Uwe Freese
  *
diff --git a/apps/appevents.h b/apps/appevents.h
index 1efd8035e3..47d0188fc6 100644
--- a/apps/appevents.h
+++ b/apps/appevents.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jonathan Gordon
  *
@@ -73,11 +72,13 @@ enum {
 
 /** Generic GUI class events **/
 enum {
-    GUI_EVENT_STATUSBAR_TOGGLE = (EVENT_CLASS_GUI|1),
+    /* Redraw skin as needed (or by force) */
+    GUI_EVENT_ACTIONREDRAW = (EVENT_CLASS_GUI|1),
+    /* Redraw skin, and update the screen if it's dirty */
     GUI_EVENT_ACTIONUPDATE,
     GUI_EVENT_THEME_CHANGED,
     /* Called when the UI viewport is cleared in the skin engine to
-     * notify the current screen that it needs to do an update */
+     * notify the current screen that it needs to redraw itself */
     GUI_EVENT_NEED_UI_UPDATE,
 };
 
diff --git a/apps/applimits.h b/apps/applimits.h
index adafca8df7..cffdb62e18 100644
--- a/apps/applimits.h
+++ b/apps/applimits.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Linus Nielsen Feltzing
  *
diff --git a/apps/apps.make b/apps/apps.make
index 33ca5d6c24..97bf3068aa 100644
--- a/apps/apps.make
+++ b/apps/apps.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
diff --git a/apps/audio_path.c b/apps/audio_path.c
index 6417adadb9..6f57e37e8f 100644
--- a/apps/audio_path.c
+++ b/apps/audio_path.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Audio signal path management APIs
  *
diff --git a/apps/audio_thread.c b/apps/audio_thread.c
index c58d509875..9eef8d337a 100644
--- a/apps/audio_thread.c
+++ b/apps/audio_thread.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005-2007 Miika Pekkarinen
  * Copyright (C) 2007-2008 Nicolas Pennequin
diff --git a/apps/audio_thread.h b/apps/audio_thread.h
index 57edf2b5ec..572aaaeeda 100644
--- a/apps/audio_thread.h
+++ b/apps/audio_thread.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005-2007 Miika Pekkarinen
  * Copyright (C) 2007-2008 Nicolas Pennequin
diff --git a/apps/beep.c b/apps/beep.c
index 62ebf2c3f9..216f4b52b8 100644
--- a/apps/beep.c
+++ b/apps/beep.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 Michael Sevakis
  *
diff --git a/apps/bitmaps/bitmaps.make b/apps/bitmaps/bitmaps.make
index cf166f3f8c..cafe64d63e 100644
--- a/apps/bitmaps/bitmaps.make
+++ b/apps/bitmaps/bitmaps.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 BITMAPDIR = $(ROOTDIR)/apps/bitmaps
diff --git a/apps/bookmark.c b/apps/bookmark.c
index d7fe0b29b1..8c4cb18211 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -959,14 +959,15 @@ static bool delete_bookmark(const char* bookmark_file_name, int bookmark_id)
 }
 
 /* ----------------------------------------------------------------------- */
-/* This displays the bookmarks in a file and allows the user to            */
-/* select one to play.                                                     */
-/* *selected_bookmark contains a non NULL value on successful bookmark     */
-/* selection.                                                              */
-/* Returns BOOKMARK_SUCCESS on successful bookmark selection, BOOKMARK_FAIL*/
-/* if no selection was made and BOOKMARK_USB_CONNECTED if the selection    */
-/* menu is forced to exit due to a USB connection.                         */
-/* ------------------------------------------------------------------------*/
+/* Displays bookmarks in a file, so user can select one to play.           */
+/*                                                                         */
+/* Returns                                                                 */
+/* BOOKMARK_SUCCESS              A bookmark or 'Don't Resume' was selected */
+/* BOOKMARK_FAIL                 No selection was made                     */
+/* BOOKMARK_USB_CONNECTED        USB connection forced exit of menu        */
+/*                                                                         */
+/* *selected_bookmark will point to bookmark if selected, or will be NULL  */
+/* ----------------------------------------------------------------------- */
 static int select_bookmark(const char* bookmark_file_name,
                            bool show_dont_resume,
                            char** selected_bookmark)
@@ -979,6 +980,7 @@ static int select_bookmark(const char* bookmark_file_name,
     bool exit = false;
     bool refresh = true;
     int ret = BOOKMARK_FAIL;
+    *selected_bookmark = NULL;
 
     bookmarks = plugin_get_buffer(&size);
     bookmarks->buffer_size = size;
@@ -996,9 +998,9 @@ static int select_bookmark(const char* bookmark_file_name,
 
     while (!exit)
     {
-
         if (refresh)
         {
+            refresh = false;
             int count = get_bookmark_count(bookmark_file_name);
             bookmarks->total_count = count;
 
@@ -1007,8 +1009,7 @@ static int select_bookmark(const char* bookmark_file_name,
                 /* No more bookmarks, delete file and exit */
                 splash(HZ, ID2P(LANG_BOOKMARK_LOAD_EMPTY));
                 remove(bookmark_file_name);
-                *selected_bookmark = NULL;
-                return BOOKMARK_FAIL;
+                break;
             }
 
             if (bookmarks->show_dont_resume)
@@ -1032,80 +1033,61 @@ static int select_bookmark(const char* bookmark_file_name,
             gui_synclist_draw(&list);
             cond_talk_ids_fq(VOICE_EXT_BMARK);
             gui_synclist_speak_item(&list);
-            refresh = false;
         }
 
         list_do_action(CONTEXT_BOOKMARKSCREEN, HZ / 2, &list, &action);
         item = gui_synclist_get_sel_pos(&list) / 2;
 
         if (bookmarks->show_dont_resume)
-        {
             item--;
-        }
 
         if (action == ACTION_STD_CONTEXT)
         {
-            MENUITEM_STRINGLIST(menu_items, ID2P(LANG_BOOKMARK_CONTEXT_MENU),
-                NULL, ID2P(LANG_BOOKMARK_CONTEXT_RESUME),
-                ID2P(LANG_DELETE));
-            static const int menu_actions[] =
-            {
-                ACTION_STD_OK, ACTION_BMS_DELETE
-            };
+            gui_synclist_scroll_stop(&list);
+            MENUITEM_STRINGLIST(menu_items, ID2P(LANG_BOOKMARK_CONTEXT_MENU), NULL,
+                                ID2P(LANG_BOOKMARK_CONTEXT_RESUME),
+                                ID2P(LANG_DELETE));
+            static const int menu_actions[] = {ACTION_STD_OK,
+                                               ACTION_BMS_DELETE};
             int selection = do_menu(&menu_items, NULL, NULL, false);
-
             refresh = true;
 
             if (selection >= 0 && selection <=
                 (int) (sizeof(menu_actions) / sizeof(menu_actions[0])))
-            {
                 action = menu_actions[selection];
-            }
         }
-
         switch (action)
         {
         case ACTION_STD_OK:
-            if (item >= 0)
-            {
-                talk_shutup();
-                *selected_bookmark = bookmarks->items[item - bookmarks->start];
-                return BOOKMARK_SUCCESS;
-            }
-            exit = true;
             ret = BOOKMARK_SUCCESS;
-            break;
-
+            if (item >= 0)
+                *selected_bookmark = bookmarks->items[item - bookmarks->start];
+            /* fall through */
         case ACTION_TREE_WPS:
         case ACTION_STD_CANCEL:
             exit = true;
             break;
-
         case ACTION_BMS_DELETE:
-            if (item >= 0)
+            if (item < 0)
+                break;
+            if (confirm_delete_yesno("", str(LANG_BOOKMARK_CONTEXT_MENU)) == YESNO_YES)
             {
-                if (confirm_delete_yesno("", str(LANG_BOOKMARK_CONTEXT_MENU)) == YESNO_YES)
-                {
-                    delete_bookmark(bookmark_file_name, item);
-                    bookmarks->reload = true;
-                }
-                refresh = true;
+                delete_bookmark(bookmark_file_name, item);
+                bookmarks->reload = true;
             }
+            refresh = true;
             break;
-
         default:
             if (default_event_handler(action) == SYS_USB_CONNECTED)
             {
                 ret = BOOKMARK_USB_CONNECTED;
                 exit = true;
             }
-
             break;
         }
     }
-
+    gui_synclist_scroll_stop(&list);
     talk_shutup();
-    *selected_bookmark = NULL;
     return ret;
 }
 
diff --git a/apps/buffering.c b/apps/buffering.c
index cf5f2e53c2..a4c179af41 100644
--- a/apps/buffering.c
+++ b/apps/buffering.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin
  *
diff --git a/apps/buffering.h b/apps/buffering.h
index 2c170d2ebd..bfb0c1c6d8 100644
--- a/apps/buffering.h
+++ b/apps/buffering.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin
  *
diff --git a/apps/codec_thread.c b/apps/codec_thread.c
index 2b109235c5..4777602df8 100644
--- a/apps/codec_thread.c
+++ b/apps/codec_thread.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005-2007 Miika Pekkarinen
  * Copyright (C) 2007-2008 Nicolas Pennequin
diff --git a/apps/codec_thread.h b/apps/codec_thread.h
index 6aa340bffe..9916d4e7dc 100644
--- a/apps/codec_thread.h
+++ b/apps/codec_thread.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Miika Pekkarinen
  *
diff --git a/apps/codecs.c b/apps/codecs.c
index c304b6eaf2..1a874bb36a 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/core_keymap.c b/apps/core_keymap.c
index 3ad83c9f96..d9fa331727 100644
--- a/apps/core_keymap.c
+++ b/apps/core_keymap.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2020 by William Wilgus
  *
diff --git a/apps/core_keymap.h b/apps/core_keymap.h
index 2077daa685..a09f4b30a3 100644
--- a/apps/core_keymap.h
+++ b/apps/core_keymap.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2020 by William Wilgus
  *
diff --git a/apps/cuesheet.c b/apps/cuesheet.c
index 9779f40c5d..e30e5ca404 100644
--- a/apps/cuesheet.c
+++ b/apps/cuesheet.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin, Jonathan Gordon
  *
diff --git a/apps/cuesheet.h b/apps/cuesheet.h
index 6885d21ef0..f17e3c2e6c 100644
--- a/apps/cuesheet.h
+++ b/apps/cuesheet.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin, Jonathan Gordon
  *
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 71686efba2..2a0f182ed2 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Heikki Hannikainen
  *
@@ -219,6 +218,22 @@ static int dbg_threads_action_callback(int action, struct gui_synclist *lists)
     }
 #if LCD_WIDTH <= 128
     int *x_offset = ((int*) lists->data);
+#if CONFIG_CPU == AS3525v2
+    if (action == ACTION_STD_MENU)
+    {
+        *x_offset += 1;
+        action = ACTION_REDRAW;
+    }
+    else if (IS_SYSEVENT(action))
+    {
+        return ACTION_REDRAW;
+    }
+    else if (action == ACTION_STD_OK)
+    {
+        *x_offset = 0;
+        action = ACTION_REDRAW;
+    }
+#else
     if (action == ACTION_STD_OK)
     {
         *x_offset += 1;
@@ -232,6 +247,7 @@ static int dbg_threads_action_callback(int action, struct gui_synclist *lists)
     {
         *x_offset = 0;
     }
+#endif
 #else
     (void) lists;
 #endif
diff --git a/apps/debug_menu.h b/apps/debug_menu.h
index 1335cb1395..103d9b434c 100644
--- a/apps/debug_menu.h
+++ b/apps/debug_menu.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Heikki Hannikainen
  *
diff --git a/apps/enc_config.c b/apps/enc_config.c
index d06ac84b5f..c640eae840 100644
--- a/apps/enc_config.c
+++ b/apps/enc_config.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Michael Sevakis
  *
diff --git a/apps/enc_config.h b/apps/enc_config.h
index 368bf8cf6c..b4720851fe 100644
--- a/apps/enc_config.h
+++ b/apps/enc_config.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Michael Sevakis
  *
diff --git a/apps/fileop.c b/apps/fileop.c
index 54c9b14f52..f9c6e67ef5 100644
--- a/apps/fileop.c
+++ b/apps/fileop.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  * Copyright (C) 2024 William Wilgus
diff --git a/apps/fileop.h b/apps/fileop.h
index f477549977..ded5ac13df 100644
--- a/apps/fileop.h
+++ b/apps/fileop.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/filetree.c b/apps/filetree.c
index 2d22818608..cbf2423ea0 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Björn Stenberg
  *
diff --git a/apps/filetree.h b/apps/filetree.h
index ebd9885ec2..af0a2c39bd 100644
--- a/apps/filetree.h
+++ b/apps/filetree.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Björn Stenberg
  *
diff --git a/apps/filetypes.c b/apps/filetypes.c
index 0e16b2c24b..30a1582da8 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
diff --git a/apps/filetypes.h b/apps/filetypes.h
index a20a2f82ee..3a717637ea 100644
--- a/apps/filetypes.h
+++ b/apps/filetypes.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Henrik Backe
  *
diff --git a/apps/gesture.c b/apps/gesture.c
index d1628100e4..752f007896 100644
--- a/apps/gesture.c
+++ b/apps/gesture.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 by Aidan MacDonald
  *
diff --git a/apps/gesture.h b/apps/gesture.h
index ba0d76110f..a4fb5428dc 100644
--- a/apps/gesture.h
+++ b/apps/gesture.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/apps/gui/backdrop.c b/apps/gui/backdrop.c
index fb35fe1e51..c3152cd4e0 100644
--- a/apps/gui/backdrop.c
+++ b/apps/gui/backdrop.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dave Chapman
  *
diff --git a/apps/gui/backdrop.h b/apps/gui/backdrop.h
index 2ab379e1cd..49fd86c2d6 100644
--- a/apps/gui/backdrop.h
+++ b/apps/gui/backdrop.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dave Chapman
  *
diff --git a/apps/gui/bitmap/list-skinned.c b/apps/gui/bitmap/list-skinned.c
index b9bd18c2d1..6bc33d8aa8 100644
--- a/apps/gui/bitmap/list-skinned.c
+++ b/apps/gui/bitmap/list-skinned.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Jonathan Gordon
  *
@@ -44,6 +43,7 @@
 
 static struct listitem_viewport_cfg *listcfg[NB_SCREENS] = {NULL};
 static struct gui_synclist *current_list;
+static bool needs_scrollbar[NB_SCREENS];
 
 static int current_row;
 static int current_column;
@@ -56,6 +56,7 @@ void skinlist_set_cfg(enum screen_type screen,
         if (listcfg[screen])
             screens[screen].scroll_stop_viewport(&listcfg[screen]->selected_item_vp.vp);
         listcfg[screen] = cfg;
+        needs_scrollbar[screen] = false;
         current_list = NULL;
         current_column = -1;
         current_row = -1;
@@ -145,7 +146,6 @@ int skinlist_get_line_count(enum screen_type screen, struct gui_synclist *list)
 
 static int current_item;
 static int current_nbitems;
-static bool needs_scrollbar[NB_SCREENS];
 bool skinlist_needs_scrollbar(enum screen_type screen)
 {
     return needs_scrollbar[screen];
@@ -281,7 +281,7 @@ bool skinlist_draw(struct screen *display, struct gui_synclist *list)
     }
     current_column = -1;
     current_row = -1;
-    skin_render_deferred(display, parent);
     current_drawing_line = list->selected_item;
+    sb_skin_force_next_update(); /* update scroll bar */
     return true;
 }
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index 34ae79e316..74bdea2f64 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jonathan Gordon
  *
@@ -446,7 +445,6 @@ void list_draw(struct screen *display, struct gui_synclist *list)
 
         callback_draw_item(&list_info);
     }
-    skin_render_deferred(display, parent);
     display->set_viewport(last_vp);
 }
 
diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c
index c8596a3f4d..fc4a67df8b 100644
--- a/apps/gui/color_picker.c
+++ b/apps/gui/color_picker.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Jonathan Gordon (2006)
  *
diff --git a/apps/gui/color_picker.h b/apps/gui/color_picker.h
index 6993b5fcaf..551d1c8fbf 100644
--- a/apps/gui/color_picker.h
+++ b/apps/gui/color_picker.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Jonathan Gordon (2006)
  *
diff --git a/apps/gui/icon.c b/apps/gui/icon.c
index 50fa0034ab..a7a48382d2 100644
--- a/apps/gui/icon.c
+++ b/apps/gui/icon.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
diff --git a/apps/gui/icon.h b/apps/gui/icon.h
index 4165391316..c05266a513 100644
--- a/apps/gui/icon.h
+++ b/apps/gui/icon.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
diff --git a/apps/gui/line.c b/apps/gui/line.c
index 39a87778a3..d4bcd60e50 100644
--- a/apps/gui/line.c
+++ b/apps/gui/line.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Thomas Martitz
  *
diff --git a/apps/gui/line.h b/apps/gui/line.h
index 8a1cc05af2..011809da50 100644
--- a/apps/gui/line.h
+++ b/apps/gui/line.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Thomas Martitz
  *
diff --git a/apps/gui/list.c b/apps/gui/list.c
index f5f02f2cb8..12f17cefef 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
@@ -49,8 +48,6 @@
 void list_draw(struct screen *display, struct gui_synclist *list);
 
 static long last_dirty_tick;
-static bool sb_title_is_dirty;
-static bool theme_enabled;
 static struct viewport parent[NB_SCREENS];
 static struct gui_synclist *current_lists;
 
@@ -183,6 +180,9 @@ void gui_synclist_init(struct gui_synclist * gui_list,
     gui_list->data = data;
     gui_list->scroll_all = scroll_all;
     gui_list->selected_size = selected_size;
+    if (selected_size != 1)
+        FOR_NB_SCREENS(i)
+            skinlist_set_cfg(i, NULL);
     gui_list->title = NULL;
     gui_list->title_icon = Icon_NOICON;
 
@@ -221,32 +221,11 @@ int gui_list_get_item_offset(struct gui_synclist * gui_list,
     return item_offset;
 }
 
-static void sb_title_cb(unsigned short id, void *data, void *userdata)
-{
-    (void)id;
-    (void)data;
-    theme_enabled = true;
-    gui_synclist_draw((struct gui_synclist *) userdata);
-}
-
 /*
  * Force a full screen update.
  */
 void gui_synclist_draw(struct gui_synclist *gui_list)
 {
-    if (sb_title_is_dirty)
-    {
-        sb_title_is_dirty = theme_enabled = false;
-
-        /* tell skin engine to refresh, then call us back */
-        add_event_ex(GUI_EVENT_NEED_UI_UPDATE, true, sb_title_cb, gui_list);
-        send_event(GUI_EVENT_ACTIONUPDATE, (void*)1);
-        remove_event_ex(GUI_EVENT_NEED_UI_UPDATE, sb_title_cb, gui_list);
-
-        /* sb_title_cb was only called if theme is enabled */
-        if (theme_enabled)
-            return;
-    }
     if (list_is_dirty(gui_list))
     {
         list_init_viewports(gui_list);
@@ -258,6 +237,7 @@ void gui_synclist_draw(struct gui_synclist *gui_list)
     {
         if (!skinlist_draw(&screens[i], gui_list))
             list_draw(&screens[i], gui_list);
+        skin_mark_dirty(i);
     }
 }
 
@@ -461,7 +441,7 @@ void gui_synclist_set_title(struct gui_synclist * gui_list,
     gui_list->title_icon = icon;
     FOR_NB_SCREENS(i)
         sb_set_title_text(title, icon, i);
-    sb_title_is_dirty = true;
+    send_event(GUI_EVENT_ACTIONREDRAW, (void*)1);
 }
 
 void gui_synclist_set_nb_items(struct gui_synclist * lists, int nb_items)
@@ -952,7 +932,7 @@ bool simplelist_show_list(struct simplelist_info *info)
 
     while(1)
     {
-        list_do_action(CONTEXT_LIST, info->timeout, &lists, &action);
+        list_do_action(CONTEXT_TREE|ALLOW_SOFTLOCK, info->timeout, &lists, &action);
 
         /* We must yield in this case or no other thread can run */
         if (info->timeout == TIMEOUT_NOBLOCK)
@@ -978,6 +958,11 @@ bool simplelist_show_list(struct simplelist_info *info)
             info->selection = -1;
             break;
         }
+        else if (action == ACTION_TREE_WPS)
+        {
+            info->selection = -2;
+            break;
+        }
         else if (action == ACTION_STD_OK)
         {
             info->selection = gui_synclist_get_sel_pos(&lists);
diff --git a/apps/gui/list.h b/apps/gui/list.h
index 1680750856..ad31180c4f 100644
--- a/apps/gui/list.h
+++ b/apps/gui/list.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index c7eab6aba1..12dff945ad 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  * Copyright (C) 2007 by Jonathan Gordon
@@ -533,7 +532,7 @@ bool option_screen(const struct settings_list *setting,
         if (!allow_wrap)
             lists.wraparound = false;
 
-        if (list_do_action(CONTEXT_LIST, HZ, /* HZ so the status bar redraws */
+        if (list_do_action(CONTEXT_LIST|ALLOW_SOFTLOCK, HZ, /* HZ so the status bar redraws */
                            &lists, &action))
         {
             /* setting changed */
diff --git a/apps/gui/option_select.h b/apps/gui/option_select.h
index a4378c00b6..ab46865667 100644
--- a/apps/gui/option_select.h
+++ b/apps/gui/option_select.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
diff --git a/apps/gui/pitchscreen.c b/apps/gui/pitchscreen.c
index 3bc0d27a07..5ae09827b2 100644
--- a/apps/gui/pitchscreen.c
+++ b/apps/gui/pitchscreen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/gui/pitchscreen.h b/apps/gui/pitchscreen.h
index 8510100a50..7015ee90c2 100644
--- a/apps/gui/pitchscreen.h
+++ b/apps/gui/pitchscreen.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Thomas Martitz
  *
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index b0d74d43a5..bc245dd80a 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jonathan Gordon
  *
@@ -40,6 +39,7 @@
 #include "debug.h"
 #include "shortcuts.h"
 #include "appevents.h"
+#include "statusbar-skinned.h"
 
  /* 1 top, 1 bottom, 2 on either side, 1 for the icons
   * if enough space, top and bottom have 2 lines */
@@ -233,7 +233,7 @@ static void quickscreen_draw(struct quickscreen *qs, enum screen_type screen)
             (vp_icons->width/2) - 4, vp_icons->height - 8, 7, 8);
     }
 
-    skin_render_deferred(display, parent);
+    skin_mark_dirty(display->screen_type);
     display->set_viewport(last_vp);
 }
 
@@ -418,13 +418,11 @@ static void quickscreen_run(struct quickscreen * qs)
             can_quit = true;
         else if (button == ACTION_QS_VOLUP) {
             adjust_volume(1);
-            FOR_NB_SCREENS(i)
-                skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_NON_STATIC);
+            sb_skin_force_next_update();
         }
         else if (button == ACTION_QS_VOLDOWN) {
             adjust_volume(-1);
-            FOR_NB_SCREENS(i)
-                skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_NON_STATIC);
+            sb_skin_force_next_update();
         }
         else if (button == ACTION_STD_CONTEXT)
         {
diff --git a/apps/gui/quickscreen.h b/apps/gui/quickscreen.h
index ae56231129..28a012669b 100644
--- a/apps/gui/quickscreen.h
+++ b/apps/gui/quickscreen.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
diff --git a/apps/gui/scrollbar.c b/apps/gui/scrollbar.c
index 532659e580..86af989f5e 100644
--- a/apps/gui/scrollbar.c
+++ b/apps/gui/scrollbar.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Markus Braun (2002)
  *
diff --git a/apps/gui/scrollbar.h b/apps/gui/scrollbar.h
index fa0907c686..5b4732ecac 100644
--- a/apps/gui/scrollbar.h
+++ b/apps/gui/scrollbar.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Kevin Ferrare
  *
diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c
index 994640c1fb..94460222ad 100644
--- a/apps/gui/skin_engine/skin_backdrops.c
+++ b/apps/gui/skin_engine/skin_backdrops.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 2a6f8072ec..c2c19b2b8c 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002-2007 Björn Stenberg
  * Copyright (C) 2007-2008 Nicolas Pennequin
@@ -71,8 +70,20 @@
 #include "statusbar-skinned.h"
 #include "skin_display.h"
 
+static bool dirty[NB_SCREENS];
+
 void skin_render(struct gui_wps *gwps, unsigned refresh_mode);
 
+bool skin_is_dirty(enum screen_type screen)
+{
+    return dirty[screen] && !(dirty[screen] = false);
+}
+
+void skin_mark_dirty(enum screen_type screen)
+{
+    dirty[screen] = true;
+}
+
 /* update a skinned screen, update_type is WPS_REFRESH_* values.
  * Usually it should only be WPS_REFRESH_NON_STATIC
  * A full update will be done if required (skin_do_full_update() == true)
@@ -90,6 +101,7 @@ void skin_update(enum skinnable_screens skin, enum screen_type screen,
 
     skin_render(gwps, skin_do_full_update(skin, screen) ?
                         SKIN_REFRESH_ALL : update_type);
+    skin_mark_dirty(screen);
 }
 
 #ifdef AB_REPEAT_ENABLE
@@ -198,6 +210,23 @@ void draw_progressbar(struct gui_wps *gwps, struct skin_viewport* skin_viewport,
         length = 100;
         end = battery_level();
     }
+    else if (pb->type == SKIN_TOKEN_PLAYLIST_PROGRESSBAR)
+    {
+        unsigned long pl_elapsed, pl_total;
+        if (id3 && wps_get_playlist_percent(id3,
+                       id3->elapsed + state->ff_rewind_count,
+                       &pl_elapsed, &pl_total)
+            && pl_total > 0)
+        {
+            length = pl_total;
+            end = pl_elapsed;
+        }
+        else
+        {
+            length = 1;
+            end = 0;
+        }
+    }
     else if (pb->type == SKIN_TOKEN_PEAKMETER_LEFTBAR ||
              pb->type == SKIN_TOKEN_PEAKMETER_RIGHTBAR)
     {
@@ -397,8 +426,17 @@ void wps_display_images(struct gui_wps *gwps, struct viewport* vp)
     (void)vp;
     struct wps_data *data = gwps->data;
     struct screen *display = gwps->display;
-    struct skin_token_list *list = SKINOFFSETTOPTR(get_skin_buffer(data), data->images);
 
+    /* Start with album art, as it may be drawn over by mask images */
+#ifdef HAVE_ALBUMART
+    struct skin_albumart *aa = SKINOFFSETTOPTR(get_skin_buffer(data), data->albumart);
+    if (aa && aa->draw_handle >= 0)
+    {
+        draw_album_art(gwps, aa->draw_handle, false);
+        aa->draw_handle = -1;
+    }
+#endif
+    struct skin_token_list *list = SKINOFFSETTOPTR(get_skin_buffer(data), data->images);
     while (list)
     {
         struct wps_token *token = SKINOFFSETTOPTR(get_skin_buffer(data), list->token);
@@ -420,15 +458,6 @@ void wps_display_images(struct gui_wps *gwps, struct viewport* vp)
         }
         list = SKINOFFSETTOPTR(get_skin_buffer(data), list->next);
     }
-#ifdef HAVE_ALBUMART
-    /* now draw the AA */
-    struct skin_albumart *aa = SKINOFFSETTOPTR(get_skin_buffer(data), data->albumart);
-    if (aa && aa->draw_handle >= 0)
-    {
-        draw_album_art(gwps, aa->draw_handle, false);
-        aa->draw_handle = -1;
-    }
-#endif
 
     display->set_drawmode(DRMODE_SOLID);
 }
diff --git a/apps/gui/skin_engine/skin_display.h b/apps/gui/skin_engine/skin_display.h
index 56af12aa03..a89df10d39 100644
--- a/apps/gui/skin_engine/skin_display.h
+++ b/apps/gui/skin_engine/skin_display.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002-2007 Björn Stenberg
  * Copyright (C) 2007-2008 Nicolas Pennequin
diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c
index 5528385f80..61a0c65e02 100644
--- a/apps/gui/skin_engine/skin_engine.c
+++ b/apps/gui/skin_engine/skin_engine.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *
@@ -50,9 +49,6 @@ char* wps_default_skin(enum screen_type screen);
 char* default_radio_skin(enum screen_type screen);
 static bool skins_initialised = false;
 
-static char* get_skin_filename(char *buf, size_t buf_size,
-                               enum skinnable_screens skin, enum screen_type screen);
-
 struct gui_skin_helper {
     void (*process)(enum screen_type screen, struct wps_data *data, bool preprocess);
     char* (*default_skin)(enum screen_type screen);
@@ -153,11 +149,6 @@ void gui_sync_skin_init(void)
     }
 }
 
-void skin_unload_all(void)
-{
-    gui_sync_skin_init();
-}
-
 static void skin_reset_buffers(int item, int screen)
 {
     skin_data_free_buflib_allocs(&skins[item][screen].data);
@@ -174,7 +165,6 @@ static void skin_reset_buffers(int item, int screen)
 void settings_apply_skins(void)
 {
     int i;
-    char filename[MAX_PATH];
 
     if (audio_status() & AUDIO_STATUS_PLAY)
         audio_stop();
@@ -197,7 +187,6 @@ void settings_apply_skins(void)
     {
         FOR_NB_SCREENS(j)
         {
-            get_skin_filename(filename, MAX_PATH, i,j);
             gui_skin_reset(&skins[i][j]);
             skins[i][j].gui_wps.display = &screens[j];
             if (skin_helpers[i]->load_on_boot)
diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h
index f753dc8087..f06c4c86f0 100644
--- a/apps/gui/skin_engine/skin_engine.h
+++ b/apps/gui/skin_engine/skin_engine.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin
  * Copyright (C) 2009 Jonathan Gordon
@@ -50,12 +49,8 @@ void skin_disarm_touchregions(struct gui_wps *gwps);
 /* Do a update_type update of the skinned screen */
 void skin_update(enum skinnable_screens skin, enum screen_type screen,
                  unsigned int update_type);
-
-/* Defer updates in skin_render */
-void skin_defer_rendering(bool deferred);
-/* Render viewport together with deferred updates */
-void skin_render_deferred(struct screen *display, struct viewport *vp);
-
+void skin_mark_dirty(enum screen_type screen);
+bool skin_is_dirty(enum screen_type screen);
 bool skin_has_sbs(struct gui_wps *gwps);
 
 
@@ -83,8 +78,6 @@ void skin_load(enum skinnable_screens skin, enum screen_type screen,
 struct gui_wps *skin_get_gwps(enum skinnable_screens skin, enum screen_type screen);
 void gui_sync_skin_init(void);
 
-void skin_unload_all(void);
-
 bool skin_do_full_update(enum skinnable_screens skin, enum screen_type screen);
 void skin_request_full_update(enum skinnable_screens skin);
 void skin_request_update_locked(bool locked);
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 1030d3926c..af0c83a8b2 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin, Dan Everton, Matthias Mohr
  *               2010 Jonathan Gordon
@@ -1235,6 +1234,13 @@ static int parse_progressbar_tag(struct skin_element* element,
         token->type = SKIN_TOKEN_VOLUMEBAR;
     else if (token->type == SKIN_TOKEN_BATTERY_PERCENT)
         token->type = SKIN_TOKEN_BATTERY_PERCENTBAR;
+    else if (token->type == SKIN_TOKEN_PLAYLIST_ELAPSED_PERCENT)
+    {
+#ifndef __PCTOOL__
+        wps_playlist_percent_enable(); /* enable scanning track lengths */
+#endif
+        token->type = SKIN_TOKEN_PLAYLIST_PROGRESSBAR;
+    }
     else if (token->type == SKIN_TOKEN_TUNER_RSSI)
         token->type = SKIN_TOKEN_TUNER_RSSI_BAR;
     else if (token->type == SKIN_TOKEN_PEAKMETER_LEFT)
@@ -2417,6 +2423,7 @@ static int skin_element_callback(struct skin_element* element, void* data)
                 case SKIN_TOKEN_PROGRESSBAR:
                 case SKIN_TOKEN_VOLUME:
                 case SKIN_TOKEN_BATTERY_PERCENT:
+                case SKIN_TOKEN_PLAYLIST_ELAPSED_PERCENT:
                 case SKIN_TOKEN_PLAYER_PROGRESSBAR:
                 case SKIN_TOKEN_PEAKMETER_LEFT:
                 case SKIN_TOKEN_PEAKMETER_RIGHT:
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c
index eefbc80ee7..5c731e0676 100644
--- a/apps/gui/skin_engine/skin_render.c
+++ b/apps/gui/skin_engine/skin_render.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: skin_parser.c 26752 2010-06-10 21:22:16Z bieber $
  *
  * Copyright (C) 2010 Jonathan Gordon
  *
@@ -84,8 +83,6 @@ static void skin_render_playlistviewer(struct playlistviewer* viewer,
                                        unsigned long refresh_type);
 
 static char* skin_buffer;
-static bool defer_rendering;
-static bool dirty[NB_SCREENS];
 
 static inline struct skin_element*
 get_child(OFFSETTYPE(struct skin_element**) children, int child)
@@ -230,6 +227,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
         case SKIN_TOKEN_PLAYLIST_PERCENTBAR:
         case SKIN_TOKEN_SETTINGBAR:
         case SKIN_TOKEN_PROGRESSBAR:
+        case SKIN_TOKEN_PLAYLIST_PROGRESSBAR:
         case SKIN_TOKEN_TUNER_RSSI_BAR:
         case SKIN_TOKEN_LIST_SCROLLBAR:
         {
@@ -843,29 +841,6 @@ void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps,
     wps_display_images(gwps, &skin_viewport->vp);
 }
 
-void skin_defer_rendering(bool deferred)
-{
-    defer_rendering = deferred;
-}
-
-void skin_render_deferred(struct screen *display, struct viewport *vp)
-{
-    if (defer_rendering)
-        return;
-
-    if (dirty[display->screen_type])
-    {
-        dirty[display->screen_type] = false;
-        display->set_viewport(NULL);
-        display->update();
-    }
-    else
-    {
-        display->set_viewport(vp);
-        display->update_viewport();
-    }
-}
-
 void skin_render(struct gui_wps *gwps, unsigned refresh_mode)
 {
     const int vp_is_appearing = (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE);
@@ -957,19 +932,14 @@ void skin_render(struct gui_wps *gwps, unsigned refresh_mode)
     skin_backdrop_show(data->backdrop_id);
 #endif
 
-    dirty[display->screen_type] = defer_rendering;
     if (((refresh_mode&SKIN_REFRESH_ALL) == SKIN_REFRESH_ALL))
     {
-        defer_rendering = true;
         /* If this is the UI viewport then let the UI know
          * to redraw itself */
         send_event(GUI_EVENT_NEED_UI_UPDATE, NULL);
-        defer_rendering = dirty[display->screen_type];
     }
     /* Restore the default viewport */
     display->set_viewport_ex(NULL, VP_FLAG_VP_SET_CLEAN);
-    if (!defer_rendering)
-        display->update();
 }
 
 static __attribute__((noinline))
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 97e81430a1..32daf5dc00 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002-2007 Björn Stenberg
  * Copyright (C) 2007-2008 Nicolas Pennequin
@@ -42,10 +41,15 @@
 #include "misc.h"
 #include "led.h"
 #include "peakmeter.h"
+#include "splash.h"
 /* Image stuff */
 #include "albumart.h"
 #include "playlist.h"
 #include "playback.h"
+#include "metadata.h"
+#include "crc32.h"
+#include "file.h"
+#include "core_alloc.h"
 #include "tdspeed.h"
 #include "viewport.h"
 #include "tagcache.h"
@@ -69,6 +73,10 @@
 #include "option_select.h"
 #include "wps.h"
 
+#if (CONFIG_STORAGE & STORAGE_ATA)
+#include "ata.h" /* ata_disk_isssd() */
+#endif
+
 #define NOINLINE __attribute__ ((noinline))
 
 static const char* get_codectype(const struct mp3entry* id3)
@@ -199,6 +207,167 @@ const char *get_cuesheetid3_token(struct wps_token *token, struct mp3entry *id3,
     return NULL;
 }
 
+/* Whole-playlist progress by time (%pX). if track count exceeds MAX_TRACKS
+ * the tag falls back to position-based progress.
+ * The cache is keyed on the track count and a crc of the
+ * first, middle and last filenames, so a playlist change, same-length swap,
+ * or reshuffle causes a reload of the length data. */
+#define PLPCT_MAX_TRACKS 500
+
+static struct {
+    uint32_t sig;           /* signature of the playlist to detect changed playlist or reshuffle*/
+    int amount;
+    bool nomem;             /* allocation failed -> position fallback */
+    bool enabled;           /* tag was parsed */
+    uint16_t track_mins[PLPCT_MAX_TRACKS];
+    unsigned long total_min;
+} plpct = { .amount = -1, .enabled = false };
+
+static uint32_t plpct_sig(void)
+{
+    struct playlist_info *pl = playlist_get_current();
+    /* changes on any playlist swap or reshuffle */
+    return pl->seed ^ pl->first_index ^ pl->amount ^ pl->last_insert_pos ^ pl->dirlen
+           ^ pl->created_tick ^ pl->max_playlist_size ^ pl->last_shuffled_start;
+}
+
+/* Equal-weight estimate (every track the same length)
+     scaled by 1000 as %pX is percent-only. */
+static void plpct_estimate(const struct mp3entry *id3, unsigned long elapsed_ms,
+                           int index, int amount,
+                           unsigned long *elapsed_s, unsigned long *total_s)
+{
+    unsigned long frac = 0;  /* 0..1000 through the current track */
+    if (id3->length)
+        frac = MIN(1000UL, 1000UL * elapsed_ms / id3->length);
+    *elapsed_s = (unsigned long)(index - 1) * 1000 + frac;
+    *total_s   = (unsigned long)amount * 1000;
+}
+
+void wps_playlist_percent_enable(void)
+{
+    plpct.enabled = true;
+}
+
+void wps_playlist_percent_prepare(void)
+{
+    if (!plpct.enabled)
+        return;
+
+    plpct.nomem = true;
+
+    int amount = playlist_amount();
+    plpct.sig = plpct_sig();
+    plpct.amount = amount;
+    if (amount <= 0 || amount > PLPCT_MAX_TRACKS) /* too many tracks abort */
+    {
+        return;
+    }
+
+    struct playlist_track_info info;
+
+    struct mp3entry *tmp = get_temp_mp3entry(NULL); /* shared scratch */
+
+    if (!tmp)
+        return;
+#if (CONFIG_STORAGE & STORAGE_ATA) /* Harddrive estimate length based on filesize */
+    unsigned int last_afmt = AFMT_UNKNOWN;
+    uint32_t last_bps = 0;
+#endif
+    for (int n = 0; n < amount; n++)
+    {
+        unsigned long secs = 0;
+        uint16_t mins = 0;
+        if (playlist_get_track_info(NULL, n, &info) < 0) /* couldn't get track filename abort */
+            goto abort;
+
+        int slot = info.display_index - 1;
+        if (slot < 0 || slot >= amount)
+            goto abort;
+
+#if (CONFIG_STORAGE & STORAGE_ATA) /* Harddrive */
+        int fd = open(info.filename, O_RDONLY);
+        if (fd >= 0)
+        {
+            unsigned int afmt = probe_file_format(info.filename);
+            off_t size = filesize(fd);
+
+            if (size > 0)
+            {
+                if (afmt != last_afmt || last_bps == 0
+                    || amount <= 50 || (amount <= 250 && ata_disk_isssd())) // TODO tune this for harddisk devices
+                {
+                    if (get_metadata_afmt(tmp, fd, info.filename, afmt,
+                        METADATA_EXCLUDE_ID3_PATH | METADATA_EXCLUDE_NORMALIZE))
+                    {
+                        secs = tmp->length / 1000;
+                        last_bps = (uint32_t)((uint64_t)size * 1000 / tmp->length);
+                        last_afmt = afmt;
+                    }
+                }
+                else /* file size only -- no per-track metadata parse */
+                {
+                    secs = (unsigned long)((uint64_t)size / last_bps);
+                }
+                mins = MIN(MAX(1, (secs + 30) / 60), 65535ul);/* minutes, rounded to nearest */
+            }
+            close(fd);
+        }
+#else
+        if (get_metadata_ex(tmp, -1, info.filename,
+                            METADATA_EXCLUDE_ID3_PATH | METADATA_EXCLUDE_NORMALIZE))
+        {
+            secs = tmp->length / 1000;
+            mins = MIN(MAX(1, (secs + 30) / 60), 65535ul);/* minutes, rounded to nearest */
+        }
+#endif
+        /* unreadable tracks count as zero length */
+        plpct.track_mins[slot] = mins;
+    }
+
+    plpct.total_min = 0;
+    for (int t = 0; t < plpct.amount; t++)
+        plpct.total_min += plpct.track_mins[t];
+    plpct.nomem = false;
+abort:
+    get_temp_mp3entry(tmp); /* release scratch */
+}
+
+bool wps_get_playlist_percent(struct mp3entry *id3, unsigned long elapsed_ms,
+                              unsigned long *elapsed_s, unsigned long *total_s)
+{
+    int amount = playlist_amount();
+    int index = playlist_get_display_index();  /* 1-based */
+
+    if (!id3 || amount <= 0 || index < 1 || index > amount)
+        return false;
+
+    uint32_t sig = plpct_sig();
+    if (amount != plpct.amount || sig != plpct.sig)
+    {
+        splashf(0, ID2P(LANG_WAIT));
+        wps_playlist_percent_enable();
+        wps_playlist_percent_prepare();
+    }
+    /* error parsing playlist or more than MAX_TRACKS fall back to
+       position-based progress rather than blank */
+    if (plpct.nomem)
+    {
+        plpct_estimate(id3, elapsed_ms, index, amount, elapsed_s, total_s);
+        return true;
+    }
+
+    unsigned long before_min = 0;
+    for (int t = 0; t < index - 1; t++)
+        before_min += plpct.track_mins[t];
+
+    *elapsed_s = before_min * 60 + elapsed_ms / 1000;
+    *total_s = plpct.total_min * 60;
+    if (*elapsed_s > *total_s)
+        *elapsed_s = *total_s;
+    return true;
+}
+
 static const char* get_filename_token(struct wps_token *token, char* filename,
                                char *buf, int buf_size)
 {
@@ -334,6 +503,24 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
                 snprintf(buf, buf_size, "%lu", 100 * elapsed / length);
                 return buf;
 
+            case SKIN_TOKEN_PLAYLIST_ELAPSED_PERCENT:
+            {
+                unsigned long pl_elapsed, pl_total;
+                if (!wps_get_playlist_percent(id3, elapsed,
+                                              &pl_elapsed, &pl_total)
+                    || pl_total == 0)
+                    return NULL;
+
+                /* %pX always yields a value for a valid playlist now (the
+                   equal-weight estimate until the scan finishes, then the exact
+                   time-weighted figure), so it behaves like any percent tag;
+                   %?pX<...> is true whenever the tag applies (a sized playlist). */
+                if (intval && limit == TOKEN_VALUE_ONLY)
+                    *intval = 100 * pl_elapsed / pl_total;
+                snprintf(buf, buf_size, "%lu", 100 * pl_elapsed / pl_total);
+                return buf;
+            }
+
             case SKIN_TOKEN_TRACK_STARTING:
                 {
                     unsigned long time = token->value.i * (HZ/TIMEOUT_UNIT);
@@ -510,7 +697,7 @@ const char *get_radio_token(struct wps_token *token, int preset_offset,
             if (preset < 0)
                 preset += preset_count;
             if (token->type == SKIN_TOKEN_PRESET_NAME)
-                snprintf(buf, buf_size, "%s", radio_get_preset_name(preset));
+                radio_get_preset_name(preset, buf, buf_size);
             else if (token->type == SKIN_TOKEN_PRESET_FREQ)
                 format_freq_MHz(radio_get_preset_freq(preset),
                                 region_data->freq_step, buf, buf_size);
diff --git a/apps/gui/skin_engine/skin_touchsupport.c b/apps/gui/skin_engine/skin_touchsupport.c
index 7098d8aa05..2a610690cc 100644
--- a/apps/gui/skin_engine/skin_touchsupport.c
+++ b/apps/gui/skin_engine/skin_touchsupport.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 - Jonathan Gordon
  *
@@ -204,24 +203,11 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
         if (!gwps->id3)
             break;
 
-        if (gevent.id == GESTURE_HOLD ||
-            gevent.id == GESTURE_DRAGSTART ||
-            gevent.id == GESTURE_DRAG)
-        {
-            audio_pre_ff_rewind();
-            gwps->id3->elapsed = gwps->id3->length * (*edge_offset) / 1000;
-        }
-        else if (gevent.id == GESTURE_RELEASE)
-        {
-            audio_ff_rewind(gwps->id3->elapsed);
-        }
-        else
-        {
-            gwps->id3->elapsed = gwps->id3->length * (*edge_offset) / 1000;
-            audio_pre_ff_rewind();
-            audio_ff_rewind(gwps->id3->elapsed);
-        }
+        audio_pre_ff_rewind();
+        gwps->id3->elapsed = gwps->id3->length / 1000 * (*edge_offset);
 
+        if (gevent.id == GESTURE_TAP || gevent.id == GESTURE_RELEASE)
+            audio_ff_rewind(gwps->id3->elapsed);
     } break;
 
     case ACTION_TOUCH_VOLUME:
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index d007fe6d7e..e39358b80d 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin
  *
@@ -429,6 +428,12 @@ const char *get_cuesheetid3_token(struct wps_token *token, struct mp3entry *id3,
                                   int offset_tracks, char *buf, int buf_size);
 const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
                           char *filename, char *buf, int buf_size, int limit, int *intval);
+/* whole-playlist progress backing %pX (number and bar forms) */
+bool wps_get_playlist_percent(struct mp3entry *id3, unsigned long elapsed_ms,
+                              unsigned long *elapsed_s, unsigned long *total_s);
+void wps_playlist_percent_enable(void);
+void wps_playlist_percent_prepare(void);
+
 #if CONFIG_TUNER
 const char *get_radio_token(struct wps_token *token, int preset_offset,
                             char *buf, int buf_size, int limit, int *intval);
diff --git a/apps/gui/splash.c b/apps/gui/splash.c
index 3df6c547f6..8619d36265 100644
--- a/apps/gui/splash.c
+++ b/apps/gui/splash.c
@@ -5,9 +5,9 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Daniel Stenberg (2002)
+ * Copyright (C) William Wilgus (2026)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -39,109 +39,235 @@
 static long progress_next_tick, talked_tick;
 
 #define MAXLINES  (LCD_HEIGHT/6)
-#define MAXBUFFER 512
+
+
+#ifndef BOOTLOADER
+#if MEMORYSIZE > 8
+    #define MAXBUFFER MAX(1024, (LCD_WIDTH/SYSFONT_WIDTH) * MAXLINES + 1)
+#else
+    #define MAXBUFFER MAX(512, (LCD_WIDTH/SYSFONT_WIDTH) * MAXLINES + 1)
+#endif
+#else
+    #define MAXBUFFER (512)
+#endif
+
 #define RECT_SPACING 3
 #define SPLASH_MEMORY_INTERVAL (HZ)
 
+/* splash_internal does the actual drawing of the splash box and text
+ * each call to splash remembers the max size and will not shrink the splash box
+ * until it is reset by an activity change or \f at the beginning of a string
+ *
+ * splash supports several escape sequences ("\n\t\f\r\v\b")
+ * '\n' (new line) indicates the end of a line of text and starts a new one
+ *  ("\n\n" will end a line and create a blank line)
+ *  '\n' as the first character of the text will create a blank line
+ *
+ * '\t' (tab) starts a new line and adds several spaces to the beginning of the
+ *  new line it also left/right justifies the splash text box
+ *  (RTL languages will right justify)
+ * '\t' as the last character of the text will left/right justify
+ *  without adding any tabs to the text output
+ *
+ * '\f' (form feed) as the first character of the text will reset the text box
+ *  width and height
+ *
+ * Others:
+ * '\f', \r', '\v' '\b' will be treated as a breaking space character
+ *  they will not be displayed as output and multiple sequences will be
+ *  treated as a single character
+ *  eg. "\b\v\f\r" will break the line but only once and will not show as a space
+ *  where as "\n\n" will break a line and add a blank line
+ *  "\t\t" would break a line and add a total of 4 spaces to the next line
+*/
 static bool splash_internal(struct screen * screen, const char *fmt, va_list ap,
                             struct viewport *vp, int addl_lines)
 {
-    static int max_width[NB_SCREENS] = {2*RECT_SPACING};
+    static const char matchstr[] = "\r\n\f\v\t\b";
+    static int max_width[NB_SCREENS] = {0};
+    static int max_height[NB_SCREENS] = {0};
 #ifndef BOOTLOADER
+    static char splash_buf[MAXBUFFER] = {0};
     static enum current_activity last_act = ACTIVITY_UNKNOWN;
     enum current_activity act = get_current_activity();
 
-    if (last_act != act) /* changed activities reset max_width */
+    if (last_act != act) /* changed activities reset width / height */
     {
         FOR_NB_SCREENS(i)
-            max_width[i] = 2*RECT_SPACING;
+        {
+            max_width[i] = 0;
+            max_height[i] = 0;
+        }
         last_act = act;
     }
+#else /*def BOOTLOADER*/
+    char splash_buf[MAXBUFFER] = {0}; /* on the stack for the bootloader */
 #endif
-    /* prevent screen artifacts by keeping the max width seen */
-    int min_width = max_width[screen->screen_type];
-    char splash_buf[MAXBUFFER];
+
     struct splash_lines {
         const char *str;
-        size_t len;
+        uint16_t x;
+        uint16_t len;
     } lines[MAXLINES];
-    const char *next;
-    const char *lastbreak = NULL;
-    const char *store = NULL;
+    memset(lines, 0, sizeof(lines));
+
+    char *buf = splash_buf;
+    const char *next, *store;
+
+    bool has_tabs = false;
     int line = 0;
-    int x = 0;
-    int y, i;
-    int space_w, w, chr_h;
-    int width, height;
-    int maxw = min_width - 2*RECT_SPACING;
+    int x = 0, w = 0;
+    int y;
+    int space_w, chr_h;
+    int width = vp->width - RECT_SPACING*2;
+    int height = vp->height;
+
+    /* prevent screen artifacts by keeping the max width / height seen */
+    int maxw = max_width[screen->screen_type];
+    int maxh = max_height[screen->screen_type];
     int fontnum = vp->font;
 
-    char lastbrkchr;
-    size_t len, next_len;
-    const char matchstr[] = "\r\n\f\v\t ";
-    font_getstringsize(" ", &space_w, &chr_h, fontnum);
-    y = chr_h + (addl_lines * chr_h);
+    size_t next_len;
 
-    vsnprintf(splash_buf, sizeof(splash_buf), fmt, ap);
+    font_getstringsize(" ", &space_w, &chr_h, fontnum);
+    y = (addl_lines * chr_h);
+
+    int res = vsnprintf(splash_buf, sizeof(splash_buf), fmt, ap);
     va_end(ap);
 
-    /* break splash string into display lines, doing proper word wrap */
-    next = strptokspn_r(splash_buf, matchstr, &next_len, &store);
-    if (!next)
-        return false; /* nothing to display */
-
-    lines[line].len = next_len;
-    lines[line].str = next;
-    while (true)
+    if (res <= 0 || width < space_w || height < chr_h)
     {
-        w = font_getstringnsize(next, next_len, NULL, NULL, fontnum);
-        if (lastbreak)
+#ifdef SIMULATOR
+        if (res <= 0)
+            printf("ERROR: %s %d\n", __func__, res);
+        else
+            printf("WARNING: %s vp too small\n", __func__);
+#endif
+        return false; /* nothing to display */
+    }
+
+    const char *lastbreak = splash_buf;
+    if (*lastbreak == '\f') /* only as first character - Reset splash box size */
+    {
+        maxw = 0;
+        maxh = 0;
+    }
+
+    while(true) /* break splash string into display lines, doing proper word wrap */
+    {
+#ifndef BOOTLOADER
+        while (*lastbreak != '\0') /* handle escape chars*/
         {
-            len = next - lastbreak;
-            int next_w = len * space_w;
-            if (x + next_w + w > vp->width - RECT_SPACING*2 || lastbrkchr != ' ')
-            {   /* too wide, or control character wrap */
-                if (x > maxw)
-                    maxw = x;
-                if ((y + chr_h * 2 > vp->height) || (line >= (MAXLINES-1)))
-                    break;  /* screen full or out of lines */
-                x = 0;
-                y += chr_h;
-
-                /* split when it fits since we didn't find a valid token to break on */
-                size_t nl = next_len;
-                while (w > vp->width && --nl > 0)
-                    w = font_getstringnsize(next, nl, NULL, NULL, fontnum);
-
-                if (nl > 1 && nl != next_len)
-                {
-                    next_len = nl;
-                    store = next + nl; /* move the start pos for the next token read */
-                }
-
-                lines[++line].len = next_len;
-                lines[line].str = next;
-            }
-            else
+            switch (*lastbreak) /* all chars in matchstr */
             {
-                /*  restore & calculate spacing */
-                lines[line].len += next_len + 1;
-                x += next_w;
+                case '\t': /*fallthrough*/
+                    has_tabs = true; /* left justify (right justify for RTL)*/
+                case '\n':
+                {
+                    if (lines[line].len > 0 || *lastbreak != '\t')
+                    {
+                        x += w;
+                        if (x > maxw)
+                            maxw = x;
+
+                        x = 0;
+                        y += chr_h;
+                        if (y >= height || line >= MAXLINES-1)
+                        {
+                            break;  /* out of lines */
+                        }
+                        line++;
+                    }
+                    /* /t as last char left justifies only */
+                    if (lastbreak[0] == '\t' && lastbreak[1] != '\0')
+                    {
+                        /* add offset for tab */
+                        lines[line].x += space_w * 2;
+                        x += space_w * 2;
+                    }
+                    break;
+                }
+                case '\b': /*fallthrough*/
+                case '\f': /*fallthrough*/
+                case '\v': /*fallthrough*/
+                case '\r':
+                    break; /* acts the same as a space character */
+                default: /* No valid break chars */
+                    lastbreak = " "; /* exit */
+                    break;
             }
+            lastbreak++;
         }
-        x += w;
-
-        lastbreak = next + next_len;
-        lastbrkchr = *lastbreak;
-
-        next = strptokspn_r(NULL, matchstr, &next_len, &store);
-
-        if (!next)
-        {   /* no more words */
+#endif
+        if (lines[line].len > 0)
+        {
+            x += w;
             if (x > maxw)
                 maxw = x;
+            x = 0;
+            y += chr_h;
+            if (y >= height || line >= MAXLINES-1)
+            {
+                if (y > maxh)
+                    maxh = y;
+                break;  /* out of lines */
+            }
+            line++;
+        }
+
+        next = strptokspn_r(buf, matchstr, &next_len, &store);
+
+        if (!next)
+        {
+            x += w;
+            if (x > maxw)
+                maxw = x;
+            if (y > maxh)
+                maxh = y;
             break;
         }
+        buf = NULL; /* uses store for continuation */
+
+        lines[line].str = next;
+        lines[line].len = next_len;
+
+        w = font_getstringnsize(next, next_len, NULL, NULL, fontnum);
+        if (w > width)
+        {
+            const char *nxp, *nx = next;
+            int nw, newlen;
+            int oldlen = next_len;
+
+            while (nx - next < oldlen) /* try to split at a space char */
+            {
+                nxp = nx;
+                nx++;
+                if (*nxp != ' ' && *nx != '\0') /* split on space or EOL */
+                    continue;
+                newlen = nxp - next;
+                nw = font_getstringnsize(next, newlen, NULL, NULL, fontnum);
+
+                if (nw > width)
+                {
+                    /* is next word larger than max width & room left on this line? */
+                    if (nw - w > width && w + space_w * 8 < width)
+                        w = nw;
+                    break;
+                }
+                w = nw;
+                next_len = newlen;
+                store = nx; /* we want to skip the space char */
+            }
+            if (w > width) /* split when it fits */
+            {
+                w = width;
+                next_len = font_measurestring(next, oldlen, w, &w, NULL, fontnum);
+                store = next + next_len;
+            }
+
+            lines[line].len = next_len;
+        }
+        lastbreak = next + next_len;
     }
 
     /* prepare viewport
@@ -151,22 +277,25 @@ static bool splash_internal(struct screen * screen, const char *fmt, va_list ap,
     screen->scroll_stop();
 
     width = maxw + 2*RECT_SPACING;
-    height = y + 2*RECT_SPACING;
+    height = maxh + 2*RECT_SPACING;
 
     if (width > vp->width)
         width = vp->width;
     if (height > vp->height)
         height = vp->height;
 
+    /* center the vp in the screen area */
     vp->x += (vp->width - width) / 2;
     vp->y += (vp->height - height) / 2;
     vp->width = width;
     vp->height = height;
+    if (!has_tabs)
+        vp->flags |=  VP_FLAG_ALIGN_CENTER;
 
-    /* prevent artifacts by locking to max width observed on repeated calls */
-    max_width[screen->screen_type] = width;
+    /* prevent artifacts by locking to max width & height observed on repeated calls */
+    max_width[screen->screen_type] = width - 2*RECT_SPACING;
+    max_height[screen->screen_type] = height - 2*RECT_SPACING;
 
-    vp->flags |=  VP_FLAG_ALIGN_CENTER;
 #if LCD_DEPTH > 1
     unsigned fg = 0, bg = 0;
     bool broken = false;
@@ -203,11 +332,22 @@ static bool splash_internal(struct screen * screen, const char *fmt, va_list ap,
 
     screen->draw_border_viewport();
 
+    /* center y within the available splash box */
+    if (y < maxh)
+        y = (maxh - y) / 2;
+    else
+        y = RECT_SPACING;
+
     /* print the message to screen */
-    for(i = 0, y = RECT_SPACING; i <= line; i++, y+= chr_h)
+    for(int i = 0; i < line && y < height; i++, y+= chr_h)
     {
-        screen->putsxyf(0, y, "%.*s", lines[i].len, lines[i].str);
+        if (lines[i].len > 0)
+        {
+            x = lines[i].x;
+            screen->putsxyf(x, y, "%.*s", lines[i].len, lines[i].str);
+        }
     }
+
     return true; /* needs update */
 }
 
diff --git a/apps/gui/splash.h b/apps/gui/splash.h
index a42ad29140..ca1af167d2 100644
--- a/apps/gui/splash.h
+++ b/apps/gui/splash.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
@@ -29,6 +28,9 @@
  * Puts a splash message centered on all the screens for a given period
  *  - ticks : how long the splash is displayed (in rb ticks)
  *  - fmt : what to say *printf style
+ *  /f at the beginning of a string will reset the max width and height seen
+ *  /n will end a line /n/n will add a blank line
+ *  /t will start a new line and indent the string on that line
  */
 extern void splashf(int ticks, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3);
 
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c
index 715c3d6377..6fcb90ece5 100644
--- a/apps/gui/statusbar-skinned.c
+++ b/apps/gui/statusbar-skinned.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Thomas Martitz
  *
diff --git a/apps/gui/statusbar-skinned.h b/apps/gui/statusbar-skinned.h
index 323ce7f0d2..d2cbbdc5ad 100644
--- a/apps/gui/statusbar-skinned.h
+++ b/apps/gui/statusbar-skinned.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Thomas Martitz
  *
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index d4dd6d0590..842d8c9e75 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Robert E. Hak (2002), Linus Nielsen Feltzing (2002)
  *
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h
index 144d276335..e503365546 100644
--- a/apps/gui/statusbar.h
+++ b/apps/gui/statusbar.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index 6d57a09b08..b1a12d2d83 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
@@ -53,55 +52,63 @@
 #include "ata_mmc.h"
 #endif
 
-#ifdef USB_ENABLE_HID
-int usb_keypad_mode;
-static bool usb_hid;
-#endif
-
-#ifndef SIMULATOR
-
-static int handle_usb_events(void)
+struct usb_screen_vps_t
 {
-#if (CONFIG_STORAGE & STORAGE_MMC)
-    int next_update=0;
-#endif /* STORAGE_MMC */
+    struct viewport parent;
+    struct viewport logo;
+#ifndef USB_ENABLE_HID
+};
+#else
+    struct viewport title;
+};
 
-    /* Don't return until we get SYS_USB_DISCONNECTED or SYS_TIMEOUT */
+int usb_keypad_mode;
+static void draw_usb_keypad_mode(struct viewport *title)
+{
+    struct screen *screen = &screens[SCREEN_MAIN];
+    struct viewport *last_vp = screen->set_viewport(title);
+    screen->clear_viewport();
+    title->flags |= VP_FLAG_ALIGN_CENTER;
+    if (title->width > 1)
+        screen->puts_scroll(0, 0, str(keypad_mode_name_get(usb_keypad_mode)));
+    screen->set_viewport(last_vp);
+}
+#endif /* USB_ENABLE_HID */
+
+static void handle_usb_events(struct viewport *title)
+{
+#if (CONFIG_STORAGE & STORAGE_MMC) && !defined(SIMULATOR)
+    int next_update = 0;
+#endif /* STORAGE_MMC */
+    int button;
+
+    /* Don't return until we get SYS_USB_DISCONNECTED */
     while(1)
     {
-        int button;
-#ifdef USB_ENABLE_HID
-        if (usb_hid)
+#ifndef USB_ENABLE_HID
+        (void)title;
+#else
+        if (global_settings.usb_hid)
         {
             button = get_hid_usb_action();
-
-            /* On mode change, we need to refresh the screen */
             if (button == ACTION_USB_HID_MODE_SWITCH_NEXT ||
-                    button == ACTION_USB_HID_MODE_SWITCH_PREV)
-            {
-                break;
-            }
+                button == ACTION_USB_HID_MODE_SWITCH_PREV)
+                draw_usb_keypad_mode(title);
         }
         else
 #endif
         {
-            button = button_get_w_tmo(HZ/2);
             /* hid emits the event in get_action */
             send_event(GUI_EVENT_ACTIONUPDATE, NULL);
+            button = button_get_w_tmo(HZ/2);
         }
+        if (button == SYS_USB_DISCONNECTED)
+            return;
+        if (button == SYS_CHARGER_DISCONNECTED)
+            reset_runtime();
 
-        switch(button)
-        {
-            case SYS_USB_DISCONNECTED:
-                return 1;
-            case SYS_CHARGER_DISCONNECTED:
-                reset_runtime();
-                break;
-            case SYS_TIMEOUT:
-                break;
-        }
-
-#if (CONFIG_STORAGE & STORAGE_MMC) /* USB-MMC bridge can report activity */
+/* USB-MMC bridge can report activity */
+#if (CONFIG_STORAGE & STORAGE_MMC) && !defined(SIMULATOR)
         if(TIME_AFTER(current_tick,next_update))
         {
             if(usb_inserted()) {
@@ -111,21 +118,7 @@ static int handle_usb_events(void)
         }
 #endif /* STORAGE_MMC */
     }
-
-    return 0;
 }
-#endif /* SIMULATOR */
-
-#define MODE_NAME_LEN 32
-
-struct usb_screen_vps_t
-{
-    struct viewport parent;
-    struct viewport logo;
-#ifdef USB_ENABLE_HID
-    struct viewport title;
-#endif
-};
 
 static void usb_screen_fix_viewports(struct screen *screen,
         struct usb_screen_vps_t *usb_screen_vps)
@@ -178,7 +171,7 @@ static void usb_screen_fix_viewports(struct screen *screen,
     logo->height = logo_height;
 
 #ifdef USB_ENABLE_HID
-    if (usb_hid)
+    if (global_settings.usb_hid)
     {
         struct viewport *title = &usb_screen_vps->title;
         int char_height = font_get(parent->font)->height;
@@ -211,11 +204,9 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
         &bm_remote_usblogo,
 #endif
     };
-
     FOR_NB_SCREENS(i)
     {
         struct screen *screen = &screens[i];
-
         struct usb_screen_vps_t *usb_screen_vps = &usb_screen_vps_ar[i];
         struct viewport *parent = &usb_screen_vps->parent;
         struct viewport *logo = &usb_screen_vps->logo;
@@ -223,29 +214,14 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
         last_vp = screen->set_viewport(parent);
         screen->clear_viewport();
         screen->backlight_on();
-
         screen->set_viewport(logo);
         screen->bmp(logos[i], 0, 0);
-        if (i == SCREEN_MAIN)
-        {
-#ifdef USB_ENABLE_HID
-            if (usb_hid)
-            {
-                char modestring[100];
-                screen->set_viewport(&usb_screen_vps->title);
-                usb_screen_vps->title.flags |= VP_FLAG_ALIGN_CENTER;
-                snprintf(modestring, sizeof(modestring), "%s: %s",
-                        str(LANG_USB_KEYPAD_MODE),
-                        str(keypad_mode_name_get(usb_keypad_mode)));
-                screen->puts_scroll(0, 0, modestring);
-            }
-#endif /* USB_ENABLE_HID */
-        }
-        screen->set_viewport(parent);
-
         screen->set_viewport(last_vp);
-        screen->update_viewport();
     }
+#ifdef USB_ENABLE_HID
+    if (global_settings.usb_hid)
+        draw_usb_keypad_mode(&usb_screen_vps_ar[SCREEN_MAIN].title);
+#endif
 }
 
 void gui_usb_screen_run(bool early_usb, intptr_t seqnum)
@@ -258,6 +234,7 @@ void gui_usb_screen_run(bool early_usb, intptr_t seqnum)
 #endif
 
     struct usb_screen_vps_t usb_screen_vps_ar[NB_SCREENS];
+    struct viewport *title = NULL;
 #if defined HAVE_TOUCHSCREEN
     enum touchscreen_mode old_mode = touchscreen_get_mode();
 
@@ -269,8 +246,10 @@ void gui_usb_screen_run(bool early_usb, intptr_t seqnum)
     push_current_activity(ACTIVITY_USBSCREEN);
 
 #ifdef USB_ENABLE_HID
-    usb_hid = global_settings.usb_hid;
     usb_keypad_mode = global_settings.usb_keypad_mode;
+    title = &usb_screen_vps_ar[SCREEN_MAIN].title;
+#else
+    title = NULL;
 #endif
 
     FOR_NB_SCREENS(i)
@@ -296,33 +275,13 @@ void gui_usb_screen_run(bool early_usb, intptr_t seqnum)
         /* The font system leaves the .fnt fd's open, so we need for force close them all */
         font_disable_all();
     }
-
     usb_acknowledge(SYS_USB_CONNECTED_ACK, seqnum);
-
-    while (1)
-    {
-        usb_screens_draw(usb_screen_vps_ar);
-#ifdef SIMULATOR
-        if (button_get_w_tmo(HZ/2))
-            break;
-        send_event(GUI_EVENT_ACTIONUPDATE, NULL);
-#else
-        if (handle_usb_events())
-            break;
-#endif /* SIMULATOR */
-    }
-
-    FOR_NB_SCREENS(i)
-    {
-        const struct viewport* vp = NULL;
+    usb_screens_draw(usb_screen_vps_ar);
+    handle_usb_events(title);
 
 #if defined(USB_ENABLE_HID)
-        vp = usb_hid ? &usb_screen_vps_ar[i].title : NULL;
-#endif
-        if (vp)
-            screens[i].scroll_stop_viewport(vp);
-    }
-#ifdef USB_ENABLE_HID
+    if (global_settings.usb_hid)
+        screens[SCREEN_MAIN].scroll_stop_viewport(title);
     if (global_settings.usb_keypad_mode != usb_keypad_mode)
     {
         global_settings.usb_keypad_mode = usb_keypad_mode;
diff --git a/apps/gui/usb_screen.h b/apps/gui/usb_screen.h
index aaf5d58a3f..ca0f181611 100644
--- a/apps/gui/usb_screen.h
+++ b/apps/gui/usb_screen.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index 6bc51401f5..5f5703bf54 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jonathan Gordon
  *
@@ -83,7 +82,7 @@ static void evt_toggle(bool enable, unsigned short id,
 
 static void toggle_events(bool enable)
 {
-    evt_toggle(enable, GUI_EVENT_ACTIONUPDATE, viewportmanager_redraw);
+    evt_toggle(enable, GUI_EVENT_ACTIONREDRAW, viewportmanager_redraw);
     evt_toggle(enable, PLAYBACK_EVENT_TRACK_CHANGE, do_sbs_update_callback);
     evt_toggle(enable, PLAYBACK_EVENT_NEXTTRACKID3_AVAILABLE, do_sbs_update_callback);
 #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
@@ -113,14 +112,14 @@ static void toggle_theme(enum screen_type screen, bool force)
         if (!sb_get_persistent_title(i))
             sb_set_title_text(NULL, Icon_NOICON, i);
     }
+    skinlist_set_cfg(screen, NULL);
     toggle_events(enable_event);
 
     if (is_theme_enabled(screen))
     {
         last_vp = screens[screen].set_viewport(NULL);
         bool first_boot = theme_stack_top[screen] == 0;
-        /* remove the left overs from the previous screen.
-         * could cause a tiny flicker. Redo your screen code if that happens */
+        /* Remove the left overs from the previous screen */
 #ifdef HAVE_BACKDROP_IMAGE
         skin_backdrop_show(sb_get_backdrop(screen));
 #endif
@@ -154,9 +153,7 @@ static void toggle_theme(enum screen_type screen, bool force)
         }
         intptr_t force = first_boot?0:1;
 
-        skin_defer_rendering(true);
-        send_event(GUI_EVENT_ACTIONUPDATE, (void*)force);
-        skin_defer_rendering(false);
+        send_event(GUI_EVENT_ACTIONREDRAW, (void*)force);
         if (!first_boot)
             sb_skin_force_next_update();
     }
@@ -166,7 +163,7 @@ static void toggle_theme(enum screen_type screen, bool force)
         screens[screen].backdrop_show(NULL);
 #endif
         screens[screen].scroll_stop();
-        skinlist_set_cfg(screen, NULL);
+        skin_is_dirty(screen); /* remove dirty flag */
     }
     /* let list initialize viewport in case viewport dimensions is changed. */
     send_event(GUI_EVENT_THEME_CHANGED, NULL);
@@ -219,10 +216,16 @@ static void viewportmanager_redraw(unsigned short id, void* data)
 {
     (void)id;
     FOR_NB_SCREENS(i)
-    {
         if (is_theme_enabled(i))
             sb_skin_update(i, NULL != data);
-    }
+}
+
+static void viewportmanager_update(unsigned short id, void* data)
+{
+    viewportmanager_redraw(id, data);
+    FOR_NB_SCREENS(i)
+        if (skin_is_dirty(i))
+            screens[i].update();
 }
 
 void viewportmanager_init(void)
@@ -233,6 +236,7 @@ void viewportmanager_init(void)
         /* We always want the theme enabled by default... */
         viewportmanager_theme_enable(i, true, NULL);
     }
+    add_event(GUI_EVENT_ACTIONUPDATE, viewportmanager_update);
 }
 
 void viewportmanager_theme_changed(const int which)
diff --git a/apps/gui/viewport.h b/apps/gui/viewport.h
index c57a58b232..442964820d 100644
--- a/apps/gui/viewport.h
+++ b/apps/gui/viewport.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jonathan Gordon
  *
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 99a1f6917e..add47d08db 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Jerome Kuptz
  *
@@ -533,11 +532,7 @@ static void gwps_leave_wps(bool theme_enabled)
                viewports drawn by the WPS. May need further thought... */
             struct wps_data *sbs = skin_get_gwps(CUSTOM_STATUSBAR, i)->data;
             if (gwps->data->use_extra_framebuffer && sbs->use_extra_framebuffer)
-            {
-                skin_defer_rendering(true);
                 skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL);
-                skin_defer_rendering(false);
-            }
 #endif
             viewportmanager_theme_undo(i, skin_has_sbs(gwps));
         }
@@ -599,11 +594,7 @@ static void gwps_enter_wps(bool theme_enabled)
         skin_backdrop_show(gwps->data->backdrop_id);
 #endif
         display->clear_display();
-        if (skin_has_sbs(gwps))
-            skin_defer_rendering(true);
         skin_update(WPS, i, SKIN_REFRESH_ALL);
-        skin_defer_rendering(false);
-
     }
 #ifdef HAVE_TOUCHSCREEN
     gwps = skin_get_gwps(WPS, SCREEN_MAIN);
@@ -611,7 +602,7 @@ static void gwps_enter_wps(bool theme_enabled)
     if (gwps->data->touchregions < 0)
         touchscreen_set_mode(TOUCHSCREEN_BUTTON);
 #endif
-    /* force statusbar/skin update since we just cleared the whole screen */
+     /* Screen was cleared, so redraw SBS if enabled, and update screen */
     send_event(GUI_EVENT_ACTIONUPDATE, (void*)1);
 }
 
@@ -806,9 +797,10 @@ long gui_wps_show(void)
             case ACTION_WPS_HOTKEY:
             {
                 hotkey = true;
-                if (!global_settings.hotkey_wps)
+                int act = HK_CTX_GET(0, global_settings.context_wps);
+                if (act == HOTKEY_OFF)
                     break;
-                if (get_hotkey(global_settings.hotkey_wps)->flags & HOTKEY_FLAG_NOSBS)
+                if (get_hotkey(act)->flags & HOTKEY_FLAG_NOSBS)
                 {
                     /* leave WPS without re-enabling theme */
                     theme_enabled = false;
@@ -844,7 +836,7 @@ long gui_wps_show(void)
                 {
                     restore_theme();
                     theme_enabled = false;
-                    open_plugin_run(ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN));
+                    open_plugin_run(ID2P(LANG_ONPLAY_MENU_TITLE));
                 }
 
                 restore = true;
diff --git a/apps/gui/wps.h b/apps/gui/wps.h
index cd20c01656..36dc77e493 100644
--- a/apps/gui/wps.h
+++ b/apps/gui/wps.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c
index 827f5938b5..fefaaeda45 100644
--- a/apps/gui/yesno.c
+++ b/apps/gui/yesno.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
diff --git a/apps/gui/yesno.h b/apps/gui/yesno.h
index a6188f844b..8ce162dd77 100644
--- a/apps/gui/yesno.h
+++ b/apps/gui/yesno.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
diff --git a/apps/hosted/android/keyboard.c b/apps/hosted/android/keyboard.c
index f00a11ea6e..40f17cbc53 100644
--- a/apps/hosted/android/keyboard.c
+++ b/apps/hosted/android/keyboard.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *
diff --git a/apps/hosted/android/notification.c b/apps/hosted/android/notification.c
index a5b60c1013..234c874c7c 100644
--- a/apps/hosted/android/notification.c
+++ b/apps/hosted/android/notification.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/apps/hosted/android/notification.h b/apps/hosted/android/notification.h
index d182c7f8e7..c600c03b45 100644
--- a/apps/hosted/android/notification.h
+++ b/apps/hosted/android/notification.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/apps/hosted/android/yesno.c b/apps/hosted/android/yesno.c
index 4153865144..a40ec8dfee 100644
--- a/apps/hosted/android/yesno.c
+++ b/apps/hosted/android/yesno.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *
diff --git a/apps/iap/iap-core.c b/apps/iap/iap-core.c
index a9ed8c6c4b..0b4ad13477 100644
--- a/apps/iap/iap-core.c
+++ b/apps/iap/iap-core.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
@@ -374,6 +373,10 @@ static void iap_thread(void)
             case IAP_EV_TICK:
             {
                 iap_periodic();
+                /* pick up packets whose IAP_EV_MSG_RCVD event was lost
+                   to a queue overflow, they would otherwise sit in the
+                   RX buffer until the next packet arrives */
+                iap_handlepkt();
                 break;
             }
 
@@ -598,8 +601,12 @@ bool iap_getc(IF_IAP_MP(int port,) const unsigned char x)
     struct state_t *s = &frame_state;
     static long pkt_timeout;
 
+    /* Report "still hunting" while IAP is not set up yet, otherwise
+     * the serial driver would lock its autobaud detection onto the
+     * default bitrate before any real traffic was seen.
+     */
     if (!iap_setupflag)
-        return false;
+        return true;
 
     /* Check the time since the last packet arrived. */
     if ((s->state != ST_SYNC) && TIME_AFTER(current_tick, pkt_timeout)) {
@@ -686,6 +693,7 @@ bool iap_getc(IF_IAP_MP(int port,) const unsigned char x)
         s->check += x;
         if ((s->check & 0xFF) == 0) {
             /* done, received a valid frame */
+            iap_rxlen -= (s->len + 2);
             iap_rxpayload = iap_rxnext;
             queue_post(&iap_queue, IAP_EV_MSG_RCVD, 0);
         } else {
@@ -1288,53 +1296,63 @@ void iap_handlepkt(void)
     int length;
 
     if(!iap_setupflag) return;
+    if(!iap_running) return;
 
-    /* if we are waiting for a remote button to go out,
-       delay the handling of the new packet */
-    if(iap_repeatbtn)
-    {
-        queue_post(&iap_queue, IAP_EV_MSG_RCVD, 0);
-        sleep(1);
-        return;
-    }
-
-    /* handle command by mode */
-    length = get_u16(iap_rxstart);
-#if defined(LOGF_ENABLE) && defined(ROCKBOX_HAS_LOGF)
-    logf("R: %s", hexstring(iap_rxstart+2, (length)));
-#endif
-
-    if (length != 0) {
-        unsigned char mode = *(iap_rxstart+2);
-        switch (mode) {
-        case 0: iap_handlepkt_mode0(length, iap_rxstart+2); break;
-#ifdef HAVE_LINE_REC
-        case 1: iap_handlepkt_mode1(length, iap_rxstart+2); break;
-#endif
-        case 2: iap_handlepkt_mode2(length, iap_rxstart+2); break;
-        case 3: iap_handlepkt_mode3(length, iap_rxstart+2); break;
-        case 4: iap_handlepkt_mode4(length, iap_rxstart+2); break;
-        case 5: iap_handlepkt_mode5(length, iap_rxstart+2); break;
-#if CONFIG_TUNER
-        case 7: iap_handlepkt_mode7(length, iap_rxstart+2); break;
-#endif
-        }
-    }
-
-    /* Remove the handled packet from the RX buffer
-     * This needs to be done with interrupts disabled, to make
-     * sure the buffer and the pointers into it are handled
-     * cleanly
+    /* The number of queued IAP_EV_MSG_RCVD events does not reliably
+     * match the number of complete packets in the RX buffer, since
+     * the event queue can overflow during input bursts. Drain every
+     * complete packet instead, they occupy the buffer from
+     * iap_rxstart up to iap_rxpayload.
      */
-    level = disable_irq_save();
-    memmove(iap_rxstart, iap_rxstart+(length+2), (RX_BUFLEN+2)-(length+2));
-    iap_rxnext -= (length+2);
-    iap_rxpayload -= (length+2);
-    iap_rxlen += (length+2);
-    restore_irq(level);
+    while (iap_rxpayload != iap_rxstart)
+    {
+        /* if we are waiting for a remote button to go out,
+           delay the handling of the new packet */
+        if(iap_repeatbtn)
+        {
+            queue_post(&iap_queue, IAP_EV_MSG_RCVD, 0);
+            sleep(1);
+            return;
+        }
 
-    /* poke the poweroff timer */
-    reset_poweroff_timer();
+        /* handle command by mode */
+        length = get_u16(iap_rxstart);
+#if defined(LOGF_ENABLE) && defined(ROCKBOX_HAS_LOGF)
+        logf("R: %s", hexstring(iap_rxstart+2, (length)));
+#endif
+
+        if (length != 0) {
+            unsigned char mode = *(iap_rxstart+2);
+            switch (mode) {
+            case 0: iap_handlepkt_mode0(length, iap_rxstart+2); break;
+#ifdef HAVE_LINE_REC
+            case 1: iap_handlepkt_mode1(length, iap_rxstart+2); break;
+#endif
+            case 2: iap_handlepkt_mode2(length, iap_rxstart+2); break;
+            case 3: iap_handlepkt_mode3(length, iap_rxstart+2); break;
+            case 4: iap_handlepkt_mode4(length, iap_rxstart+2); break;
+            case 5: iap_handlepkt_mode5(length, iap_rxstart+2); break;
+#if CONFIG_TUNER
+            case 7: iap_handlepkt_mode7(length, iap_rxstart+2); break;
+#endif
+            }
+        }
+
+        /* Remove the handled packet from the RX buffer
+         * This needs to be done with interrupts disabled, to make
+         * sure the buffer and the pointers into it are handled
+         * cleanly
+         */
+        level = disable_irq_save();
+        memmove(iap_rxstart, iap_rxstart+(length+2), (RX_BUFLEN+2)-(length+2));
+        iap_rxnext -= (length+2);
+        iap_rxpayload -= (length+2);
+        iap_rxlen += (length+2);
+        restore_irq(level);
+
+        /* poke the poweroff timer */
+        reset_poweroff_timer();
+    }
 }
 
 int remote_control_rx(void)
diff --git a/apps/iap/iap-core.h b/apps/iap/iap-core.h
index b558e1cc0f..38a893374a 100644
--- a/apps/iap/iap-core.h
+++ b/apps/iap/iap-core.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
diff --git a/apps/iap/iap-lingo.h b/apps/iap/iap-lingo.h
index 982a62173f..1d357ec604 100644
--- a/apps/iap/iap-lingo.h
+++ b/apps/iap/iap-lingo.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
diff --git a/apps/iap/iap-lingo0.c b/apps/iap/iap-lingo0.c
index a0c74ce053..19ded8f5b7 100644
--- a/apps/iap/iap-lingo0.c
+++ b/apps/iap/iap-lingo0.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
diff --git a/apps/iap/iap-lingo1.c b/apps/iap/iap-lingo1.c
index 56c52d81ae..8d6013ada0 100644
--- a/apps/iap/iap-lingo1.c
+++ b/apps/iap/iap-lingo1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
diff --git a/apps/iap/iap-lingo2.c b/apps/iap/iap-lingo2.c
index 51f951c6d9..58c79504a5 100644
--- a/apps/iap/iap-lingo2.c
+++ b/apps/iap/iap-lingo2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
@@ -72,8 +71,15 @@ void iap_handlepkt_mode2(const unsigned int len, const unsigned char *buf)
      */
     CHECKLEN(3);
 
-    /* Lingo 0x02 must have been negotiated */
-    if (!DEVICE_LINGO_SUPPORTED(0x02)) {
+    /* Lingo 0x02 must have been negotiated, except for
+     * ContextButtonStatus (0x00): simple remotes like the Apple A1018
+     * identify only once at power-up. If the remote was already
+     * powered before Rockbox started (e.g. plugged in at boot) that
+     * identification is never seen, and rejecting the button events
+     * would leave the remote dead until it is replugged. The OF
+     * accepts these events without identification, so do the same.
+     */
+    if ((cmd != 0x00) && !DEVICE_LINGO_SUPPORTED(0x02)) {
         cmd_ack(cmd, IAP_ACK_BAD_PARAM);
         return;
     }
@@ -96,14 +102,13 @@ void iap_handlepkt_mode2(const unsigned int len, const unsigned char *buf)
          */
         case 0x00:
         {
-            iap_remotebtn = BUTTON_NONE;
-            iap_timeoutbtn = 0;
+            unsigned long btn = BUTTON_NONE;
 
             if(buf[2] != 0)
             {
                 if(buf[2] & 1)
                 {
-                    REMOTE_BUTTON(BUTTON_RC_PLAY);
+                    btn |= BUTTON_RC_PLAY;
 #if CONFIG_TUNER
                     if (radio_present == 1) {
                         if (remote_mute == 0) {
@@ -118,20 +123,20 @@ void iap_handlepkt_mode2(const unsigned int len, const unsigned char *buf)
 #endif
                 }
                 if(buf[2] & 2)
-                    REMOTE_BUTTON(BUTTON_RC_VOL_UP);
+                    btn |= BUTTON_RC_VOL_UP;
                 if(buf[2] & 4)
-                    REMOTE_BUTTON(BUTTON_RC_VOL_DOWN);
+                    btn |= BUTTON_RC_VOL_DOWN;
                 if(buf[2] & 8)
-                    REMOTE_BUTTON(BUTTON_RC_RIGHT);
+                    btn |= BUTTON_RC_RIGHT;
                 if(buf[2] & 16)
-                    REMOTE_BUTTON(BUTTON_RC_LEFT);
+                    btn |= BUTTON_RC_LEFT;
             }
             else if(len >= 4 && buf[3] != 0)
             {
                 if(buf[3] & 1) /* play */
                 {
                     if (audio_status() != AUDIO_STATUS_PLAY)
-                        REMOTE_BUTTON(BUTTON_RC_PLAY);
+                        btn |= BUTTON_RC_PLAY;
 #if CONFIG_TUNER
                     if (radio_present == 1) {
                         tuner_set(RADIO_MUTE,0);
@@ -141,7 +146,7 @@ void iap_handlepkt_mode2(const unsigned int len, const unsigned char *buf)
                 if(buf[3] & 2) /* pause */
                 {
                     if (audio_status() == AUDIO_STATUS_PLAY)
-                        REMOTE_BUTTON(BUTTON_RC_PLAY);
+                        btn |= BUTTON_RC_PLAY;
 #if CONFIG_TUNER
                     if (radio_present == 1) {
                         tuner_set(RADIO_MUTE,1);
@@ -180,24 +185,49 @@ void iap_handlepkt_mode2(const unsigned int len, const unsigned char *buf)
                 if (buf[4] & 0x04)
                 {
                     if (audio_status() == AUDIO_STATUS_PLAY)
-                        REMOTE_BUTTON(BUTTON_RC_PLAY);
+                        btn |= BUTTON_RC_PLAY;
                 }
 
                 if(buf[4] & 16) /* ffwd */
-                    REMOTE_BUTTON(BUTTON_RC_RIGHT);
+                    btn |= BUTTON_RC_RIGHT;
                 if(buf[4] & 32) /* frwd */
-                    REMOTE_BUTTON(BUTTON_RC_LEFT);
+                    btn |= BUTTON_RC_LEFT;
                 if(buf[4] & 64) /* menu */
-                    REMOTE_BUTTON(BUTTON_RC_MENU);
+                    btn |= BUTTON_RC_MENU;
                 if(buf[4] & 128) /* select */
-                    REMOTE_BUTTON(BUTTON_RC_SELECT);
+                    btn |= BUTTON_RC_SELECT;
             }
             else if(len >= 6 && buf[5] != 0)
             {
                 if(buf[5] & 1) /* up */
-                    REMOTE_BUTTON(BUTTON_RC_UP);
+                    btn |= BUTTON_RC_UP;
                 if (buf[5] & 2) /* down */
-                    REMOTE_BUTTON(BUTTON_RC_DOWN);
+                    btn |= BUTTON_RC_DOWN;
+            }
+
+            /* Commit the new button state in one go. The button driver
+             * reads iap_remotebtn from interrupt context, a transient
+             * BUTTON_NONE between two repeated button-down events would
+             * register as a spurious release/press pair.
+             */
+            if (btn != BUTTON_NONE)
+            {
+                /* Only re-arm iap_repeatbtn when the state changes. A
+                 * held button repeats its down event every 30-100ms,
+                 * re-arming on every repeat makes iap_handlepkt()
+                 * delay each following packet, so packets back up
+                 * during the hold and stale events replay as phantom
+                 * keypresses after the release.
+                 */
+                if (btn != iap_remotebtn)
+                    iap_repeatbtn = 2;
+                iap_remotebtn = btn;
+                iap_timeoutbtn = 3;
+            }
+            else
+            {
+                iap_remotebtn = BUTTON_NONE;
+                iap_timeoutbtn = 0;
             }
 
             /* power on released */
diff --git a/apps/iap/iap-lingo3.c b/apps/iap/iap-lingo3.c
index f1aeb1f64d..cd15ac0c2e 100644
--- a/apps/iap/iap-lingo3.c
+++ b/apps/iap/iap-lingo3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
diff --git a/apps/iap/iap-lingo4.c b/apps/iap/iap-lingo4.c
index f248f9734a..746d59f397 100644
--- a/apps/iap/iap-lingo4.c
+++ b/apps/iap/iap-lingo4.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
diff --git a/apps/iap/iap-lingo7.c b/apps/iap/iap-lingo7.c
index 467a81cc76..66e2093ba4 100644
--- a/apps/iap/iap-lingo7.c
+++ b/apps/iap/iap-lingo7.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
diff --git a/apps/keyboard.h b/apps/keyboard.h
index a2d497c28e..5322a33a6f 100644
--- a/apps/keyboard.h
+++ b/apps/keyboard.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/apps/keymaps/keymap-android.c b/apps/keymaps/keymap-android.c
index ea1abbc83a..b202c13bfc 100644
--- a/apps/keymaps/keymap-android.c
+++ b/apps/keymaps/keymap-android.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Maurus Cuelenaere
  *
diff --git a/apps/keymaps/keymap-c200.c b/apps/keymaps/keymap-c200.c
index 6ca1702e5f..77c5b18933 100644
--- a/apps/keymaps/keymap-c200.c
+++ b/apps/keymaps/keymap-c200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Mark Arigo
  *
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c
index 59ee080364..b542a26007 100644
--- a/apps/keymaps/keymap-clip.c
+++ b/apps/keymaps/keymap-clip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © Rafaël Carré 2008
  *
diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c
index 09d17120ef..5ca57216ff 100644
--- a/apps/keymaps/keymap-cowond2.c
+++ b/apps/keymaps/keymap-cowond2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Rob Purchase
  *
diff --git a/apps/keymaps/keymap-ctru.c b/apps/keymaps/keymap-ctru.c
index 0461d03192..76f5e132d6 100644
--- a/apps/keymaps/keymap-ctru.c
+++ b/apps/keymaps/keymap-ctru.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: keymap-ctru.c 28704 2025-07-09 11:28:53Z gama $
  *
  * Copyright (C) 2025 Mauricio Garrido
  *
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index 20cc16f2dc..060aa602d2 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Barry Wardell 2006
  *
diff --git a/apps/keymaps/keymap-echor1.c b/apps/keymaps/keymap-echor1.c
index ece596c22e..0ae0901017 100644
--- a/apps/keymaps/keymap-echor1.c
+++ b/apps/keymaps/keymap-echor1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Aidan MacDonald
  *
diff --git a/apps/keymaps/keymap-erosq.c b/apps/keymaps/keymap-erosq.c
index 50d91f8ce9..de9e15b23e 100644
--- a/apps/keymaps/keymap-erosq.c
+++ b/apps/keymaps/keymap-erosq.c
@@ -43,7 +43,7 @@ static const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_CANCEL,     BUTTON_BACK|BUTTON_REL,        BUTTON_BACK },
     { ACTION_STD_CONTEXT,    BUTTON_MENU|BUTTON_REPEAT,     BUTTON_MENU },
     { ACTION_STD_MENU,       BUTTON_MENU|BUTTON_REL,        BUTTON_MENU },
-    { ACTION_STD_KEYLOCK,    BUTTON_POWER|BUTTON_REL,       BUTTON_NONE },
+    { ACTION_STD_KEYLOCK,    BUTTON_POWER|BUTTON_REL,       BUTTON_POWER},
 
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
diff --git a/apps/keymaps/keymap-fiiom3k.c b/apps/keymaps/keymap-fiiom3k.c
index 355a87e78f..4322ce9b4d 100644
--- a/apps/keymaps/keymap-fiiom3k.c
+++ b/apps/keymaps/keymap-fiiom3k.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/apps/keymaps/keymap-fiiom3klinux.c b/apps/keymaps/keymap-fiiom3klinux.c
index 79a7687501..db0b304569 100644
--- a/apps/keymaps/keymap-fiiom3klinux.c
+++ b/apps/keymaps/keymap-fiiom3klinux.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2019 by Roman Stolyarov
  *
diff --git a/apps/keymaps/keymap-fuze.c b/apps/keymaps/keymap-fuze.c
index ef0bed1099..0bae6b9adb 100644
--- a/apps/keymaps/keymap-fuze.c
+++ b/apps/keymaps/keymap-fuze.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Thomas Martitz 2008
  * Copyright (C) Barry Wardell 2006
diff --git a/apps/keymaps/keymap-fuzeplus.c b/apps/keymaps/keymap-fuzeplus.c
index 052f11085e..cb9bed6a44 100644
--- a/apps/keymaps/keymap-fuzeplus.c
+++ b/apps/keymaps/keymap-fuzeplus.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © Amaury Pouly 2011
  *
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c
index 35cecb7476..4627045d20 100644
--- a/apps/keymaps/keymap-gigabeat-s.c
+++ b/apps/keymaps/keymap-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c
index 913763af18..e2a6bb601b 100644
--- a/apps/keymaps/keymap-gigabeat.c
+++ b/apps/keymaps/keymap-gigabeat.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index 7df2b61d05..567d0ec388 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Barry Wardell 2006
  *
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index b35c44b0f9..2aed9fa2a1 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/keymaps/keymap-hdd1630.c b/apps/keymaps/keymap-hdd1630.c
index 7afcaeec6d..a6722581ac 100644
--- a/apps/keymaps/keymap-hdd1630.c
+++ b/apps/keymaps/keymap-hdd1630.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Mark Arigo
  *
diff --git a/apps/keymaps/keymap-hdd6330.c b/apps/keymaps/keymap-hdd6330.c
index 18ef2b7c8f..a9ea52389b 100644
--- a/apps/keymaps/keymap-hdd6330.c
+++ b/apps/keymaps/keymap-hdd6330.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Mark Arigo
  *
diff --git a/apps/keymaps/keymap-hm60x.c b/apps/keymaps/keymap-hm60x.c
index fa8783de6d..82979c3313 100644
--- a/apps/keymaps/keymap-hm60x.c
+++ b/apps/keymaps/keymap-hm60x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Andrew Ryabinin
  *
diff --git a/apps/keymaps/keymap-hm801.c b/apps/keymaps/keymap-hm801.c
index 210f521178..d1a05a4399 100644
--- a/apps/keymaps/keymap-hm801.c
+++ b/apps/keymaps/keymap-hm801.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Andrew Ryabinin
  *
diff --git a/apps/keymaps/keymap-ihifi.c b/apps/keymaps/keymap-ihifi.c
index 0c28f812f1..7a2b89f7cd 100644
--- a/apps/keymaps/keymap-ihifi.c
+++ b/apps/keymaps/keymap-ihifi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/apps/keymaps/keymap-ihifi770.c b/apps/keymaps/keymap-ihifi770.c
index a5f37cdb7d..80ab0402c7 100644
--- a/apps/keymaps/keymap-ihifi770.c
+++ b/apps/keymaps/keymap-ihifi770.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/apps/keymaps/keymap-ihifi800.c b/apps/keymaps/keymap-ihifi800.c
index 4dfceff965..9642a9f16f 100644
--- a/apps/keymaps/keymap-ihifi800.c
+++ b/apps/keymaps/keymap-ihifi800.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index f074026e60..787d930468 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/keymaps/keymap-m200.c b/apps/keymaps/keymap-m200.c
index be202d21e6..5cf203f565 100644
--- a/apps/keymaps/keymap-m200.c
+++ b/apps/keymaps/keymap-m200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Mark Arigo
  *
diff --git a/apps/keymaps/keymap-m3.c b/apps/keymaps/keymap-m3.c
index bcd96d664b..c3d7fdd56f 100644
--- a/apps/keymaps/keymap-m3.c
+++ b/apps/keymaps/keymap-m3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Jens Arnold
  *
diff --git a/apps/keymaps/keymap-ma.c b/apps/keymaps/keymap-ma.c
index aca006d071..9534626b36 100644
--- a/apps/keymaps/keymap-ma.c
+++ b/apps/keymaps/keymap-ma.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/apps/keymaps/keymap-mpio-hd200.c b/apps/keymaps/keymap-mpio-hd200.c
index 019d4bfac4..86c2594749 100644
--- a/apps/keymaps/keymap-mpio-hd200.c
+++ b/apps/keymaps/keymap-mpio-hd200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/apps/keymaps/keymap-mpio-hd300.c b/apps/keymaps/keymap-mpio-hd300.c
index 7941d1704b..4aa3236934 100644
--- a/apps/keymaps/keymap-mpio-hd300.c
+++ b/apps/keymaps/keymap-mpio-hd300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c
index 0a677efc00..ecb6210f9a 100644
--- a/apps/keymaps/keymap-mr100.c
+++ b/apps/keymaps/keymap-mr100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Mark Arigo
  *
diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c
index 41e6d21827..2c7cc22829 100644
--- a/apps/keymaps/keymap-mr500.c
+++ b/apps/keymaps/keymap-mr500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/keymaps/keymap-newtarget.c b/apps/keymaps/keymap-newtarget.c
index 6c09184931..f9af353e67 100644
--- a/apps/keymaps/keymap-newtarget.c
+++ b/apps/keymaps/keymap-newtarget.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 200
  *
diff --git a/apps/keymaps/keymap-nwz.c b/apps/keymaps/keymap-nwz.c
index 36675566d3..051bb5c428 100644
--- a/apps/keymaps/keymap-nwz.c
+++ b/apps/keymaps/keymap-nwz.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © Amaury Pouly 2013
  *
diff --git a/apps/keymaps/keymap-nwza860.c b/apps/keymaps/keymap-nwza860.c
index 899796552e..0f729a3069 100644
--- a/apps/keymaps/keymap-nwza860.c
+++ b/apps/keymaps/keymap-nwza860.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © Amaury Pouly 2017
  *
diff --git a/apps/keymaps/keymap-ondavx747.c b/apps/keymaps/keymap-ondavx747.c
index 508d86d6eb..d6e0176d9f 100644
--- a/apps/keymaps/keymap-ondavx747.c
+++ b/apps/keymaps/keymap-ondavx747.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/apps/keymaps/keymap-ondavx767.c b/apps/keymaps/keymap-ondavx767.c
index 7dd7435348..dafa467860 100644
--- a/apps/keymaps/keymap-ondavx767.c
+++ b/apps/keymaps/keymap-ondavx767.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/apps/keymaps/keymap-ondavx777.c b/apps/keymaps/keymap-ondavx777.c
index c4b68f1ef2..4eccbde7d7 100644
--- a/apps/keymaps/keymap-ondavx777.c
+++ b/apps/keymaps/keymap-ondavx777.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/apps/keymaps/keymap-rgnano.c b/apps/keymaps/keymap-rgnano.c
index 6ed71bccb1..c142707fb8 100644
--- a/apps/keymaps/keymap-rgnano.c
+++ b/apps/keymaps/keymap-rgnano.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Hairo R. Carela
  *
diff --git a/apps/keymaps/keymap-rk27xx-generic.c b/apps/keymaps/keymap-rk27xx-generic.c
index 4c07384810..b25dade212 100644
--- a/apps/keymaps/keymap-rk27xx-generic.c
+++ b/apps/keymaps/keymap-rk27xx-generic.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Marcin Bukat
  *
diff --git a/apps/keymaps/keymap-sa9200.c b/apps/keymaps/keymap-sa9200.c
index 2dcf301f0f..b2c3cac946 100644
--- a/apps/keymaps/keymap-sa9200.c
+++ b/apps/keymaps/keymap-sa9200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/keymaps/keymap-sansa-connect.c b/apps/keymaps/keymap-sansa-connect.c
index b339744b0f..7976f2a40f 100644
--- a/apps/keymaps/keymap-sansa-connect.c
+++ b/apps/keymaps/keymap-sansa-connect.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/apps/keymaps/keymap-sdl.c b/apps/keymaps/keymap-sdl.c
index ce10c5cf17..35636c0a6a 100644
--- a/apps/keymaps/keymap-sdl.c
+++ b/apps/keymaps/keymap-sdl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Maurus Cuelenaere
  *
diff --git a/apps/keymaps/keymap-shanlingq1.c b/apps/keymaps/keymap-shanlingq1.c
index f8fefe5ff3..ad60ac5037 100644
--- a/apps/keymaps/keymap-shanlingq1.c
+++ b/apps/keymaps/keymap-shanlingq1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c
index 07710be78d..f1d6486bd3 100644
--- a/apps/keymaps/keymap-touchscreen.c
+++ b/apps/keymaps/keymap-touchscreen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/keymaps/keymap-vibe500.c b/apps/keymaps/keymap-vibe500.c
index 5116ec8575..8209ef5fd0 100644
--- a/apps/keymaps/keymap-vibe500.c
+++ b/apps/keymaps/keymap-vibe500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Szymon Dziok
  *
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index 249df7bf3c..78cf4d374b 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/keymaps/keymap-xduoox20.c b/apps/keymaps/keymap-xduoox20.c
index fa4076e27d..35d3e964bf 100644
--- a/apps/keymaps/keymap-xduoox20.c
+++ b/apps/keymaps/keymap-xduoox20.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2018 by Roman Stolyarov
  *
diff --git a/apps/keymaps/keymap-xduoox3.c b/apps/keymaps/keymap-xduoox3.c
index bf588411eb..0cd56f63af 100644
--- a/apps/keymaps/keymap-xduoox3.c
+++ b/apps/keymaps/keymap-xduoox3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/apps/keymaps/keymap-xduoox3ii.c b/apps/keymaps/keymap-xduoox3ii.c
index c8724ec1f0..69d848180a 100644
--- a/apps/keymaps/keymap-xduoox3ii.c
+++ b/apps/keymaps/keymap-xduoox3ii.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2018 by Roman Stolyarov
  *
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c
index 9332c9fe98..d593b252b1 100644
--- a/apps/keymaps/keymap-yh8xx_yh9xx.c
+++ b/apps/keymaps/keymap-yh8xx_yh9xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/keymaps/keymap-ypr0.c b/apps/keymaps/keymap-ypr0.c
index 6e493ddf61..099bc5a338 100644
--- a/apps/keymaps/keymap-ypr0.c
+++ b/apps/keymaps/keymap-ypr0.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: keymap-sdl.c 28704 2010-11-29 11:28:53Z teru $
  *
  * Copyright (C) 2011 Lorenzo Miori
  *
diff --git a/apps/keymaps/keymap-ypr1.c b/apps/keymaps/keymap-ypr1.c
index 64a9399a73..12f268ad90 100644
--- a/apps/keymaps/keymap-ypr1.c
+++ b/apps/keymaps/keymap-ypr1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: keymap-sdl.c 28704 2010-11-29 11:28:53Z teru $
  *
  * Copyright (C) 2013 Lorenzo Miori
  *
diff --git a/apps/keymaps/keymap-zen.c b/apps/keymaps/keymap-zen.c
index b4d709bfb6..a0356e093b 100644
--- a/apps/keymaps/keymap-zen.c
+++ b/apps/keymaps/keymap-zen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © Amaury Pouly 2013
  *
diff --git a/apps/keymaps/keymap-zenv.c b/apps/keymaps/keymap-zenv.c
index 7853a26f1d..183d5f7adb 100644
--- a/apps/keymaps/keymap-zenv.c
+++ b/apps/keymaps/keymap-zenv.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © Amaury Pouly 2013
  *
diff --git a/apps/keymaps/keymap-zenxfi2.c b/apps/keymaps/keymap-zenxfi2.c
index ba25592246..416be11bad 100644
--- a/apps/keymaps/keymap-zenxfi2.c
+++ b/apps/keymaps/keymap-zenxfi2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/apps/keymaps/keymap-zenxfi3.c b/apps/keymaps/keymap-zenxfi3.c
index d19a407b78..56928300bb 100644
--- a/apps/keymaps/keymap-zenxfi3.c
+++ b/apps/keymaps/keymap-zenxfi3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/apps/lang/arabic.lang b/apps/lang/arabic.lang
index d8e8bf0e04..53313bf624 100644
--- a/apps/lang/arabic.lang
+++ b/apps/lang/arabic.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/basque.lang b/apps/lang/basque.lang
index 44d62202bf..8b8acc7cb8 100644
--- a/apps/lang/basque.lang
+++ b/apps/lang/basque.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index 8f859fc112..f0d165cceb 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -14943,20 +14942,6 @@
     *: "Не е плъгин"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
-  desc: open plugin module
-  user: core
-  <source>
-    *: "Set WPS Context Plugin"
-  </source>
-  <dest>
-    *: "Избери плъгин за WPS контекст"
-  </dest>
-  <voice>
-    *: "Избери плъгин за WPS контекст"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PARAMETER
   desc:
@@ -15806,16 +15791,16 @@
 </phrase>
 <phrase>
   id: LANG_DEFAULT_BROWSER
-  desc: in Settings
+  desc: deprecated
   user: core
   <source>
-    *: "Default Browser"
+    *: ""
   </source>
   <dest>
-    *: "Браузър по подразбиране"
+    *: ""
   </dest>
   <voice>
-    *: "Браузър по подразбиране"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -16990,3 +16975,255 @@
     *: "Ю Ес Би"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
+  user: core
+  <source>
+    *: "Set Context Item"
+  </source>
+  <dest>
+    *: "Избери елемент за контекст"
+  </dest>
+  <voice>
+    *: "Избери елемент за контекст"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILE_NOT_FOUND
+  desc: When file does not exist
+  user: core
+  <source>
+    *: "File not found"
+  </source>
+  <dest>
+    *: "Не е намерен файл"
+  </dest>
+  <voice>
+    *: "Не е намерен файл"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_IN_FILES
+  desc: Reveal item in File Browser
+  user: core
+  <source>
+    *: "Show in Files"
+  </source>
+  <dest>
+    *: "Покажи във файлов мениджър"
+  </dest>
+  <voice>
+    *: "Покажи във файлов мениджър"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANNEL_SWAP
+  desc: in sound_settings
+  user: core
+  <source>
+    *: "Swap Left & Right"
+  </source>
+  <dest>
+    *: "Размяна на ляво/дясно"
+  </dest>
+  <voice>
+    *: "Размяна на ляво и дясно"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_SET
+  desc: countdown_timer plugin - header shown on the setup screen where the user enters the countdown duration
+  user: core
+  <source>
+    *: "SET TIMER"
+  </source>
+  <dest>
+    *: "НАСТРОЙКА ТАЙМЕР"
+  </dest>
+  <voice>
+    *: "Настройка таймер"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_RUNNING
+  desc: countdown_timer plugin - status label shown while the countdown is active
+  user: core
+  <source>
+    *: "RUNNING"
+  </source>
+  <dest>
+    *: "АКТИВЕН"
+  </dest>
+  <voice>
+    *: "Активен"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_PAUSED
+  desc: countdown_timer plugin - status label shown while the countdown is paused
+  user: core
+  <source>
+    *: "PAUSED"
+  </source>
+  <dest>
+    *: "ПАУЗА"
+  </dest>
+  <voice>
+    *: "Пауза"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_OVERTIME
+  desc: countdown_timer plugin - status label shown when the countdown has passed zero and is counting up
+  user: core
+  <source>
+    *: "OVERTIME"
+  </source>
+  <dest>
+    *: "ИЗВЪНРЕДНО"
+  </dest>
+  <voice>
+    *: "Извънредно"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_FINISHED
+  desc: countdown_timer plugin - status label shown at the moment the countdown expires
+  user: core
+  <source>
+    *: "FINISHED"
+  </source>
+  <dest>
+    *: "ЗАВЪРШЕН"
+  </dest>
+  <voice>
+    *: "Завършен"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
+  user: core
+  <source>
+    *: "Set Context Item"
+  </source>
+  <dest>
+    *: "Избери елемент за контекст"
+  </dest>
+  <voice>
+    *: "Избери елемент за контекст"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILE_NOT_FOUND
+  desc: When file does not exist
+  user: core
+  <source>
+    *: "File not found"
+  </source>
+  <dest>
+    *: "Не е намерен файл"
+  </dest>
+  <voice>
+    *: "Не е намерен файл"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_IN_FILES
+  desc: Reveal item in File Browser
+  user: core
+  <source>
+    *: "Show in Files"
+  </source>
+  <dest>
+    *: "Покажи във файлов мениджър"
+  </dest>
+  <voice>
+    *: "Покажи във файлов мениджър"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANNEL_SWAP
+  desc: in sound_settings
+  user: core
+  <source>
+    *: "Swap Left & Right"
+  </source>
+  <dest>
+    *: "Размяна на ляво/дясно"
+  </dest>
+  <voice>
+    *: "Размяна на ляво и дясно"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_SET
+  desc: countdown_timer plugin - header shown on the setup screen where the user enters the countdown duration
+  user: core
+  <source>
+    *: "SET TIMER"
+  </source>
+  <dest>
+    *: "НАСТРОЙКА ТАЙМЕР"
+  </dest>
+  <voice>
+    *: "Настройка таймер"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_RUNNING
+  desc: countdown_timer plugin - status label shown while the countdown is active
+  user: core
+  <source>
+    *: "RUNNING"
+  </source>
+  <dest>
+    *: "АКТИВЕН"
+  </dest>
+  <voice>
+    *: "Активен"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_PAUSED
+  desc: countdown_timer plugin - status label shown while the countdown is paused
+  user: core
+  <source>
+    *: "PAUSED"
+  </source>
+  <dest>
+    *: "ПАУЗА"
+  </dest>
+  <voice>
+    *: "Пауза"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_OVERTIME
+  desc: countdown_timer plugin - status label shown when the countdown has passed zero and is counting up
+  user: core
+  <source>
+    *: "OVERTIME"
+  </source>
+  <dest>
+    *: "ИЗВЪНРЕДНО"
+  </dest>
+  <voice>
+    *: "Извънредно"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_FINISHED
+  desc: countdown_timer plugin - status label shown at the moment the countdown expires
+  user: core
+  <source>
+    *: "FINISHED"
+  </source>
+  <dest>
+    *: "ЗАВЪРШЕН"
+  </dest>
+  <voice>
+    *: "Завършен"
+  </voice>
+</phrase>
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index dbc9aa17ed..3d046e9351 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index e714f0c713..85437f0223 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -3,7 +3,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -14948,20 +14947,6 @@
     *: "不是插件"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
-  desc: open plugin module
-  user: core
-  <source>
-    *: "Set WPS Context Plugin"
-  </source>
-  <dest>
-    *: "设置播放屏幕上下文插件"
-  </dest>
-  <voice>
-    *: "设置播放屏幕上下文插件"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PARAMETER
   desc:
@@ -17107,3 +17092,17 @@
     *: "完成"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
+  user: core
+  <source>
+    *: "Set Context Item"
+  </source>
+  <dest>
+    *: "设置上下文项目"
+  </dest>
+  <voice>
+    *: "设置上下文项目"
+  </voice>
+</phrase>
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index cc7eca6ab4..2ffee1e338 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -3,7 +3,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index 90a4246006..170b57de93 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index a0fbcacdd0..cac98f22db 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 28c3529a3b..5ba440c881 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -14959,20 +14959,6 @@
     *: "Kein Zusatzprogramm"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
-  desc: open plugin module
-  user: core
-  <source>
-    *: "Set WPS Context Plugin"
-  </source>
-  <dest>
-    *: "Setze WPS Kontext Zusatzprogramm"
-  </dest>
-  <voice>
-    *: "Setze W P S Kontext Zusatzprogramm"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PARAMETER
   desc:
@@ -17118,3 +17104,17 @@
     *: "Beendet"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
+  user: core
+  <source>
+    *: "Set Context Item"
+  </source>
+  <dest>
+    *: "Kontext-Element festlegen"
+  </dest>
+  <voice>
+    *: "Kontextelement festlegen"
+  </voice>
+</phrase>
diff --git a/apps/lang/eesti.lang b/apps/lang/eesti.lang
index 84442366a9..f1eb655849 100644
--- a/apps/lang/eesti.lang
+++ b/apps/lang/eesti.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang
index 1a5a3ca496..f2ca369671 100644
--- a/apps/lang/english-us.lang
+++ b/apps/lang/english-us.lang
@@ -14937,20 +14937,6 @@
     *: "Not a plugin"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
-  desc: open plugin module
-  user: core
-  <source>
-    *: "Set WPS Context Plugin"
-  </source>
-  <dest>
-    *: "Set WPS Context Plugin"
-  </dest>
-  <voice>
-    *: "Set WPS Context Plugin"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PARAMETER
   desc:
@@ -17096,3 +17082,17 @@
     *: "Swap Left & Right"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
+  user: core
+  <source>
+    *: "Set Context Item"
+  </source>
+  <dest>
+    *: "Set Context Item"
+  </dest>
+  <voice>
+    *: "Set Context Item"
+  </voice>
+</phrase>
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 8e0523a42b..6ed795f602 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -15205,17 +15205,17 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
-  desc: open plugin module
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
   user: core
   <source>
-    *: "Set WPS Context Plugin"
+    *: "Set Context Item"
   </source>
   <dest>
-    *: "Set WPS Context Plugin"
+    *: "Set Context Item"
   </dest>
   <voice>
-    *: "Set WPS Context Plugin"
+    *: "Set Context Item"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 14dd2db561..6dffa08c33 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang
index 529e671577..521edc62f9 100644
--- a/apps/lang/esperanto.lang
+++ b/apps/lang/esperanto.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index 5476e09018..9e709b570f 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 7b92309fe9..2b16347de9 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang
index c7b2a62db7..cfff98cd5d 100644
--- a/apps/lang/galego.lang
+++ b/apps/lang/galego.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 9bd20f3636..8b22e8174a 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index b49104adb0..c8be3cf297 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/hindi.lang b/apps/lang/hindi.lang
index af50e8655a..6c4e38d397 100644
--- a/apps/lang/hindi.lang
+++ b/apps/lang/hindi.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/hrvatski.lang b/apps/lang/hrvatski.lang
index 55b8d1beeb..83c466561b 100644
--- a/apps/lang/hrvatski.lang
+++ b/apps/lang/hrvatski.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang
index 47bd005af3..83a1478254 100644
--- a/apps/lang/islenska.lang
+++ b/apps/lang/islenska.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 6d83d3f61e..2746eab39c 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -14666,20 +14665,6 @@
     *: "Non è un plugin"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
-  desc: open plugin module
-  user: core
-  <source>
-    *: "Set WPS Context Plugin"
-  </source>
-  <dest>
-    *: "Imposta un Plugin Contestuale per WPS"
-  </dest>
-  <voice>
-    *: "Imposta un Plugin Contestuale per WPS"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PARAMETER
   desc:
@@ -17100,3 +17085,17 @@
     *: "Terminato"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
+  user: core
+  <source>
+    *: "Set Context Item"
+  </source>
+  <dest>
+    *: "Imposta Elemento Contestuale"
+  </dest>
+  <voice>
+    *: "Imposta Elemento Contestuale"
+  </voice>
+</phrase>
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index aaf46fa501..b080759121 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index b73c5a4280..8b11ae3e34 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -14955,20 +14954,6 @@
     *: "플러그인 아님"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
-  desc: open plugin module
-  user: core
-  <source>
-    *: "Set WPS Context Plugin"
-  </source>
-  <dest>
-    *: "재생 중 화면 컨텍스트 플러그인 설정"
-  </dest>
-  <voice>
-    *: "재생 중 화면 컨텍스트 플러그인 설정"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PARAMETER
   desc:
@@ -17114,3 +17099,17 @@
     *: "완료"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
+  user: core
+  <source>
+    *: "Set Context Item"
+  </source>
+  <dest>
+    *: "컨텍스트 항목 설정"
+  </dest>
+  <voice>
+    *: "컨텍스트 항목 설정"
+  </voice>
+</phrase>
diff --git a/apps/lang/lang.make b/apps/lang/lang.make
index bae19aad85..2952ac5aef 100644
--- a/apps/lang/lang.make
+++ b/apps/lang/lang.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 LANGS := $(call preprocess, $(APPSDIR)/lang/SOURCES)
diff --git a/apps/lang/latviesu.lang b/apps/lang/latviesu.lang
index 0d65d484fa..ab4c8dccd8 100644
--- a/apps/lang/latviesu.lang
+++ b/apps/lang/latviesu.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -15052,20 +15051,6 @@
     *: "Nav spraudnis"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
-  desc: open plugin module
-  user: core
-  <source>
-    *: "Set WPS Context Plugin"
-  </source>
-  <dest>
-    *: "Uzstādīt atskaņotāja konteksta spraudni"
-  </dest>
-  <voice>
-    *: "Uzstādīt atskaņotāja konteksta spraudni"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PARAMETER
   desc:
@@ -17099,3 +17084,17 @@
     *: "Beidzies"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
+  user: core
+  <source>
+    *: "Set Context Item"
+  </source>
+  <dest>
+    *: "Iestatīt konteksta vienumu"
+  </dest>
+  <voice>
+    *: "Iestatīt konteksta vienumu"
+  </voice>
+</phrase>
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index 5423cb6ba7..d96f0305c3 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index edac063a7e..6383dc0480 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/moldoveneste.lang b/apps/lang/moldoveneste.lang
index e1db7daf9d..4c8b371ff3 100644
--- a/apps/lang/moldoveneste.lang
+++ b/apps/lang/moldoveneste.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -15058,20 +15057,6 @@
     *: "Nu este un plaghin"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
-  desc: open plugin module
-  user: core
-  <source>
-    *: "Set WPS Context Plugin"
-  </source>
-  <dest>
-    *: "Alege plugin implicit"
-  </dest>
-  <voice>
-    *: "Alege plaghin implicit"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PARAMETER
   desc:
@@ -15921,16 +15906,16 @@
 </phrase>
 <phrase>
   id: LANG_DEFAULT_BROWSER
-  desc: in Settings
+  desc: deprecated
   user: core
   <source>
-    *: "Default Browser"
+    *: ""
   </source>
   <dest>
-    *: "Navigator implicit"
+    *: ""
   </dest>
   <voice>
-    *: "Navigator implicit"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -16993,3 +16978,129 @@
     *: "u se be"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_FILE_NOT_FOUND
+  desc: When file does not exist
+  user: core
+  <source>
+    *: "File not found"
+  </source>
+  <dest>
+    *: "Fișierul nu a fost găsit"
+  </dest>
+  <voice>
+    *: "Fișierul nu a fost găsit"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_IN_FILES
+  desc: Reveal item in File Browser
+  user: core
+  <source>
+    *: "Show in Files"
+  </source>
+  <dest>
+    *: "Arată în fișiere"
+  </dest>
+  <voice>
+    *: "Arată în fișiere"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANNEL_SWAP
+  desc: in sound_settings
+  user: core
+  <source>
+    *: "Swap Left & Right"
+  </source>
+  <dest>
+    *: "Interschimbă stînga cu dreapta"
+  </dest>
+  <voice>
+    *: "Interschimbă stînga cu dreapta"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_SET
+  desc: countdown_timer plugin - header shown on the setup screen where the user enters the countdown duration
+  user: core
+  <source>
+    *: "SET TIMER"
+  </source>
+  <dest>
+    *: "SETEAZĂ TEMPORIZATOR"
+  </dest>
+  <voice>
+    *: "Setează temporizator"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_RUNNING
+  desc: countdown_timer plugin - status label shown while the countdown is active
+  user: core
+  <source>
+    *: "RUNNING"
+  </source>
+  <dest>
+    *: "RULEAZĂ"
+  </dest>
+  <voice>
+    *: "Rulează"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_PAUSED
+  desc: countdown_timer plugin - status label shown while the countdown is paused
+  user: core
+  <source>
+    *: "PAUSED"
+  </source>
+  <dest>
+    *: "ÎNTRERUPT"
+  </dest>
+  <voice>
+    *: "Întrerupt"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_OVERTIME
+  desc: countdown_timer plugin - status label shown when the countdown has passed zero and is counting up
+  user: core
+  <source>
+    *: "OVERTIME"
+  </source>
+  <dest>
+    *: "TIMP DEPĂȘIT"
+  </dest>
+  <voice>
+    *: "Timp depășit"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_FINISHED
+  desc: countdown_timer plugin - status label shown at the moment the countdown expires
+  user: core
+  <source>
+    *: "FINISHED"
+  </source>
+  <dest>
+    *: "FINALIZAT"
+  </dest>
+  <voice>
+    *: "Finalizat"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
+  user: core
+  <source>
+    *: "Set Context Item"
+  </source>
+  <dest>
+    *: "Setează element context"
+  </dest>
+  <voice>
+    *: "Setează element context"
+  </voice>
+</phrase>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index d722854d22..aea94e33ae 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index eee67b9be8..be6540c498 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index 4d93cce360..c5e6503fcf 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index 726e5b8661..2ed705ffd6 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -14672,20 +14672,6 @@
     *: "To nie jest wtyczka"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
-  desc: open plugin module
-  user: core
-  <source>
-    *: "Set WPS Context Plugin"
-  </source>
-  <dest>
-    *: "Ustaw wtyczkę kontekstową WPS"
-  </dest>
-  <voice>
-    *: "Ustaw wtyczkę kontekstową WPS"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PARAMETER
   desc:
@@ -17106,3 +17092,17 @@
     *: "Ukończono"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
+  user: core
+  <source>
+    *: "Set Context Item"
+  </source>
+  <dest>
+    *: "Ustaw element kontekstowy"
+  </dest>
+  <voice>
+    *: "Ustaw element kontekstowy"
+  </voice>
+</phrase>
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 71dc258233..42ba9cbbe3 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index de7d4ae241..c76da1116e 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index a2bf35136b..dbae60f9ba 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -15058,20 +15057,6 @@
     *: "Nu este un plaghin"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
-  desc: open plugin module
-  user: core
-  <source>
-    *: "Set WPS Context Plugin"
-  </source>
-  <dest>
-    *: "Alege plugin implicit"
-  </dest>
-  <voice>
-    *: "Alege plaghin implicit"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PARAMETER
   desc:
@@ -15921,16 +15906,16 @@
 </phrase>
 <phrase>
   id: LANG_DEFAULT_BROWSER
-  desc: in Settings
+  desc: deprecated
   user: core
   <source>
-    *: "Default Browser"
+    *: ""
   </source>
   <dest>
-    *: "Navigator implicit"
+    *: ""
   </dest>
   <voice>
-    *: "Navigator implicit"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -16993,3 +16978,129 @@
     *: "u se be"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_FILE_NOT_FOUND
+  desc: When file does not exist
+  user: core
+  <source>
+    *: "File not found"
+  </source>
+  <dest>
+    *: "Fișierul nu a fost găsit"
+  </dest>
+  <voice>
+    *: "Fișierul nu a fost găsit"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_IN_FILES
+  desc: Reveal item in File Browser
+  user: core
+  <source>
+    *: "Show in Files"
+  </source>
+  <dest>
+    *: "Arată în fișiere"
+  </dest>
+  <voice>
+    *: "Arată în fișiere"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANNEL_SWAP
+  desc: in sound_settings
+  user: core
+  <source>
+    *: "Swap Left & Right"
+  </source>
+  <dest>
+    *: "SETEAZĂ TEMPORIZATOR"
+  </dest>
+  <voice>
+    *: "Interschimbă stânga cu dreapta"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_SET
+  desc: countdown_timer plugin - header shown on the setup screen where the user enters the countdown duration
+  user: core
+  <source>
+    *: "SET TIMER"
+  </source>
+  <dest>
+    *: "SETEAZĂ TEMPORIZATOR"
+  </dest>
+  <voice>
+    *: "Setează temporizator"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_RUNNING
+  desc: countdown_timer plugin - status label shown while the countdown is active
+  user: core
+  <source>
+    *: "RUNNING"
+  </source>
+  <dest>
+    *: "RULEAZĂ"
+  </dest>
+  <voice>
+    *: "Rulează"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_PAUSED
+  desc: countdown_timer plugin - status label shown while the countdown is paused
+  user: core
+  <source>
+    *: "PAUSED"
+  </source>
+  <dest>
+    *: "ÎNTRERUPT"
+  </dest>
+  <voice>
+    *: "Întrerupt"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_OVERTIME
+  desc: countdown_timer plugin - status label shown when the countdown has passed zero and is counting up
+  user: core
+  <source>
+    *: "OVERTIME"
+  </source>
+  <dest>
+    *: "TIMP DEPĂȘIT"
+  </dest>
+  <voice>
+    *: "Timp depășit"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COUNTDOWN_TIMER_FINISHED
+  desc: countdown_timer plugin - status label shown at the moment the countdown expires
+  user: core
+  <source>
+    *: "FINISHED"
+  </source>
+  <dest>
+    *: "FINALIZAT"
+  </dest>
+  <voice>
+    *: "Finalizat"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
+  user: core
+  <source>
+    *: "Set Context Item"
+  </source>
+  <dest>
+    *: "Setează element context"
+  </dest>
+  <voice>
+    *: "Setează element context"
+  </voice>
+</phrase>
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index 097a344887..77020f4191 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -14941,20 +14940,6 @@
     *: "Nie je zásuvný modul"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
-  desc: open plugin module
-  user: core
-  <source>
-    *: "Set WPS Context Plugin"
-  </source>
-  <dest>
-    *: "Nastaviť zásuvný modul pre kontext Obrazovky teraz hrá"
-  </dest>
-  <voice>
-    *: "Nastaviť zásuvný modul pre kontext Obrazovky teraz hrá"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PARAMETER
   desc:
@@ -17100,3 +17085,17 @@
     *: "Ukončený"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SET_CONTEXT_ITEM
+  desc: WPS context item
+  user: core
+  <source>
+    *: "Set Context Item"
+  </source>
+  <dest>
+    *: "Nastaviť kontextovú položku"
+  </dest>
+  <voice>
+    *: "Nastaviť kontextovú položku"
+  </voice>
+</phrase>
diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang
index 1f88f15c2d..c624687ec1 100644
--- a/apps/lang/slovenscina.lang
+++ b/apps/lang/slovenscina.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index 1044e3f32b..96ff7347a6 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index e6ccf91194..dc68d41792 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index b259c86da6..9b098636e0 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index bcd4505eab..e7f5f137d8 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index 68ef3f100c..6daad2e8cb 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index 507ce32de2..c4db36cd31 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id: ukrainian.lang 21788 2009-07-16 07:00:00Z amiconn $
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/vietnamese.lang b/apps/lang/vietnamese.lang
index d794a4e2be..ea8190f9f5 100644
--- a/apps/lang/vietnamese.lang
+++ b/apps/lang/vietnamese.lang
@@ -3,7 +3,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/vlaams.lang b/apps/lang/vlaams.lang
index 9993c6b54d..1f19cddf6f 100644
--- a/apps/lang/vlaams.lang
+++ b/apps/lang/vlaams.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index b9d440ee63..231f45ad22 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/apps/language.c b/apps/language.c
index 112a25957c..096c708e62 100644
--- a/apps/language.c
+++ b/apps/language.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Daniel Stenberg
  *
@@ -147,6 +146,25 @@ int lang_english_to_id(const char *english)
     return -1;
 }
 
+const char * lang_id_to_english(int lang_id)
+{
+    int i;
+    unsigned char *ptr = (unsigned char *) core_language_builtin;
+
+    if (lang_id >= 0 && lang_id < LANG_LAST_INDEX_IN_ARRAY)
+    {
+        if (language_strings[0] == ptr) /* already in english */
+            return str(lang_id);
+
+        for (i = 0; i < LANG_LAST_INDEX_IN_ARRAY; i++) {
+            if (i == lang_id)
+                return ptr;
+            ptr += strlen((char *)ptr) + 1; /* advance pointer to next string */
+        }
+    }
+    return ""; /* Not found */
+}
+
 int lang_is_rtl(void)
 {
     return (lang_options & LANGUAGE_FLAG_RTL) != 0;
diff --git a/apps/language.h b/apps/language.h
index 85fa7f6efa..7f15bb80e4 100644
--- a/apps/language.h
+++ b/apps/language.h
@@ -7,7 +7,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002, 2008 Daniel Stenberg
  *
@@ -34,6 +33,8 @@ int lang_load(const char *filename, const unsigned char *builtin,
 
 /* get the ID of an english string so it can be localised */
 int lang_english_to_id(const char *english);
+/* get the english string of a given id */
+const char * lang_id_to_english(int lang_id);
 
 /* returns whether the loaded language is a right-to-left language */
 int lang_is_rtl(void);
diff --git a/apps/logfdisp.c b/apps/logfdisp.c
index efbfa192f5..5b1adc00e0 100644
--- a/apps/logfdisp.c
+++ b/apps/logfdisp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Daniel Stenberg
  *
diff --git a/apps/logfdisp.h b/apps/logfdisp.h
index 92fc7548b4..2f0cdd0733 100644
--- a/apps/logfdisp.h
+++ b/apps/logfdisp.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Daniel Stenberg
  *
diff --git a/apps/main.c b/apps/main.c
index 510bcdfc34..38bc18925a 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/menu.c b/apps/menu.c
index ce96c64d48..b4c4a3d419 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Robert E. Hak
  *
diff --git a/apps/menu.h b/apps/menu.h
index 1f017b0c49..f3e6e50ce1 100644
--- a/apps/menu.h
+++ b/apps/menu.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Robert E. Hak
  *
diff --git a/apps/menus/audiohw_eq_menu.c b/apps/menus/audiohw_eq_menu.c
index 8bfd2260b0..9b87c1b259 100644
--- a/apps/menus/audiohw_eq_menu.c
+++ b/apps/menus/audiohw_eq_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Michael Sevakis
  *
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 2ce566a888..f7b3efa2c4 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c
index 831cd06b6f..267019035c 100644
--- a/apps/menus/eq_menu.c
+++ b/apps/menus/eq_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/apps/menus/eq_menu.h b/apps/menus/eq_menu.h
index f99f83d94f..3d21ea3eea 100644
--- a/apps/menus/eq_menu.h
+++ b/apps/menus/eq_menu.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/apps/menus/exported_menus.h b/apps/menus/exported_menus.h
index 93cabb0f2e..b7e95298d4 100644
--- a/apps/menus/exported_menus.h
+++ b/apps/menus/exported_menus.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index d20b5dade6..a09d81de3d 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
diff --git a/apps/menus/menu_common.c b/apps/menus/menu_common.c
index 1fa8ba3af2..9a7c0cf78d 100644
--- a/apps/menus/menu_common.c
+++ b/apps/menus/menu_common.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dan Everton
  *
diff --git a/apps/menus/menu_common.h b/apps/menus/menu_common.h
index 5a28c3f03c..2738ccc1af 100644
--- a/apps/menus/menu_common.h
+++ b/apps/menus/menu_common.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dan Everton
  *
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c
index b71a286240..c359161734 100644
--- a/apps/menus/playback_menu.c
+++ b/apps/menus/playback_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c
index 9b5e8e99e0..7066f05914 100644
--- a/apps/menus/playlist_menu.c
+++ b/apps/menus/playlist_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
diff --git a/apps/menus/plugin_menu.c b/apps/menus/plugin_menu.c
index fa0d721c05..05fb2087c5 100644
--- a/apps/menus/plugin_menu.c
+++ b/apps/menus/plugin_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
@@ -56,12 +55,12 @@ static int plugins_menu(void* param)
     intptr_t item = (intptr_t)param;
     int ret;
 
-    struct browse_context browse = {
+    static struct browse_context browse = {
         .dirfilter = SHOW_PLUGINS,
-        .title = str(items[item].id),
         .icon = Icon_Plugin,
-        .root = items[item].path,
     };
+    browse.root = items[item].path;
+    browse.title = str(items[item].id);
 
     ret = rockbox_browse(&browse);
 
diff --git a/apps/menus/radio_menu.c b/apps/menus/radio_menu.c
index e245f82f13..f4de98d60e 100644
--- a/apps/menus/radio_menu.c
+++ b/apps/menus/radio_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Linus Nielsen Feltzing
  *
@@ -40,6 +39,9 @@ static int fm_recording_screen(void)
 {
     bool ret;
 
+    if (radio_get_current_frequency() == 0)
+        return 0;
+
     /* switch recording source to FMRADIO for the duration */
     int rec_source = global_settings.rec_source;
     global_settings.rec_source = AUDIO_SRC_FMRADIO;
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c
index 9ef0eb6bac..667c43c9b8 100644
--- a/apps/menus/recording_menu.c
+++ b/apps/menus/recording_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 9ea1b4dbee..9b017dc2f9 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
@@ -59,7 +58,7 @@
 #include "onplay.h"
 #include "misc.h"
 
-#if defined(DX50) || defined(DX90) || (defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR))
+#if !defined(SIMULATOR) && !defined(USB_NONE) && (defined(HAVE_USB_ADB) || defined(HAVE_USB_POWER))
 #define HAVE_USB_MODE
 #endif
 
@@ -193,7 +192,9 @@ MENUITEM_SETTING(show_filename_ext, &global_settings.show_filename_ext, NULL);
 MENUITEM_SETTING(browse_current, &global_settings.browse_current, NULL);
 MENUITEM_SETTING(show_path_in_browser, &global_settings.show_path_in_browser, NULL);
 #ifdef HAVE_HOTKEY
-MENUITEM_SETTING(hotkey_tree_item, &global_settings.hotkey_tree, NULL);
+MENUITEM_FUNCTION_W_PARAM(hotkey_tree_item, 0, ID2P(LANG_HOTKEY_FILE_BROWSER),
+                                  tree_context_menu_do_setting, (void*)0,
+                                  NULL, Icon_Menu_setting);
 #endif
 static int clear_start_directory(void)
 {
@@ -721,34 +722,109 @@ MAKE_MENU(voice_settings_menu, ID2P(LANG_VOICE), 0, Icon_Voice,
 /*    VOICE MENU                   */
 /***********************************/
 
-/*    WPS_CONTEXT_PLUGIN           */
+/*    WPS_CONTEXT_MENU          */
 /***********************************/
-static void wps_plugin_cb(void)
+static char *wps_context_menu_get_name(int selected_item, void * data,
+                                   char *buffer, size_t buffer_len)
 {
-    open_plugin_browse(ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN));
+    int item = (intptr_t)data;
+    int act = HK_CTX_GET(item, global_settings.context_wps);
+    const struct hotkey_assignment *cur = get_hotkey(act);
+#ifdef HAVE_HOTKEY
+    if (item == 0)
+    {
+        snprintf(buffer, buffer_len,"%s [%s]",
+                 str(LANG_HOTKEY_WPS), str(cur->lang_id));
+    }
+    else
+#endif
+    {
+        snprintf(buffer, buffer_len,"%s %d [%s]",
+                 str(LANG_SET_CONTEXT_ITEM), item, str(cur->lang_id));
+    }
+    return buffer;
+    (void)selected_item;
 }
-MENUITEM_FUNCTION(wps_set_context_plugin, 0,
-                  ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN),
-                  wps_plugin_cb, NULL, Icon_Plugin);
 
-/*    WPS_CONTEXT_PLUGIN           */
-/***********************************/
+static int wps_context_menu_speak_item(int selected_item, void * data)
+{
+    int item = (intptr_t)data;
+    int act = HK_CTX_GET(item, global_settings.context_wps);
 
+    const struct hotkey_assignment *cur = get_hotkey(act);
+#ifdef HAVE_HOTKEY
+    if (item == 0)
+    {
+        talk_id(LANG_HOTKEY_WPS, false);
+    }
+    else
+#endif
+    {
+        talk_id(LANG_SET_CONTEXT_ITEM, false);
+        talk_number(item, true);
+    }
+    talk_id(cur->lang_id, true);
+    return 0;
+    (void)selected_item;
+}
+
+#ifdef HAVE_HOTKEY
+MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hotkey_wps_item, 0,
+                                  wps_context_menu_do_setting, (void*)0,
+                                  wps_context_menu_get_name,
+                                  wps_context_menu_speak_item,
+                                  (void*)0, NULL, Icon_Menu_setting);
+#else
+MENUITEM_FUNCTION_DYNTEXT_W_PARAM(wps_set_context_item_0, 0,
+                                  wps_context_menu_do_setting, (void*)0,
+                                  wps_context_menu_get_name,
+                                  wps_context_menu_speak_item,
+                                  (void*)0, NULL, Icon_Menu_setting);
+#endif
+MENUITEM_FUNCTION_DYNTEXT_W_PARAM(wps_set_context_item_1, 0,
+                                  wps_context_menu_do_setting, (void*)1,
+                                  wps_context_menu_get_name,
+                                  wps_context_menu_speak_item,
+                                  (void*)1, NULL, Icon_Menu_setting);
+
+MENUITEM_FUNCTION_DYNTEXT_W_PARAM(wps_set_context_item_2, 0,
+                                  wps_context_menu_do_setting, (void*)2,
+                                  wps_context_menu_get_name,
+                                  wps_context_menu_speak_item,
+                                  (void*)2, NULL, Icon_Menu_setting);
+
+MENUITEM_FUNCTION_DYNTEXT_W_PARAM(wps_set_context_item_3, 0,
+                                  wps_context_menu_do_setting, (void*)3,
+                                  wps_context_menu_get_name,
+                                  wps_context_menu_speak_item,
+                                  (void*)3, NULL, Icon_Menu_setting);
+
+MENUITEM_FUNCTION_DYNTEXT_W_PARAM(wps_set_context_item_4, 0,
+                                  wps_context_menu_do_setting, (void*)4,
+                                  wps_context_menu_get_name,
+                                  wps_context_menu_speak_item,
+                                  (void*)4, NULL, Icon_Menu_setting);
+
+static void reset_wps_items(void)
+{
+    reset_setting(find_setting(&global_settings.context_wps), NULL);
+}
+MENUITEM_FUNCTION(reset_wps_item, 0, ID2P(LANG_RESET), reset_wps_items, NULL, Icon_Queued)
 /***********************************/
 /*    WPS Settings MENU            */
 
-
-#ifdef HAVE_HOTKEY
-MENUITEM_SETTING(hotkey_wps_item, &global_settings.hotkey_wps, NULL);
-#endif
-
 MAKE_MENU(wps_settings, ID2P(LANG_WPS), 0, Icon_Playback_menu
 #ifdef HAVE_HOTKEY
-            ,&hotkey_wps_item
+            ,&hotkey_wps_item /* this is item 0 */
+#else
+            ,&wps_set_context_item_0
 #endif
-            ,&wps_set_context_plugin
+            ,&wps_set_context_item_1
+            ,&wps_set_context_item_2
+            ,&wps_set_context_item_3
+            ,&wps_set_context_item_4
+            ,&reset_wps_item
             );
-
 /*    WPS Settings MENU            */
 /***********************************/
 
diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c
index 558b829ffe..61d16f4cb1 100644
--- a/apps/menus/sound_menu.c
+++ b/apps/menus/sound_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c
index 86d3861826..03ddfc2a3a 100644
--- a/apps/menus/theme_menu.c
+++ b/apps/menus/theme_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c
index 79a38a1a57..6c282a2865 100644
--- a/apps/menus/time_menu.c
+++ b/apps/menus/time_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
diff --git a/apps/misc.c b/apps/misc.c
index 0c5d73d2ee..ea4726d0c2 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
@@ -374,10 +373,13 @@ static bool clean_shutdown(enum shutdown_type sd_type,
         int audio_stat = audio_status();
 #endif
 
+        FOR_NB_SCREENS(i)
+            viewportmanager_theme_enable(i, true, NULL);
+        clear_screen_buffer(false);
         FOR_NB_SCREENS(i)
         {
-            screens[i].clear_display();
             screens[i].update();
+            screens[i].scroll_stop();
         }
 
         if (batt_safe)
@@ -388,6 +390,8 @@ static bool clean_shutdown(enum shutdown_type sd_type,
             {
                 cancel_shutdown();
                 splash(HZ, ID2P(LANG_TAGCACHE_BUSY));
+                FOR_NB_SCREENS(i)
+                    viewportmanager_theme_undo(i, false);
                 return false;
             }
 #endif
@@ -1354,7 +1358,10 @@ const char *format_time_auto(char *buffer, int buf_len, long value,
     const char * const sign        = &"-"[value < 0 ? 0 : 1];
     bool               is_rtl      = lang_is_rtl();
     char               timebuf[25]; /* -2147483648:00:00.00\0 */
-    int                len, left_offset;
+    int                len;
+#if 0 /* unused */
+    int left_offset;
+#endif
     unsigned char      base_idx, max_idx;
 
     unsigned long  units_in[UNIT_IDX_TIME_COUNT];
@@ -1427,8 +1434,11 @@ const char *format_time_auto(char *buffer, int buf_len, long value,
 
         timebuf[offsets[base_idx] + fwidth[base_idx]] = '\0';
 
+#if 0 /* unused */
         left_offset  = -(offsets[max_idx]);
-        left_offset += strlcpy(buffer, sign, buf_len);
+        left_offset +=
+#endif
+        strlcpy(buffer, sign, buf_len);
 
         /* trim leading zero on the max_idx */
         if ((unit_idx & UNIT_TRIM_ZERO) == UNIT_TRIM_ZERO &&
@@ -1456,7 +1466,9 @@ const char *format_time_auto(char *buffer, int buf_len, long value,
 
         fwidth[UNIT_IDX_HR] = len - offsets[UNIT_IDX_HR];
 
+#if 0 /* unused */
         left_offset = -(offsets[base_idx]);
+#endif
 
         /* trim leading zero on the max_idx */
         if ((unit_idx & UNIT_TRIM_ZERO) == UNIT_TRIM_ZERO &&
@@ -1471,7 +1483,10 @@ const char *format_time_auto(char *buffer, int buf_len, long value,
         if (!supress_unit)
         {
             strmemccpy(buffer, unit_strings_core[units[max_idx]], buf_len);
-            left_offset += strlcat(buffer, " ", buf_len);
+#if 0 /* unused */
+            left_offset +=
+#endif
+            strlcat(buffer, " ", buf_len);
             strlcat(buffer, &timebuf[offsets[base_idx]], buf_len);
         }
         else
@@ -1796,11 +1811,7 @@ static void push_current_activity_refresh(enum current_activity screen, bool ref
     {
         skinlist_set_cfg(i, NULL);
         if (refresh)
-        {
-            skin_defer_rendering(true);
             skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL);
-            skin_defer_rendering(false);
-        }
     }
     if (refresh)
         sb_skin_force_next_update();
@@ -1813,11 +1824,7 @@ static void pop_current_activity_refresh(bool refresh)
     {
         skinlist_set_cfg(i, NULL);
         if (refresh)
-        {
-            skin_defer_rendering(true);
             skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL);
-            skin_defer_rendering(false);
-        }
     }
     if (refresh)
         sb_skin_force_next_update();
diff --git a/apps/misc.h b/apps/misc.h
index c4aa718c4a..12d85c2845 100644
--- a/apps/misc.h
+++ b/apps/misc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
diff --git a/apps/onplay.c b/apps/onplay.c
index 824b2f38cc..34887c4b0f 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
@@ -67,12 +66,14 @@
 #ifdef HAVE_DISK_STORAGE
 #include "storage.h"
 #endif
+#include "language.h"
 
 static int onplay_result = ONPLAY_OK;
 static bool in_queue_submenu = false;
 
 static bool (*ctx_current_playlist_insert)(int position, bool queue, bool create_new);
 static int (*ctx_add_to_playlist)(const char* playlist, bool new_playlist);
+static char *onplay_get_plugin_name(bool reload);
 extern struct menu_item_ex file_menu; /* settings_menu.c  */
 
 /* redefine MAKE_MENU so the MENU_EXITAFTERTHISMENU flag can be added easily */
@@ -137,15 +138,6 @@ static bool clipboard_clip(struct clipboard *clip, const char *path,
 /* interface function.                                                     */
 /* ----------------------------------------------------------------------- */
 
-
-static int bookmark_load_menu_wrapper(void)
-{
-    if (get_current_activity() == ACTIVITY_CONTEXTMENU)  /* get rid of parent activity */
-        pop_current_activity_without_refresh();          /* when called from ctxt menu */
-
-    return bookmark_load_menu();
-}
-
 static int bookmark_menu_callback(int action,
                                   const struct menu_item_ex *this_item,
                                   struct gui_synclist *this_list);
@@ -155,7 +147,7 @@ MENUITEM_FUNCTION(bookmark_create_menu_item, 0,
                   bookmark_menu_callback, Icon_Bookmark);
 MENUITEM_FUNCTION(bookmark_load_menu_item, 0,
                   ID2P(LANG_BOOKMARK_MENU_LIST),
-                  bookmark_load_menu_wrapper,
+                  bookmark_load_menu,
                   bookmark_menu_callback, Icon_Bookmark);
 MAKE_ONPLAYMENU(bookmark_menu, ID2P(LANG_BOOKMARK_MENU),
                 bookmark_menu_callback, Icon_Bookmark,
@@ -201,9 +193,6 @@ static bool save_playlist(void)
 
 static int wps_view_cur_playlist(void)
 {
-    if (get_current_activity() == ACTIVITY_CONTEXTMENU)  /* get rid of parent activity */
-        pop_current_activity_without_refresh(); /* when called from ctxt menu */
-
     playlist_viewer_ex(NULL, NULL);
 
     return 0;
@@ -664,8 +653,165 @@ MENUITEM_FUNCTION(rating_item, 0, ID2P(LANG_MENU_SET_RATING),
                   set_rating_inline,
                   ratingitem_callback, Icon_Questionmark);
 #endif
-MENUITEM_RETURNVALUE(plugin_item, ID2P(LANG_OPEN_PLUGIN),
-                  GO_TO_PLUGIN, NULL, Icon_Plugin);
+
+static char *wps_context_get_item_name(int selected_item, void * data,
+                               char *buffer, size_t buffer_len)
+{
+    (void)selected_item; (void)data; (void)buffer; (void)buffer_len;
+    int item = (intptr_t)data;
+    const struct hotkey_assignment *hkey =
+      get_hotkey(HK_CTX_GET(item, global_settings.context_wps));
+    if (hkey->action == HOTKEY_PLUGIN)
+    {
+        return onplay_get_plugin_name(false);
+    }
+#ifdef HAVE_PITCHCONTROL
+    else if (hkey->action == HOTKEY_PITCHSCREEN)
+    {
+        int32_t ts = dsp_get_timestretch();
+        int32_t pitch = sound_get_pitch();
+        if (ts != PITCH_SPEED_100 || pitch != PITCH_SPEED_100)
+        {
+            int32_t speed = GET_SPEED(pitch, ts);
+            snprintf(buffer, buffer_len,"%s %ld.%ld%% / %ld.%ld%%", str(hkey->lang_id),
+                 pitch / PITCH_SPEED_PRECISION,
+                (pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10),
+                 speed / PITCH_SPEED_PRECISION,
+                (speed % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10));
+            return buffer;
+        }
+    }
+#endif
+    return ID2P(hkey->lang_id);
+}
+
+static int wps_context_item_speak_item(int selected_item, void * data)
+{
+    int item = (intptr_t)data;
+    const struct hotkey_assignment *hkey =
+      get_hotkey(HK_CTX_GET(item, global_settings.context_wps));
+
+    if (hkey->action == HOTKEY_PLUGIN)
+    {
+        talk_spell(onplay_get_plugin_name(false), false);
+        return 0;
+    }
+#ifdef HAVE_PITCHCONTROL
+    else if (hkey->action == HOTKEY_PITCHSCREEN)
+    {
+        int32_t ts = dsp_get_timestretch();
+        int32_t pitch = sound_get_pitch();
+        if (ts != PITCH_SPEED_100 || pitch != PITCH_SPEED_100)
+        {
+            talk_id(hkey->lang_id, false);
+
+            if (pitch != PITCH_SPEED_100)
+                talk_value_decimal(pitch, UNIT_PERCENT, 2, true);
+            if (ts != PITCH_SPEED_100)
+            {
+                int32_t speed = GET_SPEED(pitch, ts);
+                talk_id(LANG_SPEED, true);
+                talk_value_decimal(speed, UNIT_PERCENT, 2, true);
+            }
+            return 0;
+        }
+    }
+#endif
+    talk_id(hkey->lang_id, false);
+    return 0;
+    (void)selected_item;
+}
+
+static int execute_hotkey(int action);
+static int wps_context_item_cb(int,const struct menu_item_ex *,struct gui_synclist *);
+
+/* need special handling so we can change the icon */
+#define WPSCTX_RETURNVALUE_DYNTEXT(name, val, cb, text_callback,            \
+                                     voice_callback, text_cb_data, icon)    \
+     struct menu_get_name_and_icon name##_                                  \
+         = {cb,text_callback,voice_callback,text_cb_data,icon};             \
+     static const struct menu_item_ex name   =                              \
+        { MT_RETURN_VALUE|MENU_DYNAMIC_DESC, { .value = val},               \
+        {.menu_get_name_and_icon = & name##_}};
+
+WPSCTX_RETURNVALUE_DYNTEXT(context_item_0, GO_TO_PREVIOUS, wps_context_item_cb,
+  wps_context_get_item_name, wps_context_item_speak_item, (void*)0, Icon_NOICON);
+
+WPSCTX_RETURNVALUE_DYNTEXT(context_item_1, GO_TO_PREVIOUS, wps_context_item_cb,
+  wps_context_get_item_name, wps_context_item_speak_item, (void*)1, Icon_NOICON);
+
+WPSCTX_RETURNVALUE_DYNTEXT(context_item_2, GO_TO_PREVIOUS, wps_context_item_cb,
+  wps_context_get_item_name, wps_context_item_speak_item, (void*)2, Icon_NOICON);
+
+WPSCTX_RETURNVALUE_DYNTEXT(context_item_3, GO_TO_PREVIOUS, wps_context_item_cb,
+  wps_context_get_item_name, wps_context_item_speak_item, (void*)3, Icon_NOICON);
+
+WPSCTX_RETURNVALUE_DYNTEXT(context_item_4, GO_TO_PREVIOUS, wps_context_item_cb,
+  wps_context_get_item_name, wps_context_item_speak_item, (void*)4, Icon_NOICON);
+
+/* map item number to menu_get_name_and_icon structs so we can change icons */
+static struct menu_get_name_and_icon * const ctx_item_map[HK_CTX_ITEMS]=
+  {&context_item_0_, &context_item_1_, &context_item_2_, &context_item_3_, &context_item_4_};
+
+#ifdef HAVE_PITCHCONTROL
+MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH),
+                  gui_syncpitchscreen_run, NULL, Icon_Audio);
+MENUITEM_FUNCTION(pitch_reset_item, 0, ID2P(LANG_RESET_SETTING),
+                  reset_pitch, NULL, Icon_Submenu_Entered);
+
+MAKE_ONPLAYMENU(pitch_menu, ID2P(LANG_PITCH),
+                NULL, Icon_Audio,
+                &pitch_screen_item,
+                &pitch_reset_item);
+#endif
+
+static int wps_context_item_cb(int action,
+                                  const struct menu_item_ex *this_item,
+                                  struct gui_synclist *this_list)
+{
+    if (action == ACTION_ENTER_MENUITEM || action == ACTION_REQUEST_MENUITEM)
+    {
+        int item = (intptr_t) this_item->menu_get_name_and_icon->list_get_name_data;
+        int act =  HK_CTX_GET(item, global_settings.context_wps);
+        if (act == HOTKEY_OFF)
+        {
+            return ACTION_EXIT_MENUITEM;
+        }
+        ctx_item_map[item]->icon_id = get_hotkey(act)->icon;
+#ifdef HAVE_PITCHCONTROL
+        if (act == HOTKEY_PITCHSCREEN)
+        {
+            int32_t ts = dsp_get_timestretch();
+            if (sound_get_pitch() != PITCH_SPEED_100 || ts != PITCH_SPEED_100)
+            {
+                ctx_item_map[item]->icon_id = Icon_Submenu; /* if setting changed show + */
+            }
+        }
+#endif
+    }
+    else if (action == ACTION_EXIT_MENUITEM) /* selected */
+    {
+        int item = (intptr_t) this_item->menu_get_name_and_icon->list_get_name_data;
+        int act =  HK_CTX_GET(item, global_settings.context_wps);
+        if (act == HOTKEY_CONTEXT_MENU)
+        {
+            onplay_result = hotkey_run_menu(HOTKEY_FLAG_WPS, true, 0);
+        }
+#ifdef HAVE_PITCHCONTROL
+        else if (act == HOTKEY_PITCHSCREEN && ctx_item_map[item]->icon_id == Icon_Submenu)
+        {
+            do_menu(&pitch_menu, NULL, NULL, false);
+        }
+#endif
+        else
+        {
+            onplay_result = execute_hotkey(act);
+        }
+        return ACTION_EXIT_AFTER_THIS_MENUITEM;
+    }
+    return action;
+    (void)this_list;
+}
 
 static bool view_cue(void)
 {
@@ -696,9 +842,6 @@ MENUITEM_FUNCTION(view_cue_item, 0, ID2P(LANG_BROWSE_CUESHEET),
 
 static int browse_id3_wrapper(void)
 {
-    if (get_current_activity() == ACTIVITY_CONTEXTMENU)  /* get rid of parent activity */
-        pop_current_activity_without_refresh();          /* when called from ctxt menu */
-
     if (browse_id3(audio_current_track(),
             playlist_get_display_index(),
             playlist_amount(), NULL, 1, NULL))
@@ -710,60 +853,6 @@ static int browse_id3_wrapper(void)
 MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_MENU_SHOW_ID3_INFO),
                   browse_id3_wrapper, NULL, Icon_NOICON);
 
-#ifdef HAVE_PITCHCONTROL
-MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH),
-                  gui_syncpitchscreen_run, NULL, Icon_Audio);
-MENUITEM_FUNCTION(pitch_reset_item, 0, ID2P(LANG_RESET_SETTING),
-                  reset_pitch, NULL, Icon_Submenu_Entered);
-
-static int pitch_callback(int action,
-                          const struct menu_item_ex *this_item,
-                          struct gui_synclist *this_list);
-
-/* need special handling so we can toggle the icon */
-#define MAKE_PITCHMENU( name, str, callback, icon, ... )           \
-    static const struct menu_item_ex *name##_[]  = {__VA_ARGS__};  \
-    struct menu_callback_with_desc name##__ = {callback,str,icon}; \
-    static const struct menu_item_ex name =                        \
-        {MT_MENU|MENU_HAS_DESC|MENU_EXITAFTERTHISMENU|             \
-         MENU_ITEM_COUNT(sizeof( name##_)/sizeof(*name##_)),       \
-            { (void*)name##_},{.callback_and_desc = & name##__}};
-
-MAKE_PITCHMENU(pitch_menu, ID2P(LANG_PITCH),
-                pitch_callback, Icon_Audio,
-                &pitch_screen_item,
-                &pitch_reset_item);
-
-static int pitch_callback(int action,
-                          const struct menu_item_ex *this_item,
-                          struct gui_synclist *this_list)
-{
-    if (action == ACTION_ENTER_MENUITEM || action == ACTION_REQUEST_MENUITEM)
-    {
-        pitch_menu__.icon_id = Icon_Submenu; /* if setting changed show + */
-        int32_t ts = dsp_get_timestretch();
-        if (sound_get_pitch() == PITCH_SPEED_100 && ts == PITCH_SPEED_100)
-        {
-            pitch_menu__.icon_id = Icon_Audio;
-            if (action == ACTION_ENTER_MENUITEM)
-            { /* if default then run pitch screen directly */
-                gui_syncpitchscreen_run();
-                action = ACTION_EXIT_MENUITEM;
-            }
-        }
-    }
-    return action;
-
-    (void)this_item;
-    (void)this_list;
-}
-#endif /*def HAVE_PITCHCONTROL*/
-
-#ifdef HAVE_ALBUMART
-MENUITEM_FUNCTION(view_album_art_item, 0, ID2P(LANG_VIEW_ALBUMART),
-                  view_album_art, NULL, Icon_NOICON);
-#endif
-
 static int clipboard_delete_selected_fileobject(void)
 {
     int rc = delete_fileobject(selected_file.path);
@@ -881,10 +970,6 @@ static bool onplay_load_plugin(void *param)
     if (!prepare_database_sel(param))
         return false;
 #endif
-
-    if (get_current_activity() == ACTIVITY_CONTEXTMENU)  /* get rid of parent activity */
-        pop_current_activity_without_refresh();          /* when called from ctxt menu */
-
     int ret = filetype_load_plugin((const char*)param, selected_file.path);
     if (ret == PLUGIN_USB_CONNECTED)
         onplay_result = ONPLAY_RELOAD_DIR;
@@ -897,6 +982,29 @@ static bool onplay_load_plugin(void *param)
     return false;
 }
 
+static char *onplay_get_plugin_name(bool reload)
+{
+    static char ctx_plugin_namebuf[OPEN_PLUGIN_NAMESZ] = "";
+    if (reload || ctx_plugin_namebuf[0] == '\0')
+    {
+        int res = open_plugin_load_entry(ID2P(LANG_ONPLAY_MENU_TITLE));
+        if (res >= 0 || res ==  OPEN_PLUGIN_NEEDS_FLUSHED)
+        {
+            struct open_plugin_entry_t *op = open_plugin_get_entry();
+            strmemccpy(ctx_plugin_namebuf, op->name, sizeof(ctx_plugin_namebuf));
+        }
+        else
+        {
+            strmemccpy(ctx_plugin_namebuf, str(LANG_OPEN_PLUGIN),
+                       sizeof(ctx_plugin_namebuf));
+        }
+    }
+
+    if (get_current_activity() == ACTIVITY_SETTINGS)
+        return str(LANG_OPEN_PLUGIN);
+    return ctx_plugin_namebuf;
+}
+
 static int reveal(void)
 {
 #ifdef HAVE_TAGCACHE
@@ -912,7 +1020,7 @@ static int reveal(void)
     strmemccpy(global_status.browse_last_folder, selected_file.path,
                sizeof global_status.browse_last_folder);
     onplay_result = ONPLAY_REVEAL_FILE;
-    return 0;
+    return GO_TO_FILEBROWSER;
 }
 
 MENUITEM_FUNCTION(reveal_item, 0, ID2P(LANG_SHOW_IN_FILES),
@@ -1146,15 +1254,14 @@ MAKE_ONPLAYMENU( wps_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE),
            &rating_item,
 #endif
            &bookmark_menu,
-           &plugin_item,
-           &browse_id3_item,
-           &reveal_item, &view_cue_item,
-#ifdef HAVE_PITCHCONTROL
-           &pitch_menu,
-#endif
-#ifdef HAVE_ALBUMART
-           &view_album_art_item,
+           &view_cue_item,
+#ifndef HAVE_HOTKEY
+           &context_item_0,
 #endif
+           &context_item_1,
+           &context_item_2,
+           &context_item_3,
+           &context_item_4,
          );
 
 int sort_playlists_callback(int action,
@@ -1194,11 +1301,13 @@ MAKE_ONPLAYMENU( tree_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE),
 #endif
            &add_to_faves_item, &set_as_dir_menu, &file_menu, &sort_playlists,
          );
+
 static int onplaymenu_callback(int action,
                                const struct menu_item_ex *this_item,
                                struct gui_synclist *this_list)
 {
     (void)this_list;
+
     switch (action)
     {
         case ACTION_TREE_STOP:
@@ -1226,7 +1335,6 @@ static int onplaymenu_callback(int action,
     return action;
 }
 
-#ifdef HAVE_HOTKEY
 /* direct function calls, no need for menu callbacks */
 static bool hotkey_delete_item(void)
 {
@@ -1287,12 +1395,26 @@ static int hotkey_tree_run_plugin(void *param)
     return ONPLAY_RELOAD_DIR;
 }
 
-static int hotkey_run_menu(void); /* display hotkey items as a menu */
 static int hotkey_wps_run_plugin(void)
 {
-    open_plugin_run(ID2P(LANG_HOTKEY_WPS));
+    if (get_current_activity() == ACTIVITY_CONTEXTMENU)
+        open_plugin_run(ID2P(LANG_ONPLAY_MENU_TITLE));
+#ifdef HAVE_HOTKEY
+    else
+        open_plugin_run(ID2P(LANG_HOTKEY_WPS));
+#endif
     return ONPLAY_OK;
 }
+
+static int hotkey_execute_menu(void)
+{
+    intptr_t flag = HOTKEY_FLAG_WPS;
+    if (selected_file.context != CONTEXT_WPS)
+        flag = HOTKEY_FLAG_TREE;
+
+    return hotkey_run_menu(flag, true, 0);
+}
+
 #define HOTKEY_FUNC(func, param) {{(void *)func}, param}
 
 /* Any desired hotkey functions go here, in the enum in onplay.h,
@@ -1304,82 +1426,103 @@ static const struct hotkey_assignment hotkey_items[] = {
       .lang_id = LANG_OFF,
       .func = HOTKEY_FUNC(NULL,NULL),
       .return_code = ONPLAY_RELOAD_DIR,
-      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_TREE },
-    { .action = HOTKEY_VIEW_PLAYLIST,
+      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_TREE,
+      .icon=Icon_NOICON},
+   { .action = HOTKEY_VIEW_PLAYLIST,
       .lang_id = LANG_VIEW_DYNAMIC_PLAYLIST,
       .func = HOTKEY_FUNC(NULL, NULL),
       .return_code = ONPLAY_PLAYLIST,
-      .flags = HOTKEY_FLAG_WPS },
-    { .action = HOTKEY_SHOW_TRACK_INFO,
+      .flags = HOTKEY_FLAG_WPS,
+      .icon = Icon_Playlist},
+   { .action = HOTKEY_SHOW_TRACK_INFO,
       .lang_id = LANG_MENU_SHOW_ID3_INFO,
       .func = HOTKEY_FUNC(browse_id3_wrapper, NULL),
       .return_code = ONPLAY_RELOAD_DIR,
-      .flags = HOTKEY_FLAG_WPS },
+      .flags = HOTKEY_FLAG_WPS,
+      .icon = Icon_Questionmark},
 #ifdef HAVE_PITCHCONTROL
     { .action = HOTKEY_PITCHSCREEN,
       .lang_id = LANG_PITCH,
       .func = HOTKEY_FUNC(gui_syncpitchscreen_run, NULL),
       .return_code = ONPLAY_RELOAD_DIR,
-      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_NOSBS },
+      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_NOSBS,
+      .icon = Icon_Audio},
 #endif
     { .action = HOTKEY_OPEN_WITH,
       .lang_id = LANG_ONPLAY_OPEN_WITH,
       .func = HOTKEY_FUNC(hotkey_open_with, NULL),
       .return_code = ONPLAY_RELOAD_DIR,
-      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_TREE },
-    { .action = HOTKEY_DELETE,
+      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_TREE,
+      .icon = Icon_Plugin},
+   { .action = HOTKEY_DELETE,
       .lang_id = LANG_DELETE,
       .func = HOTKEY_FUNC(hotkey_delete_item, NULL),
       .return_code = ONPLAY_RELOAD_DIR,
-      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_TREE },
-    { .action = HOTKEY_INSERT,
+      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_TREE,
+      .icon = Icon_NOICON},
+   { .action = HOTKEY_INSERT,
       .lang_id = LANG_ADD,
       .func = HOTKEY_FUNC(add_to_playlist, (intptr_t*)&addtopl_insert),
       .return_code = ONPLAY_RELOAD_DIR,
-      .flags = HOTKEY_FLAG_TREE },
-    { .action = HOTKEY_INSERT_SHUFFLED,
+      .flags = HOTKEY_FLAG_TREE,
+      .icon = Icon_Queued},
+   { .action = HOTKEY_INSERT_SHUFFLED,
       .lang_id = LANG_ADD_SHUFFLED,
       .func = HOTKEY_FUNC(hotkey_tree_pl_insert_shuffled, NULL),
       .return_code = ONPLAY_FUNC_RETURN,
-      .flags = HOTKEY_FLAG_TREE },
-    { .action = HOTKEY_PLUGIN,
+      .flags = HOTKEY_FLAG_TREE,
+      .icon = Icon_Queued},
+   { .action = HOTKEY_PLUGIN,
       .lang_id = LANG_OPEN_PLUGIN,
       .func = HOTKEY_FUNC(hotkey_wps_run_plugin, NULL),
       .return_code = ONPLAY_FUNC_RETURN,
-      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_NOSBS },
-    { .action = HOTKEY_BOOKMARK,
+      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_NOSBS,
+      .icon = Icon_Plugin},
+   { .action = HOTKEY_BOOKMARK,
       .lang_id = LANG_BOOKMARK_MENU_CREATE,
       .func = HOTKEY_FUNC(bookmark_create_menu, NULL),
       .return_code = ONPLAY_OK,
-      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_NOSBS },
-    { .action = HOTKEY_BOOKMARK_LIST,
+      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_NOSBS,
+      .icon = Icon_Bookmark},
+   { .action = HOTKEY_BOOKMARK_LIST,
       .lang_id = LANG_BOOKMARK_MENU_LIST,
       .func = HOTKEY_FUNC(bookmark_load_menu, NULL),
       .return_code = ONPLAY_START_PLAY,
-      .flags = HOTKEY_FLAG_WPS },
-    { .action = HOTKEY_PROPERTIES,
+      .flags = HOTKEY_FLAG_WPS,
+      .icon = Icon_Bookmark},
+   { .action = HOTKEY_PROPERTIES,
       .lang_id = LANG_PROPERTIES,
       .func = HOTKEY_FUNC(hotkey_tree_run_plugin, (void *)"properties"),
       .return_code = ONPLAY_FUNC_RETURN,
-      .flags = HOTKEY_FLAG_TREE },
-    { .action = HOTKEY_CONTEXT_MENU,
+      .flags = HOTKEY_FLAG_TREE,
+      .icon = Icon_NOICON},
+   { .action = HOTKEY_SHOW_IN_FILES,
+      .lang_id = LANG_SHOW_IN_FILES,
+      .func = HOTKEY_FUNC(reveal, NULL),
+      .return_code = ONPLAY_REVEAL_FILE,
+      .flags = HOTKEY_FLAG_WPS,
+      .icon = Icon_file_view_menu},
+   { .action = HOTKEY_CONTEXT_MENU,
       .lang_id = LANG_ONPLAY_MENU_TITLE,
-      .func = HOTKEY_FUNC(hotkey_run_menu, NULL),
+      .func = HOTKEY_FUNC(hotkey_execute_menu, NULL),
       .return_code = ONPLAY_FUNC_RETURN,
-      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_TREE },
+      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_TREE,
+      .icon = Icon_Submenu},
 #ifdef HAVE_ALBUMART
     { .action = HOTKEY_ALBUMART,
       .lang_id = LANG_VIEW_ALBUMART,
       .func = HOTKEY_FUNC(view_album_art, NULL),
       .return_code = ONPLAY_OK,
-      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_NOSBS },
+      .flags = HOTKEY_FLAG_WPS | HOTKEY_FLAG_NOSBS,
+      .icon = Icon_Wps},
 #endif
 #ifdef HAVE_TAGCACHE
     { .action = HOTKEY_PICTUREFLOW,
       .lang_id = LANG_ONPLAY_PICTUREFLOW,
       .func = HOTKEY_FUNC(hotkey_tree_run_plugin, (void *)"pictureflow"),
       .return_code = ONPLAY_FUNC_RETURN,
-      .flags = HOTKEY_FLAG_TREE },
+      .flags = HOTKEY_FLAG_TREE,
+      .icon = Icon_Plugin},
 #endif
 };
 
@@ -1406,9 +1549,13 @@ static int execute_hotkey(int action)
     if (func.function != NULL)
     {
         if (func.param != NULL)
+        {
             func_return = (*func.function_w_param)(func.param);
+        }
         else
+        {
             func_return = (*func.function)();
+        }
     }
     const int return_code = this_item->return_code;
 
@@ -1421,56 +1568,83 @@ static const char* hotkey_get_name(int selected_item, void * data,
                                      char * buffer, size_t buffer_len)
 {
     (void)buffer; (void)buffer_len;
-    const struct hotkey_assignment **hk_menu = (const struct hotkey_assignment **)data;
-    return ID2P(hk_menu[selected_item + 1]->lang_id);  /* +1 to skip HOTKEY_OFF */
+    const struct hotkey_assignment **hk_menu =
+                (const struct hotkey_assignment**)data;
+
+    if (hk_menu[selected_item]->action == HOTKEY_PLUGIN)
+    {
+        return onplay_get_plugin_name(false);
+    }
+
+    return ID2P(hk_menu[selected_item]->lang_id);
 }
 
 static int hotkey_get_talk(int selected_item, void * data)
 {
-    if (global_settings.talk_menu)
-    {
-        const struct hotkey_assignment **hk_menu = (const struct hotkey_assignment **)data;
-        talk_id(hk_menu[selected_item + 1]->lang_id, false); /* +1 to skip HOTKEY_OFF */
-    }
+    const struct hotkey_assignment **hk_menu =
+                (const struct hotkey_assignment**)data;
+    if (hk_menu[selected_item]->action == HOTKEY_PLUGIN)
+        talk_spell(onplay_get_plugin_name(false), false);
+    else
+        talk_id(hk_menu[selected_item]->lang_id, false);
     return 0;
 }
 
-static int hotkey_run_menu(void)
+static enum themable_icons hotkey_get_icon(int selected_item, void * data)
 {
-    intptr_t flag = HOTKEY_FLAG_WPS;
-    if (selected_file.context != CONTEXT_WPS)
-        flag = HOTKEY_FLAG_TREE;
+    const struct hotkey_assignment **hk_menu =
+                (const struct hotkey_assignment**)data;
+    return hk_menu[selected_item]->icon;
+}
 
+int hotkey_run_menu(intptr_t flag, bool execute, int current_action)
+{
     const struct hotkey_assignment *hk_menu[ARRAYLEN(hotkey_items)];
 
+    char *title = str(LANG_ONPLAY_MENU_TITLE);
+#ifdef HAVE_HOTKEY
+    if (flag & HOTKEY_FLAG_TREE)
+            title = str(LANG_HOTKEY_FILE_BROWSER);
+#endif
     struct simplelist_info info;
+    int selected = 0;
     int count = 0;
     for (size_t i = 0; i < ARRAYLEN(hotkey_items); i++)
     {
         hk_menu[i] = NULL; /*clear all the hk_menu entries prior to setting them */
+        if (hotkey_items[i].action == HOTKEY_OFF && execute)
+            continue; /* Don't display HOTKEY_OFF item */
         if ((hotkey_items[i].flags & flag) == flag)
         {
-            if (hotkey_items[i].action != HOTKEY_CONTEXT_MENU)
+            if (!execute || hotkey_items[i].action != HOTKEY_CONTEXT_MENU)
             {
+                if (hotkey_items[i].action == current_action)
+                    selected = count;
                 hk_menu[count++] = &hotkey_items[i];
             }
         }
     }
 
-    /* count -1 don't display HOTKEY_OFF item */
-    simplelist_info_init(&info, str(LANG_ONPLAY_MENU_TITLE), count - 1, (void*)&hk_menu);
+    simplelist_info_init(&info, title, count, (void*)&hk_menu);
     info.get_name = hotkey_get_name;
-    info.get_icon = NULL;
+    info.get_icon = hotkey_get_icon;
     info.get_talk = hotkey_get_talk;
-
+    info.selection = selected;
     simplelist_show_list(&info);
-    if (info.selection >= 0) /* run user selected hotkey item */
+
+    if (execute)
     {
-        return execute_hotkey(hk_menu[info.selection + 1]->action);
+        if (info.selection < 0) /* canceled */
+            return ONPLAY_RELOAD_DIR;
+        return execute_hotkey(hk_menu[info.selection]->action);
+    }
+    else
+    {
+        if (info.selection < 0) /* canceled */
+            return -1;
+        return hk_menu[info.selection]->action;
     }
-    return ONPLAY_RELOAD_DIR;
 }
-#endif /* HOTKEY */
 
 int onplay(char* file, int attr, int from_context, bool hotkey, int customaction)
 {
@@ -1506,8 +1680,17 @@ int onplay(char* file, int attr, int from_context, bool hotkey, int customaction
 
 #ifdef HAVE_HOTKEY
     if (hotkey)
-        return execute_hotkey((from_context == CONTEXT_WPS ?
-                         global_settings.hotkey_wps : global_settings.hotkey_tree));
+    {
+        if (from_context == CONTEXT_WPS)
+        {
+            wps_context_item_cb(ACTION_EXIT_MENUITEM, &context_item_0, NULL);
+            return onplay_result;
+        }
+        else
+        {
+            return execute_hotkey(global_settings.hotkey_tree & HK_CTX_MASK);
+        }
+    }
 #else
     (void)hotkey;
 #endif
@@ -1526,10 +1709,7 @@ int onplay(char* file, int attr, int from_context, bool hotkey, int customaction
     else
         menu = &tree_onplay_menu;
     menu_selection = do_menu(menu, NULL, NULL, false);
-
-    if (get_current_activity() == ACTIVITY_CONTEXTMENU) /* Activity may have been      */
-        pop_current_activity();                         /* popped already by menu item */
-
+    pop_current_activity();
 
     if (menu_selection == GO_TO_WPS)
         return ONPLAY_START_PLAY;
@@ -1549,3 +1729,126 @@ int get_onplay_context(void)
 {
     return selected_file.context;
 }
+
+static int hotkey_menu_do_setting(void *param, int *setting, int flag)
+{
+    int current = *setting;
+    int item = (intptr_t)param;
+
+    int temp =  HK_CTX_GET(item, current);
+    int sel = hotkey_run_menu(flag, false, temp);
+    if (sel >=0)
+    {
+        if (sel == HOTKEY_PLUGIN)
+        {
+            if (get_current_activity() != ACTIVITY_QUICKSCREEN)
+            {
+#ifdef HAVE_HOTKEY
+                if (item == 0)
+                    open_plugin_browse(ID2P(LANG_HOTKEY_WPS));
+                else
+#endif
+                {
+                    open_plugin_browse(ID2P(LANG_ONPLAY_MENU_TITLE));
+                    onplay_get_plugin_name(true);
+                }
+            }
+        }
+
+        current &= ~HK_CTX_SET(item, HK_CTX_MASK);/*clear*/
+        current |= HK_CTX_SET(item, sel);
+
+        /* check for duplicates */
+#ifdef HAVE_HOTKEY
+        if (item > 0)
+            for (int i = 1; i < HK_CTX_ITEMS; i++)
+#else
+        for (int i = 0; i < HK_CTX_ITEMS; i++)
+#endif
+        {
+            if (i != item)
+            {
+                if (HK_CTX_GET(i, *setting) == sel)
+                {
+                    current &= ~HK_CTX_SET(i, HK_CTX_MASK);/*clear*/
+                }
+            }
+        }
+        *setting = current;
+    }
+    return sel;
+}
+
+int wps_context_menu_do_setting(void *param)
+{
+    return hotkey_menu_do_setting(param, &global_settings.context_wps, HOTKEY_FLAG_WPS);
+
+}
+#ifdef HAVE_HOTKEY
+int tree_context_menu_do_setting(void *param)
+{
+    return hotkey_menu_do_setting(param, &global_settings.hotkey_tree, HOTKEY_FLAG_TREE);
+}
+#endif
+
+void wps_context_menu_load_from_cfg(void* setting, char *value)
+{
+    int item = 0;
+    int var = 0;
+    char *st = value;
+    char *end = value;
+    while (*end != '\0' && item < HK_CTX_ITEMS)
+    {
+        end++;
+        if (*end == ',' || *end == '\0')
+        {
+            st = skip_whitespace(st);
+            if (end - st  > 1)
+            {
+                for (size_t i = ARRAYLEN(hotkey_items) - 1; i < ARRAYLEN(hotkey_items); i--)
+                {
+                    const char *this = lang_id_to_english(hotkey_items[i].lang_id);
+                    if (strncasecmp(st, this, end-st) == 0)
+                    {
+                        var |= HK_CTX_SET(item, hotkey_items[i].action);
+                    }
+                }
+            }
+            st = end + 1;
+            item++;
+        }
+    }
+    *(int*)setting = var;
+}
+
+char* wps_context_menu_write_to_cfg(void* setting, char*buf, int buf_len)
+{
+    int var = *(int*)setting;
+    int items = HK_CTX_ITEMS;
+
+#ifdef HAVE_HOTKEY
+    if (setting == &global_settings.hotkey_tree)
+        items = 1;
+#endif
+
+    unsigned int written;
+    char *buffer = buf;
+    for (int i = 0; i < items && buf_len > 0; i++)
+    {
+        written = snprintf(buffer, buf_len, "%s, ",
+                    lang_id_to_english(get_hotkey(HK_CTX_GET(i, var))->lang_id));
+        buf_len -= written;
+        buffer += written;
+    }
+    return buf;
+}
+
+void wps_context_menu_set_default(void* setting, void* defaultval)
+{
+    *(int*)setting = *(int*)defaultval;
+}
+
+bool wps_context_menu_is_changed(void* setting, void* defaultval)
+{
+    return *(int*)setting != *(int*)defaultval;
+}
diff --git a/apps/onplay.h b/apps/onplay.h
index e811b9b983..2a91a1b455 100644
--- a/apps/onplay.h
+++ b/apps/onplay.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
@@ -21,20 +20,15 @@
 #ifndef _ONPLAY_H_
 #define _ONPLAY_H_
 
-#ifdef HAVE_HOTKEY
 #include "menu.h"
-#endif
 
-enum {
+enum onplay_custom_action {
     ONPLAY_NO_CUSTOMACTION,
     ONPLAY_CUSTOMACTION_SHUFFLE_SONGS,
     ONPLAY_CUSTOMACTION_FIRSTLETTER,
 };
 
-int onplay(char* file, int attr, int from_context, bool hotkey, int customaction);
-int get_onplay_context(void);
-
-enum {
+enum onplay_return_code {
     ONPLAY_MAINMENU = -1,
     ONPLAY_OK = 0,
     ONPLAY_RELOAD_DIR,
@@ -42,13 +36,9 @@ enum {
     ONPLAY_START_PLAY,
     ONPLAY_PLAYLIST,
     ONPLAY_PLUGIN,
-#ifdef HAVE_HOTKEY
     ONPLAY_FUNC_RETURN, /* for use in hotkey_assignment only */
-#endif
 };
 
-#ifdef HAVE_HOTKEY
-
 enum hotkey_action {
     HOTKEY_OFF = 0,
     HOTKEY_VIEW_PLAYLIST,
@@ -64,7 +54,9 @@ enum hotkey_action {
     HOTKEY_INSERT_SHUFFLED,
     HOTKEY_BOOKMARK_LIST,
     HOTKEY_ALBUMART,
-    HOTKEY_CONTEXT_MENU, /* shows / executes above actions in a menu */
+    HOTKEY_SHOW_IN_FILES,
+    HOTKEY_CONTEXT_MENU = 0x3E, /* Last item shows / executes above actions in a menu */
+    /* Note no more than 62 items */
 };
 enum hotkey_flags {
     HOTKEY_FLAG_NONE = 0x0,
@@ -74,19 +66,40 @@ enum hotkey_flags {
 };
 
 struct hotkey_assignment {
-    int action;             /* hotkey_action */
     int lang_id;            /* Language ID */
     struct menu_func_param func;  /* Function to run if this entry is selected */
-    int16_t return_code;    /* What to return after the function is run. */
-    uint16_t flags;         /* Flags what context, display options */
-};                          /* (Pick ONPLAY_FUNC_RETURN to use function's return value) */
+    int8_t  return_code;    /* What to return after the function is run. */
+    uint8_t flags;         /* Flags what context, display options */
+                           /* (Pick ONPLAY_FUNC_RETURN to use function's return value) */
+    uint8_t action;        /* hotkey_action */
+    uint8_t icon;          /* context menu icon */
+};
+
+/* hotkey & wps context menu */
+#define HK_CTX_ITEMS (5) /* 6 x 5 = 30 bits */
+#define HK_CTX_MASK  (0x3F)
+#define HK_CTX_BITS  (6) /* 6 bits, enough for 62 hotkey actions */
+#define HK_CTX_SET(item, hotkey) ((hotkey & HK_CTX_MASK) << (item * HK_CTX_BITS))
+#define HK_CTX_GET(item, hotkey) ((hotkey >> (item * HK_CTX_BITS)) & HK_CTX_MASK)
 
 const struct hotkey_assignment *get_hotkey(int action);
-#endif
+int hotkey_run_menu(intptr_t flag, bool execute, int current_action);
+
+int onplay(char* file, int attr, int from_context, bool hotkey, int customaction);
+int get_onplay_context(void);
 
 /* needed for the playlist viewer.. eventually clean this up */
 void onplay_show_playlist_cat_menu(const char* track_name, int attr,
                                    void (*add_to_pl_cb));
 void onplay_show_playlist_menu(const char* path, int attr, void (*playlist_insert_cb));
 
+int wps_context_menu_do_setting(void *param);
+#ifdef HAVE_HOTKEY
+int tree_context_menu_do_setting(void *param);
+#endif
+void wps_context_menu_set_default(void* setting, void* defaultval);
+char* wps_context_menu_write_to_cfg(void* setting, char*buf, int buf_len);
+void wps_context_menu_load_from_cfg(void* setting, char *value);
+bool wps_context_menu_is_changed(void* setting, void* defaultval);
+
 #endif
diff --git a/apps/open_plugin.c b/apps/open_plugin.c
index 7950d96101..da3f3addb6 100644
--- a/apps/open_plugin.c
+++ b/apps/open_plugin.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2020 by William Wilgus
  *
diff --git a/apps/open_plugin.h b/apps/open_plugin.h
index 3e00827baf..6a142fa46a 100644
--- a/apps/open_plugin.h
+++ b/apps/open_plugin.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2020 by William Wilgus
  *
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index 68b7e40602..3c68cfbf84 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Miika Pekkarinen
  * Copyright (C) 2011 by Michael Sevakis
diff --git a/apps/pcmbuf.h b/apps/pcmbuf.h
index 846a7d868f..41bc93d75e 100644
--- a/apps/pcmbuf.h
+++ b/apps/pcmbuf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Miika Pekkarinen
  *
diff --git a/apps/playback.c b/apps/playback.c
index 8102f8d917..719802e030 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005-2007 Miika Pekkarinen
  * Copyright (C) 2007-2008 Nicolas Pennequin
diff --git a/apps/playback.h b/apps/playback.h
index 6953927942..46bedf5111 100644
--- a/apps/playback.h
+++ b/apps/playback.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Miika Pekkarinen
  *
diff --git a/apps/playlist.c b/apps/playlist.c
index 198e2baa01..9140d25a8c 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by wavey@wavey.org
  *
@@ -179,6 +178,9 @@
 static struct playlist_info current_playlist;
 static struct playlist_info on_disk_playlist;
 
+/* playlist elapsed percent function from skin_tokens.c */
+extern void wps_playlist_percent_prepare(void);
+
 /* REPEAT_ONE support function from playback.c */
 extern bool audio_pending_track_skip_is_manual(void);
 static inline bool is_manual_skip(void)
@@ -492,7 +494,7 @@ static void empty_playlist_unlocked(struct playlist_info* playlist, bool resume)
     playlist->first_index = 0;
     playlist->amount = 0;
     playlist->last_insert_pos = -1;
-
+    playlist->created_tick = current_tick;
     playlist->started = false;
 
     if (!resume && playlist == &current_playlist)
@@ -705,6 +707,7 @@ static void display_playlist_count(int count, const unsigned char *fmt,
 static int add_indices_to_playlist(struct playlist_info* playlist,
                                    char* buffer, size_t buflen)
 {
+    unsigned long loading_tick = current_tick + HZ/6;
     ssize_t nread;
     unsigned int i, count = 0;
     bool store_index;
@@ -727,7 +730,6 @@ static int add_indices_to_playlist(struct playlist_info* playlist,
 
     i = lseek(playlist->fd, 0, SEEK_CUR);
 
-    splash(0, ID2P(LANG_WAIT));
     store_index = true;
 
     while(1)
@@ -762,6 +764,12 @@ static int add_indices_to_playlist(struct playlist_info* playlist,
                     playlist->indices[ playlist->amount ] = i+count;
                     dc_init_filerefs(playlist, playlist->amount, 1);
                     playlist->amount++;
+
+                    if (TIME_AFTER(current_tick, loading_tick))
+                    {
+                        loading_tick += HZ*10;
+                        splash(0, ID2P(LANG_WAIT));
+                    }
                 }
             }
         }
@@ -3750,6 +3758,8 @@ void playlist_start(int start_index, unsigned long elapsed,
 
     playlist_write_unlock(playlist);
 
+    wps_playlist_percent_prepare();
+
     audio_play(elapsed, offset);
     audio_resume();
 }
diff --git a/apps/playlist.h b/apps/playlist.h
index 02e1262cd3..a906221664 100644
--- a/apps/playlist.h
+++ b/apps/playlist.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by wavey@wavey.org
  *
@@ -86,6 +85,7 @@ struct playlist_info
     int last_shuffled_start; /* number of tracks when insert last
                                     shuffled command start */
     int  seed;           /* shuffle seed                            */
+    unsigned long created_tick;
     struct mutex mutex; /* mutex for control file access    */
 #ifdef HAVE_DIRCACHE
     int dcfrefs_handle;
diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c
index 736e5595dc..7a7e082e21 100644
--- a/apps/playlist_catalog.c
+++ b/apps/playlist_catalog.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Sebastian Henriksen, Hardeep Sidhu
  *
diff --git a/apps/playlist_catalog.h b/apps/playlist_catalog.h
index add8d23293..a05518dcc5 100644
--- a/apps/playlist_catalog.h
+++ b/apps/playlist_catalog.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Sebastian Henriksen, Hardeep Sidhu
  *
diff --git a/apps/playlist_menu.h b/apps/playlist_menu.h
index 196782e8e0..da8d2f9708 100644
--- a/apps/playlist_menu.h
+++ b/apps/playlist_menu.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index 8e28606652..639007ec10 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Hardeep Sidhu
  *
@@ -52,6 +51,10 @@
 #include "yesno.h"
 #include "playback.h"
 
+#ifdef HAVE_DISK_STORAGE
+#include "storage.h"
+#endif
+
 #if defined (HAVE_TAGCACHE) && defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE)
 #include "tagcache.h"
 #endif
@@ -59,9 +62,17 @@
 /* Maximum number of tracks we can have loaded at one time                   */
 #define MAX_PLAYLIST_ENTRIES 200
 
-/* Maximum amount of space required for the name buffer. For each
-   entry, we store the file name as well as, possibly, metadata              */
-#define MAX_NAME_BUFFER_SZ (MAX_PLAYLIST_ENTRIES * 2 * MAX_PATH)
+/* Maximum file name length in name buffer                                   */
+#define MAX_NAME_SZ (sizeof ((struct playlist_track_info *)0)->filename)
+
+/* Maximum formatted metadata length in name buffer                          */
+#define MAX_ID3_SZ MAX_PATH
+
+/* Maximum single track info length in name buffer                           */
+#define MAX_TRACK_INFO (MAX_NAME_SZ + MAX_ID3_SZ)
+
+/* Maximum amount of space required for the name buffer.                     */
+#define MAX_NAME_BUFFER_SZ (MAX_PLAYLIST_ENTRIES * MAX_TRACK_INFO)
 
 /* Over-approximation of view_text plugin size                               */
 #define VIEW_TEXT_PLUGIN_SZ 5000
@@ -185,12 +196,10 @@ static int playlist_entry_load(struct playlist_entry *entry, int index,
 
     len = strlcpy(name_buffer, info.filename, remaining_size) + 1;
 
-    if (global_settings.playlist_viewer_track_display >
-        PLAYLIST_VIEWER_ENTRY_SHOW_FULL_PATH && len <= remaining_size)
-    {
-        /* Allocate space for the id3viewc if the option is enabled */
-        len += MAX_PATH + 1;
-    }
+    /* Allocate space for formatted metadata, if option is enabled */
+    if (global_settings.playlist_viewer_track_display
+        > PLAYLIST_VIEWER_ENTRY_SHOW_FULL_PATH)
+        len += MAX_ID3_SZ;
 
     if (len <= remaining_size)
     {
@@ -386,8 +395,8 @@ static bool update_playlist(bool force)
 
 /* Initialize the playlist viewer. */
 static bool playlist_viewer_init(struct playlist_viewer * viewer,
-                                 const char* filename, bool reload,
-                                 int *most_recent_selection)
+                                 const char* dir, const char* file,
+                                 bool reload, int *recent_selection)
 {
     char *buffer, *index_buffer = NULL;
     size_t buffer_size, index_buffer_size = 0;
@@ -401,9 +410,9 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer,
               - 80 KiB plugin buffer: Sansa c200v2
               - 64 KiB plugin buffer: Sansa m200v4, Sansa Clip
     */
-    bool require_index_buffer = filename && (is_playing || PLUGIN_BUFFER_SIZE >= 0x80000);
+    bool require_index_buffer = file && (is_playing || PLUGIN_BUFFER_SIZE >= 0x80000);
 
-    if (!filename && !is_playing)
+    if (!file && !is_playing)
     {
         /* Try to restore the list from control file */
         if (playlist_resume() == -1)
@@ -417,11 +426,12 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer,
     size_t id3_size = ALIGN_UP(sizeof(*viewer->id3), 4);
 
     buffer = plugin_get_buffer(&buffer_size);
-    if (!buffer || buffer_size <= MAX_PATH + id3_size)
+    if (!buffer || buffer_size <= MAX_TRACK_INFO + id3_size)
         return false;
 
+    /* Leave space to fit id3 struct and at least a single track in name buffer */
     if (require_index_buffer)
-        index_buffer_size = playlist_get_index_bufsz(buffer_size - id3_size - (MAX_PATH + 1));
+        index_buffer_size = playlist_get_index_bufsz(buffer_size - id3_size - MAX_TRACK_INFO);
 
     /* Check for unused space in the plugin buffer to run
        the view_text plugin used by the Track Info screen:
@@ -431,70 +441,44 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer,
     │plugin)│██ view_text ██│ id3 │ index buffer │  name buffer  │  │
     └───────┴───────────────┴─────┴──────────────┴───────────────┴──┘
     */
-    if (buffer_size >= VIEW_TEXT_PLUGIN_SZ + id3_size + index_buffer_size + MAX_NAME_BUFFER_SZ)
+    viewer->allow_view_text_plugin = (buffer_size >=
+        VIEW_TEXT_PLUGIN_SZ + id3_size + index_buffer_size + MAX_NAME_BUFFER_SZ);
+
+    if (viewer->allow_view_text_plugin)
     {
         buffer += VIEW_TEXT_PLUGIN_SZ;
         buffer_size -= VIEW_TEXT_PLUGIN_SZ;
-        viewer->allow_view_text_plugin = true;
     }
-    else
-        viewer->allow_view_text_plugin = false;
-
     viewer->id3 = (void *) buffer;
     buffer += id3_size;
     buffer_size -= id3_size;
 
-    if (!filename)
+    /* Viewing playlist on disk */
+    if (file)
     {
-        viewer->playlist = NULL;
-        viewer->title = (char *) str(LANG_PLAYLIST);
-    }
-    else
-    {
-        /* Viewing playlist on disk */
-        const char *dir, *file;
-        char *temp_ptr;
-
-        /* Separate directory from filename */
-        temp_ptr = strrchr(filename+1,'/');
-        if (temp_ptr)
-        {
-            *temp_ptr = 0;
-            dir = filename;
-            file = temp_ptr + 1;
-        }
-        else
-        {
-            dir = "/";
-            file = filename+1;
-        }
-        viewer->title = file;
-
         if (require_index_buffer)
         {
             index_buffer = buffer;
             buffer += index_buffer_size;
             buffer_size -= index_buffer_size;
         }
-
         viewer->playlist = playlist_load(dir, file,
                                          index_buffer, index_buffer_size,
                                          buffer, buffer_size);
-
-        /* Merge separated dir and filename again */
-        if (temp_ptr)
-            *temp_ptr = '/';
     }
+    else
+        viewer->playlist = NULL;
+
     playlist_buffer_init(&viewer->buffer, buffer, buffer_size);
 
     viewer->moving_track = -1;
     viewer->moving_playlist_index = -1;
-    viewer->initial_selection = most_recent_selection;
+    viewer->initial_selection = recent_selection;
 
     if (!reload)
     {
         if (viewer->playlist)
-            viewer->selected_track = most_recent_selection ? *most_recent_selection : 0;
+            viewer->selected_track = recent_selection ? *recent_selection : 0;
         else
             viewer->selected_track = playlist_get_display_index() - 1;
     }
@@ -529,12 +513,37 @@ static void format_name(char* dest, const char* src, size_t bufsz)
     }
 }
 
-/* Format display line */
-static void format_line(struct playlist_entry* track, char* str,
-                        int len)
+static char* retrieve_formatted_id3(struct playlist_entry* track)
 {
-    char *id3viewc = NULL;
-    char *skipped, *prefix, *suffix;
+    struct mp3entry *id3 = viewer.id3;
+    char *formatted_id3 = track->name + strlen(track->name) + 1;
+    bool retrieve_success = retrieve_id3_tags(track->index, track->name,
+                                              id3, METADATA_EXCLUDE_ID3_PATH);
+    yield();
+    track->attr |= PLAYLIST_ATTR_RETRIEVE_ID3_ATTEMPTED;
+    if (!retrieve_success || !id3->title || !*id3->title)
+        return NULL;
+    track->attr |= PLAYLIST_ATTR_RETRIEVE_ID3_SUCCEEDED;
+
+    size_t len = strlcpy(formatted_id3, id3->title, MAX_ID3_SZ);
+    if (global_settings.playlist_viewer_track_display
+        != PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE && id3->album && *id3->album &&
+        len < MAX_ID3_SZ - 10)
+    {
+        formatted_id3[len++] = ' ';
+        formatted_id3[len++] = '-';
+        formatted_id3[len++] = ' ';
+        strmemccpy(&formatted_id3[len], id3->album, MAX_ID3_SZ - len);
+    }
+    return formatted_id3;
+}
+
+/* Format display line */
+static void format_line(struct playlist_entry* track, char* buf, int buf_sz)
+{
+    char name[MAX_PATH], *skipped, *prefix, *suffix, *formatted_name = NULL;
+    bool show_id3 = global_settings.playlist_viewer_track_display
+                    > PLAYLIST_VIEWER_ENTRY_SHOW_FULL_PATH;
     skipped = prefix = suffix = "";
     if (track->attr & PLAYLIST_ATTR_SKIPPED)
         skipped = "(ERR) ";
@@ -543,97 +552,24 @@ static void format_line(struct playlist_entry* track, char* str,
         prefix = "[";
         suffix = "]";
     }
-    if (!(track->attr & PLAYLIST_ATTR_RETRIEVE_ID3_ATTEMPTED) &&
-        (global_settings.playlist_viewer_track_display ==
-            PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE_AND_ALBUM ||
-        global_settings.playlist_viewer_track_display ==
-            PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE
-    ))
-    {
-        track->attr |= PLAYLIST_ATTR_RETRIEVE_ID3_ATTEMPTED;
-        bool retrieve_success = retrieve_id3_tags(track->index, track->name,
-                                                  viewer.id3,
-                                                  METADATA_EXCLUDE_ID3_PATH);
-        if (retrieve_success)
-        {
-            if (!id3viewc)
-            {
-                id3viewc = track->name + strlen(track->name) + 1;
-            }
-            struct mp3entry * pid3 = viewer.id3;
-            id3viewc[0] = '\0';
-            if (global_settings.playlist_viewer_track_display ==
-                PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE_AND_ALBUM)
-            {
-                /* Title & Album */
-                if (pid3->title && pid3->title[0] != '\0')
-                {
-                    char* cur_str = id3viewc;
-                    int title_len = strlen(pid3->title);
-                    int rem_space = MAX_PATH;
-                    for (int i = 0; i < title_len && rem_space > 0; i++)
-                    {
-                        cur_str[0] = pid3->title[i];
-                        cur_str++;
-                        rem_space--;
-                    }
-                    if (rem_space > 10)
-                    {
-                        cur_str[0] = (char) ' ';
-                        cur_str[1] = (char) '-';
-                        cur_str[2] = (char) ' ';
-                        cur_str += 3;
-                        rem_space -= 3;
-                        cur_str = strmemccpy(cur_str, (pid3->album &&
-                                             pid3->album[0] != '\0') ? pid3->album :
-                                             (char*) str(LANG_TAGNAVI_UNTAGGED),
-                                             rem_space);
-                        if (cur_str)
-                            track->attr |= PLAYLIST_ATTR_RETRIEVE_ID3_SUCCEEDED;
-                    }
-                }
-            }
-            else if (global_settings.playlist_viewer_track_display ==
-                     PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE)
-            {
-                /* Just the title */
-                if (pid3->title && pid3->title[0] != '\0' &&
-                    strmemccpy(id3viewc, pid3->title, MAX_PATH))
-                {
-                    track->attr |= PLAYLIST_ATTR_RETRIEVE_ID3_SUCCEEDED;
-                }
-            }
-            /* Yield to reduce as much as possible the perceived UI lag,
-            because retrieving id3 tags is an expensive operation */
-            yield();
-        }
-    }
+
+    if (show_id3 && !(track->attr & PLAYLIST_ATTR_RETRIEVE_ID3_ATTEMPTED))
+        formatted_name = retrieve_formatted_id3(track);
 
     if (!(track->attr & PLAYLIST_ATTR_RETRIEVE_ID3_SUCCEEDED))
     {
-        /* Simply use a formatted file name */
-        char name[MAX_PATH];
         format_name(name, track->name, sizeof(name));
-        if (global_settings.playlist_viewer_indices)
-            /* Display playlist index */
-            snprintf(str, len, "%s%d. %s%s%s",
-                     prefix, track->display_index, skipped, name, suffix);
-        else
-            snprintf(str, len, "%s%s%s%s", prefix, skipped, name, suffix);
+        formatted_name = name;
     }
+    else if (!formatted_name)
+        formatted_name = track->name + strlen(track->name) + 1;
+
+    if (global_settings.playlist_viewer_indices)
+        snprintf(buf, buf_sz, "%s%d. %s%s%s", prefix, track->display_index,
+                 skipped, formatted_name, suffix);
     else
-    {
-        if (!id3viewc)
-        {
-            id3viewc = track->name + strlen(track->name) + 1;
-        }
-        if (global_settings.playlist_viewer_indices)
-            /* Display playlist index */
-            snprintf(str, len, "%s%d. %s%s%s",
-                     prefix, track->display_index, skipped, id3viewc, suffix);
-        else
-            snprintf(str, len, "%s%s%s%s", prefix, skipped, id3viewc, suffix);
-    }
+        snprintf(buf, buf_sz, "%s%s%s%s", prefix,
+                 skipped, formatted_name, suffix);
 }
 
 /* Fallback for displaying fullscreen tags, in case there is not
@@ -978,32 +914,79 @@ static bool update_viewer(struct gui_synclist *playlist_lists, enum pv_context_r
 
 static bool open_playlist_viewer(const char* filename,
                                   struct gui_synclist *playlist_lists,
-                                  bool reload, int *most_recent_selection)
+                                  bool reload, int *recent_selection)
 {
+    const char *dir = NULL, *file = NULL;
+    char *sep = NULL;
     viewer.loading_tick = current_tick + HZ/3;
-    push_current_activity(ACTIVITY_PLAYLISTVIEWER);
 
-    if (playlist_viewer_init(&viewer, filename, reload, most_recent_selection))
-        viewer.is_open = true;
+    /* Set viewer title */
+    if (filename)
+    {
+        /* Separate directory from filename */
+        sep = strrchr(filename + 1, '/');
+        if (sep)
+        {
+            *sep = '\0';
+            dir = filename;
+            file = sep + 1;
+        }
+        else
+        {
+            dir = "/";
+            file = filename + 1;
+        }
+        viewer.title = file;
+    }
     else
+        viewer.title = (char *) str(LANG_PLAYLIST);
+
+    /* Prevent UI from feeling unresponsive when retrieving
+       metadata, or on devices that use disk storage. */
+    if (global_settings.playlist_viewer_track_display
+        > PLAYLIST_VIEWER_ENTRY_SHOW_FULL_PATH
+#ifdef HAVE_DISK_STORAGE
+        || (!storage_disk_is_active()
+#ifdef HAVE_DIRCACHE
+            && (filename || !global_settings.dircache)
+#endif /* HAVE DIRCACHE */
+           )
+#endif /* HAVE_DISK_STORAGE */
+       )
+    {
+        push_activity_without_refresh(ACTIVITY_PLAYLISTVIEWER);
+        clear_screen_buffer(false);
+        FOR_NB_SCREENS(i)
+            sb_set_title_text(viewer.title, Icon_Playlist, i);
+        send_event(GUI_EVENT_ACTIONUPDATE, (void*) 1);
+    }
+    else
+        push_current_activity(ACTIVITY_PLAYLISTVIEWER);
+
+    viewer.is_open = playlist_viewer_init(&viewer, dir, file, reload, recent_selection);
+
+    /* Merge separated dir and filename again */
+    if (sep)
+        *sep = '/';
+
+    if (!viewer.is_open)
         return false;
 
     update_gui(playlist_lists, true);
-
     return true;
 }
 
 /* Main viewer function.  Filename identifies playlist to be viewed.  If NULL,
    view current playlist. */
 enum playlist_viewer_result playlist_viewer_ex(const char* filename,
-                                               int* most_recent_selection)
+                                               int* recent_selection)
 {
     enum playlist_viewer_result ret = PLAYLIST_VIEWER_OK;
     bool exit = false;        /* exit viewer */
     int button;
     struct gui_synclist playlist_lists;
 
-    if (!open_playlist_viewer(filename, &playlist_lists, false, most_recent_selection))
+    if (!open_playlist_viewer(filename, &playlist_lists, false, recent_selection))
     {
         ret = PLAYLIST_VIEWER_CANCEL;
         goto exit;
@@ -1034,7 +1017,7 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename,
         }
 
         /* Timeout so we can determine if play status has changed */
-        bool res = list_do_action(CONTEXT_TREE, HZ/2, &playlist_lists, &button);
+        bool res = list_do_action(CONTEXT_TREE|ALLOW_SOFTLOCK, HZ/2, &playlist_lists, &button);
         /* during moving, another redraw is going to be needed,
          * since viewer.selected_track is updated too late (after the first draw)
          * drawing the moving item needs it */
@@ -1291,7 +1274,7 @@ bool search_playlist(void)
     struct gui_synclist playlist_lists;
     struct playlist_track_info track;
 
-    if (!playlist_viewer_init(&viewer, 0, false, NULL))
+    if (!playlist_viewer_init(&viewer, NULL, NULL, false, NULL))
         return ret;
     if (kbd_input(search_str, sizeof(search_str), NULL) < 0)
         return ret;
diff --git a/apps/playlist_viewer.h b/apps/playlist_viewer.h
index 2bb1336f4f..93ea9364cf 100644
--- a/apps/playlist_viewer.h
+++ b/apps/playlist_viewer.h
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Hardeep Sidhu
  *
diff --git a/apps/plugin.c b/apps/plugin.c
index 6c689b21e6..d06e9936e3 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
@@ -353,6 +352,7 @@ static const struct plugin_api rockbox_api = {
     gui_synclist_del_item,
     gui_synclist_do_button,
     gui_synclist_set_title,
+    gui_synclist_scroll_stop,
     gui_syncyesno_run,
     simplelist_info_init,
     simplelist_show_list,
@@ -488,6 +488,7 @@ static const struct plugin_api rockbox_api = {
     talk_force_enqueue_next,
 
     /* kernel/ system */
+    panicf,
 #if defined(ARM_NEED_DIV0)
     __div0,
 #endif
@@ -562,7 +563,9 @@ static const struct plugin_api rockbox_api = {
     __cyg_profile_func_exit,
 #endif
     add_event,
+    add_event_ex,
     remove_event,
+    remove_event_ex,
     send_event,
 
 #if (CONFIG_PLATFORM & PLATFORM_HOSTED)
@@ -578,6 +581,7 @@ static const struct plugin_api rockbox_api = {
     vsnprintf,
     vuprintf,
     strcpy,
+    strncpy,
     strlcpy,
     strlen,
     strrchr,
@@ -696,6 +700,7 @@ static const struct plugin_api rockbox_api = {
     count_mp3_frames,
     create_xing_header,
 #ifdef HAVE_TAGCACHE
+    tagtree_entries_iterate,
     tagcache_search,
     tagcache_search_set_uniqbuf,
     tagcache_search_add_filter,
@@ -709,9 +714,8 @@ static const struct plugin_api rockbox_api = {
     tagcache_is_in_ram,
 #if defined(HAVE_DIRCACHE)
     tagcache_fill_tags,
-#endif
-#endif
-    tagtree_subentries_do_action,
+#endif /* HAVE_DIRCACHE */
+#endif /* HAVE_TC_RAMCACHE */
 #endif /* HAVE_TAGCACHE */
 
 #ifdef HAVE_ALBUMART
@@ -871,10 +875,7 @@ static const struct plugin_api rockbox_api = {
 
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
-    panicf,
-    gui_synclist_scroll_stop,
-    add_event_ex,
-    remove_event_ex,
+    font_measurestring,
 };
 
 static int plugin_buffer_handle;
@@ -1011,6 +1012,8 @@ int plugin_load(const char* plugin, const void* parameter)
     if (!global_settings.talk_menu)
         talk_buffer_set_policy(TALK_BUFFER_LOOSE);
 
+    screen_helper_setfont(FONT_UI);
+
     plugin_check_open_close__enter();
 
     int rc = p_hdr->entry_point(parameter); /* run the loaded plugin */
@@ -1022,10 +1025,8 @@ int plugin_load(const char* plugin, const void* parameter)
     pop_current_activity_without_refresh();
     if (get_current_activity() != ACTIVITY_WPS)
     {
-        skin_defer_rendering(true);
         FOR_NB_SCREENS(i)
-                skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL);
-        skin_defer_rendering(false);
+            skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL);
         sb_skin_force_next_update();
     }
 
diff --git a/apps/plugin.h b/apps/plugin.h
index 50fe1508ab..7ccc4b1239 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
@@ -62,7 +61,6 @@
 
 #define splash(__ticks, __str) splashf(__ticks, __str)
 
-char* strncpy(char *, const char *, size_t);
 void* plugin_get_buffer(size_t *buffer_size);
 size_t plugin_reserve_buffer(size_t buffer_size);
 int plugin_open(const char *plugin, const char *parameter);
@@ -181,7 +179,7 @@ int plugin_open(const char *plugin, const char *parameter);
  * when this happens please take the opportunity to sort in
  * any new functions "waiting" at the end of the list.
  */
-#define PLUGIN_API_VERSION 282
+#define PLUGIN_API_VERSION 284
 
 /* 239 Marks the removal of ARCHOS HWCODEC and CHARCELL */
 
@@ -414,6 +412,7 @@ struct plugin_api {
     bool (*gui_synclist_do_button)(struct gui_synclist * lists, int *action);
     void (*gui_synclist_set_title)(struct gui_synclist *lists, const char* title,
                                    enum themable_icons icon);
+    void (*gui_synclist_scroll_stop)(struct gui_synclist *lists);
     enum yesno_res (*gui_syncyesno_run)(const struct text_message * main_message,
                                         const struct text_message * yes_message,
                                         const struct text_message * no_message);
@@ -569,6 +568,7 @@ struct plugin_api {
     void (*talk_force_enqueue_next)(void);
 
     /* kernel/ system */
+    void (*panicf)(const char *msg, ...);
 #if defined(ARM_NEED_DIV0)
     void (*__div0)(void);
 #endif
@@ -655,7 +655,17 @@ struct plugin_api {
 #endif
     /* event api */
     bool (*add_event)(unsigned short id, void (*handler)(unsigned short id, void *data));
+    bool (*add_event_ex)(unsigned short id, bool oneshot,
+                         void (*handler)(unsigned short id,
+                                         void *event_data,
+                                         void *user_data),
+                         void *user_data);
     void (*remove_event)(unsigned short id, void (*handler)(unsigned short id, void *data));
+    void (*remove_event_ex)(unsigned short id,
+                            void (*handler)(unsigned short id,
+                                            void *event_data,
+                                            void *user_data),
+                            void *user_data);
     void (*send_event)(unsigned short id, void *data);
 
 #if (CONFIG_PLATFORM & PLATFORM_HOSTED)
@@ -672,6 +682,7 @@ struct plugin_api {
     int (*vsnprintf)(char *buf, size_t size, const char *fmt, va_list ap);
     int (*vuprintf)(vuprintf_push_cb push, void *userp, const char *fmt, va_list ap);
     char* (*strcpy)(char *dst, const char *src);
+    char* (*strncpy)(char * dst, const char * src, size_t count);
     size_t (*strlcpy)(char *dst, const char *src, size_t length);
     size_t (*strlen)(const char *str);
     char * (*strrchr)(const char *s, int c);
@@ -812,6 +823,9 @@ struct plugin_api {
             void (*progressfunc)(int), bool generate_toc,
             unsigned char* tempbuf, size_t tempbuf_len);
 #ifdef HAVE_TAGCACHE
+    bool (*tagtree_entries_iterate)(struct tagcache_search *tcs,
+                                    bool (*action_cb)(const char *file_name),
+                                    char *buf, size_t buf_sz);
     bool (*tagcache_search)(struct tagcache_search *tcs, int tag);
     void (*tagcache_search_set_uniqbuf)(struct tagcache_search *tcs,
            void *buffer, long length);
@@ -828,9 +842,8 @@ struct plugin_api {
     bool (*tagcache_is_in_ram)(void);
 #if defined(HAVE_DIRCACHE)
     bool (*tagcache_fill_tags)(struct mp3entry *id3, const char *filename);
-#endif
-#endif
-    bool (*tagtree_subentries_do_action)(bool (*action_cb)(const char *file_name));
+#endif /* HAVE_DIRCACHE */
+#endif /* HAVE_TC_RAMCACHE */
 #endif /* HAVE_TAGCACHE */
 
 #ifdef HAVE_ALBUMART
@@ -1026,18 +1039,8 @@ struct plugin_api {
 
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
-    void (*panicf)(const char *msg, ...);
-    void (*gui_synclist_scroll_stop)(struct gui_synclist *lists);
-    bool (*add_event_ex)(unsigned short id, bool oneshot,
-                         void (*handler)(unsigned short id,
-                                         void *event_data,
-                                         void *user_data),
-                         void *user_data);
-    void (*remove_event_ex)(unsigned short id,
-                            void (*handler)(unsigned short id,
-                                            void *event_data,
-                                            void *user_data),
-                            void *user_data);
+    int (*font_measurestring)(const unsigned char *str, size_t maxbytes,
+                              size_t maxwidth, int *w, int *h, int fontnum);
 };
 
 /* plugin header */
diff --git a/apps/plugins/2048.c b/apps/plugins/2048.c
index 2458554631..5c0da8a0e0 100644
--- a/apps/plugins/2048.c
+++ b/apps/plugins/2048.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei
  *
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index 484eedf681..1ba38c97bb 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -74,7 +74,7 @@ mikmod
     (CONFIG_KEYPAD == SANSA_FUZE_PAD) || (CONFIG_KEYPAD == SANSA_E200_PAD) || \
     (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \
     (CONFIG_KEYPAD == IPOD_1G2G_PAD || CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) || \
-    (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) || (CONFIG_KEYPAD == CTRU_PAD)
+    (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) || (CONFIG_KEYPAD == CTRU_PAD) || (CONFIG_KEYPAD == EROSQ_PAD)
 /* PDBox is confirmed to run on these player models. */
 pdbox
 #endif
diff --git a/apps/plugins/alarmclock.c b/apps/plugins/alarmclock.c
index 535097724f..7461bf2502 100644
--- a/apps/plugins/alarmclock.c
+++ b/apps/plugins/alarmclock.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Clément Pit-Claudel
  *
diff --git a/apps/plugins/amaze.c b/apps/plugins/amaze.c
index 6664748323..c0eaf1a11d 100644
--- a/apps/plugins/amaze.c
+++ b/apps/plugins/amaze.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, (c) 2018 Sebastian Leonhardt
  *
diff --git a/apps/plugins/announce_status.c b/apps/plugins/announce_status.c
index f71d25af6f..044d77f417 100644
--- a/apps/plugins/announce_status.c
+++ b/apps/plugins/announce_status.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (C) 2003-2005 Jörg Hohensohn
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 6245340fb3..284043c14f 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (C) 2006 Alexander Spyridakis, Hristo Kovachev
diff --git a/apps/plugins/bench_mem_jpeg.c b/apps/plugins/bench_mem_jpeg.c
index 184eb0f1c8..db210613b8 100644
--- a/apps/plugins/bench_mem_jpeg.c
+++ b/apps/plugins/bench_mem_jpeg.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   ( (__) )  \___|    ( | \_\ ( (__) )    (
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Andrew Mahone
  *
diff --git a/apps/plugins/bench_scaler.c b/apps/plugins/bench_scaler.c
index dc794e67f2..0dc201f907 100644
--- a/apps/plugins/bench_scaler.c
+++ b/apps/plugins/bench_scaler.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   ( (__) )  \___|    ( | \_\ ( (__) )    (
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Andrew Mahone
  *
diff --git a/apps/plugins/bitmaps/pluginbitmaps.make b/apps/plugins/bitmaps/pluginbitmaps.make
index caf7d23535..55928174ba 100644
--- a/apps/plugins/bitmaps/pluginbitmaps.make
+++ b/apps/plugins/bitmaps/pluginbitmaps.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 PBMPINCDIR = $(BUILDDIR)/pluginbitmaps
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index 10272f90e4..d5a84b7e4e 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Tom Ross
  *
diff --git a/apps/plugins/boomshine.lua b/apps/plugins/boomshine.lua
index fcdf7c9a1c..a95c7d4114 100644
--- a/apps/plugins/boomshine.lua
+++ b/apps/plugins/boomshine.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
 
  Port of Chain Reaction (which is based on Boomshine) to Rockbox in Lua.
  See http://www.yvoschaap.com/chainrxn/ and http://www.k2xl.com/games/boomshine/
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c
index a42a0af6ba..a10931cd2b 100644
--- a/apps/plugins/bounce.c
+++ b/apps/plugins/bounce.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Daniel Stenberg
  *
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index bb34219895..855aeb98db 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005, 2006 Ben Basha (Paprica)
  * Copyright (C) 2009 Karl Kurbjun
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c
index f870d19efa..a647d98fad 100644
--- a/apps/plugins/bubbles.c
+++ b/apps/plugins/bubbles.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2005 Adam Boot
 *
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 27bb4bb438..2feee39799 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 Pengxuan Liu (Isaac)
  *
@@ -1119,7 +1118,7 @@ static void transcendFunc(char* func, double* tt, int* ttPower)
             
             /* Save current function context */
             char original_func[3];
-            strncpy(original_func, func, 3);
+            rb->strncpy(original_func, func, 3);
             
             transcendFunc("asin", &arcsin_input, &arcsin_power);
             
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index d1213367ae..f605c3267c 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * (based upon 1.1 by calpefrosch) updated by www.HuwSy.ukhackers.net
  *
  * Copyright (C) 2002
diff --git a/apps/plugins/chessbox.c b/apps/plugins/chessbox.c
index 14d2936848..4b01dd7ac9 100644
--- a/apps/plugins/chessbox.c
+++ b/apps/plugins/chessbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Jens Arnold
  *
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c
index ad75541039..225092106f 100644
--- a/apps/plugins/chessbox/chessbox.c
+++ b/apps/plugins/chessbox/chessbox.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2006 Miguel A. Arévalo
 * Color graphics from eboard
diff --git a/apps/plugins/chessbox/chessbox.make b/apps/plugins/chessbox/chessbox.make
index 7fa0598eb9..396d268da5 100644
--- a/apps/plugins/chessbox/chessbox.make
+++ b/apps/plugins/chessbox/chessbox.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 CHESSBOX_SRCDIR = $(APPSDIR)/plugins/chessbox
@@ -32,7 +31,7 @@ $(CHESSBOX_OBJDIR)/chessbox.refmap: $(CHESSBOX_OBJ)
 
 $(CHESSBOX_OUTLDS): $(PLUGIN_LDS) $(CHESSBOX_OBJDIR)/chessbox.refmap
 	$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DPLUGIN -DOVERLAY_OFFSET=$(shell \
-		$(TOOLSDIR)/ovl_offset.pl $(CHESSBOX_OBJDIR)/chessbox.refmap))
+		$(TOOLSDIR)/ovl_offset.pl $(CHESSBOX_OBJDIR)/chessbox.refelf))
 
 $(CHESSBOX_OBJDIR)/chessbox.ovl: $(CHESSBOX_OBJ) $(CHESSBOX_OUTLDS)
 	$(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
diff --git a/apps/plugins/chessbox/chessbox_pgn.c b/apps/plugins/chessbox/chessbox_pgn.c
index d6da369b9e..bc68a5936a 100644
--- a/apps/plugins/chessbox/chessbox_pgn.c
+++ b/apps/plugins/chessbox/chessbox_pgn.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2007 Mauricio Peccorini
 *
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index 681f89150c..8d621dcfb7 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2007 Mauricio Peccorini
 *
diff --git a/apps/plugins/chessbox/opening.c b/apps/plugins/chessbox/opening.c
index 2728ff1f1e..5cd1474fa9 100644
--- a/apps/plugins/chessbox/opening.c
+++ b/apps/plugins/chessbox/opening.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc.
 * Copyright (c) 1987 by Stuart Cracraft and John Stanback
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 521ae034b7..9de3a78229 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Kjell Ericson
  *
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index fa6acea82a..d791d8408b 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Orginal from Vision-8 Emulator / Copyright (C) 1997-1999  Marcel de Kogel
  * Modified for Archos by Blueloop (a.wenger@gmx.de)
@@ -1376,7 +1375,7 @@ static void chip8_sound_off (void)
 /****************************************************************************/
 static void chip8_update_display(void)
 {
-    int x, lcd_x, y, i;
+    int x, y, i;
     byte w;
     byte* row;
     /* frame buffer in hardware fomat */
@@ -1385,7 +1384,7 @@ static void chip8_update_display(void)
     for (y=0;y<CHIP8_HEIGHT/8;++y)
     {
         row = lcd_framebuf[y];
-        for (x=0, lcd_x=0;x<CHIP8_WIDTH;++x,++lcd_x)
+        for (x=0;x<CHIP8_WIDTH;++x)
         {
             w = 0;
             for (i=0;i<8;i++)
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index 74d1fc9237..f31e834b4c 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Originally by Joshua Oreman, improved by Prashant Varanasi
  * Ported to Rockbox by Ben Basha (Paprica)
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c
index 210864968b..b8e8d2164b 100644
--- a/apps/plugins/clix.c
+++ b/apps/plugins/clix.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008-2009 Rene Peinthor
  * Contribution from Johannes Schwarz (new menu system, use of highscore lib)
diff --git a/apps/plugins/clock/clock.c b/apps/plugins/clock/clock.c
index 7fa9a3c2f2..7a881a8403 100644
--- a/apps/plugins/clock/clock.c
+++ b/apps/plugins/clock/clock.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Kévin Ferrare, graphic design 2003 Zakk Roberts
  *
diff --git a/apps/plugins/clock/clock.h b/apps/plugins/clock/clock.h
index 6de4287e02..4dd43b9db8 100644
--- a/apps/plugins/clock/clock.h
+++ b/apps/plugins/clock/clock.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/clock/clock.make b/apps/plugins/clock/clock.make
index 9e03c6665b..c42a21899c 100644
--- a/apps/plugins/clock/clock.make
+++ b/apps/plugins/clock/clock.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 CLOCKSRCDIR := $(APPSDIR)/plugins/clock
diff --git a/apps/plugins/clock/clock_bitmap_strings.c b/apps/plugins/clock/clock_bitmap_strings.c
index c909dbeb7b..7fbcab4d23 100644
--- a/apps/plugins/clock/clock_bitmap_strings.c
+++ b/apps/plugins/clock/clock_bitmap_strings.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/clock/clock_bitmap_strings.h b/apps/plugins/clock/clock_bitmap_strings.h
index 357dbcd4bc..33d6f79b9e 100644
--- a/apps/plugins/clock/clock_bitmap_strings.h
+++ b/apps/plugins/clock/clock_bitmap_strings.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/clock/clock_bitmaps.c b/apps/plugins/clock/clock_bitmaps.c
index 50c31806bc..8769df848f 100644
--- a/apps/plugins/clock/clock_bitmaps.c
+++ b/apps/plugins/clock/clock_bitmaps.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/clock/clock_bitmaps.h b/apps/plugins/clock/clock_bitmaps.h
index 8cd9cd1a79..6b4f1b67eb 100644
--- a/apps/plugins/clock/clock_bitmaps.h
+++ b/apps/plugins/clock/clock_bitmaps.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/clock/clock_draw.c b/apps/plugins/clock/clock_draw.c
index 12f39a2d65..a72415c658 100644
--- a/apps/plugins/clock/clock_draw.c
+++ b/apps/plugins/clock/clock_draw.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/clock/clock_draw.h b/apps/plugins/clock/clock_draw.h
index 24ba030597..e41c1e1a7b 100644
--- a/apps/plugins/clock/clock_draw.h
+++ b/apps/plugins/clock/clock_draw.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/clock/clock_draw_analog.c b/apps/plugins/clock/clock_draw_analog.c
index 62ada08c34..3a03bafa36 100644
--- a/apps/plugins/clock/clock_draw_analog.c
+++ b/apps/plugins/clock/clock_draw_analog.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare based on Zakk Roberts's work
  *
diff --git a/apps/plugins/clock/clock_draw_analog.h b/apps/plugins/clock/clock_draw_analog.h
index 6602912dfc..150396e36d 100644
--- a/apps/plugins/clock/clock_draw_analog.h
+++ b/apps/plugins/clock/clock_draw_analog.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/clock/clock_draw_binary.c b/apps/plugins/clock/clock_draw_binary.c
index 611ab1b371..224f34bf52 100644
--- a/apps/plugins/clock/clock_draw_binary.c
+++ b/apps/plugins/clock/clock_draw_binary.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/clock/clock_draw_binary.h b/apps/plugins/clock/clock_draw_binary.h
index 26e1c02a37..313a4b69b1 100644
--- a/apps/plugins/clock/clock_draw_binary.h
+++ b/apps/plugins/clock/clock_draw_binary.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/clock/clock_draw_digital.c b/apps/plugins/clock/clock_draw_digital.c
index b9e2116912..fb26b5dcaa 100644
--- a/apps/plugins/clock/clock_draw_digital.c
+++ b/apps/plugins/clock/clock_draw_digital.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/clock/clock_draw_digital.h b/apps/plugins/clock/clock_draw_digital.h
index be18665336..86231736f2 100644
--- a/apps/plugins/clock/clock_draw_digital.h
+++ b/apps/plugins/clock/clock_draw_digital.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/clock/clock_menu.c b/apps/plugins/clock/clock_menu.c
index ca5373321b..1f26bdf1d6 100644
--- a/apps/plugins/clock/clock_menu.c
+++ b/apps/plugins/clock/clock_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Zakk Roberts
  *
diff --git a/apps/plugins/clock/clock_settings.c b/apps/plugins/clock/clock_settings.c
index 11d4fae343..6e6f32bd36 100644
--- a/apps/plugins/clock/clock_settings.c
+++ b/apps/plugins/clock/clock_settings.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare based on Zakk Roberts's work
  *
diff --git a/apps/plugins/clock/clock_settings.h b/apps/plugins/clock/clock_settings.h
index 60c7e77188..307488cc0e 100644
--- a/apps/plugins/clock/clock_settings.h
+++ b/apps/plugins/clock/clock_settings.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare based on Zakk Roberts's work
  *
diff --git a/apps/plugins/codebuster.c b/apps/plugins/codebuster.c
index 2b64898d47..bdc5e3a598 100644
--- a/apps/plugins/codebuster.c
+++ b/apps/plugins/codebuster.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 Clément Pit--Claudel
 *
diff --git a/apps/plugins/countdown_timer.c b/apps/plugins/countdown_timer.c
index b520047bf3..6976914806 100644
--- a/apps/plugins/countdown_timer.c
+++ b/apps/plugins/countdown_timer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Teun van Dalen
  *
diff --git a/apps/plugins/credits.c b/apps/plugins/credits.c
index f4716651fd..fee2816a17 100644
--- a/apps/plugins/credits.c
+++ b/apps/plugins/credits.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Robert Hak <rhak at ramapo.edu>
  *
diff --git a/apps/plugins/credits.pl b/apps/plugins/credits.pl
index 942a96b99f..f86a4e4d91 100644
--- a/apps/plugins/credits.pl
+++ b/apps/plugins/credits.pl
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 while (<STDIN>) {
     if(($_ =~ /^([A-Z]+[\S ]+)/) && ($_ !~ /^People/)) {
diff --git a/apps/plugins/crypt_firmware.c b/apps/plugins/crypt_firmware.c
index 3ccab090f5..332d18e761 100644
--- a/apps/plugins/crypt_firmware.c
+++ b/apps/plugins/crypt_firmware.c
@@ -7,7 +7,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  *
- * $Id$
  * 
  * Rockbox plugin copyright (C) 2009 Dave Chapman.
  * Based on encryption code (C) 2009 Michael Sparmann
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index d3c95be10f..5ea60363c5 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2002 Damien Teney
 * modified to use int instead of float math by Andreas Zwirtes
diff --git a/apps/plugins/cue_playlist.c b/apps/plugins/cue_playlist.c
index d3f64fcc50..653cbf58f5 100644
--- a/apps/plugins/cue_playlist.c
+++ b/apps/plugins/cue_playlist.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2024 William Wilgus
  *
diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c
index cb8e4ddf72..f28a1778c5 100644
--- a/apps/plugins/demystify.c
+++ b/apps/plugins/demystify.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2005 Kevin Ferrare
 *
diff --git a/apps/plugins/dice.c b/apps/plugins/dice.c
index 62050c182a..42de07e115 100644
--- a/apps/plugins/dice.c
+++ b/apps/plugins/dice.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Brandon Low
  *
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c
index c7868c09d0..fe61229c7e 100644
--- a/apps/plugins/dict.c
+++ b/apps/plugins/dict.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Tomas Salfischberger
  *
diff --git a/apps/plugins/disktidy.c b/apps/plugins/disktidy.c
index 258ba95217..993a68a2db 100644
--- a/apps/plugins/disktidy.c
+++ b/apps/plugins/disktidy.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 David Dent
  *
@@ -329,7 +328,7 @@ static enum plugin_status display_run_stats(void)
     if (sbs_has_title)
     {
 #endif
-        rb->send_event(GUI_EVENT_ACTIONUPDATE, (void*)1);
+        rb->send_event(GUI_EVENT_ACTIONREDRAW, (void*)1);
     }
 
     rb->viewport_set_defaults(&vp, SCREEN_MAIN);
@@ -603,7 +602,7 @@ static enum plugin_status tidy_do(void)
 
     sbs_has_title = rb->sb_set_title_text(CLEANING_STR, Icon_NOICON, SCREEN_MAIN);
     if (sbs_has_title)
-        rb->send_event(GUI_EVENT_ACTIONUPDATE, (void*)1);
+        rb->send_event(GUI_EVENT_ACTIONREDRAW, (void*)1);
 
     run_stats.files_removed = 0;
     run_stats.dirs_removed = 0;
diff --git a/apps/plugins/doom/d_french.h b/apps/plugins/doom/d_french.h
index 6910ad0094..c79a1fb61e 100644
--- a/apps/plugins/doom/d_french.h
+++ b/apps/plugins/doom/d_french.h
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make
index 8be7620feb..c8b4723ee6 100644
--- a/apps/plugins/doom/doom.make
+++ b/apps/plugins/doom/doom.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 DOOMSRCDIR := $(APPSDIR)/plugins/doom
diff --git a/apps/plugins/doom/doomdata.h b/apps/plugins/doom/doomdata.h
index f56524e6cd..9cdbac68a8 100644
--- a/apps/plugins/doom/doomdata.h
+++ b/apps/plugins/doom/doomdata.h
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/doomdef.c b/apps/plugins/doom/doomdef.c
index 6ae4bb6894..6d35998a59 100644
--- a/apps/plugins/doom/doomdef.c
+++ b/apps/plugins/doom/doomdef.c
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/doomstat.c b/apps/plugins/doom/doomstat.c
index b6dc649d1b..47d86ebccf 100644
--- a/apps/plugins/doom/doomstat.c
+++ b/apps/plugins/doom/doomstat.c
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/doomstat.h b/apps/plugins/doom/doomstat.h
index 089f93b356..29f6f03b66 100644
--- a/apps/plugins/doom/doomstat.h
+++ b/apps/plugins/doom/doomstat.h
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/i_sound.h b/apps/plugins/doom/i_sound.h
index 2e733b1c62..6c6e169153 100644
--- a/apps/plugins/doom/i_sound.h
+++ b/apps/plugins/doom/i_sound.h
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/i_system.c b/apps/plugins/doom/i_system.c
index 601ffc3b27..76e8d87f7a 100644
--- a/apps/plugins/doom/i_system.c
+++ b/apps/plugins/doom/i_system.c
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/i_system.h b/apps/plugins/doom/i_system.h
index 35de3ef09b..ae7b07fea3 100644
--- a/apps/plugins/doom/i_system.h
+++ b/apps/plugins/doom/i_system.h
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index cdae2a2b5c..a66bf25852 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -1,7 +1,6 @@
 /* Emacs style mode select   -*- C++ -*-
  *-----------------------------------------------------------------------------
  *
- * $Id$
  *
  * Copyright (C) 1993-1996 by id Software, Inc.
  *
diff --git a/apps/plugins/doom/i_video.h b/apps/plugins/doom/i_video.h
index fd8f269d6b..a3ae9c5912 100644
--- a/apps/plugins/doom/i_video.h
+++ b/apps/plugins/doom/i_video.h
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/m_cheat.c b/apps/plugins/doom/m_cheat.c
index e46111293f..e5cba5ed4f 100644
--- a/apps/plugins/doom/m_cheat.c
+++ b/apps/plugins/doom/m_cheat.c
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/m_cheat.h b/apps/plugins/doom/m_cheat.h
index dfa916ffdb..ee974b93dc 100644
--- a/apps/plugins/doom/m_cheat.h
+++ b/apps/plugins/doom/m_cheat.h
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/m_fixed.h b/apps/plugins/doom/m_fixed.h
index 15fd9867a3..a093edc6d8 100644
--- a/apps/plugins/doom/m_fixed.h
+++ b/apps/plugins/doom/m_fixed.h
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/m_menu.c b/apps/plugins/doom/m_menu.c
index bf241aa097..731e281266 100644
--- a/apps/plugins/doom/m_menu.c
+++ b/apps/plugins/doom/m_menu.c
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/m_menu.h b/apps/plugins/doom/m_menu.h
index da360c0147..8317d1675f 100644
--- a/apps/plugins/doom/m_menu.h
+++ b/apps/plugins/doom/m_menu.h
@@ -1,7 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id$
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
diff --git a/apps/plugins/doom/r_data.c b/apps/plugins/doom/r_data.c
index 17800f231c..01393bf7fc 100644
--- a/apps/plugins/doom/r_data.c
+++ b/apps/plugins/doom/r_data.c
@@ -398,7 +398,7 @@ void R_InitTextures (void)
    const unsigned char *names; // cph -
    const char *name_p;// const*'s
    int  *patchlookup;
-   int  totalwidth;
+//   int  totalwidth;
    int  nummappatches;
    int  offset;
    int  maxoff, maxoff2;
@@ -465,7 +465,7 @@ void R_InitTextures (void)
    textures = Z_Malloc(numtextures*sizeof*textures, PU_STATIC, 0);
    textureheight = Z_Malloc(numtextures*sizeof*textureheight, PU_STATIC, 0);
 
-   totalwidth = 0;
+//   totalwidth = 0;
 
    for (i=0 ; i<numtextures ; i++, directory++)
    {
@@ -555,7 +555,7 @@ void R_InitTextures (void)
       texture->widthmask = j-1;
       textureheight[i] = texture->height<<FRACBITS;
 
-      totalwidth += texture->width;
+//      totalwidth += texture->width;
    }
 
    free(patchlookup);         // killough
diff --git a/apps/plugins/doom/r_draw.c b/apps/plugins/doom/r_draw.c
index 8208972a66..4991a94b45 100644
--- a/apps/plugins/doom/r_draw.c
+++ b/apps/plugins/doom/r_draw.c
@@ -324,8 +324,8 @@ void R_DrawFuzzColumn(void)
 {
    int      count;
    byte     *dest;
-   fixed_t  frac;
-   fixed_t  fracstep;
+//   fixed_t  frac;
+//   fixed_t  fracstep;
 
    // Adjust borders. Low...
    if (!dc_yl)
@@ -356,8 +356,8 @@ void R_DrawFuzzColumn(void)
    dest = topleft + dc_yl*SCREENWIDTH + dc_x;
 
    // Looks familiar.
-   fracstep = dc_iscale;
-   frac = dc_texturemid + (dc_yl-centery)*fracstep;
+//   fracstep = dc_iscale;
+//   frac = dc_texturemid + (dc_yl-centery)*fracstep;
 
    // Looks like an attempt at dithering,
    // using the colormap #6 (of 0-31, a bit brighter than average).
@@ -383,7 +383,7 @@ void R_DrawFuzzColumn(void)
 
       dest += SCREENWIDTH;
 
-      frac += fracstep;
+//      frac += fracstep;
    }
    while (count--);
 }
diff --git a/apps/plugins/doom/rockmacros.h b/apps/plugins/doom/rockmacros.h
index c749382952..d46d5a22fc 100644
--- a/apps/plugins/doom/rockmacros.h
+++ b/apps/plugins/doom/rockmacros.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Michiel van der Kolk, Jens Arnold
  *
@@ -76,6 +75,8 @@ int my_close(int id);
 #define strcmp(a,b)        rb->strcmp((a),(b))
 #undef  strncmp
 #define strncmp(a,b,c)     rb->strncmp((a),(b),(c))
+#undef  strncpy
+#define strncpy(a,b,c)     rb->strncpy((a),(b),(c))
 #undef  strchr
 #define strchr(a,b)        rb->strchr((a),(b))
 #undef  strrchr
diff --git a/apps/plugins/duke3d.c b/apps/plugins/duke3d.c
index 6e1c6f0b01..bd53d15328 100644
--- a/apps/plugins/duke3d.c
+++ b/apps/plugins/duke3d.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Franklin Wei
  *
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index fb719ab9aa..18aefe2503 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Delyan Kratunov
  *
diff --git a/apps/plugins/fft/fft.make b/apps/plugins/fft/fft.make
index b14566ca58..bd0b1ddc1f 100644
--- a/apps/plugins/fft/fft.make
+++ b/apps/plugins/fft/fft.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 FFTSRCDIR := $(APPSDIR)/plugins/fft
diff --git a/apps/plugins/file_picker.c b/apps/plugins/file_picker.c
index f4d0b25b4f..a5adafce14 100644
--- a/apps/plugins/file_picker.c
+++ b/apps/plugins/file_picker.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2024 William Wilgus
  *
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c
index 5cdf4a2d3a..2cab104d46 100644
--- a/apps/plugins/fire.c
+++ b/apps/plugins/fire.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2005 Kevin Ferrare
 *
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c
index 40ed470791..b3ee945375 100644
--- a/apps/plugins/fireworks.c
+++ b/apps/plugins/fireworks.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Zakk Roberts
  *
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index 3080f2f239..42a1e4b9af 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Vicentini Martin
  *
diff --git a/apps/plugins/fractals/cpu_arm.h b/apps/plugins/fractals/cpu_arm.h
index 929f5d427c..cf7a906e06 100644
--- a/apps/plugins/fractals/cpu_arm.h
+++ b/apps/plugins/fractals/cpu_arm.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Tomer Shalev
  *
diff --git a/apps/plugins/fractals/cpu_coldfire.h b/apps/plugins/fractals/cpu_coldfire.h
index 9be207ee2f..24f090ae33 100644
--- a/apps/plugins/fractals/cpu_coldfire.h
+++ b/apps/plugins/fractals/cpu_coldfire.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Tomer Shalev
  *
diff --git a/apps/plugins/fractals/fractal.c b/apps/plugins/fractals/fractal.c
index 8c5d93e0b7..d83e6b9281 100644
--- a/apps/plugins/fractals/fractal.c
+++ b/apps/plugins/fractals/fractal.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 Matthias Wientapper
  * Heavily extended 2005 Jens Arnold
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h
index d56b7a1f39..79324a507b 100644
--- a/apps/plugins/fractals/fractal.h
+++ b/apps/plugins/fractals/fractal.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Tomer Shalev
  *
diff --git a/apps/plugins/fractals/fractal_rect.c b/apps/plugins/fractals/fractal_rect.c
index af846d3f7a..9576d0ffab 100644
--- a/apps/plugins/fractals/fractal_rect.c
+++ b/apps/plugins/fractals/fractal_rect.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Tomer Shalev
  *
diff --git a/apps/plugins/fractals/fractal_rect.h b/apps/plugins/fractals/fractal_rect.h
index 9d57c29df6..8c87fb51fe 100644
--- a/apps/plugins/fractals/fractal_rect.h
+++ b/apps/plugins/fractals/fractal_rect.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Tomer Shalev
  *
diff --git a/apps/plugins/fractals/fractal_sets.h b/apps/plugins/fractals/fractal_sets.h
index 865517b5b5..ed963e7149 100644
--- a/apps/plugins/fractals/fractal_sets.h
+++ b/apps/plugins/fractals/fractal_sets.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Tomer Shalev
  *
diff --git a/apps/plugins/fractals/fractals.make b/apps/plugins/fractals/fractals.make
index 48bff5c611..906612f2aa 100644
--- a/apps/plugins/fractals/fractals.make
+++ b/apps/plugins/fractals/fractals.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 FRACTALSSRCDIR := $(APPSDIR)/plugins/fractals
diff --git a/apps/plugins/fractals/mandelbrot_set.c b/apps/plugins/fractals/mandelbrot_set.c
index 69485d405a..3e2dc63b42 100644
--- a/apps/plugins/fractals/mandelbrot_set.c
+++ b/apps/plugins/fractals/mandelbrot_set.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 Matthias Wientapper
  * Heavily extended 2005 Jens Arnold
diff --git a/apps/plugins/fractals/mandelbrot_set.h b/apps/plugins/fractals/mandelbrot_set.h
index 2814d24e58..a2a0bd9154 100644
--- a/apps/plugins/fractals/mandelbrot_set.h
+++ b/apps/plugins/fractals/mandelbrot_set.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Tomer Shalev
  *
diff --git a/apps/plugins/frotz/dumb_frotz.h b/apps/plugins/frotz/dumb_frotz.h
index 0b8415e4ae..7061991e32 100644
--- a/apps/plugins/frotz/dumb_frotz.h
+++ b/apps/plugins/frotz/dumb_frotz.h
@@ -1,5 +1,4 @@
 /* dumb-frotz.h
- * $Id: dumb-frotz.h,v 1.1.1.1 2002/03/26 22:38:34 feedle Exp $
  * Frotz os functions for a standard C library and a dumb terminal.
  * Now you can finally play Zork Zero on your Teletype.
  *
diff --git a/apps/plugins/frotz/dumb_init.c b/apps/plugins/frotz/dumb_init.c
index e4ab3ad824..4a7f2a276a 100644
--- a/apps/plugins/frotz/dumb_init.c
+++ b/apps/plugins/frotz/dumb_init.c
@@ -1,5 +1,4 @@
 /* dumb-init.c
- * $Id: dumb-init.c,v 1.1.1.1 2002/03/26 22:38:34 feedle Exp $
  *
  * Copyright 1997,1998 Alva Petrofsky <alva@petrofsky.berkeley.ca.us>.
  * Any use permitted provided this notice stays intact.
diff --git a/apps/plugins/frotz/dumb_output.c b/apps/plugins/frotz/dumb_output.c
index eb61419195..7047978d6c 100644
--- a/apps/plugins/frotz/dumb_output.c
+++ b/apps/plugins/frotz/dumb_output.c
@@ -1,5 +1,4 @@
 /* dumb-output.c
- * $Id: dumb-output.c,v 1.2 2002/03/26 22:52:31 feedle Exp $
  *
  * Copyright 1997,1998 Alfresco Petrofsky <alfresco@petrofsky.berkeley.edu>.
  * Any use permitted provided this notice stays intact.
diff --git a/apps/plugins/frotz/frotz.c b/apps/plugins/frotz/frotz.c
index 31fb668e60..9afda50196 100644
--- a/apps/plugins/frotz/frotz.c
+++ b/apps/plugins/frotz/frotz.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Torne Wuff
  *
diff --git a/apps/plugins/frotz/frotz.make b/apps/plugins/frotz/frotz.make
index 0bf4370cca..9850c2956f 100644
--- a/apps/plugins/frotz/frotz.make
+++ b/apps/plugins/frotz/frotz.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 FROTZSRCDIR := $(APPSDIR)/plugins/frotz
diff --git a/apps/plugins/frotz/frotzplugin.h b/apps/plugins/frotz/frotzplugin.h
index f975fc8c22..6a399910b4 100644
--- a/apps/plugins/frotz/frotzplugin.h
+++ b/apps/plugins/frotz/frotzplugin.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Torne Wuff
  *
diff --git a/apps/plugins/goban.c b/apps/plugins/goban.c
index 5ad7b37327..8ed3fc1fd1 100644
--- a/apps/plugins/goban.c
+++ b/apps/plugins/goban.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/board.c b/apps/plugins/goban/board.c
index c36fcc56e9..f6ccf879df 100644
--- a/apps/plugins/goban/board.c
+++ b/apps/plugins/goban/board.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/board.h b/apps/plugins/goban/board.h
index cd6f01e79a..492b2f972a 100644
--- a/apps/plugins/goban/board.h
+++ b/apps/plugins/goban/board.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/display.c b/apps/plugins/goban/display.c
index f701dbb315..2fb734129f 100644
--- a/apps/plugins/goban/display.c
+++ b/apps/plugins/goban/display.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/display.h b/apps/plugins/goban/display.h
index c6b03a2af2..40351fb05f 100644
--- a/apps/plugins/goban/display.h
+++ b/apps/plugins/goban/display.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/game.c b/apps/plugins/goban/game.c
index 1971a5b15c..95b82ab427 100644
--- a/apps/plugins/goban/game.c
+++ b/apps/plugins/goban/game.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/game.h b/apps/plugins/goban/game.h
index 6a351fb676..b07e6eff00 100644
--- a/apps/plugins/goban/game.h
+++ b/apps/plugins/goban/game.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/goban.c b/apps/plugins/goban/goban.c
index a0aa39036e..f955389f06 100644
--- a/apps/plugins/goban/goban.c
+++ b/apps/plugins/goban/goban.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h
index 159f3d2fbd..80d69cb9e1 100644
--- a/apps/plugins/goban/goban.h
+++ b/apps/plugins/goban/goban.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/goban.make b/apps/plugins/goban/goban.make
index 160cfdf1ad..0ce670b408 100644
--- a/apps/plugins/goban/goban.make
+++ b/apps/plugins/goban/goban.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 GOBAN_SRCDIR := $(APPSDIR)/plugins/goban
@@ -29,7 +28,7 @@ $(GOBAN_BUILDDIR)/goban.refmap: $(GOBAN_OBJ)
 
 $(GOBAN_OUTLDS): $(PLUGIN_LDS) $(GOBAN_BUILDDIR)/goban.refmap
 	$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DPLUGIN -DOVERLAY_OFFSET=$(shell \
-		$(TOOLSDIR)/ovl_offset.pl $(GOBAN_BUILDDIR)/goban.refmap))
+		$(TOOLSDIR)/ovl_offset.pl $(GOBAN_BUILDDIR)/goban.refelf))
 
 $(GOBAN_BUILDDIR)/goban.ovl: $(GOBAN_OBJ) $(GOBAN_OUTLDS)
 	$(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
diff --git a/apps/plugins/goban/sgf.c b/apps/plugins/goban/sgf.c
index 9cec367363..5bfb09f009 100644
--- a/apps/plugins/goban/sgf.c
+++ b/apps/plugins/goban/sgf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/sgf.h b/apps/plugins/goban/sgf.h
index d2aca81ebb..c9270fda22 100644
--- a/apps/plugins/goban/sgf.h
+++ b/apps/plugins/goban/sgf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/sgf_output.c b/apps/plugins/goban/sgf_output.c
index 6a52789f7a..c0ff025317 100644
--- a/apps/plugins/goban/sgf_output.c
+++ b/apps/plugins/goban/sgf_output.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/sgf_output.h b/apps/plugins/goban/sgf_output.h
index dfc6319797..84df83d296 100644
--- a/apps/plugins/goban/sgf_output.h
+++ b/apps/plugins/goban/sgf_output.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/sgf_parse.c b/apps/plugins/goban/sgf_parse.c
index 58a517142f..3ffde5604f 100644
--- a/apps/plugins/goban/sgf_parse.c
+++ b/apps/plugins/goban/sgf_parse.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/sgf_parse.h b/apps/plugins/goban/sgf_parse.h
index 869d343bd7..a7da2119a6 100644
--- a/apps/plugins/goban/sgf_parse.h
+++ b/apps/plugins/goban/sgf_parse.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/sgf_storage.c b/apps/plugins/goban/sgf_storage.c
index f0f023541f..aeb78fa6a5 100644
--- a/apps/plugins/goban/sgf_storage.c
+++ b/apps/plugins/goban/sgf_storage.c
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/sgf_storage.h b/apps/plugins/goban/sgf_storage.h
index 4835c8c9d2..12af09da5c 100644
--- a/apps/plugins/goban/sgf_storage.h
+++ b/apps/plugins/goban/sgf_storage.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/types.h b/apps/plugins/goban/types.h
index a7c2b9b0ae..da61aea364 100644
--- a/apps/plugins/goban/types.h
+++ b/apps/plugins/goban/types.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/util.c b/apps/plugins/goban/util.c
index 206606a4bb..a2bd776219 100644
--- a/apps/plugins/goban/util.c
+++ b/apps/plugins/goban/util.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/goban/util.h b/apps/plugins/goban/util.h
index 83dc880ac7..63e814977c 100644
--- a/apps/plugins/goban/util.h
+++ b/apps/plugins/goban/util.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2009 Joshua Simmons <mud at majidejima dot com>
  *
diff --git a/apps/plugins/greyscale.c b/apps/plugins/greyscale.c
index d9cb7436de..0144dc297d 100644
--- a/apps/plugins/greyscale.c
+++ b/apps/plugins/greyscale.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Greyscale demo plugin
 *
diff --git a/apps/plugins/helloworld.c b/apps/plugins/helloworld.c
index af55610c73..f87a018721 100644
--- a/apps/plugins/helloworld.c
+++ b/apps/plugins/helloworld.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/plugins/helloworld.lua b/apps/plugins/helloworld.lua
index aa2ef446d3..2cd0c2bcda 100644
--- a/apps/plugins/helloworld.lua
+++ b/apps/plugins/helloworld.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
 
  Example Lua script
 
diff --git a/apps/plugins/imageviewer/bmp/bmp.c b/apps/plugins/imageviewer/bmp/bmp.c
index 8ad822892c..df8c8c6818 100644
--- a/apps/plugins/imageviewer/bmp/bmp.c
+++ b/apps/plugins/imageviewer/bmp/bmp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * BMP image viewer
  *
diff --git a/apps/plugins/imageviewer/bmp/bmp.make b/apps/plugins/imageviewer/bmp/bmp.make
index 0947dd6166..7002b953eb 100644
--- a/apps/plugins/imageviewer/bmp/bmp.make
+++ b/apps/plugins/imageviewer/bmp/bmp.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 BMPSRCDIR := $(IMGVSRCDIR)/bmp
diff --git a/apps/plugins/imageviewer/gif/gif.make b/apps/plugins/imageviewer/gif/gif.make
index 76b62cd022..88cb30f0fc 100644
--- a/apps/plugins/imageviewer/gif/gif.make
+++ b/apps/plugins/imageviewer/gif/gif.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 GIFSRCDIR := $(IMGVSRCDIR)/gif
diff --git a/apps/plugins/imageviewer/image_decoder.c b/apps/plugins/imageviewer/image_decoder.c
index c481899bae..152e23fd9a 100644
--- a/apps/plugins/imageviewer/image_decoder.c
+++ b/apps/plugins/imageviewer/image_decoder.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * load image decoder.
  *
diff --git a/apps/plugins/imageviewer/image_decoder.h b/apps/plugins/imageviewer/image_decoder.h
index 7a9cd5d06c..f5dabd47ad 100644
--- a/apps/plugins/imageviewer/image_decoder.h
+++ b/apps/plugins/imageviewer/image_decoder.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * load image decoder.
  *
diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c
index 45836134fe..31ee4dac45 100644
--- a/apps/plugins/imageviewer/imageviewer.c
+++ b/apps/plugins/imageviewer/imageviewer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * user intereface of image viewer
  *
diff --git a/apps/plugins/imageviewer/imageviewer.h b/apps/plugins/imageviewer/imageviewer.h
index 7727dd033d..179d0bfa80 100644
--- a/apps/plugins/imageviewer/imageviewer.h
+++ b/apps/plugins/imageviewer/imageviewer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * user intereface of image viewer.
  *
diff --git a/apps/plugins/imageviewer/imageviewer.make b/apps/plugins/imageviewer/imageviewer.make
index 37b2e6ff8d..66640304e7 100644
--- a/apps/plugins/imageviewer/imageviewer.make
+++ b/apps/plugins/imageviewer/imageviewer.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 IMGVSRCDIR := $(APPSDIR)/plugins/imageviewer
@@ -44,11 +43,11 @@ $(IMGVBUILDDIR)/%.ovl: $(IMGDEC_OUTLDS)
 
 # rule to create reference map for image decoder
 $(IMGVBUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(IMGVSRCDIR)/imageviewer.h $(PLUGINLINK_LDS) $(PLUGIN_LIBS)
-	$(call PRINTS,LD $(@F))$(CC) $(IMGDECFLAGS) -o /dev/null \
+	$(call PRINTS,LD $(@F))$(CC) $(IMGDECFLAGS) -o $(IMGVBUILDDIR)/$*.refelf \
 		$(filter %.o, $^) \
 		$(filter %.a, $+) \
 		-lgcc $(IMGDECLDFLAGS)
 
 $(IMGVBUILDDIR)/%.link: $(PLUGIN_LDS) $(IMGVBUILDDIR)/%.refmap
 	$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DPLUGIN -DIMGVDECODER_OFFSET=$(shell \
-		$(TOOLSDIR)/ovl_offset.pl $(IMGVBUILDDIR)/$*.refmap))
+		$(TOOLSDIR)/ovl_offset.pl $(IMGVBUILDDIR)/$*.refelf))
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h
index 46e99ff3f8..d86f4c812e 100644
--- a/apps/plugins/imageviewer/imageviewer_button.h
+++ b/apps/plugins/imageviewer/imageviewer_button.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * user intereface of image viewer.
  *
diff --git a/apps/plugins/imageviewer/jpeg/jpeg.c b/apps/plugins/imageviewer/jpeg/jpeg.c
index 1f152e0fc3..e8d654c00b 100644
--- a/apps/plugins/imageviewer/jpeg/jpeg.c
+++ b/apps/plugins/imageviewer/jpeg/jpeg.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * JPEG image viewer
 * (This is a real mess if it has to be coded in one single C file)
diff --git a/apps/plugins/imageviewer/jpeg/jpeg.make b/apps/plugins/imageviewer/jpeg/jpeg.make
index dd7addca56..a0ef9bff8d 100644
--- a/apps/plugins/imageviewer/jpeg/jpeg.make
+++ b/apps/plugins/imageviewer/jpeg/jpeg.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 JPEGSRCDIR := $(IMGVSRCDIR)/jpeg
diff --git a/apps/plugins/imageviewer/jpeg/jpeg_decoder.c b/apps/plugins/imageviewer/jpeg/jpeg_decoder.c
index e262a50971..a06dc8ca1a 100644
--- a/apps/plugins/imageviewer/jpeg/jpeg_decoder.c
+++ b/apps/plugins/imageviewer/jpeg/jpeg_decoder.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * JPEG image viewer
 * (This is a real mess if it has to be coded in one single C file)
diff --git a/apps/plugins/imageviewer/jpeg/jpeg_decoder.h b/apps/plugins/imageviewer/jpeg/jpeg_decoder.h
index b86bdaf001..853c1ebbf5 100644
--- a/apps/plugins/imageviewer/jpeg/jpeg_decoder.h
+++ b/apps/plugins/imageviewer/jpeg/jpeg_decoder.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * JPEG image viewer
 * (This is a real mess if it has to be coded in one single C file)
diff --git a/apps/plugins/imageviewer/jpeg/yuv2rgb.c b/apps/plugins/imageviewer/jpeg/yuv2rgb.c
index 9a7a40fbe6..21bc14e0d7 100644
--- a/apps/plugins/imageviewer/jpeg/yuv2rgb.c
+++ b/apps/plugins/imageviewer/jpeg/yuv2rgb.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * JPEG image viewer
 * (This is a real mess if it has to be coded in one single C file)
diff --git a/apps/plugins/imageviewer/jpeg/yuv2rgb.h b/apps/plugins/imageviewer/jpeg/yuv2rgb.h
index d10a944f38..b9133789de 100644
--- a/apps/plugins/imageviewer/jpeg/yuv2rgb.h
+++ b/apps/plugins/imageviewer/jpeg/yuv2rgb.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * JPEG image viewer
 * (This is a real mess if it has to be coded in one single C file)
diff --git a/apps/plugins/imageviewer/jpegp/jpegp.make b/apps/plugins/imageviewer/jpegp/jpegp.make
index 8d15af3a68..05953e68d4 100644
--- a/apps/plugins/imageviewer/jpegp/jpegp.make
+++ b/apps/plugins/imageviewer/jpegp/jpegp.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 JPEGPSRCDIR := $(IMGVSRCDIR)/jpegp
diff --git a/apps/plugins/imageviewer/jpegp/rb_glue.h b/apps/plugins/imageviewer/jpegp/rb_glue.h
index ce08483deb..7b85d49443 100644
--- a/apps/plugins/imageviewer/jpegp/rb_glue.h
+++ b/apps/plugins/imageviewer/jpegp/rb_glue.h
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  *
- * $Id$
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/apps/plugins/imageviewer/png/crc32.c b/apps/plugins/imageviewer/png/crc32.c
index c7921a028b..f374400231 100644
--- a/apps/plugins/imageviewer/png/crc32.c
+++ b/apps/plugins/imageviewer/png/crc32.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Original source:
  * Copyright (c) 2003 by Joergen Ibsen / Jibz
diff --git a/apps/plugins/imageviewer/png/png.c b/apps/plugins/imageviewer/png/png.c
index 68a14a268e..5f9aa9393c 100644
--- a/apps/plugins/imageviewer/png/png.c
+++ b/apps/plugins/imageviewer/png/png.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$id $
  *
  * Copyright (C) 2009 by Christophe Gouiran <bechris13250 -at- gmail -dot- com>
  *
diff --git a/apps/plugins/imageviewer/png/png.make b/apps/plugins/imageviewer/png/png.make
index cac46ceb19..4996e26001 100644
--- a/apps/plugins/imageviewer/png/png.make
+++ b/apps/plugins/imageviewer/png/png.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 PNGSRCDIR := $(IMGVSRCDIR)/png
diff --git a/apps/plugins/imageviewer/png/png_decoder.c b/apps/plugins/imageviewer/png/png_decoder.c
index 5c7b43fbdf..d571b466b9 100644
--- a/apps/plugins/imageviewer/png/png_decoder.c
+++ b/apps/plugins/imageviewer/png/png_decoder.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$id $
  *
  * Copyright (C) 2009 by Christophe Gouiran <bechris13250 -at- gmail -dot- com>
  *
diff --git a/apps/plugins/imageviewer/png/png_decoder.h b/apps/plugins/imageviewer/png/png_decoder.h
index 4ca2a51277..5763a58695 100644
--- a/apps/plugins/imageviewer/png/png_decoder.h
+++ b/apps/plugins/imageviewer/png/png_decoder.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$id $
  *
  * Copyright (C) 2009 by Christophe Gouiran <bechris13250 -at- gmail -dot- com>
  *
diff --git a/apps/plugins/imageviewer/png/tinf.h b/apps/plugins/imageviewer/png/tinf.h
index 645bdb7d5a..c1a109554f 100644
--- a/apps/plugins/imageviewer/png/tinf.h
+++ b/apps/plugins/imageviewer/png/tinf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Original source:
  * Copyright (c) 2003 by Joergen Ibsen / Jibz
diff --git a/apps/plugins/imageviewer/png/tinflate.c b/apps/plugins/imageviewer/png/tinflate.c
index f873c37569..310d017063 100644
--- a/apps/plugins/imageviewer/png/tinflate.c
+++ b/apps/plugins/imageviewer/png/tinflate.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Original source:
  * Copyright (c) 2003 by Joergen Ibsen / Jibz
diff --git a/apps/plugins/imageviewer/png/tinfzlib.c b/apps/plugins/imageviewer/png/tinfzlib.c
index 711b6cf2e9..9dafb54763 100644
--- a/apps/plugins/imageviewer/png/tinfzlib.c
+++ b/apps/plugins/imageviewer/png/tinfzlib.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Original source:
  * Copyright (c) 2003 by Joergen Ibsen / Jibz
diff --git a/apps/plugins/imageviewer/ppm/ppm.c b/apps/plugins/imageviewer/ppm/ppm.c
index 9a88744382..f2bdc07d68 100644
--- a/apps/plugins/imageviewer/ppm/ppm.c
+++ b/apps/plugins/imageviewer/ppm/ppm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/apps/plugins/imageviewer/ppm/ppm.make b/apps/plugins/imageviewer/ppm/ppm.make
index b98ee62832..a21823ac28 100644
--- a/apps/plugins/imageviewer/ppm/ppm.make
+++ b/apps/plugins/imageviewer/ppm/ppm.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 PPMSRCDIR := $(IMGVSRCDIR)/ppm
diff --git a/apps/plugins/imageviewer/ppm/ppm_decoder.c b/apps/plugins/imageviewer/ppm/ppm_decoder.c
index ccb208b80b..5daa7d58d8 100644
--- a/apps/plugins/imageviewer/ppm/ppm_decoder.c
+++ b/apps/plugins/imageviewer/ppm/ppm_decoder.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   ( (__) )  \___|    ( | \_\ ( (__) )    (
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Alexander Papst
  *
diff --git a/apps/plugins/imageviewer/ppm/ppm_decoder.h b/apps/plugins/imageviewer/ppm/ppm_decoder.h
index edd1bcba55..0226f76808 100644
--- a/apps/plugins/imageviewer/ppm/ppm_decoder.h
+++ b/apps/plugins/imageviewer/ppm/ppm_decoder.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index d8b792aedc..f365e04534 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Albert Veli
  *
diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c
index 2c2db812e4..a67b793607 100644
--- a/apps/plugins/iriver_flash.c
+++ b/apps/plugins/iriver_flash.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * !!! DON'T MESS WITH THIS CODE UNLESS YOU'RE ABSOLUTELY SURE WHAT YOU DO !!!
  *
diff --git a/apps/plugins/iriverify.c b/apps/plugins/iriverify.c
index 0277590042..1d2807eb64 100644
--- a/apps/plugins/iriverify.c
+++ b/apps/plugins/iriverify.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Alexandre Bourget
  *
diff --git a/apps/plugins/jackpot.c b/apps/plugins/jackpot.c
index fd878509cf..6cc6885e97 100644
--- a/apps/plugins/jackpot.c
+++ b/apps/plugins/jackpot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare based on work by Pierre Delore
  *
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index e681c578ad..0cf4fd1743 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2005 Adam Boot
 *
diff --git a/apps/plugins/keybox.c b/apps/plugins/keybox.c
index 749d76af74..5894ed2755 100644
--- a/apps/plugins/keybox.c
+++ b/apps/plugins/keybox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Nils Wallménius
  *
diff --git a/apps/plugins/keyremap.c b/apps/plugins/keyremap.c
index 410f4096e4..9917bc567e 100644
--- a/apps/plugins/keyremap.c
+++ b/apps/plugins/keyremap.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   ( (__) )  \___|    ( | \_\ ( (__) )    (
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 William Wilgus
  *
@@ -743,6 +742,19 @@ static int keymap_add_button_entry(int context, int action_code,
             break;
         }
     }
+
+    for (int i = 0; i < ctx_data.act_count; i++)
+    {
+        if (ctx_data.act_map[i].context == context &&
+            ctx_data.act_map[i].map.action_code == action_code)
+        {
+            /*Duplicate -- Update the existing entry */
+            ctx_data.act_map[i].map.button_code = button_code;
+            ctx_data.act_map[i].map.pre_button_code = pre_button_code;
+            return ctx_data.act_count;
+        }
+    }
+
     if (!hasctx || keyremap_buffer.end - sizeof(struct action_mapping_t) < keyremap_buffer.front)
         goto fail;
     keyremap_buffer.end -= sizeof(struct action_mapping_t);
@@ -949,7 +961,11 @@ static int keyremap_import_file(char *filenamebuf, size_t bufsz)
     char *pact;
     int ctx = -1;
 
-    keyremap_reset_buffer();
+    if (ctx_data.ctx_count == 0 || rb->yesno_pop("Delete Current Entries?") == true)
+    {
+        keyremap_reset_buffer();
+    }
+
 next_line:
     while (rb->read_line(fd, filenamebuf, (int) bufsz) > 0)
     {
@@ -1118,7 +1134,10 @@ static int keyremap_load_file(const char *filename)
 
     if (count > 0)
     {
-        keyremap_reset_buffer();
+        if (ctx_data.ctx_count == 0 || rb->yesno_pop("Delete Current Entries?") == true)
+        {
+            keyremap_reset_buffer();
+        }
         while(--count > 0)
         {
             rb->lseek(fd, ctxpos, SEEK_SET); /* next context remap entry */
diff --git a/apps/plugins/lamp.c b/apps/plugins/lamp.c
index 5aa06f4d2d..28272f97a5 100644
--- a/apps/plugins/lamp.c
+++ b/apps/plugins/lamp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   ( (__) )  \___|    ( | \_\ ( (__) )    (
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Vuong Minh Hiep (vmh)
  * Copyright (C) 2008 Thomas Martitz (kugel.)
diff --git a/apps/plugins/lastfm_scrobbler.c b/apps/plugins/lastfm_scrobbler.c
index 906888c957..93b520bee3 100644
--- a/apps/plugins/lastfm_scrobbler.c
+++ b/apps/plugins/lastfm_scrobbler.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2024 William Wilgus
  *
@@ -67,6 +66,7 @@ Example
     All fields except those marked (optional) above are required.
 */
 
+#include "rbversion.h"
 #include "plugin.h"
 #include "lib/configfile.h"
 
@@ -87,7 +87,7 @@ Example
 /* increment this on any code change that effects output */
 #define SCROBBLER_VERSION "1.1"
 
-#define SCROBBLER_REVISION " $Revision$"
+#define SCROBBLER_REVISION " " RBVERSION " "
 
 #define SCROBBLER_BAD_ENTRY "# FAILED - "
 
@@ -760,7 +760,9 @@ static int pbl_copyloop(int fd_copy, const char *src_filename,
     struct scrobbler_entry entry;
     long next_tick = *rb->current_tick;
     int count = 0;
+#if defined(ROCKBOX_HAS_LOGF)
     int line_num = 0;
+#endif
     int lines_copied = 0;
     int fd_src = rb->open_utf8(src_filename, O_RDONLY);
     if (fd_src < 0)
@@ -773,7 +775,9 @@ static int pbl_copyloop(int fd_copy, const char *src_filename,
     while(rb->read_line(fd_src, buf, buf_sz) > 0)
     {
         char skipch = ' ';
+#if defined(ROCKBOX_HAS_LOGF)
         line_num++;
+#endif
         do_timed_yield();
         if (buf[0] == '\0') /* skip empty lines */
             continue;
@@ -911,7 +915,9 @@ static int sbl_export(void)
 
         struct scrobbler_entry entry;
         int rd = 0;
+#if defined(ROCKBOX_HAS_LOGF)
         int line_num = 0;
+#endif
 
         scrobbler_fd = sbl_open_create();
         if (scrobbler_fd >= 0)
@@ -921,7 +927,9 @@ static int sbl_export(void)
             {
                 if ((rd = rb->read_line(fd_copy, buf, sizeof(buf))) <= 0)
                     break;
+#if defined(ROCKBOX_HAS_LOGF)
                 line_num++;
+#endif
                 if (buf[0] != ' ') /* skip culled entries comments and empty lines */
                     continue;
                 pbl_parse_valid_entry(&entry, buf);
diff --git a/apps/plugins/lastfm_scrobbler_viewer.c b/apps/plugins/lastfm_scrobbler_viewer.c
index c7bf2bab8b..8ce5ab8b85 100644
--- a/apps/plugins/lastfm_scrobbler_viewer.c
+++ b/apps/plugins/lastfm_scrobbler_viewer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   ( (__) )  \___|    ( | \_\ ( (__) )    (
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2023 William Wilgus
  *
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES
index 06adb04426..84495d8585 100644
--- a/apps/plugins/lib/SOURCES
+++ b/apps/plugins/lib/SOURCES
@@ -15,7 +15,6 @@ highscore.c
 simple_viewer.c
 display_text.c
 printcell_helper.c
-strncpy.c
 stdio_compat.c
 
 #if (LCD_DEPTH < 4)
diff --git a/apps/plugins/lib/action_helper.h b/apps/plugins/lib/action_helper.h
index 53f5c840f8..5bcb902dbe 100644
--- a/apps/plugins/lib/action_helper.h
+++ b/apps/plugins/lib/action_helper.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2021 William Wilgus
 *
diff --git a/apps/plugins/lib/arg_helper.c b/apps/plugins/lib/arg_helper.c
index 63b7acbb2b..c31f706990 100644
--- a/apps/plugins/lib/arg_helper.c
+++ b/apps/plugins/lib/arg_helper.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 William Wilgus
  *
diff --git a/apps/plugins/lib/arg_helper.h b/apps/plugins/lib/arg_helper.h
index 638279ee42..1dd73c524a 100644
--- a/apps/plugins/lib/arg_helper.h
+++ b/apps/plugins/lib/arg_helper.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 William Wilgus
  *
diff --git a/apps/plugins/lib/bmp_smooth_scale.c b/apps/plugins/lib/bmp_smooth_scale.c
index 378ff96448..b1329e25c6 100644
--- a/apps/plugins/lib/bmp_smooth_scale.c
+++ b/apps/plugins/lib/bmp_smooth_scale.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Code for the scaling algorithm:
  * Imlib2 is (C) Carsten Haitzler and various contributors. The MMX code
diff --git a/apps/plugins/lib/button_helper.h b/apps/plugins/lib/button_helper.h
index 4087ba898a..86940abab0 100644
--- a/apps/plugins/lib/button_helper.h
+++ b/apps/plugins/lib/button_helper.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2021 William Wilgus
 *
diff --git a/apps/plugins/lib/button_helper.pl b/apps/plugins/lib/button_helper.pl
index 192df18d7f..3dbadc2b67 100755
--- a/apps/plugins/lib/button_helper.pl
+++ b/apps/plugins/lib/button_helper.pl
@@ -6,7 +6,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2009 by Maurus Cuelenaere
 # Copyright (C) 2021 by William Wilgus
@@ -21,7 +20,7 @@
 #expects -dM -E source input on STDIN
 use strict;
 use warnings;
-my $svnrev = '$Revision$';
+my $svnrev = '';
 my @buttons = ();
 my $count = 1; #null sentinel
 my $val;
@@ -51,7 +50,7 @@ while(my $line = <STDIN>)
 my @sorted = sort { @$a{'value'} <=> @$b{'value'} } @buttons;
 print <<EOF
 /* Don't change this file! */
-/* It is automatically generated of button.h */
+/* It is automatically generated of button.h ($svnrev) */
 #include "plugin.h"
 #include "button.h"
 #include "button_helper.h"
diff --git a/apps/plugins/lib/checkbox.c b/apps/plugins/lib/checkbox.c
index 80ede83e8a..cd95b8a6ab 100644
--- a/apps/plugins/lib/checkbox.c
+++ b/apps/plugins/lib/checkbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Markus Braun
  *
diff --git a/apps/plugins/lib/checkbox.h b/apps/plugins/lib/checkbox.h
index d4318f2305..75006ebec0 100644
--- a/apps/plugins/lib/checkbox.h
+++ b/apps/plugins/lib/checkbox.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Markus Braun
  *
diff --git a/apps/plugins/lib/configfile.c b/apps/plugins/lib/configfile.c
index 918a3291ce..31c10855f8 100644
--- a/apps/plugins/lib/configfile.c
+++ b/apps/plugins/lib/configfile.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Linus Nielsen Feltzing
  *
diff --git a/apps/plugins/lib/configfile.h b/apps/plugins/lib/configfile.h
index 4fdcf802d5..113e18bd5c 100644
--- a/apps/plugins/lib/configfile.h
+++ b/apps/plugins/lib/configfile.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Linus Nielsen Feltzing
  *
diff --git a/apps/plugins/lib/display_text.c b/apps/plugins/lib/display_text.c
index d60b139d1c..1909b4feb6 100644
--- a/apps/plugins/lib/display_text.c
+++ b/apps/plugins/lib/display_text.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Johannes Schwarz
  * based on Will Robertson code in superdom
diff --git a/apps/plugins/lib/display_text.h b/apps/plugins/lib/display_text.h
index 33a8ff53af..d10dc929dc 100644
--- a/apps/plugins/lib/display_text.h
+++ b/apps/plugins/lib/display_text.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Johannes Schwarz
  * based on Will Robertson code in superdom
diff --git a/apps/plugins/lib/feature_wrappers.h b/apps/plugins/lib/feature_wrappers.h
index 50552fbda4..9937f27641 100644
--- a/apps/plugins/lib/feature_wrappers.h
+++ b/apps/plugins/lib/feature_wrappers.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Andrew Mahone
 *
diff --git a/apps/plugins/lib/gcc-support.c b/apps/plugins/lib/gcc-support.c
index 53b01b9f01..b4a6adca30 100644
--- a/apps/plugins/lib/gcc-support.c
+++ b/apps/plugins/lib/gcc-support.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Michael Sevakis
 *
diff --git a/apps/plugins/lib/grey.h b/apps/plugins/lib/grey.h
index 5cafc6a83e..6ca94a1782 100644
--- a/apps/plugins/lib/grey.h
+++ b/apps/plugins/lib/grey.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * New greyscale framework
 *
diff --git a/apps/plugins/lib/grey_coldfire.S b/apps/plugins/lib/grey_coldfire.S
index b01d27a768..a99dca277c 100644
--- a/apps/plugins/lib/grey_coldfire.S
+++ b/apps/plugins/lib/grey_coldfire.S
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * New greyscale framework
 * Coldfire assembler routines
diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c
index b025ef8eaa..16a674528a 100644
--- a/apps/plugins/lib/grey_core.c
+++ b/apps/plugins/lib/grey_core.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * New greyscale framework
 * Core & miscellaneous functions
diff --git a/apps/plugins/lib/grey_draw.c b/apps/plugins/lib/grey_draw.c
index 481b34d3ad..8475e91063 100644
--- a/apps/plugins/lib/grey_draw.c
+++ b/apps/plugins/lib/grey_draw.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * New greyscale framework
 * Drawing functions
diff --git a/apps/plugins/lib/grey_parm.c b/apps/plugins/lib/grey_parm.c
index 700b6f0026..af336803de 100644
--- a/apps/plugins/lib/grey_parm.c
+++ b/apps/plugins/lib/grey_parm.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * New greyscale framework
 * Parameter handling
diff --git a/apps/plugins/lib/grey_scroll.c b/apps/plugins/lib/grey_scroll.c
index a9ce45db92..0480035c81 100644
--- a/apps/plugins/lib/grey_scroll.c
+++ b/apps/plugins/lib/grey_scroll.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * New greyscale framework
 * Scrolling routines
diff --git a/apps/plugins/lib/helper.c b/apps/plugins/lib/helper.c
index 92d9ec905e..8c5bc06e8a 100644
--- a/apps/plugins/lib/helper.c
+++ b/apps/plugins/lib/helper.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Peter D'Hoye
  *
diff --git a/apps/plugins/lib/helper.h b/apps/plugins/lib/helper.h
index 6aee4dc581..52436969c4 100644
--- a/apps/plugins/lib/helper.h
+++ b/apps/plugins/lib/helper.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Peter D'Hoye
  *
diff --git a/apps/plugins/lib/highscore.c b/apps/plugins/lib/highscore.c
index 04faf27891..9c3beb3a27 100644
--- a/apps/plugins/lib/highscore.c
+++ b/apps/plugins/lib/highscore.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Linus Nielsen Feltzing
  *
diff --git a/apps/plugins/lib/highscore.h b/apps/plugins/lib/highscore.h
index b1b6a040ac..31b2e2c4e0 100644
--- a/apps/plugins/lib/highscore.h
+++ b/apps/plugins/lib/highscore.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Linus Nielsen Feltzing
  *
diff --git a/apps/plugins/lib/icon_helper.c b/apps/plugins/lib/icon_helper.c
index 857bddb128..9366dc5121 100644
--- a/apps/plugins/lib/icon_helper.c
+++ b/apps/plugins/lib/icon_helper.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 William Wilgus
  *
diff --git a/apps/plugins/lib/icon_helper.h b/apps/plugins/lib/icon_helper.h
index e30a607a3f..83fdcd2c52 100644
--- a/apps/plugins/lib/icon_helper.h
+++ b/apps/plugins/lib/icon_helper.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 William Wilgus
  *
diff --git a/apps/plugins/lib/jhash.c b/apps/plugins/lib/jhash.c
index 40fb861d71..ca6da3e8df 100644
--- a/apps/plugins/lib/jhash.c
+++ b/apps/plugins/lib/jhash.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Bob Jenkins
  * http://burtleburtle.net/bob/c/lookup3.c
diff --git a/apps/plugins/lib/jhash.h b/apps/plugins/lib/jhash.h
index 7699e24587..49a0466023 100644
--- a/apps/plugins/lib/jhash.h
+++ b/apps/plugins/lib/jhash.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Andrew Mahone
 *
diff --git a/apps/plugins/lib/jpeg_mem.h b/apps/plugins/lib/jpeg_mem.h
index 8636f702cf..1cd43d64af 100644
--- a/apps/plugins/lib/jpeg_mem.h
+++ b/apps/plugins/lib/jpeg_mem.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Andrew Mahone
 *
diff --git a/apps/plugins/lib/kbd_helper.c b/apps/plugins/lib/kbd_helper.c
index 50e0bc4e23..c742d187b1 100644
--- a/apps/plugins/lib/kbd_helper.c
+++ b/apps/plugins/lib/kbd_helper.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2020 William Wilgus
  *
diff --git a/apps/plugins/lib/kbd_helper.h b/apps/plugins/lib/kbd_helper.h
index ef24700309..eaab4559c3 100644
--- a/apps/plugins/lib/kbd_helper.h
+++ b/apps/plugins/lib/kbd_helper.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2020 William Wilgus
  *
diff --git a/apps/plugins/lib/keymaps.h b/apps/plugins/lib/keymaps.h
index 1570b5a19a..3cd281bf2e 100644
--- a/apps/plugins/lib/keymaps.h
+++ b/apps/plugins/lib/keymaps.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2017 Franklin Wei
 *
diff --git a/apps/plugins/lib/md5.c b/apps/plugins/lib/md5.c
index 145a62da53..8490396453 100644
--- a/apps/plugins/lib/md5.c
+++ b/apps/plugins/lib/md5.c
@@ -2,7 +2,6 @@
  * md5.c: not so strong MD5 hashing
  *****************************************************************************
  * Copyright (C) 2004-2005 the VideoLAN team
- * $Id: cb57f7b6522df0960a924193cfca438c03a92521 $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Sam Hocevar <sam@zoy.org>
diff --git a/apps/plugins/lib/md5.h b/apps/plugins/lib/md5.h
index 0e1547d2b4..e26b9c6d02 100644
--- a/apps/plugins/lib/md5.h
+++ b/apps/plugins/lib/md5.h
@@ -2,7 +2,6 @@
  * vlc_md5.h: MD5 hash
  *****************************************************************************
  * Copyright (C) 2004-2005 the VideoLAN team
- * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Sam Hocevar <sam@zoy.org>
diff --git a/apps/plugins/lib/mul_id3.c b/apps/plugins/lib/mul_id3.c
index 66a7c4dab5..b5c739d383 100644
--- a/apps/plugins/lib/mul_id3.c
+++ b/apps/plugins/lib/mul_id3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2023 Christian Soffke
  *
diff --git a/apps/plugins/lib/mul_id3.h b/apps/plugins/lib/mul_id3.h
index 1bb311c441..3b784eefd3 100644
--- a/apps/plugins/lib/mul_id3.h
+++ b/apps/plugins/lib/mul_id3.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2023 Christian Soffke
  *
diff --git a/apps/plugins/lib/mylcd.h b/apps/plugins/lib/mylcd.h
index 47bdec9e2c..e7474d72a2 100644
--- a/apps/plugins/lib/mylcd.h
+++ b/apps/plugins/lib/mylcd.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2010 Michael Sevakis
  *
diff --git a/apps/plugins/lib/osd.c b/apps/plugins/lib/osd.c
index 99f77da7dc..19a08417c3 100644
--- a/apps/plugins/lib/osd.c
+++ b/apps/plugins/lib/osd.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Floating on-screen display
 *
diff --git a/apps/plugins/lib/osd.h b/apps/plugins/lib/osd.h
index 1c2752139a..c36d52973b 100644
--- a/apps/plugins/lib/osd.h
+++ b/apps/plugins/lib/osd.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Floating on-screen display
 *
diff --git a/apps/plugins/lib/overlay.c b/apps/plugins/lib/overlay.c
index 065273534e..03c0deacb7 100644
--- a/apps/plugins/lib/overlay.c
+++ b/apps/plugins/lib/overlay.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Overlay loader
  *
diff --git a/apps/plugins/lib/overlay.h b/apps/plugins/lib/overlay.h
index 4602966632..b9cd7de132 100644
--- a/apps/plugins/lib/overlay.h
+++ b/apps/plugins/lib/overlay.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Overlay loader
  *
diff --git a/apps/plugins/lib/picture.c b/apps/plugins/lib/picture.c
index 7717b76eeb..76144d48a5 100644
--- a/apps/plugins/lib/picture.c
+++ b/apps/plugins/lib/picture.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/lib/picture.h b/apps/plugins/lib/picture.h
index 7aa9899018..5b6f050d0f 100644
--- a/apps/plugins/lib/picture.h
+++ b/apps/plugins/lib/picture.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Copyright Kévin Ferrare
  *
diff --git a/apps/plugins/lib/playback_control.c b/apps/plugins/lib/playback_control.c
index 19d39a9c92..e096da10ad 100644
--- a/apps/plugins/lib/playback_control.c
+++ b/apps/plugins/lib/playback_control.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/plugins/lib/playback_control.h b/apps/plugins/lib/playback_control.h
index 3762837740..832fc5cdfb 100644
--- a/apps/plugins/lib/playback_control.h
+++ b/apps/plugins/lib/playback_control.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 171522acae..5d2c0e323a 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2006 Jonathan Gordon
 *
@@ -324,7 +323,9 @@ const struct button_mapping pla_main_ctx[] =
    || (CONFIG_KEYPAD == IPOD_3G_PAD) \
    || (CONFIG_KEYPAD == IPOD_4G_PAD)
     {PLA_CANCEL,            BUTTON_MENU|BUTTON_SELECT,          BUTTON_NONE },
+    {PLA_CANCEL,            BUTTON_MENU|BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE },
     {PLA_EXIT,              BUTTON_PLAY|BUTTON_SELECT,          BUTTON_NONE },
+    {PLA_EXIT,              BUTTON_PLAY|BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE },
     {PLA_SELECT,            BUTTON_SELECT,                      BUTTON_NONE },
     {PLA_SELECT_REL,        BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT },
     {PLA_SELECT_REPEAT,     BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_NONE },
diff --git a/apps/plugins/lib/pluginlib_actions.h b/apps/plugins/lib/pluginlib_actions.h
index 51a0f4a84a..28b91fdc76 100644
--- a/apps/plugins/lib/pluginlib_actions.h
+++ b/apps/plugins/lib/pluginlib_actions.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2006 Jonathan Gordon
 *
diff --git a/apps/plugins/lib/pluginlib_albumart.c b/apps/plugins/lib/pluginlib_albumart.c
index 25c6716097..e5f7c30c9e 100644
--- a/apps/plugins/lib/pluginlib_albumart.c
+++ b/apps/plugins/lib/pluginlib_albumart.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Andrew Mahone
 *
diff --git a/apps/plugins/lib/pluginlib_bmp.c b/apps/plugins/lib/pluginlib_bmp.c
index 82f84b05af..2ab5e9056f 100644
--- a/apps/plugins/lib/pluginlib_bmp.c
+++ b/apps/plugins/lib/pluginlib_bmp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Antoine Cellerier <dionoea -at- videolan -dot- org>
  * Copyright (C) 2009 by Andrew Mahone
diff --git a/apps/plugins/lib/pluginlib_bmp.h b/apps/plugins/lib/pluginlib_bmp.h
index f0540988de..736cfc86f6 100644
--- a/apps/plugins/lib/pluginlib_bmp.h
+++ b/apps/plugins/lib/pluginlib_bmp.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Antoine Cellerier <dionoea -at- videolan -dot- org>
  *
diff --git a/apps/plugins/lib/pluginlib_exit.h b/apps/plugins/lib/pluginlib_exit.h
index 8170cf71e9..db9797f2ba 100644
--- a/apps/plugins/lib/pluginlib_exit.h
+++ b/apps/plugins/lib/pluginlib_exit.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Maurus Cuelenaere
 *
diff --git a/apps/plugins/lib/pluginlib_jpeg_idct_arm.S b/apps/plugins/lib/pluginlib_jpeg_idct_arm.S
index 5e6149d59f..70d9c74ffe 100644
--- a/apps/plugins/lib/pluginlib_jpeg_idct_arm.S
+++ b/apps/plugins/lib/pluginlib_jpeg_idct_arm.S
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Andrew Mahone
 *
diff --git a/apps/plugins/lib/pluginlib_jpeg_load.c b/apps/plugins/lib/pluginlib_jpeg_load.c
index 842084cfa6..e88f890d0a 100644
--- a/apps/plugins/lib/pluginlib_jpeg_load.c
+++ b/apps/plugins/lib/pluginlib_jpeg_load.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Andrew Mahone
 *
diff --git a/apps/plugins/lib/pluginlib_jpeg_mem.c b/apps/plugins/lib/pluginlib_jpeg_mem.c
index 6fc04854b5..332ba75f61 100644
--- a/apps/plugins/lib/pluginlib_jpeg_mem.c
+++ b/apps/plugins/lib/pluginlib_jpeg_mem.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Andrew Mahone
 *
diff --git a/apps/plugins/lib/pluginlib_resize.c b/apps/plugins/lib/pluginlib_resize.c
index 255fd7f6aa..9c8cca4143 100644
--- a/apps/plugins/lib/pluginlib_resize.c
+++ b/apps/plugins/lib/pluginlib_resize.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Andrew Mahone
 *
diff --git a/apps/plugins/lib/pluginlib_touchscreen.c b/apps/plugins/lib/pluginlib_touchscreen.c
index 5903b7c7a9..89635dc5f8 100644
--- a/apps/plugins/lib/pluginlib_touchscreen.c
+++ b/apps/plugins/lib/pluginlib_touchscreen.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2008 by Maurus Cuelenaere
 * Copyright (C) 2009 by Karl Kurbjun
diff --git a/apps/plugins/lib/pluginlib_touchscreen.h b/apps/plugins/lib/pluginlib_touchscreen.h
index dbd944c040..03964e6710 100644
--- a/apps/plugins/lib/pluginlib_touchscreen.h
+++ b/apps/plugins/lib/pluginlib_touchscreen.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2008 by Maurus Cuelenaere
 * Copyright (C) 2009 by Karl Kurbjun
diff --git a/apps/plugins/lib/printcell_helper.c b/apps/plugins/lib/printcell_helper.c
index 5c34a5d794..2bf523ef51 100644
--- a/apps/plugins/lib/printcell_helper.c
+++ b/apps/plugins/lib/printcell_helper.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 by William Wilgus
  *
diff --git a/apps/plugins/lib/printcell_helper.h b/apps/plugins/lib/printcell_helper.h
index f58e73c0a5..d0ff98ed98 100644
--- a/apps/plugins/lib/printcell_helper.h
+++ b/apps/plugins/lib/printcell_helper.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 William Wilgus
  *
diff --git a/apps/plugins/lib/profile_plugin.c b/apps/plugins/lib/profile_plugin.c
index 9224997423..61312f2614 100644
--- a/apps/plugins/lib/profile_plugin.c
+++ b/apps/plugins/lib/profile_plugin.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Passthrough routines for plugin profiling
 *
diff --git a/apps/plugins/lib/profile_plugin.h b/apps/plugins/lib/profile_plugin.h
index ce0581a7cb..5150d13f80 100644
--- a/apps/plugins/lib/profile_plugin.h
+++ b/apps/plugins/lib/profile_plugin.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Passthrough routines for plugin profiling.
 *
diff --git a/apps/plugins/lib/read_image.c b/apps/plugins/lib/read_image.c
index edc4bfb981..881befa65d 100644
--- a/apps/plugins/lib/read_image.c
+++ b/apps/plugins/lib/read_image.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Andrew Mahone
 *
diff --git a/apps/plugins/lib/read_image.h b/apps/plugins/lib/read_image.h
index 158220dd8f..65bc167821 100644
--- a/apps/plugins/lib/read_image.h
+++ b/apps/plugins/lib/read_image.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Andrew Mahone
 *
diff --git a/apps/plugins/lib/rgb_hsv.c b/apps/plugins/lib/rgb_hsv.c
index 27e3b9dcba..41688c18cf 100644
--- a/apps/plugins/lib/rgb_hsv.c
+++ b/apps/plugins/lib/rgb_hsv.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Antoine Cellerier <dionoea -at- videolan -dot- org>
  *
diff --git a/apps/plugins/lib/rgb_hsv.h b/apps/plugins/lib/rgb_hsv.h
index 9e9e2285ad..f80fd9a8fc 100644
--- a/apps/plugins/lib/rgb_hsv.h
+++ b/apps/plugins/lib/rgb_hsv.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Antoine Cellerier <dionoea -at- videolan -dot- org>
  *
diff --git a/apps/plugins/lib/simple_viewer.c b/apps/plugins/lib/simple_viewer.c
index 27a30ef0b5..921d0b7aa5 100644
--- a/apps/plugins/lib/simple_viewer.c
+++ b/apps/plugins/lib/simple_viewer.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2010 Teruaki Kawashima
 *
@@ -299,9 +298,9 @@ int view_text(const char *title, const char *text)
     /* handle themes that draw over the UI viewport */
     rb->add_event_ex(GUI_EVENT_NEED_UI_UPDATE, false, ui_update_cb, &info);
 
-    /* skin engine needs to render title and redraw screen */
+    /* skin engine needs to draw title */
     if (info.sbs_has_title)
-        rb->send_event(GUI_EVENT_ACTIONUPDATE, (void*)1);
+        rb->send_event(GUI_EVENT_ACTIONREDRAW, (void*)1);
     else
         draw_text(&info);
 
diff --git a/apps/plugins/lib/simple_viewer.h b/apps/plugins/lib/simple_viewer.h
index ff3ef23f14..68f24dcfdc 100644
--- a/apps/plugins/lib/simple_viewer.h
+++ b/apps/plugins/lib/simple_viewer.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2010 Teruaki Kawashima
 *
diff --git a/apps/plugins/lib/wrappers.h b/apps/plugins/lib/wrappers.h
index 761854fa05..3b20df4984 100644
--- a/apps/plugins/lib/wrappers.h
+++ b/apps/plugins/lib/wrappers.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Andrew Mahone
 *
diff --git a/apps/plugins/lib/xlcd.h b/apps/plugins/lib/xlcd.h
index 069cc00508..8e4c6edbc0 100644
--- a/apps/plugins/lib/xlcd.h
+++ b/apps/plugins/lib/xlcd.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Additional LCD routines not present in the core itself
 *
diff --git a/apps/plugins/lib/xlcd_core.c b/apps/plugins/lib/xlcd_core.c
index 9a274cb48d..fc272e21ce 100644
--- a/apps/plugins/lib/xlcd_core.c
+++ b/apps/plugins/lib/xlcd_core.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Additional LCD routines not present in the rockbox core
 * Core functions
diff --git a/apps/plugins/lib/xlcd_draw.c b/apps/plugins/lib/xlcd_draw.c
index 98b1004352..8e1a402939 100644
--- a/apps/plugins/lib/xlcd_draw.c
+++ b/apps/plugins/lib/xlcd_draw.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Additional LCD routines not present in the rockbox core
 * Drawing functions
diff --git a/apps/plugins/lib/xlcd_scroll.c b/apps/plugins/lib/xlcd_scroll.c
index 906f4eaae1..8ffe4c4b1c 100644
--- a/apps/plugins/lib/xlcd_scroll.c
+++ b/apps/plugins/lib/xlcd_scroll.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Additional LCD routines not present in the rockbox core
 * Scrolling functions
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c
index b7ec97c5d1..1e98dce47f 100644
--- a/apps/plugins/logo.c
+++ b/apps/plugins/logo.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Jonas Häggqvist
  *
diff --git a/apps/plugins/lrcplayer.c b/apps/plugins/lrcplayer.c
index f87d3aa7c2..8ce00fad7a 100644
--- a/apps/plugins/lrcplayer.c
+++ b/apps/plugins/lrcplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008-2009 Teruaki Kawashima
  *
diff --git a/apps/plugins/lua/action_helper.pl b/apps/plugins/lua/action_helper.pl
index f225952bf9..5dde7ea733 100755
--- a/apps/plugins/lua/action_helper.pl
+++ b/apps/plugins/lua/action_helper.pl
@@ -1,12 +1,11 @@
 #!/usr/bin/env perl
 ############################################################################
-#             __________               __   ___.                  
-#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___  
-#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /  
-#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
-#                     \/            \/     \/    \/            \/ 
-# $Id$
+#                     \/            \/     \/    \/            \/
 #
 # Copyright (C) 2009 by Maurus Cuelenaere
 #
@@ -18,6 +17,8 @@
 #
 ############################################################################
 
+my $svnrev = '';
+
 $i = 0;
 $j = 0;
 while(my $line = <STDIN>)
@@ -42,7 +43,7 @@ while(my $line = <STDIN>)
 }
 
 print "-- Don't change this file!\n";
-printf "-- It is automatically generated of action.h %s\n", '$Revision$';
+printf "-- It is automatically generated of action.h (%s)\n", $svnrev;
 
 print "rb.actions = {\n";
 foreach $action(@actions)
diff --git a/apps/plugins/lua/button_helper.pl b/apps/plugins/lua/button_helper.pl
index 7af3231b11..bd2c024555 100755
--- a/apps/plugins/lua/button_helper.pl
+++ b/apps/plugins/lua/button_helper.pl
@@ -1,12 +1,11 @@
 #!/usr/bin/env perl
 ############################################################################
-#             __________               __   ___.                  
-#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___  
-#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /  
-#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
-#                     \/            \/     \/    \/            \/ 
-# $Id$
+#                     \/            \/     \/    \/            \/
 #
 # Copyright (C) 2009 by Maurus Cuelenaere
 #
@@ -18,7 +17,7 @@
 #
 ############################################################################
 
-$svnrev = '$Revision$';
+$svnrev = '';
 
 print <<EOF
 #include <stdio.h>
diff --git a/apps/plugins/lua/include_lua/audio.lua b/apps/plugins/lua/include_lua/audio.lua
index 87fca61fc2..98a0fc8c32 100644
--- a/apps/plugins/lua/include_lua/audio.lua
+++ b/apps/plugins/lua/include_lua/audio.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/blit.lua b/apps/plugins/lua/include_lua/blit.lua
index 3505ae4943..c6117563d9 100644
--- a/apps/plugins/lua/include_lua/blit.lua
+++ b/apps/plugins/lua/include_lua/blit.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/color.lua b/apps/plugins/lua/include_lua/color.lua
index 7266c090f3..bed0820131 100644
--- a/apps/plugins/lua/include_lua/color.lua
+++ b/apps/plugins/lua/include_lua/color.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/create_kbd_layout.lua b/apps/plugins/lua/include_lua/create_kbd_layout.lua
index 7d0792a667..996c2c9a9e 100644
--- a/apps/plugins/lua/include_lua/create_kbd_layout.lua
+++ b/apps/plugins/lua/include_lua/create_kbd_layout.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/dbgettags.lua b/apps/plugins/lua/include_lua/dbgettags.lua
index 8e9f26393d..0c44130a64 100644
--- a/apps/plugins/lua/include_lua/dbgettags.lua
+++ b/apps/plugins/lua/include_lua/dbgettags.lua
@@ -7,7 +7,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/draw.lua b/apps/plugins/lua/include_lua/draw.lua
index 7208b63efb..67aa877c22 100644
--- a/apps/plugins/lua/include_lua/draw.lua
+++ b/apps/plugins/lua/include_lua/draw.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/draw_floodfill.lua b/apps/plugins/lua/include_lua/draw_floodfill.lua
index 0303e711f2..ff2c5a4cd8 100644
--- a/apps/plugins/lua/include_lua/draw_floodfill.lua
+++ b/apps/plugins/lua/include_lua/draw_floodfill.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/draw_num.lua b/apps/plugins/lua/include_lua/draw_num.lua
index 831e23e71e..1cbdd4f43a 100644
--- a/apps/plugins/lua/include_lua/draw_num.lua
+++ b/apps/plugins/lua/include_lua/draw_num.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2019 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/draw_poly.lua b/apps/plugins/lua/include_lua/draw_poly.lua
index d5bc83ae39..95593ef3c8 100644
--- a/apps/plugins/lua/include_lua/draw_poly.lua
+++ b/apps/plugins/lua/include_lua/draw_poly.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/draw_text.lua b/apps/plugins/lua/include_lua/draw_text.lua
index 1d44954a5c..a790c92980 100644
--- a/apps/plugins/lua/include_lua/draw_text.lua
+++ b/apps/plugins/lua/include_lua/draw_text.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/filebrowse.lua b/apps/plugins/lua/include_lua/filebrowse.lua
index 0640ec3764..fb74798ccb 100755
--- a/apps/plugins/lua/include_lua/filebrowse.lua
+++ b/apps/plugins/lua/include_lua/filebrowse.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
@@ -24,136 +23,9 @@ if ... == nil then rb.splash(rb.HZ * 3, "use 'require'") end
 require("printtable")
 local _lcd = require("lcd")
 local _timer = require("timer")
+local tmploader = require("temploader")
+--local get_files = require("get_files")--Using tmploader instead
 
---------------------------------------------------------------------------------
---[[ returns a sorted tables of directories and (another) of files
--- path is the starting path; norecurse == true.. only that path will be searched
---   findfile & finddir are definable search functions
---  if not defined all files/dirs are returned if false is passed.. none
--- or you can provide your own function see below..
--- f_t and d_t allow you to pass your own tables for re-use but isn't necessary
-]]
-local function get_files(path, norecurse, finddir, findfile, sort_by, f_t, d_t)
-    local quit = false
-    local sort_by_function -- forward declaration
-    local filepath_function -- forward declaration
-    local files = f_t or {}
-    local dirs = d_t or {}
-
-    local function f_filedir(name)
-        --default find function
-        -- example: return name:find(".mp3", 1, true) ~= nil
-        if name:len() <= 2 and (name == "." or name == "..") then
-            return false
-        end
-        return true
-    end
-    local function d_filedir(name)
-        --default discard function
-        return false
-    end
-
-    if finddir == nil then
-        finddir = f_filedir
-    elseif type(finddir) ~= "function" then
-        finddir = d_filedir
-    end
-
-    if findfile == nil then
-        findfile = f_filedir
-    elseif type(findfile) ~= "function" then
-        findfile = d_filedir
-    end
-
-    local function _get_files(path, cancelbtn)
-        local sep = ""
-        local filepath
-        local finfo_t
-        if string.sub(path, - 1) ~= "/" then sep = "/" end
-        for fname, isdir, finfo_t in luadir.dir(path, true) do
-            if isdir and finddir(fname) then
-                table.insert(dirs, path .. sep ..fname)
-            elseif not isdir and findfile(fname) then
-                filepath = filepath_function(path, sep, fname, finfo_t.attribute, finfo_t.size, finfo_t.time)
-                table.insert(files, filepath)
-            end
-
-            if  rb.get_plugin_action(0) == cancelbtn then
-                return true
-            end
-        end
-    end
-
-
-
-    local function cmp_alphanum (op1, op2)
-        local type1= type(op1)
-        local type2 = type(op2)
-
-        if type1 ~= type2 then
-            return type1 < type2
-        else
-            if type1 == "string" then
-                op1 = op1:upper()
-                op2 = op2:upper()
-                return sort_by_function(op1, op2)
-            end
-            return op1 < op2
-        end
-     end
-
-    _lcd:splashf(1, "Searching for Files")
-
-    if sort_by == "name" then
-        sort_by_function = function(s1, s2) return s1 < s2 end
-        filepath_function = function(path, sep, fname, fattrib, fsize, ftime)
-                return string.format("%s%s%s;", path, sep, fname)
-        end
-    elseif sort_by == "size" then
-        filepath_function = function(path, sep, fname, fattrib, fsize, ftime)
-                return string.format("%s%s%s; At:%d, Sz:%d, Tm:%d", path, sep, fname, fattrib, fsize, ftime)
-        end
-        sort_by_function = function(s1, s2)
-            local v1, v2
-            v1 = string.match(s1, "SZ:(%d+)")
-            v2 = string.match(s2, "SZ:(%d+)")
-            if v1 or v2 then
-                return tonumber(v1 or 0) < tonumber(v2 or 0)
-            end
-            return s1 < s2
-        end
-    elseif sort_by == "date" then
-        filepath_function = function(path, sep, fname, fattrib, fsize, ftime)
-                return string.format("%s%s%s; At:%d, Sz:%d, Tm:%d", path, sep, fname, fattrib, fsize, ftime)
-        end
-        sort_by_function = function(s1, s2)
-            local v1, v2
-            v1 = string.match(s1, "TM:(%d+)")
-            v2 = string.match(s2, "TM:(%d+)")
-            if v1 or v2 then
-                return tonumber(v1 or 0) < tonumber(v2 or 0)
-            end
-            return s1 < s2
-        end
-    end
-
-    table.insert(dirs, path) -- root
-
-    for key,value in pairs(dirs) do
-        --luadir.dir may error out so we need to do the call protected
-        -- _get_files(value, CANCEL_BUTTON)
-        _, quit = pcall(_get_files, value, CANCEL_BUTTON)
-
-        if quit == true or norecurse then
-            break;
-        end
-    end
-
-    table.sort(files, cmp_alphanum)
-    table.sort(dirs, cmp_alphanum)
-
-    return dirs, files
-end -- get_files
 --------------------------------------------------------------------------------
 
 -- uses print_table and get_files to display simple file browser
@@ -177,7 +49,7 @@ function file_choose(dir, title, sort_by, descending)
         return secs, csecs
     end
 
-    local norecurse  = true
+    local recurse  = false
     local f_finddir  = nil -- function to match directories; nil all, false none
     local f_findfile = nil -- function to match files; nil all, false none
 
@@ -187,14 +59,28 @@ function file_choose(dir, title, sort_by, descending)
     local files = {}
     local dirs = {}
     local item = 1
-    _lcd:clear()
+    local cancel_fn = nil
 
+    if CANCEL_BUTTON and CANCEL_BUTTON > 0 then
+        cancel_fn = function()
+                        if rb.get_plugin_action(0) == CANCEL_BUTTON then rb.splash(0, "Canceled") return true end
+                        return false
+                    end
+    else
+        cancel_fn = function()
+                        if rb.action_userabort(0)then rb.splash(0, "Canceled") return true end
+                        return false
+                    end
+    end
+
+    _lcd:clear()
+    local get_files = tmploader("get_files")
     while item > 0 do
         if not title then
             timer = _timer()
         end
-
-        dirs, files = get_files(dir, norecurse, f_finddir, f_findfile, sort_by, dirs, files)
+        rb.splash(1, "Searching for Files")
+        dirs, files = get_files(dir, recurse, f_finddir, f_findfile, sort_by, cancel_fn, dirs, files)
 
         local parentdir = dirs[1]
         for i = 1, #dirs do
diff --git a/apps/plugins/lua/include_lua/fileviewers.lua b/apps/plugins/lua/include_lua/fileviewers.lua
index c686f3eeda..e80b9c5e82 100755
--- a/apps/plugins/lua/include_lua/fileviewers.lua
+++ b/apps/plugins/lua/include_lua/fileviewers.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
@@ -28,7 +27,7 @@ local _print = require("print")
 local _timer = require("timer")
 
 require("actions")
-local CANCEL_BUTTON = rb.actions.PLA_CANCEL
+_G.CANCEL_BUTTON = rb.actions.PLA_CANCEL --global 
 --------------------------------------------------------------------------------
 -- builds an index of byte position of every line at each bufsz increment
 -- in filename; bufsz == 1 would be every line; saves to filename.ext.idx_ext
diff --git a/apps/plugins/lua/include_lua/get_files.lua b/apps/plugins/lua/include_lua/get_files.lua
new file mode 100644
index 0000000000..f9e7a66699
--- /dev/null
+++ b/apps/plugins/lua/include_lua/get_files.lua
@@ -0,0 +1,165 @@
+--[[
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ * Copyright (C) 2026 William Wilgus
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+]]
+if ... == nil then rb.splash(rb.HZ * 3, "use 'require'") end
+
+--------------------------------------------------------------------------------
+--[[ returns a sorted tables of directories and (another) of files
+-- path is the starting path; recurse == false.. only that path will be searched
+-- findfile & finddir are definable search functions
+-- if not defined all files/dirs are returned if false is passed.. none
+    or you can provide your own function see below..
+-- sort_by can be by "name" "size" "date" or "none" to perform no sorting
+    note: for "size" and "date" you may need to strip the attribute data to use
+    the returned filename
+-- cancel_fn if not defined or not a function no user cancel otherwise supply
+    your own cancel function which returns true to cancel searching for files
+-- f_t and d_t allow you to pass your own tables for re-use but isn't necessary
+]]
+local function get_files(path, recurse, finddir, findfile, sort_by, cancel_fn, f_t, d_t)
+    local quit = false
+    local sort_by_function = nil
+    local filepath_function -- forward declaration
+    local files = f_t or {}
+    local dirs = d_t or {}
+
+    local function f_filedir(name)
+        --default find function
+        -- example: return name:find(".mp3", 1, true) ~= nil
+        if name:len() <= 2 and (name == "." or name == "..") then
+            return false
+        end
+        return true
+    end
+    local function d_filedir(name)
+        --default discard function
+        return false
+    end
+
+    if finddir == nil then
+        finddir = f_filedir
+    elseif type(finddir) ~= "function" then
+        finddir = d_filedir
+    end
+
+    if findfile == nil then
+        findfile = f_filedir
+    elseif type(findfile) ~= "function" then
+        findfile = d_filedir
+    end
+
+    if type(cancel_fn) ~= "function" then
+        cancel_fn = function() return false end
+    end
+
+    local function _get_files(path)
+        local sep = ""
+        local filepath
+        local finfo_t
+        if string.sub(path, - 1) ~= "/" then sep = "/" end
+        for fname, isdir, finfo_t in luadir.dir(path, true) do
+            if isdir and finddir(fname) then
+                table.insert(dirs, path .. sep ..fname)
+            elseif not isdir and findfile(fname) then
+                filepath = filepath_function(path, sep, fname, finfo_t.attribute, finfo_t.size, finfo_t.time)
+                table.insert(files, filepath)
+            end
+
+            if cancel_fn() == true then
+                return true
+            end
+        end
+        return false;
+    end
+
+    local function cmp_alphanum (op1, op2)
+        local type1= type(op1)
+        local type2 = type(op2)
+
+        if type1 ~= type2 then
+            return type1 < type2
+        else
+            if type1 == "string" then
+                op1 = op1:upper()
+                op2 = op2:upper()
+                return sort_by_function(op1, op2)
+            end
+            return op1 < op2
+        end
+     end
+
+    if sort_by == "name" then
+        sort_by_function = function(s1, s2) return s1 < s2 end
+        filepath_function = function(path, sep, fname, fattrib, fsize, ftime)
+                return string.format("%s%s%s;", path, sep, fname)
+        end
+    elseif sort_by == "size" then
+        filepath_function = function(path, sep, fname, fattrib, fsize, ftime)
+                return string.format("%s%s%s; At:%d, Sz:%d, Tm:%d", path, sep, fname, fattrib, fsize, ftime)
+        end
+        sort_by_function = function(s1, s2)
+            local v1, v2
+            v1 = string.match(s1, "SZ:(%d+)")
+            v2 = string.match(s2, "SZ:(%d+)")
+            if v1 or v2 then
+                return tonumber(v1 or 0) < tonumber(v2 or 0)
+            end
+            return s1 < s2
+        end
+    elseif sort_by == "date" then
+        filepath_function = function(path, sep, fname, fattrib, fsize, ftime)
+                return string.format("%s%s%s; At:%d, Sz:%d, Tm:%d", path, sep, fname, fattrib, fsize, ftime)
+        end
+        sort_by_function = function(s1, s2)
+            local v1, v2
+            v1 = string.match(s1, "TM:(%d+)")
+            v2 = string.match(s2, "TM:(%d+)")
+            if v1 or v2 then
+                return tonumber(v1 or 0) < tonumber(v2 or 0)
+            end
+            return s1 < s2
+        end
+    else -- "none"
+        filepath_function = function(path, sep, fname, fattrib, fsize, ftime)
+                return string.format("%s%s%s;", path, sep, fname)
+        end
+    end
+
+    table.insert(dirs, path) -- root
+
+    for key,value in pairs(dirs) do
+        --luadir.dir may error out so we need to do the call protected
+        -- _get_files(value, CANCEL_BUTTON)
+        _, quit = pcall(_get_files, value)
+
+        if quit == true or not recurse then
+            break;
+        end
+    end
+    if type(sort_by_function) == "function" then
+        table.sort(files, cmp_alphanum)
+        table.sort(dirs, cmp_alphanum)
+    end
+
+    return dirs, files
+end -- get_files
+--------------------------------------------------------------------------------
+return get_files
diff --git a/apps/plugins/lua/include_lua/image.lua b/apps/plugins/lua/include_lua/image.lua
index 5fd452ea78..7f91c4473b 100644
--- a/apps/plugins/lua/include_lua/image.lua
+++ b/apps/plugins/lua/include_lua/image.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/image_save.lua b/apps/plugins/lua/include_lua/image_save.lua
index df88e9ba91..389696c591 100644
--- a/apps/plugins/lua/include_lua/image_save.lua
+++ b/apps/plugins/lua/include_lua/image_save.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/lcd.lua b/apps/plugins/lua/include_lua/lcd.lua
index 726ba9b30c..7453d1b0d5 100644
--- a/apps/plugins/lua/include_lua/lcd.lua
+++ b/apps/plugins/lua/include_lua/lcd.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/math_ex.lua b/apps/plugins/lua/include_lua/math_ex.lua
index bd4cc58765..8bb1701409 100644
--- a/apps/plugins/lua/include_lua/math_ex.lua
+++ b/apps/plugins/lua/include_lua/math_ex.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/menubuttons.lua b/apps/plugins/lua/include_lua/menubuttons.lua
index 99e6eb1430..4e29ccd101 100644
--- a/apps/plugins/lua/include_lua/menubuttons.lua
+++ b/apps/plugins/lua/include_lua/menubuttons.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/menucoresettings.lua b/apps/plugins/lua/include_lua/menucoresettings.lua
index 27d5e86ca1..eda424db3b 100644
--- a/apps/plugins/lua/include_lua/menucoresettings.lua
+++ b/apps/plugins/lua/include_lua/menucoresettings.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/pcm.lua b/apps/plugins/lua/include_lua/pcm.lua
index 9652c5e3a7..1d66db7ebb 100644
--- a/apps/plugins/lua/include_lua/pcm.lua
+++ b/apps/plugins/lua/include_lua/pcm.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2018 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/playlist.lua b/apps/plugins/lua/include_lua/playlist.lua
index dfa839aab1..5a72454523 100644
--- a/apps/plugins/lua/include_lua/playlist.lua
+++ b/apps/plugins/lua/include_lua/playlist.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2018 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/poly_points.lua b/apps/plugins/lua/include_lua/poly_points.lua
index d313710e5c..bf7f067998 100644
--- a/apps/plugins/lua/include_lua/poly_points.lua
+++ b/apps/plugins/lua/include_lua/poly_points.lua
@@ -7,7 +7,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/print.lua b/apps/plugins/lua/include_lua/print.lua
index 6f2010422a..c9cd9935c7 100644
--- a/apps/plugins/lua/include_lua/print.lua
+++ b/apps/plugins/lua/include_lua/print.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/printmenus.lua b/apps/plugins/lua/include_lua/printmenus.lua
index 938d99a5ed..9756edf32a 100644
--- a/apps/plugins/lua/include_lua/printmenus.lua
+++ b/apps/plugins/lua/include_lua/printmenus.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/printsubmenu.lua b/apps/plugins/lua/include_lua/printsubmenu.lua
index f4b93db98d..ac728ed480 100644
--- a/apps/plugins/lua/include_lua/printsubmenu.lua
+++ b/apps/plugins/lua/include_lua/printsubmenu.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/printtable.lua b/apps/plugins/lua/include_lua/printtable.lua
index 02f3935ae6..c959bb5f3b 100644
--- a/apps/plugins/lua/include_lua/printtable.lua
+++ b/apps/plugins/lua/include_lua/printtable.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/rbcompat.lua b/apps/plugins/lua/include_lua/rbcompat.lua
index 377bc2e4e0..ea00ed6a88 100644
--- a/apps/plugins/lua/include_lua/rbcompat.lua
+++ b/apps/plugins/lua/include_lua/rbcompat.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2018 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/rbsettings.lua b/apps/plugins/lua/include_lua/rbsettings.lua
index 995e5023c9..4da6ee61b2 100644
--- a/apps/plugins/lua/include_lua/rbsettings.lua
+++ b/apps/plugins/lua/include_lua/rbsettings.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2019 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/sound.lua b/apps/plugins/lua/include_lua/sound.lua
index 072df0b6ae..aed3d34da2 100644
--- a/apps/plugins/lua/include_lua/sound.lua
+++ b/apps/plugins/lua/include_lua/sound.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2019 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/strftime.lua b/apps/plugins/lua/include_lua/strftime.lua
index 6cf449aeec..0079d6fecb 100644
--- a/apps/plugins/lua/include_lua/strftime.lua
+++ b/apps/plugins/lua/include_lua/strftime.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
 
  strfrtime
  Copyright (C) 2026 William Wilgus
@@ -73,13 +72,13 @@ local function strftime(tmfmt, tm)
                     elseif c == "F" then
                         out = strftime("%Y-%m-%d", tm)
                     elseif c == "a" then
-                        out = weekdays[tm.wday + 1]:sub(1, 3)
+                        out = weekdays[tm.wday]:sub(1, 3)
                     elseif c == "A" then
-                        out = weekdays[tm.wday + 1]
+                        out = weekdays[tm.wday]
                     elseif c == "h" or c == "b" then
-                        out = months[tm.month + 1]:sub(1, 3)
+                        out = months[tm.month]:sub(1, 3)
                     elseif c == "B" then
-                        out = months[tm.month + 1]
+                        out = months[tm.month]
                     elseif c == "p" then
                         --local idx = tm.hour > 12 and 4 or 5
                         out = tm.hour > 12 and "PM" or "AM"
@@ -87,7 +86,7 @@ local function strftime(tmfmt, tm)
                         --local idx = tm.hour > 12 and 2 or 1
                         out = tm.hour > 12 and "pm" or "am"
                     elseif c == "C" then
-                        local no = (tm.year / 100) + 19
+                        local no = (tm.year / 100)
                         out = strformat("%02d", no)
                     elseif c == "d" then
                         out = strformat("%02d", tm.day)
@@ -108,30 +107,36 @@ local function strftime(tmfmt, tm)
                         if no == 0 then no = 12 end
                         out = strformat("%2.0d", no)
                     elseif c == "m" then
-                        out = strformat("%02d", tm.mon)
+                        out = strformat("%02d", tm.month)
                     elseif c == "M" then
                         out = strformat("%02d", tm.min)
                     elseif c == "S" then
                         out = strformat("%02d", tm.sec)
                     elseif c == "u" then
-                        local no = tm.wday == 0 and 7 or tm.wday
+                        local wday = tm.wday - 1
+                        local no = wday == 0 and 7 or wday
                         out = strformat("%d", no)
                     elseif c == "w" then
                         out = strformat("%d", tm.wday)
                     elseif c == "U" then
-                        local no = ((tm.yday - tm.wday + 7) / 7)
+                        local yday = tm.yday - 1
+                        local wday = tm.wday - 1
+                        local no = ((yday - wday + 7) / 7) + 1
                         out = strformat("%02d", no)
                     elseif c == "W" then
-                        local no = ((tm.yday - (tm.wday + 7) % 7 + 7) / 7)
+                        local yday = tm.yday - 1
+                        local wday = tm.wday - 1
+                        local no = ((yday - (wday + 7) % 7 + 7) / 7) + 1
                         out = strformat("%02d", no)
                     elseif c == "s" then
                         out = os.time()
                     elseif c == "Z" then
                         out = "[ETC?]"
                     elseif c == "Y" then
-                        local y1 = (tm.year / 100) + 19
+                    --[[local y1 = (tm.year / 100) + 19
                         local y2 = tm.year % 100
-                        out = strformat("%02d%02d", y1, y2)
+                        out = strformat("%02d%02d", y1, y2)]]
+                        out = strformat("%04d", tm.year)
                     elseif c == "y" then
                         out = strformat("%02d", tm.year % 100)
                     elseif c == "O" or c == "E" then
@@ -160,14 +165,14 @@ Note: This implementation assumes the following structure for the `tm`
 table (similar to C's `struct tm`):
 
 local tm = {
-    year = 126,    -- Years since 1900
-    mon = 0,       -- Month (0-11)
+    year = 2026,   -- Year
+    month = 1,     -- Month (1-12)
     day = 5,       -- Day of month (1-31)
     hour = 14,     -- Hours (0-23)
     min = 30,      -- Minutes (0-59)
     sec = 45,      -- Seconds (0-59)
-    wday = 2,      -- Day of week (0-6, Sunday=0)
-    yday = 4,      -- Day of year (0-365)
+    wday = 2,      -- Day of week (1-7, Sunday=1)
+    yday = 4,      -- Day of year (1-366)
     isdst = false  -- Daylight saving time flag
 }
 
@@ -235,11 +240,11 @@ local function get_tmdate(d, tm)
     end
 
     tm = tm or {}
-    tm.year = y + UNIX_EPOCH_YEAR -- year - 1900
-    tm.month = x0 -- 0..11
-    tm.yday = tm_yday
+    tm.year = y + UNIX_EPOCH_YEAR + 1900 -- year + 1900
+    tm.month = x0 + 1 -- (0..11) + 1
+    tm.yday = tm_yday + 1
     tm.day = yday - mon_yday[x0 + 1] + 1 -- 1..31
-    tm.wday = (d + 1) % 7 -- 0..6
+    tm.wday = (d + 1) % 7 + 1 -- (0..6) + 1
     return tm--return tm
 end
 
diff --git a/apps/plugins/lua/include_lua/temploader.lua b/apps/plugins/lua/include_lua/temploader.lua
index 7fd58aee99..39187d36ab 100644
--- a/apps/plugins/lua/include_lua/temploader.lua
+++ b/apps/plugins/lua/include_lua/temploader.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 William Wilgus
  *
diff --git a/apps/plugins/lua/include_lua/timer.lua b/apps/plugins/lua/include_lua/timer.lua
index 18b973cbbd..6b0d8f7824 100644
--- a/apps/plugins/lua/include_lua/timer.lua
+++ b/apps/plugins/lua/include_lua/timer.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua/lapi.c b/apps/plugins/lua/lapi.c
index 120f8c8313..bc672b6065 100644
--- a/apps/plugins/lua/lapi.c
+++ b/apps/plugins/lua/lapi.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lapi.c,v 2.55.1.5 2008/07/04 18:41:18 roberto Exp $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lapi.h b/apps/plugins/lua/lapi.h
index f968ffc992..db9f19e538 100644
--- a/apps/plugins/lua/lapi.h
+++ b/apps/plugins/lua/lapi.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Auxiliary functions from Lua API
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lauxlib.c b/apps/plugins/lua/lauxlib.c
index 3c95328c39..17da31ea90 100644
--- a/apps/plugins/lua/lauxlib.c
+++ b/apps/plugins/lua/lauxlib.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lauxlib.c,v 1.159.1.3 2008/01/21 13:20:51 roberto Exp $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lauxlib.h b/apps/plugins/lua/lauxlib.h
index 4b4f3be1db..0300a2b624 100644
--- a/apps/plugins/lua/lauxlib.h
+++ b/apps/plugins/lua/lauxlib.h
@@ -1,5 +1,4 @@
 /*
-** $Id: lauxlib.h,v 1.88.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lbaselib.c b/apps/plugins/lua/lbaselib.c
index cb7b29a92a..e9491ae9e5 100644
--- a/apps/plugins/lua/lbaselib.c
+++ b/apps/plugins/lua/lbaselib.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lbaselib.c,v 1.191.1.6 2008/02/14 16:46:22 roberto Exp $
 ** Basic library
 ** See Copyright Notice in lua.h
 */
@@ -232,7 +231,6 @@ static int luaB_type (lua_State *L) {
 }
 
 
-/** $Id: lbaselib.c,v 1.276.1.1 2013/04/12 18:48:47 roberto Exp $ */
 static int pairsmeta (lua_State *L, const char *method, int iszero,
                       lua_CFunction iter) {
   if (!luaL_getmetafield(L, 1, method)) {  /* no metamethod? */
diff --git a/apps/plugins/lua/lcode.c b/apps/plugins/lua/lcode.c
index bf031436e8..d6eeb18eca 100644
--- a/apps/plugins/lua/lcode.c
+++ b/apps/plugins/lua/lcode.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lcode.c,v 2.25.1.5 2011/01/31 14:53:16 roberto Exp $
 ** Code generator for Lua
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lcode.h b/apps/plugins/lua/lcode.h
index 751b2b5695..d3294364ba 100644
--- a/apps/plugins/lua/lcode.h
+++ b/apps/plugins/lua/lcode.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Code generator for Lua
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/ldebug.c b/apps/plugins/lua/ldebug.c
index d6bb60f55f..8823d3e21c 100644
--- a/apps/plugins/lua/ldebug.c
+++ b/apps/plugins/lua/ldebug.c
@@ -1,5 +1,4 @@
 /*
-** $Id: ldebug.c,v 2.29.1.6 2008/05/08 16:56:26 roberto Exp $
 ** Debug Interface
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/ldebug.h b/apps/plugins/lua/ldebug.h
index 7aa9f459d5..f29ba26938 100644
--- a/apps/plugins/lua/ldebug.h
+++ b/apps/plugins/lua/ldebug.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Auxiliary functions from Debug Interface module
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/ldo.c b/apps/plugins/lua/ldo.c
index 7eccc54480..4a29862b51 100644
--- a/apps/plugins/lua/ldo.c
+++ b/apps/plugins/lua/ldo.c
@@ -1,5 +1,4 @@
 /*
-** $Id: ldo.c,v 2.38.1.4 2012/01/18 02:27:10 roberto Exp $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/ldo.h b/apps/plugins/lua/ldo.h
index 4c97134805..6b5846745a 100644
--- a/apps/plugins/lua/ldo.h
+++ b/apps/plugins/lua/ldo.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/ldump.c b/apps/plugins/lua/ldump.c
index be7dce3497..1ef2d713dd 100644
--- a/apps/plugins/lua/ldump.c
+++ b/apps/plugins/lua/ldump.c
@@ -1,5 +1,4 @@
 /*
-** $Id: ldump.c,v 2.8.1.1 2007/12/27 13:02:25 roberto Exp $
 ** save precompiled Lua chunks
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lfunc.c b/apps/plugins/lua/lfunc.c
index ef275cecd2..efc66238f8 100644
--- a/apps/plugins/lua/lfunc.c
+++ b/apps/plugins/lua/lfunc.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lfunc.c,v 2.12.1.2 2007/12/28 14:58:43 roberto Exp $
 ** Auxiliary functions to manipulate prototypes and closures
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lfunc.h b/apps/plugins/lua/lfunc.h
index 4c2b7fd138..3681ad24f1 100644
--- a/apps/plugins/lua/lfunc.h
+++ b/apps/plugins/lua/lfunc.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Auxiliary functions to manipulate prototypes and closures
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lgc.c b/apps/plugins/lua/lgc.c
index 2a4d95aba8..75d8cda517 100644
--- a/apps/plugins/lua/lgc.c
+++ b/apps/plugins/lua/lgc.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lgc.c,v 2.38.1.2 2011/03/18 18:05:38 roberto Exp $
 ** Garbage Collector
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lgc.h b/apps/plugins/lua/lgc.h
index 115008d6be..d801cdaf8b 100644
--- a/apps/plugins/lua/lgc.h
+++ b/apps/plugins/lua/lgc.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Garbage Collector
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/liolib.c b/apps/plugins/lua/liolib.c
index b44a732369..22213191a5 100644
--- a/apps/plugins/lua/liolib.c
+++ b/apps/plugins/lua/liolib.c
@@ -1,5 +1,4 @@
 /*
-** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $
 ** Standard I/O (and system) library
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/llex.c b/apps/plugins/lua/llex.c
index 2d45feec8b..350a3c993d 100644
--- a/apps/plugins/lua/llex.c
+++ b/apps/plugins/lua/llex.c
@@ -1,5 +1,4 @@
 /*
-** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/llex.h b/apps/plugins/lua/llex.h
index fa8b7a2a28..0fd78e2a24 100644
--- a/apps/plugins/lua/llex.h
+++ b/apps/plugins/lua/llex.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/llimits.h b/apps/plugins/lua/llimits.h
index a31ad160ad..00027e20d6 100644
--- a/apps/plugins/lua/llimits.h
+++ b/apps/plugins/lua/llimits.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Limits, basic types, and some other `installation-dependent' definitions
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lmathlib.c b/apps/plugins/lua/lmathlib.c
index 3a868a1521..d72797009b 100644
--- a/apps/plugins/lua/lmathlib.c
+++ b/apps/plugins/lua/lmathlib.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lmathlib.c,v 1.67.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Standard mathematical library
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lmem.c b/apps/plugins/lua/lmem.c
index ae7d8c965f..14bce80c15 100644
--- a/apps/plugins/lua/lmem.c
+++ b/apps/plugins/lua/lmem.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lmem.c,v 1.70.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Interface to Memory Manager
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lmem.h b/apps/plugins/lua/lmem.h
index 97a888c7f8..afa5f498ae 100644
--- a/apps/plugins/lua/lmem.h
+++ b/apps/plugins/lua/lmem.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Interface to Memory Manager
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/loadlib.c b/apps/plugins/lua/loadlib.c
index 49383028fd..3f85bcd800 100644
--- a/apps/plugins/lua/loadlib.c
+++ b/apps/plugins/lua/loadlib.c
@@ -1,5 +1,4 @@
 /*
-** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $
 ** Dynamic library loader for Lua
 ** See Copyright Notice in lua.h
 **
diff --git a/apps/plugins/lua/lobject.c b/apps/plugins/lua/lobject.c
index 65a23cf938..ee5896e5ac 100644
--- a/apps/plugins/lua/lobject.c
+++ b/apps/plugins/lua/lobject.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lobject.c,v 2.22.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Some generic functions over Lua objects
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lobject.h b/apps/plugins/lua/lobject.h
index 83651c2c47..e3c58ca009 100644
--- a/apps/plugins/lua/lobject.h
+++ b/apps/plugins/lua/lobject.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Type definitions for Lua objects
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lopcodes.c b/apps/plugins/lua/lopcodes.c
index 4cc745230b..a140d2fd74 100644
--- a/apps/plugins/lua/lopcodes.c
+++ b/apps/plugins/lua/lopcodes.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lopcodes.c,v 1.37.1.1 2007/12/27 13:02:25 roberto Exp $
 ** See Copyright Notice in lua.h
 */
 
diff --git a/apps/plugins/lua/lopcodes.h b/apps/plugins/lua/lopcodes.h
index e1aed0f637..d51eb18f0b 100644
--- a/apps/plugins/lua/lopcodes.h
+++ b/apps/plugins/lua/lopcodes.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Opcodes for Lua virtual machine
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/loslib.c b/apps/plugins/lua/loslib.c
index 8ab1cabde9..8e44bfbe89 100644
--- a/apps/plugins/lua/loslib.c
+++ b/apps/plugins/lua/loslib.c
@@ -1,5 +1,4 @@
 /*
-** $Id: loslib.c,v 1.19.1.3 2008/01/18 16:38:18 roberto Exp $
 ** Standard Operating System library
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lparser.c b/apps/plugins/lua/lparser.c
index 06c62cedde..7345f8c068 100644
--- a/apps/plugins/lua/lparser.c
+++ b/apps/plugins/lua/lparser.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lparser.c,v 2.42.1.4 2011/10/21 19:31:42 roberto Exp $
 ** Lua Parser
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lparser.h b/apps/plugins/lua/lparser.h
index a6af9eb94f..fff30f39b0 100644
--- a/apps/plugins/lua/lparser.h
+++ b/apps/plugins/lua/lparser.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Lua Parser
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lstate.c b/apps/plugins/lua/lstate.c
index 67921d84a1..0ed0506a17 100644
--- a/apps/plugins/lua/lstate.c
+++ b/apps/plugins/lua/lstate.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lstate.c,v 2.36.1.2 2008/01/03 15:20:39 roberto Exp $
 ** Global State
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lstate.h b/apps/plugins/lua/lstate.h
index 82431bc5a9..007b97b754 100644
--- a/apps/plugins/lua/lstate.h
+++ b/apps/plugins/lua/lstate.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Global State
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lstring.c b/apps/plugins/lua/lstring.c
index 6d73f1e9ea..07593f9ab6 100644
--- a/apps/plugins/lua/lstring.c
+++ b/apps/plugins/lua/lstring.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lstring.c,v 2.8.1.1 2007/12/27 13:02:25 roberto Exp $
 ** String table (keeps all strings handled by Lua)
 ** See Copyright Notice in lua.h
 ** luaS_newllocstr is adapted from "elua -- pseudo RO strings"
diff --git a/apps/plugins/lua/lstring.h b/apps/plugins/lua/lstring.h
index 8ca69b8de3..7b0420d1a4 100644
--- a/apps/plugins/lua/lstring.h
+++ b/apps/plugins/lua/lstring.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** String table (keep all strings handled by Lua)
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lstrlib.c b/apps/plugins/lua/lstrlib.c
index 8b39314e93..ae2e9fe91d 100644
--- a/apps/plugins/lua/lstrlib.c
+++ b/apps/plugins/lua/lstrlib.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $
 ** Standard library for string operations and pattern-matching
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/ltable.c b/apps/plugins/lua/ltable.c
index 31162fe7c1..ab363f9fa9 100644
--- a/apps/plugins/lua/ltable.c
+++ b/apps/plugins/lua/ltable.c
@@ -1,5 +1,4 @@
 /*
-** $Id: ltable.c,v 2.32.1.2 2007/12/28 15:32:23 roberto Exp $
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/ltable.h b/apps/plugins/lua/ltable.h
index aa28914871..7c37105983 100644
--- a/apps/plugins/lua/ltable.h
+++ b/apps/plugins/lua/ltable.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/ltablib.c b/apps/plugins/lua/ltablib.c
index 0bdac7f6c5..7544ff50c4 100644
--- a/apps/plugins/lua/ltablib.c
+++ b/apps/plugins/lua/ltablib.c
@@ -1,5 +1,4 @@
 /*
-** $Id: ltablib.c,v 1.38.1.3 2008/02/14 16:46:58 roberto Exp $
 ** Library for Table Manipulation
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/ltm.c b/apps/plugins/lua/ltm.c
index 946028006f..3e4f52e777 100644
--- a/apps/plugins/lua/ltm.c
+++ b/apps/plugins/lua/ltm.c
@@ -1,5 +1,4 @@
 /*
-** $Id: ltm.c,v 2.8.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Tag methods
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/ltm.h b/apps/plugins/lua/ltm.h
index 1b89683ef3..1d74f9ee20 100644
--- a/apps/plugins/lua/ltm.h
+++ b/apps/plugins/lua/ltm.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Tag methods
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lua.h b/apps/plugins/lua/lua.h
index 74331e924f..2cde07b57f 100644
--- a/apps/plugins/lua/lua.h
+++ b/apps/plugins/lua/lua.h
@@ -1,5 +1,4 @@
 /*
-** $Id: lua.h,v 1.218.1.7 2012/01/13 20:36:20 roberto Exp $
 ** Lua - An Extensible Extension Language
 ** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
 ** See Copyright Notice at the end of this file
diff --git a/apps/plugins/lua/lua.make b/apps/plugins/lua/lua.make
index 7ca05c15d1..77216b3c1f 100644
--- a/apps/plugins/lua/lua.make
+++ b/apps/plugins/lua/lua.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 LUA_SRCDIR := $(APPSDIR)/plugins/lua
@@ -66,7 +65,7 @@ $(LUA_BUILDDIR)/lua.refmap: $(LUA_OBJ) $(TLSFLIB)
 
 $(LUA_OUTLDS): $(PLUGIN_LDS) $(LUA_BUILDDIR)/lua.refmap
 	$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DPLUGIN -DOVERLAY_OFFSET=$(shell \
-		$(TOOLSDIR)/ovl_offset.pl $(LUA_BUILDDIR)/lua.refmap))
+		$(TOOLSDIR)/ovl_offset.pl $(LUA_BUILDDIR)/lua.refelf))
 
 $(LUA_BUILDDIR)/lua.ovl: $(LUA_OBJ) $(TLSFLIB) $(LUA_OUTLDS)
 	$(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
diff --git a/apps/plugins/lua/lua_tests/time_date_tests.lua b/apps/plugins/lua/lua_tests/time_date_tests.lua
index 4fd56de6f6..2828669422 100644
--- a/apps/plugins/lua/lua_tests/time_date_tests.lua
+++ b/apps/plugins/lua/lua_tests/time_date_tests.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
 
  Copyright (C) 2026 William Wilgus
  This program is free software; you can redistribute it and/or
diff --git a/apps/plugins/lua/luaconf.h b/apps/plugins/lua/luaconf.h
index 77d4057118..ef2f8e97ef 100644
--- a/apps/plugins/lua/luaconf.h
+++ b/apps/plugins/lua/luaconf.h
@@ -1,5 +1,4 @@
 /*
-** $Id: luaconf.h,v 1.82.1.7 2008/02/11 16:25:08 roberto Exp $
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/luadir.h b/apps/plugins/lua/luadir.h
index 80c3c3b92f..5e3b924b18 100644
--- a/apps/plugins/lua/luadir.h
+++ b/apps/plugins/lua/luadir.h
@@ -2,7 +2,6 @@
 ** LuaFileSystem
 ** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem)
 **
-** $Id: lfs.h,v 1.5 2008/02/19 20:08:23 mascarenhas Exp $
 */
 
 int luaopen_luadir (lua_State *L);
diff --git a/apps/plugins/lua/lualib.h b/apps/plugins/lua/lualib.h
index d4f69fc4af..b54e860e2a 100644
--- a/apps/plugins/lua/lualib.h
+++ b/apps/plugins/lua/lualib.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Lua standard libraries
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lundump.c b/apps/plugins/lua/lundump.c
index 13f910edd7..10805f1c8e 100644
--- a/apps/plugins/lua/lundump.c
+++ b/apps/plugins/lua/lundump.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lundump.c,v 2.7.1.4 2008/04/04 19:51:41 roberto Exp $
 ** load precompiled Lua chunks
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lundump.h b/apps/plugins/lua/lundump.h
index b2fe851e59..ee294dc683 100644
--- a/apps/plugins/lua/lundump.h
+++ b/apps/plugins/lua/lundump.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** load precompiled Lua chunks
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lvm.c b/apps/plugins/lua/lvm.c
index 52d12d0371..5d839c592a 100644
--- a/apps/plugins/lua/lvm.c
+++ b/apps/plugins/lua/lvm.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lvm.c,v 2.63.1.5 2011/08/17 20:43:11 roberto Exp $
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lvm.h b/apps/plugins/lua/lvm.h
index dff2a139f7..1b3f2e127f 100644
--- a/apps/plugins/lua/lvm.h
+++ b/apps/plugins/lua/lvm.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lzio.c b/apps/plugins/lua/lzio.c
index 54d5ec4741..d5e34611e4 100644
--- a/apps/plugins/lua/lzio.c
+++ b/apps/plugins/lua/lzio.c
@@ -1,5 +1,4 @@
 /*
-** $Id: lzio.c,v 1.31.1.1 2007/12/27 13:02:25 roberto Exp $
 ** a generic input stream interface
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/lzio.h b/apps/plugins/lua/lzio.h
index cb32e6abc4..5cda01638c 100644
--- a/apps/plugins/lua/lzio.h
+++ b/apps/plugins/lua/lzio.h
@@ -1,5 +1,4 @@
 /*
-** $Id$
 ** Buffered streams
 ** See Copyright Notice in lua.h
 */
diff --git a/apps/plugins/lua/rbdefines_helper.pl b/apps/plugins/lua/rbdefines_helper.pl
index 75b43d0eb4..8e65408d0f 100755
--- a/apps/plugins/lua/rbdefines_helper.pl
+++ b/apps/plugins/lua/rbdefines_helper.pl
@@ -6,7 +6,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/ 
-# $Id$
 #
 # Copyright (C) 2019 by William Wilgus
 #
diff --git a/apps/plugins/lua/rockaux.c b/apps/plugins/lua/rockaux.c
index e82471ddaf..725e9c1d14 100644
--- a/apps/plugins/lua/rockaux.c
+++ b/apps/plugins/lua/rockaux.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dan Everton (safetydan)
  * Copyright (C) 2018 William Wilgus
@@ -72,84 +71,108 @@ int splash_scroller(int timeout, const char* str)
     struct viewport *last_vp = rb->lcd_set_viewport(&vp);
     int fontnum = vp.font;
 
+    if (fontnum == FONT_UI)
+    {
+        fontnum = rb->global_status->font_id[SCREEN_MAIN];
+        if (fontnum == FONT_SYSFIXED)
+            fontnum = FONT_UI;
+    }
     font_getstringsize("W", &ch_w, &ch_h, fontnum);
 
-    const int max_w = LCD_WIDTH - (ch_w * 2);
+    const int max_w = LCD_WIDTH;
     const int max_lines = LCD_HEIGHT / ch_h - 1;
-    const int wrap_thresh = (LCD_WIDTH / 3);
-    const char *ch;
-    const char *brk;
+    const int wrap_thresh = (LCD_WIDTH / 4);
 
-    const int max_ch = (LCD_WIDTH / ch_w - 1) * 2;
-    char line[max_ch + 2]; /* display buffer */
-    const char break_chars[] = "@#$%^&*+-{}[]()/\\|<>:;.,? _\n\r\t";
+    const int max_ch = (LCD_WIDTH / ch_w - 1) * 3;
+    char line[max_ch + 2]; /* display buffer +2 incase of tab chars */
+    const char break_chars[] = "/\\ \r\n\f\v";
+    const char *ch, *brk;
 
-    int linepos, curline, linesdisp, realline, chars_next_break;
+    int linepos, curline, linesdisp, maxl, last_break;
+    int realline = 0;
     int action = ACTION_NONE;
     int firstline = 0;
     int cycles = 2; /* get action timeout returns immediately on first call */
-
     while (cycles > 0)
     {
         /* walk whole buffer every refresh, only display relevant portion */
         lcd_clear_display();
         curline = 0;
-        linepos = 0;
         linesdisp = 0;
+        last_break = 0;
         ch = str;
-        for (; *ch && linepos < max_ch; ch++)
+        while(*ch != '\0')
         {
-            if (ch[0] == '\t')
-            {
-                line[linepos++] = ' ';
-                line[linepos] = ' ';
-            }
-            else if (ch[0] == '\b' && timeout > 0)
-            {
-                line[linepos] = ' ';
-                beep_play(1000, HZ, 1000);
-            }
-            else if (ch[0] < ' ' && ch[0] > '\0') /* Dont copy control characters */
-                line[linepos] = (linepos == 0) ? '\0' : ' ';
-            else
-                line[linepos] = ch[0];
+            linepos = 0;
+            brk = NULL;
 
-            line[linepos + 1] = '\0'; /* terminate to check text extent */
-            font_getstringsize(line, &w, NULL, fontnum);
+            maxl = rb->font_measurestring(ch, max_ch, max_w, &w, NULL, fontnum);
+
+            for (; *ch && linepos < maxl; ch++)
+            {
+                if (strpbrk_n(ch, 1, break_chars))
+                {
+                    last_break = linepos;
+                    brk = ch;
+                    if (!isgraph(*brk)) /*!isprint() || isspace()*/
+                        brk++;
+                    if (*ch == '\n')
+                    {
+                        ch++;
+                        break;
+                    }
+                }
+                if (ch[0] == '\t')
+                {
+                    line[linepos++] = ' ';
+                    line[linepos] = ' ';
+                    if(maxl == max_ch)
+                        maxl-=2;
+                }
+                else if (ch[0] == '\b' || ch[0] == '\a')
+                {
+                    if (timeout > 0)
+                    {
+                        beep_play(1000, HZ, 1000);
+                    }
+                    continue;
+                }
+                else if (ch[0] < ' ' && ch[0] > '\0') /* Dont copy control characters */
+                {
+                    continue;
+                }
+                else
+                {
+                    line[linepos++] = ch[0];
+                }
+            }
+            line[linepos] = '\0';
 
             /* try to not split in middle of words */
-            if (w + wrap_thresh >= max_w &&
-                strpbrk_n(ch, 1, break_chars))
+            if (last_break > 0 && *ch != '\0')
             {
-                brk = strpbrk_n(ch+1, max_ch, break_chars);
-                chars_next_break = (brk - ch);
-                if (brk &&
-                 (chars_next_break < 2 || w + (ch_w * chars_next_break) > max_w))
+                if ((!strpbrk_n(ch, 1, break_chars)) &&
+                   (w + wrap_thresh > max_w && strpbrk_n(ch, max_ch, break_chars)))
                 {
-                    if (!isprint(line[linepos]))
-                    {
-                        line[linepos] = '\0';
-                        ch--; /* back-up we want it on the next line */
-                    }
-                    w += max_w;
+                    line[last_break] = '\0';
+                    ch = brk;
                 }
             }
+            realline = curline - firstline;
+            if (realline >= 0 && realline < max_lines)
+            {
+                lcd_putsxy(0, realline * ch_h, line);
+                linesdisp++;
+                last_break = 0;
+            }
+            if (linepos == maxl && isspace(*ch)) /* we would have split at this space if we could see it */
+                ch++;
+            curline++;
+        }
 
-            if (w > max_w ||
-               (ch[0] >= '\n' && iscntrl(ch[0])) ||
-                ch[1] == '\0')
-            {
-                realline = curline - firstline;
-                if (realline >= 0 && realline < max_lines)
-                {
-                    lcd_putsxy(0, realline * ch_h, line);
-                    linesdisp++;
-                }
-                linepos = 0;
-                curline++;
-                continue;
-            }
-            linepos++;
+        if (realline >= max_lines)
+        {
+            rb->lcd_hline(10, LCD_WIDTH - 10, LCD_HEIGHT - 1);
         }
 
         lcd_update();
diff --git a/apps/plugins/lua/rockconf.h b/apps/plugins/lua/rockconf.h
index 15d3f16106..27398e1174 100644
--- a/apps/plugins/lua/rockconf.h
+++ b/apps/plugins/lua/rockconf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dan Everton (safetydan)
  *
@@ -66,6 +65,7 @@ int splash_scroller(int timeout, const char* str);
 #define strcmp   rb->strcmp
 #define strcpy   rb->strcpy
 #define strlen   rb->strlen
+#define strncpy  rb->strncpy
 #define strtol   rb->strtol
 #define strtoul  rb->strtoul
 #define strstr   rb->strstr
diff --git a/apps/plugins/lua/rocklib.c b/apps/plugins/lua/rocklib.c
index 4d77afedc0..31c7b1621c 100644
--- a/apps/plugins/lua/rocklib.c
+++ b/apps/plugins/lua/rocklib.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dan Everton (safetydan)
  * Copyright (C) 2009 Maurus Cuelenaere
@@ -312,6 +311,15 @@ RB_WRAP(splash)
     return 0;
 }
 
+RB_WRAP(splash_progress)
+{
+    int current = luaL_checkint(L, 1);
+    int total = luaL_checkint(L, 2);
+    const char *str = luaL_checkstring(L, 3);
+    rb->splash_progress(current, total, str);
+    return 0;
+}
+
 RB_WRAP(splash_scroller)
 {
     int timeout = luaL_checkint(L, 1);
@@ -962,6 +970,7 @@ static const luaL_Reg rocklib[] =
     RB_FUNC(gui_syncyesno_run),
     RB_FUNC(do_menu),
     RB_FUNC(splash),
+    RB_FUNC(splash_progress),
     RB_FUNC(splash_scroller),
 
     /* DEVICE AUDIO / SOUND / PLAYLIST CONTROL */
diff --git a/apps/plugins/lua/rocklib.h b/apps/plugins/lua/rocklib.h
index 02b5ff6c88..51990c9375 100644
--- a/apps/plugins/lua/rocklib.h
+++ b/apps/plugins/lua/rocklib.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dan Everton (safetydan)
  *
diff --git a/apps/plugins/lua/rocklib_aux.pl b/apps/plugins/lua/rocklib_aux.pl
index 823a699e4d..972c9e4ec8 100755
--- a/apps/plugins/lua/rocklib_aux.pl
+++ b/apps/plugins/lua/rocklib_aux.pl
@@ -1,12 +1,11 @@
 #!/usr/bin/env perl
 ############################################################################
-#             __________               __   ___.                  
-#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___  
-#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /  
-#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
-#                     \/            \/     \/    \/            \/ 
-# $Id$
+#                     \/            \/     \/    \/            \/
 #
 # Copyright (C) 2009 by Maurus Cuelenaere
 #
@@ -37,7 +36,7 @@ sub rand_string
 {
     my @chars=('a'..'z');
     my $ret;
-    foreach (1..5) 
+    foreach (1..5)
     {
         $ret .= $chars[rand @chars];
     }
@@ -180,7 +179,7 @@ while(<STDIN>)
     }
 }
 
-my $svnrev = '$Revision$';
+my $svnrev = '';
 
 # Print the header
 print <<EOF
@@ -390,7 +389,7 @@ foreach my $function (@sorted_functions)
         {
             $func_args .= ", ".$arguments[$i]{'name'};
         }
-        
+
         # Print the function call
         my $func = sprintf("rb->%s(%s)", @$function{'name'}, $func_args);
 
diff --git a/apps/plugins/lua/rocklib_events.c b/apps/plugins/lua/rocklib_events.c
index 52e87f3d61..16699c5e57 100644
--- a/apps/plugins/lua/rocklib_events.c
+++ b/apps/plugins/lua/rocklib_events.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2019 William Wilgus
  *
diff --git a/apps/plugins/lua/rocklib_img.c b/apps/plugins/lua/rocklib_img.c
index df5e028283..7cc9741a42 100644
--- a/apps/plugins/lua/rocklib_img.c
+++ b/apps/plugins/lua/rocklib_img.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dan Everton (safetydan)
  * Copyright (C) 2009 Maurus Cuelenaere
@@ -1576,6 +1575,14 @@ static inline struct viewport* opt_viewport(lua_State *L,
         vp->height = check_tablevalue(L, "height", narg);
     }
     vp->font = check_tablevalue_def(L, "font", narg, FONT_UI);
+
+    if (vp->font == FONT_UI)
+    {
+        vp->font = rb->global_status->font_id[SCREEN_MAIN];
+        if (vp->font == FONT_SYSFIXED)
+            vp->font = FONT_UI;
+    }
+
     vp->drawmode = check_tablevalue_def(L, "drawmode", narg, DRMODE_SOLID);
 
 #if LCD_DEPTH == 2
@@ -1619,9 +1626,11 @@ RB_WRAP(font_getstringsize)
     int w, h, result;
 
     if (fontnumber == FONT_UI)
+    {
         fontnumber = rb->global_status->font_id[SCREEN_MAIN];
-    else if (fontnumber < 0)
-        fontnumber = FONT_SYSFIXED;
+        if (fontnumber == FONT_SYSFIXED)
+            fontnumber = FONT_UI;
+    }
 
     if lua_isnoneornil(L, 2)
         result = RB_SCREENS(L, 3, getstringsize, str, &w, &h);
@@ -1649,6 +1658,12 @@ RB_WRAP(lcd_framebuffer)
 RB_WRAP(lcd_setfont)
 {
     int font = (int) luaL_checkint(L, 1);
+    if (font == FONT_UI)
+    {
+        font = rb->global_status->font_id[SCREEN_MAIN];
+        if (font == FONT_SYSFIXED)
+            font = FONT_UI;
+    }
     RB_SCREENS(L, 2, setfont, font);
     return 0;
 }
diff --git a/apps/plugins/lua/rocklib_img.h b/apps/plugins/lua/rocklib_img.h
index 90b24f1ad1..5ca69fd4bf 100644
--- a/apps/plugins/lua/rocklib_img.h
+++ b/apps/plugins/lua/rocklib_img.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dan Everton (safetydan)
  *
diff --git a/apps/plugins/lua/rocklibc.h b/apps/plugins/lua/rocklibc.h
index 3902bf8fb8..3dd093d2f3 100644
--- a/apps/plugins/lua/rocklibc.h
+++ b/apps/plugins/lua/rocklibc.h
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dan Everton (safetydan)
  *
diff --git a/apps/plugins/lua/rocklua.c b/apps/plugins/lua/rocklua.c
index f35f2462f6..c77510ed11 100644
--- a/apps/plugins/lua/rocklua.c
+++ b/apps/plugins/lua/rocklua.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dan Everton (safetydan)
  *
diff --git a/apps/plugins/lua/settings_helper.pl b/apps/plugins/lua/settings_helper.pl
index 4a280e60c7..0f7c4f8b04 100755
--- a/apps/plugins/lua/settings_helper.pl
+++ b/apps/plugins/lua/settings_helper.pl
@@ -6,7 +6,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2018 William Wilgus
 #
@@ -26,7 +25,7 @@ use warnings;
 #  first pass outputs a c file that shall be compiled with the -S option
 #  second pass extracts the member, offset, size, type from the assembly
 
-my $svnrev = '$Revision$';
+my $svnrev = '';
 my $helper_name = 'LUA_RB_SETTINGS_H_HELPER';
 
 ############# configuration #############
diff --git a/apps/plugins/lua/strpbrk.c b/apps/plugins/lua/strpbrk.c
index efa9cbd2bb..9870b3753a 100644
--- a/apps/plugins/lua/strpbrk.c
+++ b/apps/plugins/lua/strpbrk.c
@@ -6,8 +6,8 @@ const char *strpbrk_n(const char *s, int smax, const char *accept) {
   register int i;
   register const char *a = accept;
   for (i=0; __likely(s[i] && i < smax); i++, a=accept)
-    while(__likely(a++[0]))
-      if ((s[i] == a[0]))
+    while(__likely(a[0]))
+      if ((s[i] == a++[0]))
         return &s[i];
   return NULL;
 }
diff --git a/apps/plugins/lua_scripts/file_browser.lua b/apps/plugins/lua_scripts/file_browser.lua
index ab246a2a7e..8a16a1a544 100644
--- a/apps/plugins/lua_scripts/file_browser.lua
+++ b/apps/plugins/lua_scripts/file_browser.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
  Example Lua File Viewer script
  Copyright (C) 2020 William Wilgus
  This program is free software; you can redistribute it and/or
diff --git a/apps/plugins/lua_scripts/fileview.lua b/apps/plugins/lua_scripts/fileview.lua
index 08eea0337c..d01322296d 100755
--- a/apps/plugins/lua_scripts/fileview.lua
+++ b/apps/plugins/lua_scripts/fileview.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
  Example Lua File Viewer script
  Copyright (C) 2017 William Wilgus
  This program is free software; you can redistribute it and/or
diff --git a/apps/plugins/lua_scripts/lua_scripts.lua b/apps/plugins/lua_scripts/lua_scripts.lua
index 331611d389..035e197ccc 100644
--- a/apps/plugins/lua_scripts/lua_scripts.lua
+++ b/apps/plugins/lua_scripts/lua_scripts.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 William Wilgus
  *
diff --git a/apps/plugins/lua_scripts/lua_scripts.make b/apps/plugins/lua_scripts/lua_scripts.make
index 9151ab6d1c..baa29d30ea 100644
--- a/apps/plugins/lua_scripts/lua_scripts.make
+++ b/apps/plugins/lua_scripts/lua_scripts.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 LUASCR_SRCDIR := $(APPSDIR)/plugins/lua_scripts
diff --git a/apps/plugins/lua_scripts/memchk.lua b/apps/plugins/lua_scripts/memchk.lua
index 283748b2c2..48d8df2858 100644
--- a/apps/plugins/lua_scripts/memchk.lua
+++ b/apps/plugins/lua_scripts/memchk.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
  Example Lua Memory Use
  Copyright (C) 2020 William Wilgus
  This program is free software; you can redistribute it and/or
@@ -17,28 +16,58 @@
 ]]--
 
 local a = {}
+local b = {}
 loops = 1 --global
+local last_btn = 1
+
+local ret = ""
+local status = true
+local depth = rb.LCD_DEPTH
+if depth < 8 then depth = 8 end
+local used, allocd, free = rb.mem_stats()
+local alloc_sz = (free / (depth / 8)) / 1024
+
 
 local function alloc_tables(loops)
-    for i=1,loops do a[i] = {{}}; local b = {} end
-    return true
+    for i=1,loops do a[i] = {{tostring(loops * i) .. " mem test"}}; b[i] = {} end
+    b[1] = rb.new_image(loops, alloc_sz);
+end
+
+
+local function alloc_tables_sm(loops)
+    for i=1,loops do b[i] = {{}}; end
+    local btn = rb.button_get(false)
+    if (btn ~= 0) then
+        if last_btn ~= btn then
+            last_btn = btn
+            return false;
+        end
+        while rb.button_get(false) ~= 0
+        do
+
+        end
+        ret = "User Abort"
+        status = false
+        return true
+    end
+    return false
 end
 
-local ret
-local status = true
 rb.lcd_putsxy(0, 0, "memchk loops : ")
 while (status and loops < 1000)
 do
     rb.lcd_putsxy(0, 20, loops)
     rb.lcd_update()
-    alloc_tables(loops)
+
+    if alloc_tables_sm(loops) then break end
     -- do call protected to catch OOM condition
     status, ret = pcall(alloc_tables, loops * 1000)
     loops = loops + 1
     _G.loops = loops
+    rb.yield()
 end
 
-local used, allocd, free = rb.mem_stats()
+used, allocd, free = rb.mem_stats()
 local lu = collectgarbage("count")
 local fmt = function(t, v) return string.format("%s: %d Kb\n", t, v /1024) end
 
@@ -48,10 +77,18 @@ s_t[1] = "rockbox:\n"
 s_t[2] = "Loops : "
 s_t[3] = loops - 1
 s_t[4] = "\n"
-s_t[5] = fmt("Used  ", used)
-s_t[6] = fmt("Allocd ", allocd)
-s_t[7] = fmt("Free  ", free)
-s_t[8] = "\nlua:\n"
-s_t[9] = fmt("Used", lu * 1024)
-s_t[10] = "\n\nNote that the rockbox used count is a high watermark\n"
+if not status == true then
+    s_t[5] = ret
+
+else
+    s_t[4] = ""
+    s_t[5] = ""
+end
+s_t[6] = "\n"
+s_t[7] = fmt("Used  ", used)
+s_t[8] = fmt("Allocd ", allocd)
+s_t[9] = fmt("Free  ", free)
+s_t[10] = "\nlua:\n"
+s_t[11] = fmt("Used", lu * 1024)
+s_t[12] = "\n\nNote that the rockbox used count is a high watermark\n"
 rb.splash_scroller(10 * rb.HZ, table.concat(s_t))
diff --git a/apps/plugins/lua_scripts/playback.lua b/apps/plugins/lua_scripts/playback.lua
index 6455ac57f6..6dbba2bba7 100644
--- a/apps/plugins/lua_scripts/playback.lua
+++ b/apps/plugins/lua_scripts/playback.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2020 William Wilgus
  *
diff --git a/apps/plugins/lua_scripts/random_playlist.lua b/apps/plugins/lua_scripts/random_playlist.lua
index b4fd216981..8c2ca968cc 100644
--- a/apps/plugins/lua_scripts/random_playlist.lua
+++ b/apps/plugins/lua_scripts/random_playlist.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 William Wilgus
  *
diff --git a/apps/plugins/lua_scripts/rb_poly.lua b/apps/plugins/lua_scripts/rb_poly.lua
index 60fbf87089..e02b2cc09e 100644
--- a/apps/plugins/lua_scripts/rb_poly.lua
+++ b/apps/plugins/lua_scripts/rb_poly.lua
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 William Wilgus
  *
@@ -274,7 +273,7 @@ local function Rot(t_pts, rot)
     local nw = max_x
     local nh = max_y
 
-    rot = rot % 7
+    --rot = rot % 7
     if rot == 0 then
         return t_pts
     end
@@ -327,96 +326,118 @@ local function Rot(t_pts, rot)
 
     return rot_memoized[rot][pts]
 end
-local count = -1
 
 local function rb_logo_rot(x, y, sx, sy, rot)
-    local polygon
-
-    if count >= 0 then
-        polygon = _poly.polygon
-        _lcd:clear(BLACK)
-        _poly.polyline(_LCD, x, y, Rot(cross_left_pts, rot), WHITE, false, true, sx, sy)
-        _poly.polyline(_LCD, x, y, Rot(R_shadow_pts, rot), WHITE, false, true, sx, sy)
-    else
-       polygon = function() end
-    end
+    local rot_m = rot % 7
+    local rot_next = rot + 1
+    local polygon =  _poly.polygon
+    _lcd:clear(BLACK)
+    _poly.polyline(_LCD, x, y, Rot(cross_left_pts, rot_m), WHITE, false, true, sx, sy)
+    _poly.polyline(_LCD, x, y, Rot(R_shadow_pts, rot_m), WHITE, false, true, sx, sy)
     repeat
-        polygon(_LCD, x, y, Rot(R_outline_pts, rot), BLACK, YELLOW, true, sx, sy)
-        polygon(_LCD, x, y, Rot(R_center_pts, rot), BLACK, BLACK, true, sx, sy)
-        polygon(_LCD, x, y, Rot(b_outline_pts, rot), BLACK, GREY, true, sx, sy)
-        polygon(_LCD, x, y, Rot(b_center_pts, rot), BLACK, BLACK, true, sx, sy)
+        polygon(_LCD, x, y, Rot(R_outline_pts, rot_m), BLACK, YELLOW, true, sx, sy)
+        polygon(_LCD, x, y, Rot(R_center_pts, rot_m), BLACK, BLACK, true, sx, sy)
+        polygon(_LCD, x, y, Rot(b_outline_pts, rot_m), BLACK, GREY, true, sx, sy)
+        polygon(_LCD, x, y, Rot(b_center_pts, rot_m), BLACK, BLACK, true, sx, sy)
 
-        polygon(_LCD, x, y, Rot(clef_pts, rot), WHITE, WHITE, true, sx, sy)
-        polygon(_LCD, x, y, Rot(clef_void_1_pts, rot), WHITE, BLACK, true, sx, sy)
-        polygon(_LCD, x, y, Rot(clef_void_2_pts, rot), WHITE, YELLOW, true, sx, sy)
-        polygon(_LCD, x, y, Rot(clef_void_3_pts, rot), WHITE, YELLOW, true, sx, sy)
+        polygon(_LCD, x, y, Rot(clef_pts, rot_m), WHITE, WHITE, true, sx, sy)
+        polygon(_LCD, x, y, Rot(clef_void_1_pts, rot_m), WHITE, BLACK, true, sx, sy)
+        polygon(_LCD, x, y, Rot(clef_void_2_pts, rot_m), WHITE, YELLOW, true, sx, sy)
+        polygon(_LCD, x, y, Rot(clef_void_3_pts, rot_m), WHITE, YELLOW, true, sx, sy)
+        polygon = function() end -- don't draw but memoize the next point
         rot = rot + 1
-    until count >= 0 or rot >= 6;
+        rot_m = rot % 7
+    until rot > rot_next;
 end
 
+-- we want the size of everything @ 1:1 scale so we can use that to flip/rotate the figure
+rb_logo_sz(0, 0)
+
 local action
 local redraw = true;
 local rot = 0
 local sx = -2
 local sy = -2
+local max_sx = (rb.LCD_WIDTH / max_x) * 3
+local max_sy = (rb.LCD_HEIGHT / max_y) * 3
 
--- we want the size of everything @ 1:1 scale so we can use that to flip/rotate the figure
-rb_logo_sz(0, 0)
 
-while true do
+do
+    local act = rb.actions
+    local quit = false
 
-    if redraw then
-        rb_logo_rot(0,0, sx, sy, rot)
-        _lcd:update()
-        if count > 0 then
-            redraw = false
+    function action_event(action)
+        local event
+
+        if action == actions.CANCEL or action == actions.EXIT then
+            quit = true
+        end
+
+        if action == 0 then --timer timeout
+            rot = rot + 1
+            redraw = true
             local prot = (rot) % 7
-            if prot > 0 then
+            if prot > 0 then -- erase the previous rot 
                 prot = prot - 1
                 if prot == 0 then prot = 6 end
                 rot_memoized[tostring(prot)] = nil
             end
         end
-    end
 
-    action = rb.get_plugin_action(rb.HZ/2, 1)
-    if action == actions.CANCEL or action == actions.EXIT then
-        break
-    end
-
-    redraw = redraw or (action ~= actions.NONE)
-
-    if action == actions.LEFT then
-        sx = sx - 1
-    elseif action == actions.LEFTR then
-        sx = sx - 1
-        sy = sy - 1
-    elseif action == actions.RIGHT then
-        sx = sx + 1
-    elseif action == actions.RIGHTR then
-        sx = sx + 1
-        sy = sy + 1
-    elseif action == actions.UP then
-        sy = sy - 1
-    elseif action == actions.UPR then
-        sy = sy - 1
-        sx = sy
-    elseif action == actions.DOWN then
-        sy = sy + 1
-    elseif action == actions.DOWNR then
-        sy = sy + 1
-        sx = sy
-    elseif action == actions.SELR then
-        rot = rot + 1
-        count = 0;
+        if redraw then
+            --do nothing till redrawn
+        elseif action == actions.LEFT then
+            sx = sx - 1
+        elseif action == actions.LEFTR then
+            sx = sx - 1
+            sy = sy - 1
+        elseif action == actions.RIGHT then
+            sx = sx + 1
+        elseif action == actions.RIGHTR then
+            sx = sx + 1
+            sy = sy + 1
+        elseif action == actions.UP then
+            sy = sy - 1
+        elseif action == actions.UPR then
+            sy = sy - 1
+            sx = sy
+        elseif action == actions.DOWN then
+            sy = sy + 1
+        elseif action == actions.DOWNR then
+            sy = sy + 1
+            sx = sy
+        elseif action == actions.SELR then
+            rot = rot + 1
+            count = 0;
+            redraw = true
+        else
+            return
+        end
+        if sx > max_sx then sx = max_sx end
+        if sy > max_sy then sy = max_sy end
         redraw = true
-    elseif count > 5 then
-        count = 0;
-        rot = rot + 1
-        redraw = true
-    else
-        count = count + 1
     end
+
+    function action_set_quit(bQuit)
+        quit = bQuit
+    end
+
+    function action_quit()
+        return quit
+    end
+end
+
+local eva = rockev.register("action", action_event)
+local evt = rockev.register("timer", action_event, rb.HZ * 5)
+
+--[[ Main loop ]]
+while not action_quit() do
+    if redraw then
+        rb_logo_rot(0,0, sx, sy, rot)
+        _lcd:update()
+        redraw = false
+    end
+    rb.yield()
 end --wend
 
 local used, allocd, free = rb.mem_stats()
diff --git a/apps/plugins/lua_scripts/return2WPS.lua b/apps/plugins/lua_scripts/return2WPS.lua
index 9202237691..4845b2544d 100644
--- a/apps/plugins/lua_scripts/return2WPS.lua
+++ b/apps/plugins/lua_scripts/return2WPS.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
  Example Lua Return to WPS on exit
  Copyright (C) 2021 William Wilgus
  This program is free software; you can redistribute it and/or
diff --git a/apps/plugins/lua_scripts/rlimg.lua b/apps/plugins/lua_scripts/rlimg.lua
index 7299f4e207..3068b2d7e4 100755
--- a/apps/plugins/lua_scripts/rlimg.lua
+++ b/apps/plugins/lua_scripts/rlimg.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
  Example Lua RBIMAGE script
  Copyright (C) 2009 by Maurus Cuelenaere -- some prior work
  Copyright (C) 2017 William Wilgus
@@ -76,6 +75,7 @@ local BLUE  = _clr.set(WHITE, 0, 0, 255)
 -------------------------------------------
 local clrs
 local CANCEL_BUTTON = rb.actions.PLA_CANCEL
+local EXIT_BUTTON = rb.actions.PLA_EXIT
 local LCD_DEPTH = rb.LCD_DEPTH
 -- EXAMPLES ---------------------------------------------------------------------- EXAMPLES---------------------------------------------------------------------
 function my_blit(dst_val, dx, dy, src_val, sx, sy)
@@ -236,8 +236,9 @@ function bounce_image(img)
     _img.resize(img_sqy, img)
     _img.resize(img_sqx, img)
 
-    -- moves definition of CANCEL_BUTTON from global to local
+    -- moves definition of CANCEL_BUTTON / EXIT_BUTTON from global to local
     local CANCEL_BUTTON = CANCEL_BUTTON
+    local EXIT_BUTTON = EXIT_BUTTON
 --------------------------------------------------------
     local imgn = img
     local hold = 0
@@ -348,7 +349,8 @@ function bounce_image(img)
         end
         -- 0 = timeout immediately
         -- ( -1 would be never timeout, and >0 is amount of 'ticks' before timeout)
-        if rb.get_plugin_action(wait) == CANCEL_BUTTON then
+        local btn = rb.get_plugin_action(wait)
+        if btn == CANCEL_BUTTON or btn == EXIT_BUTTON then
             break;
         end
     end
@@ -445,6 +447,10 @@ function twist(img)
     -- calculated position of each point in the sine wave(s)
     local xs, xe
 
+    -- moves definition of CANCEL_BUTTON / EXIT_BUTTON from global to local
+    local CANCEL_BUTTON = CANCEL_BUTTON
+    local EXIT_BUTTON = EXIT_BUTTON
+
     --[[--Profiling code
     local timer = _timer.start()]]
 
@@ -528,8 +534,8 @@ function twist(img)
 
         _lcd:update()
         z = z + zi
-
-        if rb.get_plugin_action(0) == CANCEL_BUTTON then
+        local btn = rb.get_plugin_action(0)
+        if btn == CANCEL_BUTTON or btn == EXIT_BUTTON then
             break
         end
     collectgarbage("step")
@@ -557,7 +563,8 @@ function draw_target(img)
         end
 
         _lcd:update()
-        if rb.get_plugin_action( 20) == CANCEL_BUTTON then
+        local btn = rb.get_plugin_action(rb.HZ / 5)
+        if btn == CANCEL_BUTTON or btn == EXIT_BUTTON then
             z = 16;
             break;
         end
@@ -597,7 +604,8 @@ function draw_sweep(img, cx, cy, radius, color)
         elseif wait < 50 then
             wait = 50 - wait
         end
-        if rb.get_plugin_action( wait) == CANCEL_BUTTON then
+        local btn = rb.get_plugin_action(wait)
+        if btn == CANCEL_BUTTON or btn == EXIT_BUTTON then
             break
         end
     end
@@ -623,6 +631,10 @@ function rotate_image(img)
     screen_img :copy(_LCD, 1, 1, xr, yr, w, h)
     --_print.f("CW")
 
+    -- moves definition of CANCEL_BUTTON / EXIT_BUTTON from global to local
+    local CANCEL_BUTTON = CANCEL_BUTTON
+    local EXIT_BUTTON = EXIT_BUTTON
+
     --[[--Profiling code
     local timer = _timer.start()]]
 
@@ -661,7 +673,8 @@ function rotate_image(img)
         end
         d = d + i
 
-        if rb.get_plugin_action(0) == CANCEL_BUTTON then
+        local btn = rb.get_plugin_action(0)
+        if btn == CANCEL_BUTTON or btn == EXIT_BUTTON then
             break;
         end
     end
@@ -687,6 +700,10 @@ function flip_image(img)
     screen_img =_img.new(w, h)
     screen_img :copy(_LCD, 1, 1, x, y, w, h)
 
+    -- moves definition of CANCEL_BUTTON / EXIT_BUTTON from global to local
+    local CANCEL_BUTTON = CANCEL_BUTTON
+    local EXIT_BUTTON = EXIT_BUTTON
+
     --[[--Profiling code
     local timer = _timer.start()]]
 
@@ -708,7 +725,8 @@ function flip_image(img)
 
         d = d + i
 
-        if rb.get_plugin_action(rb.HZ) == CANCEL_BUTTON then
+        local btn = rb.get_plugin_action(rb.HZ)
+        if btn == CANCEL_BUTTON or btn == EXIT_BUTTON then
             break;
         end
     end
@@ -734,7 +752,8 @@ function blit_mask(dst)
         dst:copy(bmask, 1, 1, 1, 1, nil, nil, false, _blit.BSAND, color)
         _lcd:update()
 
-        if rb.get_plugin_action(0) == CANCEL_BUTTON then
+        local btn = rb.get_plugin_action(0)
+        if btn == CANCEL_BUTTON or btn == EXIT_BUTTON then
             break
         end
     end
@@ -824,7 +843,8 @@ function long_text()
         _lcd:copy(img, 1, _lcd.H - h, w - p, 1)
         _lcd:update()
         if p == 0 or w - p == 1 then wait = 100; rb.sleep(50) end
-        if rb.get_plugin_action(wait) == CANCEL_BUTTON then
+        local btn = rb.get_plugin_action(wait)
+        if btn == CANCEL_BUTTON or btn == EXIT_BUTTON then
             break
         end
     end
diff --git a/apps/plugins/lua_scripts/stars.lua b/apps/plugins/lua_scripts/stars.lua
index 2a46b00707..674b1a7ce4 100644
--- a/apps/plugins/lua_scripts/stars.lua
+++ b/apps/plugins/lua_scripts/stars.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
 
  Copyright (C) 2024 William Wilgus
  This program is free software; you can redistribute it and/or
diff --git a/apps/plugins/lua_scripts/tagnav.lua b/apps/plugins/lua_scripts/tagnav.lua
index 9646f359e3..6be42a4302 100644
--- a/apps/plugins/lua_scripts/tagnav.lua
+++ b/apps/plugins/lua_scripts/tagnav.lua
@@ -7,7 +7,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2018 William Wilgus
  *
diff --git a/apps/plugins/lua_scripts/time_date.lua b/apps/plugins/lua_scripts/time_date.lua
index bf7f7bd5ec..7fca6990ea 100644
--- a/apps/plugins/lua_scripts/time_date.lua
+++ b/apps/plugins/lua_scripts/time_date.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
 
  Copyright (C) 2026 William Wilgus
  This program is free software; you can redistribute it and/or
@@ -26,7 +25,7 @@ local tmo_noblock = -1
 local ctx = 0 --CONTEXT_STD
 
 while rb.get_action(ctx, 50) == 0 do
-    rb.splash(0, os.date())
+    rb.splash(0, os.date("%a %m/%d/%y %T (%b) %Y"))
 end
 
 collectgarbage("collect")
@@ -35,14 +34,24 @@ local used, allocd, free = rb.mem_stats()
 local lu = collectgarbage("count")
 local fmt = function(t, v) return string.format("%s: %d b\n", t, v) end
 
+time = os.date("*t")
+
+time_string = ""
+
+for key, value in pairs(time) do
+  time_string = time_string .. key .. ": " .. tostring(value) .. "\n"
+end
+
 -- this is how lua recommends to concat strings rather than ..
 local s_t = {}
 s_t[1] = os.date()
 s_t[2] = "\n"
-s_t[3] = fmt("Used  ", used)
-s_t[4] = fmt("Allocd ", allocd)
-s_t[5] = fmt("Free  ", free)
-s_t[6] = "\nlua:\n"
-s_t[7] = fmt("Used", lu * 1024)
-s_t[8] = "\n\nNote that the rockbox used count is a high watermark\n"
+s_t[3] = time_string
+s_t[4] = "\n"
+s_t[5] = fmt("Used  ", used)
+s_t[6] = fmt("Allocd ", allocd)
+s_t[7] = fmt("Free  ", free)
+s_t[8] = "\nlua:\n"
+s_t[9] = fmt("Used", lu * 1024)
+s_t[10] = "\n\nNote that the rockbox used count is a high watermark\n"
 rb.splash_scroller(10 * rb.HZ, table.concat(s_t))
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c
index 6e96aae10c..7a0314f19c 100644
--- a/apps/plugins/matrix.c
+++ b/apps/plugins/matrix.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 1999 Chris Allegretta
  * Copyright (C) 2005 Alastair S - ported to podzilla
diff --git a/apps/plugins/maze.c b/apps/plugins/maze.c
index ebb83ab15c..d90c975d61 100644
--- a/apps/plugins/maze.c
+++ b/apps/plugins/maze.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Matthias Wientapper
  *
diff --git a/apps/plugins/md5sum.c b/apps/plugins/md5sum.c
index 7f1e6a4087..d836637bfb 100644
--- a/apps/plugins/md5sum.c
+++ b/apps/plugins/md5sum.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Antoine Cellerier <dionoea -at- videolan -dot- org>
  *
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c
index 0379bc0164..c1218a045a 100644
--- a/apps/plugins/metronome.c
+++ b/apps/plugins/metronome.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 Matthias Wientapper, 2014-2015 Thomas Orgis
  *
diff --git a/apps/plugins/midi/guspat.c b/apps/plugins/midi/guspat.c
index d94fbce021..4dfe8eba6f 100644
--- a/apps/plugins/midi/guspat.c
+++ b/apps/plugins/midi/guspat.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Stepan Moskovchenko
  *
diff --git a/apps/plugins/midi/guspat.h b/apps/plugins/midi/guspat.h
index 428d99ba0e..2145ff6901 100644
--- a/apps/plugins/midi/guspat.h
+++ b/apps/plugins/midi/guspat.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Stepan Moskovchenko
  *
diff --git a/apps/plugins/midi/midi.make b/apps/plugins/midi/midi.make
index 549d8e7c0a..1c8f659971 100644
--- a/apps/plugins/midi/midi.make
+++ b/apps/plugins/midi/midi.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 MIDISRCDIR := $(APPSDIR)/plugins/midi
diff --git a/apps/plugins/midi/midifile.c b/apps/plugins/midi/midifile.c
index 2340c6d14f..957e701854 100644
--- a/apps/plugins/midi/midifile.c
+++ b/apps/plugins/midi/midifile.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Stepan Moskovchenko
  *
diff --git a/apps/plugins/midi/midifile.h b/apps/plugins/midi/midifile.h
index 3e9a9d758d..6c15ce8f56 100644
--- a/apps/plugins/midi/midifile.h
+++ b/apps/plugins/midi/midifile.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Stepan Moskovchenko
  *
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index 2a6e579b9c..7f2c8ba2c6 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Karl Kurbjun based on midi2wav by Stepan Moskovchenko
  *
diff --git a/apps/plugins/midi/midiutil.c b/apps/plugins/midi/midiutil.c
index 7438455ca3..bb6941b1bb 100644
--- a/apps/plugins/midi/midiutil.c
+++ b/apps/plugins/midi/midiutil.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Stepan Moskovchenko
  *
diff --git a/apps/plugins/midi/midiutil.h b/apps/plugins/midi/midiutil.h
index 71da7461e3..b169389b53 100644
--- a/apps/plugins/midi/midiutil.h
+++ b/apps/plugins/midi/midiutil.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Stepan Moskovchenko
  *
diff --git a/apps/plugins/midi/sequencer.c b/apps/plugins/midi/sequencer.c
index ce4aa6628a..298c960aad 100644
--- a/apps/plugins/midi/sequencer.c
+++ b/apps/plugins/midi/sequencer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Stepan Moskovchenko
  *
diff --git a/apps/plugins/midi/sequencer.h b/apps/plugins/midi/sequencer.h
index 986a4e0d7c..f405d645cb 100644
--- a/apps/plugins/midi/sequencer.h
+++ b/apps/plugins/midi/sequencer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Stepan Moskovchenko
  *
diff --git a/apps/plugins/midi/synth.c b/apps/plugins/midi/synth.c
index 3143e61a4f..3d68a455cf 100644
--- a/apps/plugins/midi/synth.c
+++ b/apps/plugins/midi/synth.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Stepan Moskovchenko
  *
diff --git a/apps/plugins/midi/synth.h b/apps/plugins/midi/synth.h
index b44da21fd2..01febbf5a4 100644
--- a/apps/plugins/midi/synth.h
+++ b/apps/plugins/midi/synth.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Stepan Moskovchenko
  *
diff --git a/apps/plugins/mikmod/drv_nos.c b/apps/plugins/mikmod/drv_nos.c
index 08d70466d1..1a860b40ed 100644
--- a/apps/plugins/mikmod/drv_nos.c
+++ b/apps/plugins/mikmod/drv_nos.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id: drv_nos.c,v 1.2 2005/03/30 19:09:11 realtech Exp $
 
   Driver for no output
 
diff --git a/apps/plugins/mikmod/load_asy.c b/apps/plugins/mikmod/load_asy.c
index edd6b6b416..dea16d2468 100644
--- a/apps/plugins/mikmod/load_asy.c
+++ b/apps/plugins/mikmod/load_asy.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   ASYLUM Music Format v1.0 (.amf) loader
   adapted from load_mod.c by Raphael Assenat <raph@raphnet.net>,
diff --git a/apps/plugins/mikmod/load_dsm.c b/apps/plugins/mikmod/load_dsm.c
index e995f7dfad..97d54f429e 100644
--- a/apps/plugins/mikmod/load_dsm.c
+++ b/apps/plugins/mikmod/load_dsm.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   DSIK internal format (DSM) module loader
 
diff --git a/apps/plugins/mikmod/load_far.c b/apps/plugins/mikmod/load_far.c
index 44cd8ebfab..19005100e8 100644
--- a/apps/plugins/mikmod/load_far.c
+++ b/apps/plugins/mikmod/load_far.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   Farandole (FAR) module loader
 
diff --git a/apps/plugins/mikmod/load_gdm.c b/apps/plugins/mikmod/load_gdm.c
index 52ceea9c85..e041327b53 100644
--- a/apps/plugins/mikmod/load_gdm.c
+++ b/apps/plugins/mikmod/load_gdm.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   General DigiMusic (GDM) module loader
 
diff --git a/apps/plugins/mikmod/load_imf.c b/apps/plugins/mikmod/load_imf.c
index 39cdf5464d..b67e3ac828 100644
--- a/apps/plugins/mikmod/load_imf.c
+++ b/apps/plugins/mikmod/load_imf.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   Imago Orpheus (IMF) module loader
 
diff --git a/apps/plugins/mikmod/load_it.c b/apps/plugins/mikmod/load_it.c
index 3f8c0e6996..4442c209c0 100644
--- a/apps/plugins/mikmod/load_it.c
+++ b/apps/plugins/mikmod/load_it.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   Impulse tracker (IT) module loader
 
diff --git a/apps/plugins/mikmod/load_m15.c b/apps/plugins/mikmod/load_m15.c
index 2359175bb3..2b96b24b89 100644
--- a/apps/plugins/mikmod/load_m15.c
+++ b/apps/plugins/mikmod/load_m15.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   15 instrument MOD loader
   Also supports Ultimate Sound Tracker (old M15 format)
diff --git a/apps/plugins/mikmod/load_mod.c b/apps/plugins/mikmod/load_mod.c
index 9ce39d6922..a866262734 100644
--- a/apps/plugins/mikmod/load_mod.c
+++ b/apps/plugins/mikmod/load_mod.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   Generic MOD loader (Protracker, StarTracker, FastTracker, etc)
 
diff --git a/apps/plugins/mikmod/load_mtm.c b/apps/plugins/mikmod/load_mtm.c
index 5620575a10..4ebd28d82e 100644
--- a/apps/plugins/mikmod/load_mtm.c
+++ b/apps/plugins/mikmod/load_mtm.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   MTM module loader
 
diff --git a/apps/plugins/mikmod/load_okt.c b/apps/plugins/mikmod/load_okt.c
index a0eee7f56e..af3b7c53de 100644
--- a/apps/plugins/mikmod/load_okt.c
+++ b/apps/plugins/mikmod/load_okt.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   Oktalyzer (OKT) module loader
 
diff --git a/apps/plugins/mikmod/load_s3m.c b/apps/plugins/mikmod/load_s3m.c
index 0470c8bcab..98d702c3c9 100644
--- a/apps/plugins/mikmod/load_s3m.c
+++ b/apps/plugins/mikmod/load_s3m.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   Screamtracker (S3M) module loader
 
diff --git a/apps/plugins/mikmod/load_stm.c b/apps/plugins/mikmod/load_stm.c
index a2718fa81c..4eb0895d6d 100644
--- a/apps/plugins/mikmod/load_stm.c
+++ b/apps/plugins/mikmod/load_stm.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   Screamtracker 2 (STM) module loader
 
diff --git a/apps/plugins/mikmod/load_stx.c b/apps/plugins/mikmod/load_stx.c
index db25813342..1a478c7f34 100644
--- a/apps/plugins/mikmod/load_stx.c
+++ b/apps/plugins/mikmod/load_stx.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   STMIK 0.2 (STX) module loader
 
diff --git a/apps/plugins/mikmod/load_uni.c b/apps/plugins/mikmod/load_uni.c
index 569422470b..3a911053f9 100644
--- a/apps/plugins/mikmod/load_uni.c
+++ b/apps/plugins/mikmod/load_uni.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   UNIMOD (libmikmod's and APlayer's internal module format) loader
 
diff --git a/apps/plugins/mikmod/load_xm.c b/apps/plugins/mikmod/load_xm.c
index bdeca11b34..3dedfffbe5 100644
--- a/apps/plugins/mikmod/load_xm.c
+++ b/apps/plugins/mikmod/load_xm.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   Fasttracker (XM) module loader
 
diff --git a/apps/plugins/mikmod/mikmod.make b/apps/plugins/mikmod/mikmod.make
index bff7b82099..3740374cee 100644
--- a/apps/plugins/mikmod/mikmod.make
+++ b/apps/plugins/mikmod/mikmod.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id: Makefile 19082 2008-11-10 23:54:24Z zagor $
 #
 
 MIKMODSRCDIR := $(APPSDIR)/plugins/mikmod
diff --git a/apps/plugins/mikmod/mikmod_supp.h b/apps/plugins/mikmod/mikmod_supp.h
index aa4ede6873..f7d8d26d2a 100644
--- a/apps/plugins/mikmod/mikmod_supp.h
+++ b/apps/plugins/mikmod/mikmod_supp.h
@@ -29,6 +29,8 @@
 #define strcat(a,b)         rb->strcat(a,b)
 #undef strncmp
 #define strncmp(a,b,c)      rb->strncmp(a,b,c)
+#undef strncpy
+#define strncpy(a,b,c)      rb->strncpy(a,b,c)
 #undef strcasecmp
 #define strcasecmp(a,b)     rb->strcasecmp(a,b)
 #undef strstr
diff --git a/apps/plugins/mikmod/mloader.c b/apps/plugins/mikmod/mloader.c
index 4634c85ccf..d9d1e16793 100644
--- a/apps/plugins/mikmod/mloader.c
+++ b/apps/plugins/mikmod/mloader.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   These routines are used to access the available module loaders
 
diff --git a/apps/plugins/mikmod/mlreg.c b/apps/plugins/mikmod/mlreg.c
index 10095d8157..eaa39b1ff8 100644
--- a/apps/plugins/mikmod/mlreg.c
+++ b/apps/plugins/mikmod/mlreg.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id: mlreg.c,v 1.2 2005/03/30 19:11:34 realtech Exp $
 
   Routine for registering all loaders in libmikmod for the current platform.
 
diff --git a/apps/plugins/mikmod/mlutil.c b/apps/plugins/mikmod/mlutil.c
index ce9fbfb6fd..9b0bc9393a 100644
--- a/apps/plugins/mikmod/mlutil.c
+++ b/apps/plugins/mikmod/mlutil.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   Utility functions for the module loader
 
diff --git a/apps/plugins/mikmod/mmerror.c b/apps/plugins/mikmod/mmerror.c
index 3e39c8fc81..ee7340ee27 100644
--- a/apps/plugins/mikmod/mmerror.c
+++ b/apps/plugins/mikmod/mmerror.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   Error handling functions.
   Register an error handler with _mm_RegisterErrorHandler() and you're all set.
diff --git a/apps/plugins/mikmod/mplayer.c b/apps/plugins/mikmod/mplayer.c
index afc01b789a..0097a01fdd 100644
--- a/apps/plugins/mikmod/mplayer.c
+++ b/apps/plugins/mikmod/mplayer.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   The Protracker Player Driver
 
diff --git a/apps/plugins/mikmod/munitrk.c b/apps/plugins/mikmod/munitrk.c
index 8abf0c19ec..95b476984e 100644
--- a/apps/plugins/mikmod/munitrk.c
+++ b/apps/plugins/mikmod/munitrk.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   All routines dealing with the manipulation of UNITRK streams
 
diff --git a/apps/plugins/mikmod/npertab.c b/apps/plugins/mikmod/npertab.c
index b106b2adf8..222efb34b3 100644
--- a/apps/plugins/mikmod/npertab.c
+++ b/apps/plugins/mikmod/npertab.c
@@ -20,7 +20,6 @@
 
 /*==============================================================================
 
-  $Id$
 
   MOD format period table.  Used by both the MOD and M15 (15-inst mod) Loaders.
 
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index e4a99e8f22..0faff83f33 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004-2006 Antoine Cellerier <dionoea -at- videolan -dot- org>
  *
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c
index cf3f42521a..8823c3f044 100644
--- a/apps/plugins/mosaique.c
+++ b/apps/plugins/mosaique.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Itai Shaked 
  *
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index 7e96ab81d9..b5790f3ae2 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -1863,11 +1863,12 @@ void window_subband2(short *x1, int a[SBLIMIT])
 {
   int   xr;
   short const *wp = enwindow;
-  short *x2 = x1 - 124;
+//  short *x2 = x1 - 124;
 
   wp += 27 * 15;
-  x1 -=  2 * 15;
-  x2 +=  2 * 15;
+//  x1 -=  2 * 15;
+//  x2 +=  2 * 15;
+  (void)x1;
 
   xr = a[28] - a[0];  a[0] += a[28];  a[28] = shft9(xr) * wp[-2*27+25];
   xr = a[29] - a[1];  a[1] += a[29];  a[29] = shft9(xr) * wp[-2*27+25];
diff --git a/apps/plugins/mpegplayer/alloc.c b/apps/plugins/mpegplayer/alloc.c
index cbf930a7eb..8a56631942 100644
--- a/apps/plugins/mpegplayer/alloc.c
+++ b/apps/plugins/mpegplayer/alloc.c
@@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  * libmpeg2 sync history:
  * 2008-07-01 - CVS revision 1.13
  */
diff --git a/apps/plugins/mpegplayer/audio_thread.c b/apps/plugins/mpegplayer/audio_thread.c
index be57d46e26..3eef48a293 100644
--- a/apps/plugins/mpegplayer/audio_thread.c
+++ b/apps/plugins/mpegplayer/audio_thread.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * mpegplayer audio thread implementation
  *
diff --git a/apps/plugins/mpegplayer/disk_buf.c b/apps/plugins/mpegplayer/disk_buf.c
index 6bc4e092f2..9f55f57ee0 100644
--- a/apps/plugins/mpegplayer/disk_buf.c
+++ b/apps/plugins/mpegplayer/disk_buf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * mpegplayer buffering routines
  *
diff --git a/apps/plugins/mpegplayer/disk_buf.h b/apps/plugins/mpegplayer/disk_buf.h
index bc76ab6dc3..87279cce80 100644
--- a/apps/plugins/mpegplayer/disk_buf.h
+++ b/apps/plugins/mpegplayer/disk_buf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * AV disk buffer declarations
  *
diff --git a/apps/plugins/mpegplayer/libmpeg2/attributes.h b/apps/plugins/mpegplayer/libmpeg2/attributes.h
index 24b069223b..6491057f60 100644
--- a/apps/plugins/mpegplayer/libmpeg2/attributes.h
+++ b/apps/plugins/mpegplayer/libmpeg2/attributes.h
@@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  * libmpeg2 sync history:
  * 2008-07-01 - CVS revision 1.5
  */
diff --git a/apps/plugins/mpegplayer/libmpeg2/decode.c b/apps/plugins/mpegplayer/libmpeg2/decode.c
index 9c8081efbe..34a63dd4d2 100644
--- a/apps/plugins/mpegplayer/libmpeg2/decode.c
+++ b/apps/plugins/mpegplayer/libmpeg2/decode.c
@@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  * libmpeg2 sync history:
  * 2008-07-01 - CVS revision 1.114
  */
diff --git a/apps/plugins/mpegplayer/libmpeg2/header.c b/apps/plugins/mpegplayer/libmpeg2/header.c
index b40193a338..39e4cf4009 100644
--- a/apps/plugins/mpegplayer/libmpeg2/header.c
+++ b/apps/plugins/mpegplayer/libmpeg2/header.c
@@ -21,7 +21,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  * libmpeg2 sync history:
  * 2008-07-01 - CVS revision 1.101
  */
diff --git a/apps/plugins/mpegplayer/libmpeg2/idct.c b/apps/plugins/mpegplayer/libmpeg2/idct.c
index e202da31d2..e152ded346 100644
--- a/apps/plugins/mpegplayer/libmpeg2/idct.c
+++ b/apps/plugins/mpegplayer/libmpeg2/idct.c
@@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  * libmpeg2 sync history:
  * 2008-07-01 - CVS revision 1.36
  */
diff --git a/apps/plugins/mpegplayer/libmpeg2/idct_arm.S b/apps/plugins/mpegplayer/libmpeg2/idct_arm.S
index 8ff7c90629..402e741f3b 100644
--- a/apps/plugins/mpegplayer/libmpeg2/idct_arm.S
+++ b/apps/plugins/mpegplayer/libmpeg2/idct_arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S b/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S
index ad28cefcf2..01670a807d 100644
--- a/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S
+++ b/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Jens Arnold
  *
@@ -39,7 +38,7 @@
 
 .row_loop:
     ldmia   r0!, {r2, r3, r10, r11} @ fetch f0, f2, f4, f6, f1, f3, f5, f7
-    ldrd    r4, L_W1357         @ load  W1, W3, W5, W7
+    ldrd    r4, r5, L_W1357     @ load  W1, W3, W5, W7
 
     smuad   r6, r4, r10         @ b0 = W1 * f1 + W3 * f3
     smultt  r7, r5, r10         @ -b1 = W7 * f3
@@ -59,7 +58,7 @@
     smlatb  r7, r4, r10, r7     @ b1 += W3 * f1
     smlatt  r8, r4, r11, r8     @ b2 += W3 * f7
 
-    ldrd    r4, L_W0246         @ load  W0, W2, W4, W6
+    ldrd    r4, r5, L_W0246     @ load  W0, W2, W4, W6
     add     r2, r2, #1          @ f0 += 1
 
     smulbb  r10, r5, r3         @ a0' = W4 * f4
@@ -130,7 +129,7 @@ L_W0246:
 
 .col_loop:
     ldmia   r0!, {r2, r3, r10, r11} @ fetch f0, f2, f4, f6, f1, f3, f5, f7
-    ldrd    r4, L_W1357         @ load  W1, W3, W5, W7
+    ldrd    r4, r5, L_W1357     @ load  W1, W3, W5, W7
 
     smuad   r6, r4, r10         @ b0 = W1 * f1 + W3 * f3
     smultt  r7, r5, r10         @ -b1 = W7 * f3
@@ -150,7 +149,7 @@ L_W0246:
     smlatb  r7, r4, r10, r7     @ b1 += W3 * f1
     smlatt  r8, r4, r11, r8     @ b2 += W3 * f7
 
-    ldrd    r4, L_W0246         @ load  W0, W2, W4, W6
+    ldrd    r4, r5, L_W0246     @ load  W0, W2, W4, W6
     add     r2, r2, #32         @ DC offset: 0.5
 
     smulbb  r10, r5, r3         @ a0' = W4 * f4
diff --git a/apps/plugins/mpegplayer/libmpeg2/idct_coldfire.S b/apps/plugins/mpegplayer/libmpeg2/idct_coldfire.S
index abc54b16cb..97acd42c19 100644
--- a/apps/plugins/mpegplayer/libmpeg2/idct_coldfire.S
+++ b/apps/plugins/mpegplayer/libmpeg2/idct_coldfire.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jens Arnold
  * Based on the work of Karim Boucher and Rani Hod
diff --git a/apps/plugins/mpegplayer/libmpeg2/motion_comp.c b/apps/plugins/mpegplayer/libmpeg2/motion_comp.c
index d6968f68ce..7a1a655ca3 100644
--- a/apps/plugins/mpegplayer/libmpeg2/motion_comp.c
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp.c
@@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  * libmpeg2 sync history:
  * 2008-07-01 - CVS revision 1.17 - lost compatibility previously to
  *              provide simplified and CPU-optimized motion compensation.
diff --git a/apps/plugins/mpegplayer/libmpeg2/motion_comp.h b/apps/plugins/mpegplayer/libmpeg2/motion_comp.h
index 4737e72cab..439fcfd179 100644
--- a/apps/plugins/mpegplayer/libmpeg2/motion_comp.h
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp.h
@@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 
diff --git a/apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_c.c b/apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_c.c
index dcf1df53e9..4adb925301 100644
--- a/apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_c.c
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_c.c
@@ -19,7 +19,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 #include <inttypes.h>
 #include "mpeg2.h"
diff --git a/apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_s.S b/apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_s.S
index 1ec1b0686e..5b48367524 100644
--- a/apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_s.S
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_s.S
@@ -18,7 +18,6 @@
 @ along with this program; if not, write to the Free Software
 @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 @
-@ $Id$
 
 #include "config.h" /* Rockbox: ARM architecture version */
 
diff --git a/apps/plugins/mpegplayer/libmpeg2/motion_comp_c.c b/apps/plugins/mpegplayer/libmpeg2/motion_comp_c.c
index 9a8640e7e6..3ccf0224c7 100644
--- a/apps/plugins/mpegplayer/libmpeg2/motion_comp_c.c
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp_c.c
@@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 #include <inttypes.h>
 #include "mpeg2.h"
diff --git a/apps/plugins/mpegplayer/libmpeg2/motion_comp_coldfire_s.S b/apps/plugins/mpegplayer/libmpeg2/motion_comp_coldfire_s.S
index 55d87cb708..4a550ee04d 100644
--- a/apps/plugins/mpegplayer/libmpeg2/motion_comp_coldfire_s.S
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp_coldfire_s.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jens Arnold
  *
diff --git a/apps/plugins/mpegplayer/libmpeg2/mpeg2.h b/apps/plugins/mpegplayer/libmpeg2/mpeg2.h
index bd14ead96e..1a83539441 100644
--- a/apps/plugins/mpegplayer/libmpeg2/mpeg2.h
+++ b/apps/plugins/mpegplayer/libmpeg2/mpeg2.h
@@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  * libmpeg2 sync history:
  * 2008-07-01 - CVS revision 1.67
  */
diff --git a/apps/plugins/mpegplayer/libmpeg2/mpeg2_internal.h b/apps/plugins/mpegplayer/libmpeg2/mpeg2_internal.h
index e04562e18d..7259237cd0 100644
--- a/apps/plugins/mpegplayer/libmpeg2/mpeg2_internal.h
+++ b/apps/plugins/mpegplayer/libmpeg2/mpeg2_internal.h
@@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  * libmpeg2 sync history:
  * 2008-07-01 - CVS revision 1.89
  */
diff --git a/apps/plugins/mpegplayer/libmpeg2/mpeg2dec_config.h b/apps/plugins/mpegplayer/libmpeg2/mpeg2dec_config.h
index c34ee374df..796b5fc43f 100644
--- a/apps/plugins/mpegplayer/libmpeg2/mpeg2dec_config.h
+++ b/apps/plugins/mpegplayer/libmpeg2/mpeg2dec_config.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 #ifndef MPEG2DEC_CONFIG_H
 #define MPEG2DEC_CONFIG_H
 
diff --git a/apps/plugins/mpegplayer/libmpeg2/slice.c b/apps/plugins/mpegplayer/libmpeg2/slice.c
index 926333d5d0..b047d46907 100644
--- a/apps/plugins/mpegplayer/libmpeg2/slice.c
+++ b/apps/plugins/mpegplayer/libmpeg2/slice.c
@@ -21,7 +21,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  * libmpeg2 sync history:
  * 2008-07-01 - CVS revision 1.55
  */
diff --git a/apps/plugins/mpegplayer/libmpeg2/vlc.h b/apps/plugins/mpegplayer/libmpeg2/vlc.h
index d1b6a98cde..b06121b2d6 100644
--- a/apps/plugins/mpegplayer/libmpeg2/vlc.h
+++ b/apps/plugins/mpegplayer/libmpeg2/vlc.h
@@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  * libmpeg2 sync history:
  * 2008-07-01 - CVS revision 1.12
  */
diff --git a/apps/plugins/mpegplayer/mpeg_alloc.h b/apps/plugins/mpegplayer/mpeg_alloc.h
index 9acfbc5dec..b09f41c293 100644
--- a/apps/plugins/mpegplayer/mpeg_alloc.h
+++ b/apps/plugins/mpegplayer/mpeg_alloc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/apps/plugins/mpegplayer/mpeg_misc.c b/apps/plugins/mpegplayer/mpeg_misc.c
index 31f0644212..01a261bc06 100644
--- a/apps/plugins/mpegplayer/mpeg_misc.c
+++ b/apps/plugins/mpegplayer/mpeg_misc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Miscellaneous helper API definitions
  *
diff --git a/apps/plugins/mpegplayer/mpeg_misc.h b/apps/plugins/mpegplayer/mpeg_misc.h
index 233b815493..68997ade5b 100644
--- a/apps/plugins/mpegplayer/mpeg_misc.h
+++ b/apps/plugins/mpegplayer/mpeg_misc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Miscellaneous helper API declarations
  *
diff --git a/apps/plugins/mpegplayer/mpeg_parser.c b/apps/plugins/mpegplayer/mpeg_parser.c
index 9438730c81..60fea15b39 100644
--- a/apps/plugins/mpegplayer/mpeg_parser.c
+++ b/apps/plugins/mpegplayer/mpeg_parser.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Parser for MPEG streams
  *
diff --git a/apps/plugins/mpegplayer/mpeg_stream.h b/apps/plugins/mpegplayer/mpeg_stream.h
index 26fdaf07b4..6822f9f49f 100644
--- a/apps/plugins/mpegplayer/mpeg_stream.h
+++ b/apps/plugins/mpegplayer/mpeg_stream.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Stream definitions for MPEG
  *
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index cdf65be817..fcbd872125 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * mpegplayer main entrypoint and UI implementation
  *
diff --git a/apps/plugins/mpegplayer/mpegplayer.h b/apps/plugins/mpegplayer/mpegplayer.h
index 4ddf0ca7b1..de51d97f95 100644
--- a/apps/plugins/mpegplayer/mpegplayer.h
+++ b/apps/plugins/mpegplayer/mpegplayer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Main mpegplayer config header.
  *
diff --git a/apps/plugins/mpegplayer/mpegplayer.make b/apps/plugins/mpegplayer/mpegplayer.make
index af2156787e..56beb0f461 100644
--- a/apps/plugins/mpegplayer/mpegplayer.make
+++ b/apps/plugins/mpegplayer/mpegplayer.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 MPEGSRCDIR := $(APPSDIR)/plugins/mpegplayer
diff --git a/apps/plugins/mpegplayer/parser.h b/apps/plugins/mpegplayer/parser.h
index ba2181e98b..6488a02395 100644
--- a/apps/plugins/mpegplayer/parser.h
+++ b/apps/plugins/mpegplayer/parser.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * AV parser inteface declarations
  *
diff --git a/apps/plugins/mpegplayer/pcm_output.c b/apps/plugins/mpegplayer/pcm_output.c
index 6ce603ac9c..1f0831fff5 100644
--- a/apps/plugins/mpegplayer/pcm_output.c
+++ b/apps/plugins/mpegplayer/pcm_output.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * PCM output buffer definitions
  *
diff --git a/apps/plugins/mpegplayer/pcm_output.h b/apps/plugins/mpegplayer/pcm_output.h
index bae00cd045..32730df073 100644
--- a/apps/plugins/mpegplayer/pcm_output.h
+++ b/apps/plugins/mpegplayer/pcm_output.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * PCM output buffer declarations
  *
diff --git a/apps/plugins/mpegplayer/stream_mgr.c b/apps/plugins/mpegplayer/stream_mgr.c
index 01f2a2f9ec..73a2a20988 100644
--- a/apps/plugins/mpegplayer/stream_mgr.c
+++ b/apps/plugins/mpegplayer/stream_mgr.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * AV stream manager implementation
  *
diff --git a/apps/plugins/mpegplayer/stream_mgr.h b/apps/plugins/mpegplayer/stream_mgr.h
index 7dba9acc09..2a732cb045 100644
--- a/apps/plugins/mpegplayer/stream_mgr.h
+++ b/apps/plugins/mpegplayer/stream_mgr.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * AV stream manager decalarations
  *
diff --git a/apps/plugins/mpegplayer/stream_thread.h b/apps/plugins/mpegplayer/stream_thread.h
index dfa6e8c9a1..172784a6b6 100644
--- a/apps/plugins/mpegplayer/stream_thread.h
+++ b/apps/plugins/mpegplayer/stream_thread.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Declarations for stream-specific threading
  *
diff --git a/apps/plugins/mpegplayer/video_out.h b/apps/plugins/mpegplayer/video_out.h
index 2a3364c382..7995169bdf 100644
--- a/apps/plugins/mpegplayer/video_out.h
+++ b/apps/plugins/mpegplayer/video_out.h
@@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  * libmpeg2 sync history:
  * 2008-07-01 - CVS revision 1.22
  */
diff --git a/apps/plugins/mpegplayer/video_out_rockbox.c b/apps/plugins/mpegplayer/video_out_rockbox.c
index 331383843b..021743bf80 100644
--- a/apps/plugins/mpegplayer/video_out_rockbox.c
+++ b/apps/plugins/mpegplayer/video_out_rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * mpegplayer video output routines
  *
diff --git a/apps/plugins/mpegplayer/video_thread.c b/apps/plugins/mpegplayer/video_thread.c
index 392cc6179f..37c63c13f5 100644
--- a/apps/plugins/mpegplayer/video_thread.c
+++ b/apps/plugins/mpegplayer/video_thread.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * mpegplayer video thread implementation
  *
diff --git a/apps/plugins/multiboot_select.c b/apps/plugins/multiboot_select.c
index 865e9c0066..648ec0bbc9 100644
--- a/apps/plugins/multiboot_select.c
+++ b/apps/plugins/multiboot_select.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/apps/plugins/open_plugins.c b/apps/plugins/open_plugins.c
index a5f8b07dcd..1a10c797e9 100644
--- a/apps/plugins/open_plugins.c
+++ b/apps/plugins/open_plugins.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   ( (__) )  \___|    ( | \_\ ( (__) )    (
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2020 William Wilgus
  *
@@ -565,8 +564,10 @@ static uint32_t op_entry_add_path(const char *key, const char *plugin, const cha
             if (plugin != op_entry.path)
                 rb->strlcpy(op_entry.path, plugin, OPEN_PLUGIN_BUFSZ);
 
-            if(parameter)
+            if(parameter || rb->strncmp(plugin, VIEWERS_DIR, sizeof(VIEWERS_DIR) -1) == 0)
             {
+                if (!parameter)
+                    parameter = "";
                 /* param matches lang_id so we want to set parameter */
                 bool needs_param = op_entry.lang_id >= 0
                         && (rb->strcmp(parameter, rb->str(op_entry.lang_id)) == 0);
@@ -576,6 +577,9 @@ static uint32_t op_entry_add_path(const char *key, const char *plugin, const cha
                     if (needs_param)
                         op_entry.param[0] = '\0';
                     op_entry_set_param();
+                    if (!use_key && pathbasename(op_entry.param, (const char **)&pos) != 0)
+                        rb->strlcpy(op_entry.name, pos, OPEN_PLUGIN_NAMESZ);
+
                 }
                 else if (parameter != op_entry.param)
                     rb->strlcpy(op_entry.param, parameter, OPEN_PLUGIN_BUFSZ);
@@ -762,7 +766,9 @@ static const char* list_get_name_cb(int selected_item, void* data,
     /*TODO memoize names so we don't keep reading the disk when not necessary */
     if (data == (void*) &MENU_ID_MAIN) /* check address */
     {
-        if (op_entry_read_name(fd_dat, selected_item))
+        if (selected_item == rb->gui_synclist_get_nb_items(&lists) - 1)
+            rb->snprintf(buf, buf_len, "[%s]", rb->str(LANG_ADD));
+        else if (op_entry_read_name(fd_dat, selected_item))
         {
             if (op_entry.lang_id >= 0)
                 rb->snprintf(buf, buf_len, "%s [%s] ",
@@ -816,7 +822,12 @@ static int list_voice_cb(int list_index, void* data)
 {
     if (data == (void*) &MENU_ID_MAIN) /* check address */
     {
-        if (op_entry_read_name(fd_dat, list_index))
+        if (list_index == rb->gui_synclist_get_nb_items(&lists) - 1)
+        {
+            static const long langids[] = {LANG_ADD, VOICE_EXT_ROCK, TALK_FINAL_ID};
+            rb->talk_idarray(langids, false);
+        }
+        else if (op_entry_read_name(fd_dat, list_index))
         {
             if (op_entry.lang_id >= 0)
             {
@@ -843,9 +854,15 @@ static int list_voice_cb(int list_index, void* data)
                 }
                 return rb->talk_spell(op_entry.name, false);
             case 2:
-                return rb->talk_id(LANG_DISPLAY_FULL_PATH, false);
+                rb->talk_id(LANG_DISPLAY_FULL_PATH, false);
+                return rb->talk_fullpath(op_entry.path, true);
             case 4:
-                return rb->talk_id(LANG_PARAMETER, false);
+                rb->talk_id(LANG_PARAMETER, false);
+                if (op_entry.param[0] == '\0')
+                    return rb->talk_id(VOICE_BLANK, true);
+                if (rb->file_exists(op_entry.param))
+                    return rb->talk_fullpath(op_entry.param, true);
+                return rb->talk_spell(op_entry.param, true);
             case 6:
                 return rb->talk_id(LANG_BACK, false);
             default:
@@ -864,6 +881,8 @@ static void synclist_set(char* menu_id, int selection, int items, int sel_size)
     rb->gui_synclist_init(&lists,list_get_name_cb,
                           menu_id, false, sel_size, NULL);
 
+    if (menu_id == (void*) &MENU_ID_MAIN)
+        rb->gui_synclist_set_title(&lists, rb->str(LANG_OPEN_PLUGIN), Icon_Plugin);
     rb->gui_synclist_set_voice_callback(&lists, list_voice_cb);
     rb->gui_synclist_set_nb_items(&lists,items);
     rb->gui_synclist_select_item(&lists, selection);
@@ -979,6 +998,12 @@ static void edit_menu(int selection)
 static int context_menu(int selection)
 {
     int selected_item;
+    if (selection == rb->gui_synclist_get_nb_items(&lists) -1)
+    {
+        op_entry_browse_add(-1);
+        rb->plugin_open(rb->plugin_get_current_filename(), "\0");
+        return OP_PLUGIN_RESTART;
+    }
     if (op_entry_read(fd_dat, selection, op_entry_sz))
     {
         MENUITEM_STRINGLIST(menu, op_entry.name, context_menu_cb,
@@ -1339,7 +1364,7 @@ reopen_datfile:
         hash_exists(op_entry.hash, false);
     }
 
-    if (!fd_dat)
+    if (fd_dat < 0)
         exit = true;
 
     items = rb->lseek(fd_dat, 0, SEEK_END) / op_entry_sz;
@@ -1429,7 +1454,7 @@ reopen_datfile:
         if (!op_entry_read(fd_dat, i, op_entry_sz))
             items--;
     }
-
+# if 0
     if (items < 1 && !exit)
     {
         char* cur_filename = rb->plugin_get_current_filename();
@@ -1444,10 +1469,10 @@ reopen_datfile:
         rb->close(fd_dat);
         return PLUGIN_ERROR;
     }
-
+#endif
     if (!exit)
     {
-        synclist_set(MENU_ID_MAIN, selection, items, 1);
+        synclist_set(MENU_ID_MAIN, selection, items + 1, 1);
         rb->gui_synclist_draw(&lists);
 
         while (!exit && fd_dat >= 0)
@@ -1469,13 +1494,20 @@ reopen_datfile:
                     }
                     else if (ret != PLUGIN_GOTO_PLUGIN)
                     {
-                        synclist_set(MENU_ID_MAIN, selection, items, 1);
+                        synclist_set(MENU_ID_MAIN, selection, items + 1, 1);
                         rb->gui_synclist_draw(&lists);
                         break;
                     }
                     /* fallthrough */
                 case ACTION_STD_OK:
-                    if (op_entry_read(fd_dat, selection, op_entry_sz))
+                    if (selection == items)
+                    {
+                        op_entry_browse_add(-1);
+                        rb->plugin_open(rb->plugin_get_current_filename(), "\0");
+                        ret = PLUGIN_GOTO_PLUGIN;
+                        exit = true;
+                    }
+                    else if (op_entry_read(fd_dat, selection, op_entry_sz))
                     {
                         ret = op_entry_run();
                         exit = true;
@@ -1499,7 +1531,9 @@ reopen_datfile:
             }
         }
         op_entry_remove_empty();
+        rb->gui_synclist_scroll_stop(&lists);
     }
+
     rb->close(fd_dat);
     if (ret != PLUGIN_OK)
         return ret;
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index 123fee2541..8888bdc356 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Oscilloscope, with many different modes of operation.
 *
diff --git a/apps/plugins/otp.c b/apps/plugins/otp.c
index ed8d5737e5..4c9a1b8a20 100644
--- a/apps/plugins/otp.c
+++ b/apps/plugins/otp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 Franklin Wei
  *
diff --git a/apps/plugins/pacbox/arcade.c b/apps/plugins/pacbox/arcade.c
index 236b5fc63d..def6dfa855 100644
--- a/apps/plugins/pacbox/arcade.c
+++ b/apps/plugins/pacbox/arcade.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pacbox/arcade.h b/apps/plugins/pacbox/arcade.h
index 4207d2c7ce..0a7c1e2c90 100644
--- a/apps/plugins/pacbox/arcade.h
+++ b/apps/plugins/pacbox/arcade.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pacbox/hardware.c b/apps/plugins/pacbox/hardware.c
index bfdcf39362..fedc5e8a52 100644
--- a/apps/plugins/pacbox/hardware.c
+++ b/apps/plugins/pacbox/hardware.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pacbox/hardware.h b/apps/plugins/pacbox/hardware.h
index d1f67142ef..0950fcd680 100644
--- a/apps/plugins/pacbox/hardware.h
+++ b/apps/plugins/pacbox/hardware.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pacbox/pacbox.c b/apps/plugins/pacbox/pacbox.c
index a709c78a9b..350cb04932 100644
--- a/apps/plugins/pacbox/pacbox.c
+++ b/apps/plugins/pacbox/pacbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index 00cc6b1f59..e7cef86453 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pacbox/pacbox.make b/apps/plugins/pacbox/pacbox.make
index ae0147dead..86f2308bf2 100644
--- a/apps/plugins/pacbox/pacbox.make
+++ b/apps/plugins/pacbox/pacbox.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 PACBOXSRCDIR := $(APPSDIR)/plugins/pacbox
diff --git a/apps/plugins/pacbox/pacbox_arm.S b/apps/plugins/pacbox/pacbox_arm.S
index d4500ce45f..5b06af53c1 100644
--- a/apps/plugins/pacbox/pacbox_arm.S
+++ b/apps/plugins/pacbox/pacbox_arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2006 Dave Chapman
  *
diff --git a/apps/plugins/pacbox/pacbox_cf.S b/apps/plugins/pacbox/pacbox_cf.S
index 7a6111d16b..7008397358 100644
--- a/apps/plugins/pacbox/pacbox_cf.S
+++ b/apps/plugins/pacbox/pacbox_cf.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2006 Fredrik Ohrn
  *
diff --git a/apps/plugins/pacbox/pacbox_lcd.c b/apps/plugins/pacbox/pacbox_lcd.c
index 172faf3f84..46afafc981 100644
--- a/apps/plugins/pacbox/pacbox_lcd.c
+++ b/apps/plugins/pacbox/pacbox_lcd.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pacbox/pacbox_lcd.h b/apps/plugins/pacbox/pacbox_lcd.h
index 54d4b69243..ea09e4c069 100644
--- a/apps/plugins/pacbox/pacbox_lcd.h
+++ b/apps/plugins/pacbox/pacbox_lcd.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pacbox/wsg3.c b/apps/plugins/pacbox/wsg3.c
index c848b68b6b..459f6b92d8 100644
--- a/apps/plugins/pacbox/wsg3.c
+++ b/apps/plugins/pacbox/wsg3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pacbox/wsg3.h b/apps/plugins/pacbox/wsg3.h
index fa71cd44f0..e90162d547 100644
--- a/apps/plugins/pacbox/wsg3.h
+++ b/apps/plugins/pacbox/wsg3.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pacbox/z80.c b/apps/plugins/pacbox/z80.c
index 575771c5e4..8613a72d13 100644
--- a/apps/plugins/pacbox/z80.c
+++ b/apps/plugins/pacbox/z80.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pacbox/z80.h b/apps/plugins/pacbox/z80.h
index 02d8f184e0..dc9926a7cd 100644
--- a/apps/plugins/pacbox/z80.h
+++ b/apps/plugins/pacbox/z80.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pacbox/z80_internal.h b/apps/plugins/pacbox/z80_internal.h
index 531df044df..88a560faec 100644
--- a/apps/plugins/pacbox/z80_internal.h
+++ b/apps/plugins/pacbox/z80_internal.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Pacbox - a Pacman Emulator for Rockbox
  *
diff --git a/apps/plugins/pdbox/PDa/src/g_canvas.c b/apps/plugins/pdbox/PDa/src/g_canvas.c
index 1ac783ce67..8f3626008e 100644
--- a/apps/plugins/pdbox/PDa/src/g_canvas.c
+++ b/apps/plugins/pdbox/PDa/src/g_canvas.c
@@ -58,9 +58,9 @@ struct _canvasenvironment
 
 extern t_pd *newest;
 t_class *canvas_class;
-static int canvas_dspstate; 	    /* whether DSP is on or off */  
-t_canvas *canvas_editing;   	    /* last canvas to start text edting */ 
-t_canvas *canvas_whichfind; 	    /* last canvas we did a find in */ 
+static int canvas_dspstate; 	    /* whether DSP is on or off */
+t_canvas *canvas_editing;   	    /* last canvas to start text edting */
+t_canvas *canvas_whichfind; 	    /* last canvas we did a find in */
 t_canvas *canvas_list;	    	    /* list of all root canvases */
 
 /* ------------------ forward function declarations --------------- */
@@ -255,7 +255,7 @@ void canvas_makefilename(t_canvas *x, char *file, char *result, int resultsize)
     	strcat(result, "/");
     	strncat(result, file, nleft);
     	result[resultsize-1] = 0;
-    }    	
+    }
 }
 
 void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir)
@@ -345,7 +345,7 @@ t_outconnect *linetraverser_next(t_linetraverser *t)
     	t->tr_x21 = t->tr_y21 = t->tr_x22 = t->tr_y22 = 0;
     	t->tr_lx1 = t->tr_ly1 = t->tr_lx2 = t->tr_ly2 = 0;
     }
-    
+
     return (rval);
 }
 
@@ -435,7 +435,7 @@ t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv)
     x->gl_y2 = 1;
     canvas_setbounds(x, xloc, yloc, xloc + width, yloc + height);
     x->gl_owner = owner;
-    x->gl_name = (*s->s_name ? s : 
+    x->gl_name = (*s->s_name ? s :
     	(canvas_newfilename ? canvas_newfilename : gensym("Pd")));
     if (strcmp(x->gl_name->s_name, "Pd"))
     	pd_bind(&x->gl_pd, canvas_makebindsym(x->gl_name));
@@ -552,14 +552,14 @@ void glist_glist(t_glist *g, t_symbol *s, int argc, t_atom *argv)
 #ifdef ROCKBOX
     (void) s;
 #endif
-    t_symbol *sym = atom_getsymbolarg(0, argc, argv);   
-    float x1 = atom_getfloatarg(1, argc, argv);  
-    float y1 = atom_getfloatarg(2, argc, argv);  
-    float x2 = atom_getfloatarg(3, argc, argv);  
-    float y2 = atom_getfloatarg(4, argc, argv);  
-    float px1 = atom_getfloatarg(5, argc, argv);  
-    float py1 = atom_getfloatarg(6, argc, argv);  
-    float px2 = atom_getfloatarg(7, argc, argv);  
+    t_symbol *sym = atom_getsymbolarg(0, argc, argv);
+    float x1 = atom_getfloatarg(1, argc, argv);
+    float y1 = atom_getfloatarg(2, argc, argv);
+    float x2 = atom_getfloatarg(3, argc, argv);
+    float y2 = atom_getfloatarg(4, argc, argv);
+    float px1 = atom_getfloatarg(5, argc, argv);
+    float py1 = atom_getfloatarg(6, argc, argv);
+    float px2 = atom_getfloatarg(7, argc, argv);
     float py2 = atom_getfloatarg(8, argc, argv);
     glist_addglist(g, sym, x1, y1, x2, y2, px1, py1, px2, py2);
 }
@@ -582,7 +582,7 @@ static void canvas_setbounds(t_canvas *x, int x1, int y1, int x2, int y2)
     x->gl_screenx2 = x2;
     x->gl_screeny2 = y2;
     /* post("set bounds %d %d %d %d", x1, y1, x2, y2); */
-    if (!glist_isgraph(x) && (x->gl_y2 < x->gl_y1)) 
+    if (!glist_isgraph(x) && (x->gl_y2 < x->gl_y1))
     {
     	    /* if it's flipped so that y grows upward,
 	    fix so that zero is bottom edge and redraw.  This is
@@ -623,14 +623,14 @@ void canvas_reflecttitle(t_canvas *x)
 	    	break;
 	    if (i != 0)
 	    	strcat(namebuf, " ");
-	    atom_string(&env->ce_argv[i], namebuf + strlen(namebuf), 
+	    atom_string(&env->ce_argv[i], namebuf + strlen(namebuf),
 	    	MAXPDSTRING/2);
     	}
 	strcat(namebuf, ")");
     }
     else namebuf[0] = 0;
 #ifndef ROCKBOX
-    sys_vgui("wm title .x%x {%s%c%s - %s}\n", 
+    sys_vgui("wm title .x%x {%s%c%s - %s}\n",
     	x, x->gl_name->s_name, (x->gl_dirty? '*' : ' '), namebuf,
     	    canvas_getdir(x)->s_name);
 #endif
@@ -730,7 +730,7 @@ static void editor_free(t_editor *x, t_glist *y)
     freebytes((void *)x, sizeof(*x));
 }
 
-    /* recursively create or destroy all editors of a glist and its 
+    /* recursively create or destroy all editors of a glist and its
     sub-glists, as long as they aren't toplevels. */
 void canvas_create_editor(t_glist *x, int createit)
 {
@@ -788,7 +788,7 @@ void canvas_vis(t_canvas *x, t_floatarg f)
 #ifndef ROCKBOX
 	    sys_vgui("raise .x%x\n", x);
 	    sys_vgui("focus .x%x.c\n", x);
-	    sys_vgui("wm deiconify .x%x\n", x);  
+	    sys_vgui("wm deiconify .x%x\n", x);
 #endif /* ROCKBOX */
 #endif
 	}
@@ -809,8 +809,10 @@ void canvas_vis(t_canvas *x, t_floatarg f)
     }
     else    /* make invisible */
     {
+#ifndef ROCKBOX
     	int i;
     	t_canvas *x2;
+#endif
     	if (!x->gl_havewindow)
 	{
 	    	/* bug workaround -- a graph in a visible patch gets "invised"
@@ -828,10 +830,8 @@ void canvas_vis(t_canvas *x, t_floatarg f)
 	canvas_create_editor(x, 0);
 #ifndef ROCKBOX
    	sys_vgui("destroy .x%x\n", x);
-#endif
     	for (i = 1, x2 = x; x2; x2 = x2->gl_next, i++)
-	    ;
-#ifndef ROCKBOX
+            ;
     	sys_vgui(".mbar.find delete %d\n", i);
 #endif
 	    /* if we're a graph on our parent, and if the parent exists
@@ -858,7 +858,7 @@ void glist_menu_open(t_glist *x)
     if (glist_isvisible(x) && !glist_istoplevel(x))
     {
 	t_glist *gl2 = x->gl_owner;
-	if (!gl2) 
+	if (!gl2)
 	    bug("canvas_vis");	/* shouldn't happen but don't get too upset. */
 	else
 	{
@@ -936,7 +936,7 @@ static void canvas_drawlines(t_canvas *x)
 #else /* ROCKBOX */
     	    sys_vgui(".x%x.c create line %d %d %d %d -width %d -tags l%x\n",
 		    glist_getcanvas(x),
-		    	t.tr_lx1, t.tr_ly1, t.tr_lx2, t.tr_ly2, 
+		    	t.tr_lx1, t.tr_ly1, t.tr_lx2, t.tr_ly2,
 			    (outlet_getsymbol(t.tr_outlet) == &s_signal ? 2:1),
 			    	oc);
 #endif /* ROCKBOX */
@@ -1052,7 +1052,7 @@ void canvas_restore(t_canvas *x, t_symbol *s, int argc, t_atom *argv)
 	{
 	    t_canvasenvironment *e = canvas_getenv(canvas_getcurrent());
     	    canvas_rename(x, binbuf_realizedollsym(ap->a_w.w_symbol,
-	    	e->ce_argc, e->ce_argv, 1), 0);	
+	    	e->ce_argc, e->ce_argv, 1), 0);
 	}
 	else if (ap->a_type == A_SYMBOL)
     	  canvas_rename(x, argv[3].a_w.w_symbol, 0);
@@ -1238,13 +1238,13 @@ static void *table_new(t_symbol *s, t_floatarg f)
     if (s == &s_)
     {
 	 char  tabname[255];
-	 t_symbol *t = gensym("table"); 
+	 t_symbol *t = gensym("table");
 #ifdef ROCKBOX
         snprintf(tabname, sizeof(tabname), "%s%d", t->s_name, tabcount++);
 #else /* ROCKBOX */
 	 sprintf(tabname, "%s%d", t->s_name, tabcount++);
 #endif /* ROCKBOX */
-	 s = gensym(tabname); 
+	 s = gensym(tabname);
     }
     if (f <= 1)
     	f = 100;
@@ -1264,7 +1264,7 @@ static void *table_new(t_symbol *s, t_floatarg f)
 
     graph_array(gl, s, &s_float, f, 0);
 
-    canvas_pop(x, 0); 
+    canvas_pop(x, 0);
 
     return (x);
 }
@@ -1337,7 +1337,7 @@ static void canvas_dodsp(t_canvas *x, int toplevel, t_signal **sp)
     t_gobj *y;
     t_object *ob;
     t_symbol *dspsym = gensym("dsp");
-    t_dspcontext *dc;    
+    t_dspcontext *dc;
 
     	/* create a new "DSP graph" object to use in sorting this canvas.
 	If we aren't toplevel, there are already other dspcontexts around. */
@@ -1347,7 +1347,7 @@ static void canvas_dodsp(t_canvas *x, int toplevel, t_signal **sp)
     	obj_nsigoutlets(&x->gl_obj));
 
     	/* find all the "dsp" boxes and add them to the graph */
-    
+
     for (y = x->gl_list; y; y = y->g_next)
     	if ((ob = pd_checkobject(&y->g_pd)) && zgetfn(&y->g_pd, dspsym))
     	    ugen_add(dc, ob);
@@ -1371,10 +1371,10 @@ static void canvas_start_dsp(void)
     else sys_gui("pdtk_pd_dsp ON\n");
 #endif
     ugen_start();
-    
+
     for (x = canvas_list; x; x = x->gl_next)
     	canvas_dodsp(x, 1, 0);
-    
+
     canvas_dspstate = 1;
 }
 
@@ -1447,7 +1447,7 @@ void glist_redrawitem(t_glist *owner, t_gobj *gobj)
     }
 }
 
-    /* redraw all "scalars" (do this if a drawing command is changed.) 
+    /* redraw all "scalars" (do this if a drawing command is changed.)
     LATER we'll use the "template" information to select which ones we
     redraw.  */
 static void glist_redrawall(t_glist *gl)
@@ -1602,4 +1602,3 @@ void g_canvas_setup(void)
     g_editor_setup();
     g_readwrite_setup();
 }
-
diff --git a/apps/plugins/pdbox/PDa/src/g_template.c b/apps/plugins/pdbox/PDa/src/g_template.c
index f2770d4d5f..62cccbe252 100644
--- a/apps/plugins/pdbox/PDa/src/g_template.c
+++ b/apps/plugins/pdbox/PDa/src/g_template.c
@@ -129,7 +129,7 @@ t_template *template_new(t_symbol *templatesym, int argc, t_atom *argv)
 	x->t_vec[oldn].ds_type = newtype;
 	x->t_vec[oldn].ds_name = newname;
 	x->t_vec[oldn].ds_arraytemplate = newarraytemplate;
-    bad: 
+    bad:
     	argc -= 2; argv += 2;
     }
     if (templatesym->s_name)
@@ -188,7 +188,7 @@ t_float template_getfloat(t_template *x, t_symbol *fieldname, t_word *wp,
     return (fixtof(val));
 }
 
-void template_setfloat(t_template *x, t_symbol *fieldname, t_word *wp, 
+void template_setfloat(t_template *x, t_symbol *fieldname, t_word *wp,
     t_float f, int loud)
 {
     int onset, type;
@@ -222,7 +222,7 @@ t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp,
     return (val);
 }
 
-void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, 
+void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp,
     t_symbol *s, int loud)
 {
     int onset, type;
@@ -248,7 +248,7 @@ int template_match(t_template *x1, t_template *x2)
     	return (0);
     for (i = x2->t_n; i < x1->t_n; i++)
     {
-    	if (x1->t_vec[i].ds_type == DT_ARRAY || 
+    	if (x1->t_vec[i].ds_type == DT_ARRAY ||
 	    x1->t_vec[i].ds_type == DT_LIST)
 	    	return (0);
     }
@@ -266,10 +266,10 @@ int template_match(t_template *x1, t_template *x2)
 in their template.  The old template is assumed to be the "installed" one
 so we can delete old items; but making new ones we have to avoid scalar_new
 which would make an old one whereas we will want a new one (but whose array
-elements might still be old ones. 
+elements might still be old ones.
     LATER deal with graphics updates too... */
 
-    /* conform the word vector of a scalar to the new template */    
+    /* conform the word vector of a scalar to the new template */
 static void template_conformwords(t_template *tfrom, t_template *tto,
     int *conformaction, t_word *wfrom, t_word *wto)
 {
@@ -322,7 +322,7 @@ static t_scalar *template_conformscalar(t_template *tfrom, t_template *tto,
 
     	template_conformwords(tfrom, tto, conformaction,
 	    scfrom->sc_vec, x->sc_vec);
-	    
+
 	    /* replace the old one with the new one in the list */
 	if (glist->gl_list == &scfrom->sc_gobj)
 	{
@@ -358,7 +358,7 @@ static t_scalar *template_conformscalar(t_template *tfrom, t_template *tto,
 	}
 	else if (ds->ds_type == DT_ARRAY)
 	{
-	    template_conformarray(tfrom, tto, conformaction, 
+	    template_conformarray(tfrom, tto, conformaction,
 	    	x->sc_vec[i].w_array);
 	}
     }
@@ -411,7 +411,7 @@ static void template_conformglist(t_template *tfrom, t_template *tto,
     }
 }
 
-    /* globally conform all scalars from one template to another */ 
+    /* globally conform all scalars from one template to another */
 void template_conform(t_template *tfrom, t_template *tto)
 {
     int nto = tto->t_n, nfrom = tfrom->t_n, i, j,
@@ -479,7 +479,7 @@ t_template *template_findbyname(t_symbol *s)
 t_canvas *template_findcanvas(t_template *template)
 {
     t_gtemplate *gt;
-    if (!template) 
+    if (!template)
     	bug("template_findcanvas");
     if (!(gt = template->t_list))
     	return (0);
@@ -551,12 +551,12 @@ static void template_setup(void)
     	sizeof(t_template), CLASS_PD, 0);
     class_addmethod(pd_canvasmaker, (t_method)template_usetemplate,
     	gensym("struct"), A_GIMME, 0);
-    	
+
 }
 
 /* ---------------- gtemplates.  One per canvas. ----------- */
 
-/* this is a "text" object that searches for, and if necessary creates, 
+/* this is a "text" object that searches for, and if necessary creates,
 a "template" (above).  Other objects in the canvas then can give drawing
 instructions for the template.  The template doesn't go away when the
 gtemplate is deleted, so that you can replace it with
@@ -819,7 +819,7 @@ static void *curve_new(t_symbol *classsym, t_int argc, t_atom *argv)
     	classname += 6;
     	flags |= CLOSED;
     	if (argc) fielddesc_setfloatarg(&x->x_fillcolor, argc--, argv++);
-    	else FIELDDESC_SETFLOAT(&x->x_outlinecolor, 0); 
+    	else FIELDDESC_SETFLOAT(&x->x_outlinecolor, 0);
     }
     else classname += 4;
     if (classname[0] == 'c') flags |= BEZ;
@@ -863,7 +863,7 @@ static void curve_getrect(t_gobj *z, t_glist *glist,
     *xp1 = x1;
     *yp1 = y1;
     *xp2 = x2;
-    *yp2 = y2; 
+    *yp2 = y2;
 }
 
 static void curve_displace(t_gobj *z, t_glist *glist,
@@ -939,20 +939,23 @@ static void numbertocolor(int n, char *s)
 #endif
 }
 
-static void curve_vis(t_gobj *z, t_glist *glist, 
+static void curve_vis(t_gobj *z, t_glist *glist,
     t_word *data, t_template *template, float basex, float basey,
     int vis)
 {
     t_curve *x = (t_curve *)z;
-    int i, n = x->x_npoints;
+    int n = x->x_npoints;
+#ifndef ROCKBOX
+    int i;
     t_fielddesc *f = x->x_vec;
+#endif
 
 #ifdef ROCKBOX
     (void) glist;
     (void) basex;
     (void) basey;
 #endif
-    
+
     if (vis)
     {
     	if (n > 1)
@@ -981,18 +984,14 @@ static void curve_vis(t_gobj *z, t_glist *glist,
 #ifndef ROCKBOX
     	    else sys_vgui(".x%x.c create line\\\n",
     	    	    glist_getcanvas(glist));
-#endif
     	    for (i = 0, f = x->x_vec; i < n; i++, f += 2)
     	    {
-#ifndef ROCKBOX
     		float xloc = glist_xtopixels(glist,
     	    	    basex + fielddesc_getfloat(f, template, data, 1));
     		float yloc = glist_ytopixels(glist,
     	    	    basey + fielddesc_getfloat(f+1, template, data, 1));
     		sys_vgui("%d %d\\\n", (int)xloc, (int)yloc);
-#endif
     	    }
-#ifndef ROCKBOX
     	    sys_vgui("-width %f\\\n",
     	    	fielddesc_getfloat(&x->x_width, template, data, 1));
     	    if (flags & CLOSED) sys_vgui("-fill %s -outline %s\\\n",
@@ -1008,7 +1007,7 @@ static void curve_vis(t_gobj *z, t_glist *glist,
     {
 #ifndef ROCKBOX
     	if (n > 1) sys_vgui(".x%x.c delete curve%x\n",
-    	    glist_getcanvas(glist), data);    	
+    	    glist_getcanvas(glist), data);
 #endif
     }
 }
@@ -1038,7 +1037,7 @@ static void curve_motion(void *z, t_floatarg dx, t_floatarg dy)
     {
 	template_setfloat(curve_motion_template,
 	    f->fd_un.fd_varsym,
-	    curve_motion_wp, 
+	    curve_motion_wp,
     	    curve_motion_xbase + curve_motion_xcumulative * curve_motion_xper,
 	    	1);
     }
@@ -1046,14 +1045,14 @@ static void curve_motion(void *z, t_floatarg dx, t_floatarg dy)
     {
 	template_setfloat(curve_motion_template,
 	    (f+1)->fd_un.fd_varsym,
-	    curve_motion_wp, 
+	    curve_motion_wp,
     	    curve_motion_ybase + curve_motion_ycumulative * curve_motion_yper,
 	    	1);
     }
     glist_redrawitem(curve_motion_glist, curve_motion_gobj);
 }
 
-static int curve_click(t_gobj *z, t_glist *glist, 
+static int curve_click(t_gobj *z, t_glist *glist,
     t_scalar *sc, t_template *template, float basex, float basey,
     int xpix, int ypix, int shift, int alt, int dbl, int doit)
 {
@@ -1198,7 +1197,7 @@ static void *plot_new(t_symbol *classsym, t_int argc, t_atom *argv)
     /* get everything we'll need from the owner template of the array being
     plotted. Not used for garrays, but see below */
 static int plot_readownertemplate(t_plot *x,
-    t_word *data, t_template *ownertemplate, 
+    t_word *data, t_template *ownertemplate,
     t_symbol **elemtemplatesymp, t_array **arrayp,
     float *linewidthp, float *xlocp, float *xincp, float *ylocp)
 {
@@ -1250,7 +1249,7 @@ int array_getfields(t_symbol *elemtemplatesym,
     t_canvas *elemtemplatecanvas = 0;
 
     	/* the "float" template is special in not having to have a canvas;
-	template_findbyname is hardwired to return a predefined 
+	template_findbyname is hardwired to return a predefined
 	template. */
 
     if (!(elemtemplate =  template_findbyname(elemtemplatesym)))
@@ -1266,13 +1265,13 @@ int array_getfields(t_symbol *elemtemplatesym,
     }
     elemsize = elemtemplate->t_n * sizeof(t_word);
     if (!template_find_field(elemtemplate, gensym("y"), &yonset, &type, &dummy)
-    	|| type != DT_FLOAT)	
+    	|| type != DT_FLOAT)
 	    yonset = -1;
     if (!template_find_field(elemtemplate, gensym("x"), &xonset, &type, &dummy)
-    	|| type != DT_FLOAT) 
+    	|| type != DT_FLOAT)
 	    xonset = -1;
     if (!template_find_field(elemtemplate, gensym("w"), &wonset, &type, &dummy)
-    	|| type != DT_FLOAT) 
+    	|| type != DT_FLOAT)
 	    wonset = -1;
 
     	/* fill in slots for return values */
@@ -1300,7 +1299,7 @@ static void plot_getrect(t_gobj *z, t_glist *glist,
     int i;
     float xpix, ypix, wpix;
 
-    if (!plot_readownertemplate(x, data, template, 
+    if (!plot_readownertemplate(x, data, template,
     	&elemtemplatesym, &array, &linewidth, &xloc, &xinc, &yloc) &&
 	    !array_getfields(elemtemplatesym, &elemtemplatecanvas,
 	    	&elemtemplate, &elemsize, &xonset, &yonset, &wonset))
@@ -1376,7 +1375,7 @@ static void plot_activate(t_gobj *z, t_glist *glist,
     	/* not yet */
 }
 
-static void plot_vis(t_gobj *z, t_glist *glist, 
+static void plot_vis(t_gobj *z, t_glist *glist,
     t_word *data, t_template *template, float basex, float basey,
     int vis)
 {
@@ -1389,7 +1388,7 @@ static void plot_vis(t_gobj *z, t_glist *glist,
     t_array *array;
     int nelem;
     char *elem;
-    if (plot_readownertemplate(x, data, template, 
+    if (plot_readownertemplate(x, data, template,
     	&elemtemplatesym, &array, &linewidth, &xloc, &xinc, &yloc) ||
 	    array_getfields(elemtemplatesym, &elemtemplatecanvas,
 	    	&elemtemplate, &elemsize, &xonset, &yonset, &wonset))
@@ -1397,7 +1396,7 @@ static void plot_vis(t_gobj *z, t_glist *glist,
     nelem = array->a_n;
     elem = (char *)array->a_vec;
     if (vis)
-    {    	
+    {
     	char outline[20];
     	int lastpixel = -1, ndrawn = 0;
     	float xsum, yval = 0, xpix;
@@ -1417,7 +1416,7 @@ static void plot_vis(t_gobj *z, t_glist *glist,
     	    sys_vgui(".x%x.c create polygon \\\n",
     	    	glist_getcanvas(glist));
 #endif
-    	    
+
     	    for (i = 0, xsum = xloc; i < nelem; i++)
     	    {
     	    	float usexloc;
@@ -1538,7 +1537,7 @@ static void plot_vis(t_gobj *z, t_glist *glist,
     	    /* We're done with the outline; now draw all the points.
     	    This code is inefficient since the template has to be
     	    searched for drawing instructions for every last point. */
-    	
+
     	for (xsum = xloc, i = 0; i < nelem; i++)
     	{
     	    float usexloc, useyloc;
@@ -1586,7 +1585,7 @@ static void plot_vis(t_gobj *z, t_glist *glist,
 }
 
 
-static int plot_click(t_gobj *z, t_glist *glist, 
+static int plot_click(t_gobj *z, t_glist *glist,
     t_scalar *sc, t_template *template, float basex, float basey,
     int xpix, int ypix, int shift, int alt, int dbl, int doit)
 {
@@ -1596,7 +1595,7 @@ static int plot_click(t_gobj *z, t_glist *glist,
     t_array *array;
     t_word *data = sc->sc_vec;
 
-    if (!plot_readownertemplate(x, data, template, 
+    if (!plot_readownertemplate(x, data, template,
     	&elemtemplatesym, &array, &linewidth, &xloc, &xinc, &yloc))
     {
     	return (array_doclick(array, glist, &sc->sc_gobj,
@@ -1758,7 +1757,7 @@ static void drawnumber_activate(t_gobj *z, t_glist *glist,
     post("drawnumber_activate %d", state);
 }
 
-static void drawnumber_vis(t_gobj *z, t_glist *glist, 
+static void drawnumber_vis(t_gobj *z, t_glist *glist,
     t_word *data, t_template *template, float basex, float basey,
     int vis)
 {
@@ -1818,13 +1817,13 @@ static void drawnumber_motion(void *z, t_floatarg dx, t_floatarg dy)
 #endif
     template_setfloat(drawnumber_motion_template,
     	f->fd_un.fd_varsym,
-	    drawnumber_motion_wp, 
+	    drawnumber_motion_wp,
     	    drawnumber_motion_ycumulative,
 	    	1);
     glist_redrawitem(drawnumber_motion_glist, drawnumber_motion_gobj);
 }
 
-static int drawnumber_click(t_gobj *z, t_glist *glist, 
+static int drawnumber_click(t_gobj *z, t_glist *glist,
     t_scalar *sc, t_template *template, float basex, float basey,
     int xpix, int ypix, int shift, int alt, int dbl, int doit)
 {
@@ -1896,6 +1895,3 @@ void g_template_setup(void)
     plot_setup();
     drawnumber_setup();
 }
-
-
-
diff --git a/apps/plugins/pdbox/PDa/src/m_binbuf.c b/apps/plugins/pdbox/PDa/src/m_binbuf.c
index 2665a1343f..7394e062d5 100644
--- a/apps/plugins/pdbox/PDa/src/m_binbuf.c
+++ b/apps/plugins/pdbox/PDa/src/m_binbuf.c
@@ -164,7 +164,7 @@ void binbuf_text(t_binbuf *x, char *text, size_t size)
 		}
 		if (!slash) bufp++;
 	    }
-	    while (textp != etext && bufp != ebuf && 
+	    while (textp != etext && bufp != ebuf &&
 		(slash || (*textp != ' ' && *textp != '\n' && *textp != '\r'
 		    && *textp != '\t' &&*textp != ',' && *textp != ';')));
 	    *bufp = 0;
@@ -350,7 +350,7 @@ void binbuf_addbinbuf(t_binbuf *x, t_binbuf *y)
     	    bug("binbuf_addbinbuf");
     	}
     }
-    
+
     binbuf_add(x, z->b_n, z->b_vec);
 }
 
@@ -429,7 +429,7 @@ void binbuf_print(t_binbuf *x)
 	postatom(1, x->b_vec + i);
 	if (x->b_vec[i].a_type == A_SEMI)
 	    newline = 1;
-	else newline = 0; 
+	else newline = 0;
     }
     if (startedpost) endpost();
 }
@@ -448,10 +448,10 @@ int canvas_getdollarzero( void);
 
 t_symbol *binbuf_realizedollsym(t_symbol *s, int ac, t_atom *av, int tonew)
 {
-    int argno = atol(s->s_name), lastnum;
+    int argno = atol(s->s_name)/*, lastnum */;
     char buf[MAXPDSTRING], c, *sp;
-    for (lastnum = 0, sp = s->s_name; ((c = *sp) && c >= '0' && c <= '9');
-    	sp++, lastnum++)
+    for (/*lastnum = 0,*/ sp = s->s_name; ((c = *sp) && c >= '0' && c <= '9');
+        sp++/*, lastnum++*/)
     if (!c || argno < 0 || argno > ac)
     {
     	if (!tonew)
@@ -497,13 +497,13 @@ void binbuf_eval(t_binbuf *x, t_pd *target, int argc, t_atom *argv)
 	    	{
 		    error("$%d: not enough arguments supplied",
 			    at->a_w.w_index);
-		    goto cleanup; 
+		    goto cleanup;
 		}
     	    	else if (argv[at->a_w.w_index-1].a_type != A_SYMBOL)
 	    	{
 		    error("$%d: symbol needed as message destination",
 		    	at->a_w.w_index);
-		    goto cleanup; 
+		    goto cleanup;
 		}
 		else s = argv[at->a_w.w_index-1].a_w.w_symbol;
 	    }
@@ -679,7 +679,7 @@ int binbuf_read(t_binbuf *b, char *filename, char *dirname, int crflag)
 #endif /* ROCKBOX */
     	return (1);
     }
-    if ((length = lseek(fd, 0, SEEK_END)) < 0 || lseek(fd, 0, SEEK_SET) < 0 
+    if ((length = lseek(fd, 0, SEEK_END)) < 0 || lseek(fd, 0, SEEK_SET) < 0
     	|| !(buf = t_getbytes(length)))
     {
 #ifdef ROCKBOX
@@ -772,7 +772,7 @@ int binbuf_write(t_binbuf *x, char *filename, char *dir, int crflag)
     	x = binbuf_convert(x, 0);
 	deleteit = 1;
     }
-    
+
 #ifdef ROCKBOX
     if(!(f = binbuf_doopen(fbuf, O_WRONLY|O_CREAT|O_TRUNC)))
 #else /* ROCKBOX */
@@ -862,7 +862,7 @@ fail:
 }
 
 /* The following routine attempts to convert from max to pd or back.  The
-max to pd direction is working OK but you will need to make lots of 
+max to pd direction is working OK but you will need to make lots of
 abstractions for objects like "gate" which don't exist in Pd.  conversion
 from Pd to Max hasn't been tested for patches with subpatches yet!  */
 
@@ -903,7 +903,7 @@ static t_binbuf *binbuf_convert(t_binbuf *oldb, int maxtopd)
 	if (maxtopd)
 	{
 	    	/* case 1: importing a ".pat" file into Pd. */
-		
+
 		/* dollar signs in file translate to symbols */
 	    for (i = 0; i < natom; i++)
 	    {
@@ -940,7 +940,7 @@ static t_binbuf *binbuf_convert(t_binbuf *oldb, int maxtopd)
 		    stack[stackdepth] = nobj;
 		    stackdepth++;
 		    nobj = 0;
-		    binbuf_addv(newb, "ssfffff;", 
+		    binbuf_addv(newb, "ssfffff;",
 		    	gensym("#N"), gensym("canvas"),
 			    atom_getfloatarg(2, natom, nextmess),
 			    atom_getfloatarg(3, natom, nextmess),
@@ -1002,7 +1002,7 @@ static t_binbuf *binbuf_convert(t_binbuf *oldb, int maxtopd)
 		    binbuf_add(newb, natom - 1, outmess);
 		    nobj++;
 		}
-		else if (!strcmp(second, "message") || 
+		else if (!strcmp(second, "message") ||
 	    	    !strcmp(second, "comment"))
 		{
 	    	    SETSYMBOL(outmess, gensym("#X"));
@@ -1068,7 +1068,7 @@ static t_binbuf *binbuf_convert(t_binbuf *oldb, int maxtopd)
 			gensym("#X"), gensym("obj"),
 			atom_getfloatarg(2, natom, nextmess),
 			atom_getfloatarg(3, natom, nextmess),
-			gensym((natom > 5 ? "inlet~" : "inlet"))); 
+			gensym((natom > 5 ? "inlet~" : "inlet")));
 		    nobj++;
 		}
 		else if (!strcmp(second, "outlet"))
@@ -1077,7 +1077,7 @@ static t_binbuf *binbuf_convert(t_binbuf *oldb, int maxtopd)
 			gensym("#X"), gensym("obj"),
 			atom_getfloatarg(2, natom, nextmess),
 			atom_getfloatarg(3, natom, nextmess),
-			gensym((natom > 5 ? "outlet~" : "outlet"))); 
+			gensym((natom > 5 ? "outlet~" : "outlet")));
 		    nobj++;
 		}
 	    	else if (!strcmp(second, "user"))
@@ -1086,7 +1086,7 @@ static t_binbuf *binbuf_convert(t_binbuf *oldb, int maxtopd)
 			gensym("#X"), gensym("obj"),
 			atom_getfloatarg(3, natom, nextmess),
 			atom_getfloatarg(4, natom, nextmess),
-			atom_getsymbolarg(2, natom, nextmess)); 
+			atom_getsymbolarg(2, natom, nextmess));
 		    nobj++;
 		}
 		else if (!strcmp(second, "connect")||
@@ -1097,7 +1097,7 @@ static t_binbuf *binbuf_convert(t_binbuf *oldb, int maxtopd)
 			nobj - atom_getfloatarg(2, natom, nextmess) - 1,
 			atom_getfloatarg(3, natom, nextmess),
 			nobj - atom_getfloatarg(4, natom, nextmess) - 1,
-			atom_getfloatarg(5, natom, nextmess)); 
+			atom_getfloatarg(5, natom, nextmess));
 		}
 	    }
 	}
@@ -1115,7 +1115,7 @@ static t_binbuf *binbuf_convert(t_binbuf *oldb, int maxtopd)
 		    stack[stackdepth] = nobj;
 		    stackdepth++;
 		    nobj = 0;
-		    binbuf_addv(newb, "ssffff;", 
+		    binbuf_addv(newb, "ssffff;",
 		    	gensym("#N"), gensym("vpatcher"),
 			    atom_getfloatarg(2, natom, nextmess),
 			    atom_getfloatarg(3, natom, nextmess),
@@ -1205,9 +1205,9 @@ static t_binbuf *binbuf_convert(t_binbuf *oldb, int maxtopd)
 		    	binbuf_add(newb, natom + 3, outmess);
 		    }
 		    nobj++;
-		
+
 		}
-		else if (!strcmp(second, "msg") || 
+		else if (!strcmp(second, "msg") ||
 	    	    !strcmp(second, "text"))
 		{
 	    	    SETSYMBOL(outmess, gensym("#P"));
@@ -1238,7 +1238,7 @@ static t_binbuf *binbuf_convert(t_binbuf *oldb, int maxtopd)
 			nobj - atom_getfloatarg(2, natom, nextmess) - 1,
 			atom_getfloatarg(3, natom, nextmess),
 			nobj - atom_getfloatarg(4, natom, nextmess) - 1,
-			atom_getfloatarg(5, natom, nextmess)); 
+			atom_getfloatarg(5, natom, nextmess));
 		}
 	    }
 	}
@@ -1260,7 +1260,7 @@ int binbuf_match(t_binbuf *inbuf, t_binbuf *searchbuf)
     {
     	for (nmatched = 0; nmatched < searchbuf->b_n; nmatched++)
 	{
-	    t_atom *a1 = &inbuf->b_vec[indexin + nmatched], 
+	    t_atom *a1 = &inbuf->b_vec[indexin + nmatched],
 	    	*a2 = &searchbuf->b_vec[nmatched];
 	    if (a1->a_type != a2->a_type ||
 	    	(a1->a_type == A_SYMBOL && a1->a_w.w_symbol != a2->a_w.w_symbol)
@@ -1330,4 +1330,3 @@ void glob_evalfile(t_pd *ignore, t_symbol *name, t_symbol *dir)
     pd_doloadbang();
     canvas_resume_dsp(dspstate);
 }
-
diff --git a/apps/plugins/pdbox/PDa/src/m_obj.c b/apps/plugins/pdbox/PDa/src/m_obj.c
index 8d4947f202..26b23c3ce7 100644
--- a/apps/plugins/pdbox/PDa/src/m_obj.c
+++ b/apps/plugins/pdbox/PDa/src/m_obj.c
@@ -71,7 +71,7 @@ static void inlet_wrong(t_inlet *x, t_symbol *s)
     /* LATER figure out how to make these efficient: */
 static void inlet_bang(t_inlet *x)
 {
-    if (x->i_symfrom == &s_bang) 
+    if (x->i_symfrom == &s_bang)
     	pd_vmess(x->i_dest, x->i_symto, "");
     else if (!x->i_symfrom) pd_bang(x->i_dest);
     else inlet_wrong(x, &s_bang);
@@ -79,7 +79,7 @@ static void inlet_bang(t_inlet *x)
 
 static void inlet_pointer(t_inlet *x, t_gpointer *gp)
 {
-    if (x->i_symfrom == &s_pointer) 
+    if (x->i_symfrom == &s_pointer)
     	pd_vmess(x->i_dest, x->i_symto, "p", gp);
     else if (!x->i_symfrom) pd_pointer(x->i_dest, gp);
     else inlet_wrong(x, &s_pointer);
@@ -98,7 +98,7 @@ static void inlet_float(t_inlet *x, t_float f)
 
 static void inlet_symbol(t_inlet *x, t_symbol *s)
 {
-    if (x->i_symfrom == &s_symbol) 
+    if (x->i_symfrom == &s_symbol)
     	pd_vmess(x->i_dest, x->i_symto, "s", s);
     else if (!x->i_symfrom) pd_symbol(x->i_dest, s);
     else inlet_wrong(x, &s_symbol);
@@ -234,7 +234,7 @@ void obj_list(t_object *x, t_symbol *s, int argc, t_atom *argv)
     if (argv->a_type == A_POINTER) pd_pointer(&x->ob_pd, argv->a_w.w_gpointer);
     else if (argv->a_type == A_FLOAT) pd_float(&x->ob_pd, argv->a_w.w_float);
     else pd_symbol(&x->ob_pd, argv->a_w.w_symbol);
-} 
+}
 
 void obj_init(void)
 {
@@ -425,10 +425,10 @@ t_outconnect *obj_connect(t_object *source, int outno,
     t_outlet *o;
     t_pd *to;
     t_outconnect *oc, *oc2;
-    
+
     for (o = source->ob_outlet; o && outno; o = o->o_next, outno--) ;
     if (!o) return (0);
-    
+
     if (sink->ob_pd->c_firstin)
     {
     	if (!inno)
@@ -464,7 +464,7 @@ void obj_disconnect(t_object *source, int outno, t_object *sink, int inno)
     t_outlet *o;
     t_pd *to;
     t_outconnect *oc, *oc2;
-    
+
     for (o = source->ob_outlet; o && outno; o = o->o_next, outno--)
     if (!o) return;
     if (sink->ob_pd->c_firstin)
@@ -669,21 +669,21 @@ int obj_issignaloutlet(t_object *x, int m)
 
 t_sample *obj_findsignalscalar(t_object *x, int m)
 {
-    int n = 0;
+//    int n = 0;
     t_inlet *i;
     if (x->ob_pd->c_firstin && x->ob_pd->c_floatsignalin)
     {
     	if (!m--)
 	    return (x->ob_pd->c_floatsignalin > 0 ?
 	    	(t_sample *)(((char *)x) + x->ob_pd->c_floatsignalin) : 0);
-    	n++;
+//    	n++;
     }
     for (i = x->ob_inlet; i; i = i->i_next, m--)
     	if (i->i_symfrom == &s_signal)
     {
     	if (m == 0)
 	    return (&i->i_un.iu_floatsignalvalue);
-    	n++;
+//    	n++;
     }
     return (0);
 }
@@ -703,8 +703,7 @@ int outlet_getsignalindex(t_outlet *x)
 {
     int n = 0;
     t_outlet *o;
-    for (o = x->o_owner->ob_outlet, n = 0; o && o != x; o = o->o_next) 
+    for (o = x->o_owner->ob_outlet, n = 0; o && o != x; o = o->o_next)
     	if (o->o_sym == &s_signal) n++;
     return (n);
 }
-
diff --git a/apps/plugins/pdbox/PDa/src/s_audio_rockbox.c b/apps/plugins/pdbox/PDa/src/s_audio_rockbox.c
index 94779e6123..b51048af77 100644
--- a/apps/plugins/pdbox/PDa/src/s_audio_rockbox.c
+++ b/apps/plugins/pdbox/PDa/src/s_audio_rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009, 2010 Wincent Balin
  *
diff --git a/apps/plugins/pdbox/math.h b/apps/plugins/pdbox/math.h
index dc0e25b1e4..cd80e45169 100644
--- a/apps/plugins/pdbox/math.h
+++ b/apps/plugins/pdbox/math.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Wincent Balin
  *
diff --git a/apps/plugins/pdbox/pdbox-func.c b/apps/plugins/pdbox/pdbox-func.c
index 59088eda16..f338a45b32 100644
--- a/apps/plugins/pdbox/pdbox-func.c
+++ b/apps/plugins/pdbox/pdbox-func.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Wincent Balin
  *
diff --git a/apps/plugins/pdbox/pdbox-gui.c b/apps/plugins/pdbox/pdbox-gui.c
index 696b083b0d..a538249aaa 100644
--- a/apps/plugins/pdbox/pdbox-gui.c
+++ b/apps/plugins/pdbox/pdbox-gui.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Wincent Balin
  *
diff --git a/apps/plugins/pdbox/pdbox-net.c b/apps/plugins/pdbox/pdbox-net.c
index 03ef6bf6cb..f3bc9c2c92 100644
--- a/apps/plugins/pdbox/pdbox-net.c
+++ b/apps/plugins/pdbox/pdbox-net.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Wincent Balin
  *
diff --git a/apps/plugins/pdbox/pdbox.c b/apps/plugins/pdbox/pdbox.c
index 78d6037fa6..66596c958a 100644
--- a/apps/plugins/pdbox/pdbox.c
+++ b/apps/plugins/pdbox/pdbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009, 2010 Wincent Balin
  *
diff --git a/apps/plugins/pdbox/pdbox.h b/apps/plugins/pdbox/pdbox.h
index 36fb6c4fa8..2fd628fea2 100644
--- a/apps/plugins/pdbox/pdbox.h
+++ b/apps/plugins/pdbox/pdbox.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009, 2010 Wincent Balin
  *
@@ -160,6 +159,9 @@ void pd_init(void);
 #undef strncat
 #define strncat rb_strncat
 
+#undef strncpy
+#define strncpy rb->strncpy
+
 //#ifndef SIMULATOR
 /*FIXME: is it a correct replacement??? */
 /* #if !(CONFIG_PLATFORM & PLATFORM_HOSTED) */
@@ -313,6 +315,15 @@ enum pd_key_id
     #define PDPOD_WHEELLEFT BUTTON_UP
     #define PDPOD_WHEELRIGHT BUTTON_DOWN
     #define PDPOD_ACTION    BUTTON_SELECT
+#elif (CONFIG_KEYPAD == EROSQ_PAD)
+    #define PDPOD_QUIT      BUTTON_POWER
+    #define PDPOD_PLAY      BUTTON_PLAY
+    #define PDPOD_PREVIOUS  BUTTON_PREV
+    #define PDPOD_NEXT      BUTTON_NEXT
+    #define PDPOD_MENU      BUTTON_MENU
+    #define PDPOD_WHEELLEFT BUTTON_SCROLL_BACK
+    #define PDPOD_WHEELRIGHT BUTTON_SCROLL_FWD
+    #define PDPOD_ACTION    BUTTON_BACK
 #else
     #warning "No keys defined for this architecture!"
 #endif
diff --git a/apps/plugins/pdbox/pdbox.make b/apps/plugins/pdbox/pdbox.make
index a9ce0d2755..31b6623a55 100644
--- a/apps/plugins/pdbox/pdbox.make
+++ b/apps/plugins/pdbox/pdbox.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 PDBOXSRCDIR := $(APPSDIR)/plugins/pdbox
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 832ebc49f7..1074555399 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Tom Ross
  *
diff --git a/apps/plugins/periodic_table.c b/apps/plugins/periodic_table.c
index 448f3e1829..79120f09f2 100644
--- a/apps/plugins/periodic_table.c
+++ b/apps/plugins/periodic_table.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Jonathan Bettencourt (jonrelay)
  *           (C) 2009 Port to Rockbox by: Yifu Huang
diff --git a/apps/plugins/picross/picross.make b/apps/plugins/picross/picross.make
index ead5ba482a..c78a0266e2 100644
--- a/apps/plugins/picross/picross.make
+++ b/apps/plugins/picross/picross.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 PICRSCR_SRCDIR := $(APPSDIR)/plugins/picross
diff --git a/apps/plugins/pictureflow.c b/apps/plugins/pictureflow.c
index 738ca2f672..8de47e2f78 100644
--- a/apps/plugins/pictureflow.c
+++ b/apps/plugins/pictureflow.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Andrew Mahone
  *
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index affde85b99..872fbaa2ac 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2007 Jonas Hurrelmann (j@outpo.st)
 * Copyright (C) 2007 Nicolas Pennequin
diff --git a/apps/plugins/pictureflow/pictureflow.make b/apps/plugins/pictureflow/pictureflow.make
index eb19eaacf0..d7765d352e 100644
--- a/apps/plugins/pictureflow/pictureflow.make
+++ b/apps/plugins/pictureflow/pictureflow.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 PICTUREFLOW_SRCDIR = $(APPSDIR)/plugins/pictureflow
@@ -30,7 +29,7 @@ $(PICTUREFLOW_OBJDIR)/pictureflow.refmap: $(PICTUREFLOW_OBJ)
 
 $(PICTUREFLOW_OUTLDS): $(PLUGIN_LDS) $(PICTUREFLOW_OBJDIR)/pictureflow.refmap
 	$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DPLUGIN -DOVERLAY_OFFSET=$(shell \
-		$(TOOLSDIR)/ovl_offset.pl $(PICTUREFLOW_OBJDIR)/pictureflow.refmap))
+		$(TOOLSDIR)/ovl_offset.pl $(PICTUREFLOW_OBJDIR)/pictureflow.refelf))
 
 $(PICTUREFLOW_OBJDIR)/pictureflow.ovl: $(PICTUREFLOW_OBJ) $(PICTUREFLOW_OUTLDS)
 	$(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
diff --git a/apps/plugins/pitch_detector.c b/apps/plugins/pitch_detector.c
index a651bb8c26..556bac2841 100644
--- a/apps/plugins/pitch_detector.c
+++ b/apps/plugins/pitch_detector.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008    Lechner Michael / smoking gnu
  *
diff --git a/apps/plugins/pitch_screen.c b/apps/plugins/pitch_screen.c
index 62cb170408..eec500edb9 100644
--- a/apps/plugins/pitch_screen.c
+++ b/apps/plugins/pitch_screen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/plugins/pixel-painter.lua b/apps/plugins/pixel-painter.lua
index 43f21420f7..f237cc1c25 100644
--- a/apps/plugins/pixel-painter.lua
+++ b/apps/plugins/pixel-painter.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
 
  Port and extension of Pixel Painter by Pavel Bakhilau
  (http://js1k.com/2010-first/demo/453) to Rockbox Lua.
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c
index cdb6e66569..5ad0d5c716 100644
--- a/apps/plugins/plasma.c
+++ b/apps/plugins/plasma.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Plasma demo plugin
 *
diff --git a/apps/plugins/playing_time.c b/apps/plugins/playing_time.c
index 6504988026..cddfd196cd 100644
--- a/apps/plugins/playing_time.c
+++ b/apps/plugins/playing_time.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index 14a36f8283..2988109b69 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -310,6 +310,9 @@ SECTIONS
     	plugin_load_end_addr = .;
     }
 
+    _plugin_ram_end = ORIGIN(PLUGIN_RAM) + LENGTH(PLUGIN_RAM);
+    plugin_ram_end = ORIGIN(PLUGIN_RAM) + LENGTH(PLUGIN_RAM);
+
     /* Special trick to avoid a linker error when no other sections are
        left after garbage collection (plugin not for this platform) */
     .comment 0 :
diff --git a/apps/plugins/plugin_crt0.c b/apps/plugins/plugin_crt0.c
index 0265b1af58..a9270c4fa0 100644
--- a/apps/plugins/plugin_crt0.c
+++ b/apps/plugins/plugin_crt0.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2010 by Thomas Martitz
 *
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index db414059d3..8f28dc2b9e 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # single-file plugins:
@@ -183,7 +182,7 @@ $(BUILDDIR)/apps/plugins/%.lua: $(ROOTDIR)/apps/plugins/%.lua
 	$(call PRINTS,CP $(subst $(ROOTDIR)/,,$<))cp $< $(BUILDDIR)/apps/plugins/
 
 $(BUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(OVERLAYREF_LDS) $(PLUGIN_LIBS) $(PLUGIN_CRT0)
-	$(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o /dev/null \
+	$(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(basename $@).refelf \
 		$(filter %.o, $^) \
 		$(filter %.a, $+) \
 		-lgcc $(OVERLAYLDFLAGS)
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index c9addff347..e7c5e5671c 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 Daniel Stenberg
  *
diff --git a/apps/plugins/properties.c b/apps/plugins/properties.c
index f61f8bcabb..0368247fa3 100644
--- a/apps/plugins/properties.c
+++ b/apps/plugins/properties.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Peter D'Hoye
  *
@@ -34,6 +33,9 @@ enum props_types {
     PROPS_DIR
 };
 
+#ifdef HAVE_TAGCACHE
+static struct tagcache_search tcs;
+#endif
 static struct gui_synclist properties_lists;
 static struct mp3entry id3;
 static struct tm tm;
@@ -307,7 +309,8 @@ static bool assemble_track_info(const char *filename, struct dir_stats *stats)
         return false;
 #ifdef HAVE_TAGCACHE
     else if (props_type == PROPS_MUL_ID3 &&
-             !rb->tagtree_subentries_do_action(&mul_id3_add))
+             !rb->tagtree_entries_iterate(&tcs, &mul_id3_add, str_filename,
+                                                       sizeof str_filename))
         return false;
 #endif
 
diff --git a/apps/plugins/puzzles/puzzles.make b/apps/plugins/puzzles/puzzles.make
index 4c3322d32e..9cec633daa 100644
--- a/apps/plugins/puzzles/puzzles.make
+++ b/apps/plugins/puzzles/puzzles.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 PUZZLES_SRCDIR = $(APPSDIR)/plugins/puzzles
diff --git a/apps/plugins/puzzles/rbcompat.h b/apps/plugins/puzzles/rbcompat.h
index c438a6e110..2b146e72d1 100644
--- a/apps/plugins/puzzles/rbcompat.h
+++ b/apps/plugins/puzzles/rbcompat.h
@@ -65,6 +65,7 @@ double acos_wrapper(double x);
 #define strcmp rb->strcmp
 #define strcpy rb->strcpy
 #define strlen rb->strlen
+#define strncpy rb->strncpy
 #define strtol rb->strtol
 #define strtoq strtoq_wrapper
 #define strtouq strtouq_wrapper
diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c
index 452f647954..5e47f03296 100644
--- a/apps/plugins/puzzles/rockbox.c
+++ b/apps/plugins/puzzles/rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016-2025 Franklin Wei
  *
diff --git a/apps/plugins/quake.c b/apps/plugins/quake.c
index bb2f807d7b..5a1b236604 100644
--- a/apps/plugins/quake.c
+++ b/apps/plugins/quake.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Franklin Wei
  *
diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c
index 7f932aabd8..a8c38ddc9e 100644
--- a/apps/plugins/random_folder_advance_config.c
+++ b/apps/plugins/random_folder_advance_config.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/plugins/rb_info.c b/apps/plugins/rb_info.c
index 31b06d6f75..42b9a92052 100644
--- a/apps/plugins/rb_info.c
+++ b/apps/plugins/rb_info.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   ( (__) )  \___|    ( | \_\ ( (__) )    (
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2020 William Wilgus
  *
diff --git a/apps/plugins/remote_control.c b/apps/plugins/remote_control.c
index a5ad4423a1..6000f0d6bd 100644
--- a/apps/plugins/remote_control.c
+++ b/apps/plugins/remote_control.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 Tomer Shalev
 *
diff --git a/apps/plugins/reversi/reversi-game.c b/apps/plugins/reversi/reversi-game.c
index e555faf23e..3975ee2ec6 100644
--- a/apps/plugins/reversi/reversi-game.c
+++ b/apps/plugins/reversi/reversi-game.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2006 Alexander Levin
  *
diff --git a/apps/plugins/reversi/reversi-game.h b/apps/plugins/reversi/reversi-game.h
index eac2f4ae3a..dc316e31a9 100644
--- a/apps/plugins/reversi/reversi-game.h
+++ b/apps/plugins/reversi/reversi-game.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2006 Alexander Levin
  *
diff --git a/apps/plugins/reversi/reversi-gui.c b/apps/plugins/reversi/reversi-gui.c
index eaf9794e40..098055b4cd 100644
--- a/apps/plugins/reversi/reversi-gui.c
+++ b/apps/plugins/reversi/reversi-gui.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2006 Alexander Levin
  *
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index 389d190169..b8883c7a50 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2006 Alexander Levin
  *
diff --git a/apps/plugins/reversi/reversi-strategy-naive.c b/apps/plugins/reversi/reversi-strategy-naive.c
index 37a25d10da..48798a03b1 100644
--- a/apps/plugins/reversi/reversi-strategy-naive.c
+++ b/apps/plugins/reversi/reversi-strategy-naive.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2007 Antoine Cellerier
  *
diff --git a/apps/plugins/reversi/reversi-strategy-simple.c b/apps/plugins/reversi/reversi-strategy-simple.c
index fdf34f505b..2a91b4165b 100644
--- a/apps/plugins/reversi/reversi-strategy-simple.c
+++ b/apps/plugins/reversi/reversi-strategy-simple.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2007 Antoine Cellerier
  *
diff --git a/apps/plugins/reversi/reversi-strategy.c b/apps/plugins/reversi/reversi-strategy.c
index 7b967289e9..229659773a 100644
--- a/apps/plugins/reversi/reversi-strategy.c
+++ b/apps/plugins/reversi/reversi-strategy.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2006 Alexander Levin
  *
diff --git a/apps/plugins/reversi/reversi-strategy.h b/apps/plugins/reversi/reversi-strategy.h
index 97f3c94127..e533de29ee 100644
--- a/apps/plugins/reversi/reversi-strategy.h
+++ b/apps/plugins/reversi/reversi-strategy.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2006 Alexander Levin
  *
diff --git a/apps/plugins/reversi/reversi.make b/apps/plugins/reversi/reversi.make
index 52a97fa1ba..0730c44ac8 100644
--- a/apps/plugins/reversi/reversi.make
+++ b/apps/plugins/reversi/reversi.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 REVERSISRCDIR := $(APPSDIR)/plugins/reversi
diff --git a/apps/plugins/robotfindskitten.c b/apps/plugins/robotfindskitten.c
index 5fcb88c589..0e6ef4b3d2 100644
--- a/apps/plugins/robotfindskitten.c
+++ b/apps/plugins/robotfindskitten.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * robotfindskitten: A Zen simulation
  *
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index a657dde2d7..306568b76a 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Eli Sherer
  *
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c
index 6d535bbcd7..c6a42c23c8 100644
--- a/apps/plugins/rockblox1d.c
+++ b/apps/plugins/rockblox1d.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   ( (__) )  \___|    ( | \_\ ( (__) )    (
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 - 2008 Alexander Papst
  * Idea from http://www.tetris1d.org
diff --git a/apps/plugins/rockboy.c b/apps/plugins/rockboy.c
index b4520733ae..f27c6af593 100644
--- a/apps/plugins/rockboy.c
+++ b/apps/plugins/rockboy.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Jens Arnold
  *
diff --git a/apps/plugins/rockboy/palette-presets.h b/apps/plugins/rockboy/palette-presets.h
index 2c4490710f..283671c80f 100644
--- a/apps/plugins/rockboy/palette-presets.h
+++ b/apps/plugins/rockboy/palette-presets.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index 3cb4ba6771..16889108b9 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Gameboy emulator based on gnuboy
  *
diff --git a/apps/plugins/rockboy/rockboy.make b/apps/plugins/rockboy/rockboy.make
index 190f1ac59f..6c43df1981 100644
--- a/apps/plugins/rockboy/rockboy.make
+++ b/apps/plugins/rockboy/rockboy.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 ROCKBOY_SRCDIR = $(APPSDIR)/plugins/rockboy
@@ -30,7 +29,7 @@ $(ROCKBOY_OBJDIR)/rockboy.refmap: $(ROCKBOY_OBJ)
 
 $(ROCKBOY_OUTLDS): $(PLUGIN_LDS) $(ROCKBOY_OBJDIR)/rockboy.refmap
 	$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DPLUGIN -DOVERLAY_OFFSET=$(shell \
-		$(TOOLSDIR)/ovl_offset.pl $(ROCKBOY_OBJDIR)/rockboy.refmap))
+		$(TOOLSDIR)/ovl_offset.pl $(ROCKBOY_OBJDIR)/rockboy.refelf))
 
 $(ROCKBOY_OBJDIR)/rockboy.ovl: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS)
 	$(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h
index 2d3baf1680..6b93654f1c 100644
--- a/apps/plugins/rockboy/rockmacros.h
+++ b/apps/plugins/rockboy/rockmacros.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Michiel van der Kolk, Jens Arnold
  *
diff --git a/apps/plugins/rockboy/sound.c b/apps/plugins/rockboy/sound.c
index e8b8c6924c..8c6a1d1ee8 100644
--- a/apps/plugins/rockboy/sound.c
+++ b/apps/plugins/rockboy/sound.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * The following code is rewrite of the C++ code provided in VisualBoyAdvance.
  * There are also portions of the original GNUboy code.
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c
index b74370b815..18ccf782ff 100644
--- a/apps/plugins/rockboy/sys_rockbox.c
+++ b/apps/plugins/rockboy/sys_rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Michiel van der Kolk, Jens Arnold
  *
diff --git a/apps/plugins/rocklife.c b/apps/plugins/rocklife.c
index c4c7842fe0..c293feb59c 100644
--- a/apps/plugins/rocklife.c
+++ b/apps/plugins/rocklife.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Matthias Wientapper
  *
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index 8c7d05c00d..6fdedb0736 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Antoine Cellerier <dionoea -at- videolan -dot- org>
  * Based on parts of rockpaint 0.45, Copyright (C) 2005 Eli Sherer
diff --git a/apps/plugins/sdl/SDL_mixer/effect_position.c b/apps/plugins/sdl/SDL_mixer/effect_position.c
index e0b467b12f..e58f5b6f1c 100644
--- a/apps/plugins/sdl/SDL_mixer/effect_position.c
+++ b/apps/plugins/sdl/SDL_mixer/effect_position.c
@@ -24,7 +24,6 @@
   effect callback API. They are meant for speed over quality.  :)
 */
 
-/* $Id$ */
 
 #include "SDL.h"
 #include "SDL_mixer.h"
diff --git a/apps/plugins/sdl/SDL_mixer/effect_stereoreverse.c b/apps/plugins/sdl/SDL_mixer/effect_stereoreverse.c
index 47a8bf67f1..d78aeecfa6 100644
--- a/apps/plugins/sdl/SDL_mixer/effect_stereoreverse.c
+++ b/apps/plugins/sdl/SDL_mixer/effect_stereoreverse.c
@@ -24,7 +24,6 @@
   effect callback API. They are meant for speed over quality.  :)
 */
 
-/* $Id$ */
 
 #include "SDL.h"
 #include "SDL_mixer.h"
diff --git a/apps/plugins/sdl/SDL_mixer/effects_internal.c b/apps/plugins/sdl/SDL_mixer/effects_internal.c
index 353a15b91e..6b6ea93838 100644
--- a/apps/plugins/sdl/SDL_mixer/effects_internal.c
+++ b/apps/plugins/sdl/SDL_mixer/effects_internal.c
@@ -23,7 +23,6 @@
   These are some helper functions for the internal mixer special effects.
 */
 
-/* $Id$ */
 
 
      /* ------ These are used internally only. Don't touch. ------ */
diff --git a/apps/plugins/sdl/SDL_mixer/effects_internal.h b/apps/plugins/sdl/SDL_mixer/effects_internal.h
index 12b4b3b2da..17dd88908d 100644
--- a/apps/plugins/sdl/SDL_mixer/effects_internal.h
+++ b/apps/plugins/sdl/SDL_mixer/effects_internal.h
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* $Id$ */
 
 #ifndef _INCLUDE_EFFECTS_INTERNAL_H_
 #define _INCLUDE_EFFECTS_INTERNAL_H_
diff --git a/apps/plugins/sdl/SDL_mixer/load_aiff.c b/apps/plugins/sdl/SDL_mixer/load_aiff.c
index e33726a6d6..cb40556dbc 100644
--- a/apps/plugins/sdl/SDL_mixer/load_aiff.c
+++ b/apps/plugins/sdl/SDL_mixer/load_aiff.c
@@ -28,7 +28,6 @@
   in december 2002.
 */
 
-/* $Id$ */
 
 #include "SDL_endian.h"
 #include "SDL_mixer.h"
diff --git a/apps/plugins/sdl/SDL_mixer/load_aiff.h b/apps/plugins/sdl/SDL_mixer/load_aiff.h
index 2d2c7a48ab..ff74bea7bd 100644
--- a/apps/plugins/sdl/SDL_mixer/load_aiff.h
+++ b/apps/plugins/sdl/SDL_mixer/load_aiff.h
@@ -24,7 +24,6 @@
     This file by Torbjörn Andersson (torbjorn.andersson@eurotime.se)
 */
 
-/* $Id$ */
 
 /* Don't call this directly; use Mix_LoadWAV_RW() for now. */
 SDL_AudioSpec *Mix_LoadAIFF_RW (SDL_RWops *src, int freesrc,
diff --git a/apps/plugins/sdl/SDL_mixer/load_flac.h b/apps/plugins/sdl/SDL_mixer/load_flac.h
index 63fcd4bcd0..131625464c 100644
--- a/apps/plugins/sdl/SDL_mixer/load_flac.h
+++ b/apps/plugins/sdl/SDL_mixer/load_flac.h
@@ -22,7 +22,6 @@
   	~ Austen Dicken (admin@cvpcs.org).
 */
 
-/* $Id: $ */
 
 #ifdef FLAC_MUSIC
 /* Don't call this directly; use Mix_LoadWAV_RW() for now. */
diff --git a/apps/plugins/sdl/SDL_mixer/load_ogg.c b/apps/plugins/sdl/SDL_mixer/load_ogg.c
index 829bbdbe8b..7346e43a7d 100644
--- a/apps/plugins/sdl/SDL_mixer/load_ogg.c
+++ b/apps/plugins/sdl/SDL_mixer/load_ogg.c
@@ -22,7 +22,6 @@
   This file by Vaclav Slavik (vaclav.slavik@matfyz.cz).
 */
 
-/* $Id$ */
 
 #ifdef OGG_MUSIC
 
diff --git a/apps/plugins/sdl/SDL_mixer/load_ogg.h b/apps/plugins/sdl/SDL_mixer/load_ogg.h
index e63b04f7b3..174b9af808 100644
--- a/apps/plugins/sdl/SDL_mixer/load_ogg.h
+++ b/apps/plugins/sdl/SDL_mixer/load_ogg.h
@@ -22,7 +22,6 @@
   This file by Vaclav Slavik (vaclav.slavik@matfyz.cz).
 */
 
-/* $Id$ */
 
 #ifdef OGG_MUSIC
 /* Don't call this directly; use Mix_LoadWAV_RW() for now. */
diff --git a/apps/plugins/sdl/SDL_mixer/load_voc.c b/apps/plugins/sdl/SDL_mixer/load_voc.c
index 2e7798e222..f1682ce51a 100644
--- a/apps/plugins/sdl/SDL_mixer/load_voc.c
+++ b/apps/plugins/sdl/SDL_mixer/load_voc.c
@@ -29,7 +29,6 @@
         (http://www.freshmeat.net/projects/sox/)
 */
 
-/* $Id$ */
 
 #include "SDL_mutex.h"
 #include "SDL_endian.h"
diff --git a/apps/plugins/sdl/SDL_mixer/load_voc.h b/apps/plugins/sdl/SDL_mixer/load_voc.h
index 20ae23ca40..6fc627111a 100644
--- a/apps/plugins/sdl/SDL_mixer/load_voc.h
+++ b/apps/plugins/sdl/SDL_mixer/load_voc.h
@@ -29,7 +29,6 @@
         (http://www.freshmeat.net/projects/sox/)
 */
 
-/* $Id$ */
 
 /* Don't call this directly; use Mix_LoadWAV_RW() for now. */
 SDL_AudioSpec *Mix_LoadVOC_RW (SDL_RWops *src, int freesrc,
diff --git a/apps/plugins/sdl/SDL_mixer/mixer.c b/apps/plugins/sdl/SDL_mixer/mixer.c
index 32c6c8449f..868852afa2 100644
--- a/apps/plugins/sdl/SDL_mixer/mixer.c
+++ b/apps/plugins/sdl/SDL_mixer/mixer.c
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* $Id$ */
 
 #include "SDL_mutex.h"
 #include "SDL_endian.h"
diff --git a/apps/plugins/sdl/SDL_mixer/music.c b/apps/plugins/sdl/SDL_mixer/music.c
index 075b89b0a3..15f19d22ed 100644
--- a/apps/plugins/sdl/SDL_mixer/music.c
+++ b/apps/plugins/sdl/SDL_mixer/music.c
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* $Id$ */
 
 #include <ctype.h>
 #include "SDL_endian.h"
diff --git a/apps/plugins/sdl/SDL_mixer/music_flac.h b/apps/plugins/sdl/SDL_mixer/music_flac.h
index c87dc9ea9f..d1e36e57c8 100644
--- a/apps/plugins/sdl/SDL_mixer/music_flac.h
+++ b/apps/plugins/sdl/SDL_mixer/music_flac.h
@@ -22,7 +22,6 @@
 	~ Austen Dicken (admin@cvpcs.org)
 */
 
-/* $Id:  $ */
 
 #ifdef FLAC_MUSIC
 
diff --git a/apps/plugins/sdl/SDL_mixer/music_mod.c b/apps/plugins/sdl/SDL_mixer/music_mod.c
index be17902266..d3774492d3 100644
--- a/apps/plugins/sdl/SDL_mixer/music_mod.c
+++ b/apps/plugins/sdl/SDL_mixer/music_mod.c
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* $Id: music_mod.c 4211 2008-12-08 00:27:32Z slouken $ */
 
 #ifdef MOD_MUSIC
 
diff --git a/apps/plugins/sdl/SDL_mixer/music_mod.h b/apps/plugins/sdl/SDL_mixer/music_mod.h
index 4328e2b2c7..dc95deb2dd 100644
--- a/apps/plugins/sdl/SDL_mixer/music_mod.h
+++ b/apps/plugins/sdl/SDL_mixer/music_mod.h
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* $Id: music_mod.h 4211 2008-12-08 00:27:32Z slouken $ */
 
 #ifdef MOD_MUSIC
 
diff --git a/apps/plugins/sdl/SDL_mixer/music_ogg.c b/apps/plugins/sdl/SDL_mixer/music_ogg.c
index de5f9c5421..b07a61f630 100644
--- a/apps/plugins/sdl/SDL_mixer/music_ogg.c
+++ b/apps/plugins/sdl/SDL_mixer/music_ogg.c
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* $Id$ */
 
 #ifdef OGG_MUSIC
 
diff --git a/apps/plugins/sdl/SDL_mixer/music_ogg.h b/apps/plugins/sdl/SDL_mixer/music_ogg.h
index 4d93a2bc62..5e59a4fb05 100644
--- a/apps/plugins/sdl/SDL_mixer/music_ogg.h
+++ b/apps/plugins/sdl/SDL_mixer/music_ogg.h
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* $Id$ */
 
 #ifdef OGG_MUSIC
 
diff --git a/apps/plugins/sdl/SDL_mixer/playmus.c b/apps/plugins/sdl/SDL_mixer/playmus.c
index 4f8bb612a1..91c2d46d11 100644
--- a/apps/plugins/sdl/SDL_mixer/playmus.c
+++ b/apps/plugins/sdl/SDL_mixer/playmus.c
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* $Id$ */
 
 #ifdef unix
 #include <unistd.h>
diff --git a/apps/plugins/sdl/SDL_mixer/playwave.c b/apps/plugins/sdl/SDL_mixer/playwave.c
index e53f1a93d5..d91a0b3328 100644
--- a/apps/plugins/sdl/SDL_mixer/playwave.c
+++ b/apps/plugins/sdl/SDL_mixer/playwave.c
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* $Id$ */
 
 #ifdef unix
 #include <unistd.h>
diff --git a/apps/plugins/sdl/SDL_mixer/timidity/tables.c b/apps/plugins/sdl/SDL_mixer/timidity/tables.c
index 3c2bfe2e78..ea4502a19f 100644
--- a/apps/plugins/sdl/SDL_mixer/timidity/tables.c
+++ b/apps/plugins/sdl/SDL_mixer/timidity/tables.c
@@ -914,7 +914,6 @@ uint8 _l2u_[] =
 uint8 *_l2u = _l2u_ + 4096;
 
 
-/*	$Id$   Greg Lee */
 int xmap[XMAPMAX][5] = {
 { SFXBANK, 0, 0, 120, 0 },
 { SFXBANK, 0, 1, 120, 1 },
diff --git a/apps/plugins/sdl/SDL_mixer/wavestream.c b/apps/plugins/sdl/SDL_mixer/wavestream.c
index 8dbb2a934a..db1cbe092b 100644
--- a/apps/plugins/sdl/SDL_mixer/wavestream.c
+++ b/apps/plugins/sdl/SDL_mixer/wavestream.c
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* $Id$ */
 
 /* This file supports streaming WAV files, without volume adjustment */
 
diff --git a/apps/plugins/sdl/SDL_mixer/wavestream.h b/apps/plugins/sdl/SDL_mixer/wavestream.h
index 9d119dc152..e56e9b60bf 100644
--- a/apps/plugins/sdl/SDL_mixer/wavestream.h
+++ b/apps/plugins/sdl/SDL_mixer/wavestream.h
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* $Id$ */
 
 /* This file supports streaming WAV files, without volume adjustment */
 
diff --git a/apps/plugins/sdl/include/SDL_config_rockbox.h b/apps/plugins/sdl/include/SDL_config_rockbox.h
index 5a88378b89..542aeb535c 100644
--- a/apps/plugins/sdl/include/SDL_config_rockbox.h
+++ b/apps/plugins/sdl/include/SDL_config_rockbox.h
@@ -169,6 +169,7 @@
 #define strncat rb->strlcat /* hack */
 #endif
 #define strncmp rb->strncmp
+#define strncpy rb->strncpy
 #ifndef strncat
 #define strpbrk strpbrk_wrapper
 #endif
diff --git a/apps/plugins/sdl/include/SDL_mixer.h b/apps/plugins/sdl/include/SDL_mixer.h
index 9c25ef6b13..ddc503308e 100644
--- a/apps/plugins/sdl/include/SDL_mixer.h
+++ b/apps/plugins/sdl/include/SDL_mixer.h
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* $Id$ */
 
 #ifndef _SDL_MIXER_H
 #define _SDL_MIXER_H
diff --git a/apps/plugins/sdl/progs/duke3d/Game/src/cvars.c b/apps/plugins/sdl/progs/duke3d/Game/src/cvars.c
index db9ede288b..71b761cee9 100644
--- a/apps/plugins/sdl/progs/duke3d/Game/src/cvars.c
+++ b/apps/plugins/sdl/progs/duke3d/Game/src/cvars.c
@@ -1,3 +1,4 @@
+#include "duke3d.h"
 #include "cvars.h"
 #include "cvar_defs.h"
 #include <stdlib.h>
diff --git a/apps/plugins/sdl/progs/quake/snd_mix_arm.S b/apps/plugins/sdl/progs/quake/snd_mix_arm.S
index 0573e85923..f7a9a924ba 100644
--- a/apps/plugins/sdl/progs/quake/snd_mix_arm.S
+++ b/apps/plugins/sdl/progs/quake/snd_mix_arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2019 Franklin Wei
  *
diff --git a/apps/plugins/sdl/sdl.make b/apps/plugins/sdl/sdl.make
index f04f727aa7..8b27c49341 100644
--- a/apps/plugins/sdl/sdl.make
+++ b/apps/plugins/sdl/sdl.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 SDL_SRCDIR := $(APPSDIR)/plugins/sdl
@@ -71,7 +70,7 @@ $(SDL_OBJDIR)/duke3d.refmap: $(SDL_OBJ) $(DUKE3D_OBJ) $(TLSFLIB)
 
 $(DUKE3D_OUTLDS): $(PLUGIN_LDS) $(SDL_OBJDIR)/duke3d.refmap
 	$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DPLUGIN -DOVERLAY_OFFSET=$(shell \
-		$(TOOLSDIR)/ovl_offset.pl $(SDL_OBJDIR)/duke3d.refmap))
+		$(TOOLSDIR)/ovl_offset.pl $(SDL_OBJDIR)/duke3d.refelf))
 
 $(SDL_OBJDIR)/duke3d.ovl: $(SDL_OBJ) $(DUKE3D_OBJ) $(TLSFLIB) $(DUKE3D_OUTLDS)
 	$(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
@@ -88,7 +87,7 @@ $(SDL_OBJDIR)/wolf3d.refmap: $(SDL_OBJ) $(WOLF3D_OBJ) $(TLSFLIB)
 
 $(WOLF3D_OUTLDS): $(PLUGIN_LDS) $(SDL_OBJDIR)/wolf3d.refmap
 	$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DPLUGIN -DOVERLAY_OFFSET=$(shell \
-		$(TOOLSDIR)/ovl_offset.pl $(SDL_OBJDIR)/wolf3d.refmap))
+		$(TOOLSDIR)/ovl_offset.pl $(SDL_OBJDIR)/wolf3d.refelf))
 
 $(SDL_OBJDIR)/wolf3d.ovl: $(SDL_OBJ) $(WOLF3D_OBJ) $(TLSFLIB) $(WOLF3D_OUTLDS)
 	$(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
@@ -106,7 +105,7 @@ $(SDL_OBJDIR)/quake.refmap: $(SDL_OBJ) $(QUAKE_OBJ) $(TLSFLIB)
 
 $(QUAKE_OUTLDS): $(PLUGIN_LDS) $(SDL_OBJDIR)/quake.refmap
 	$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DPLUGIN -DOVERLAY_OFFSET=$(shell \
-		$(TOOLSDIR)/ovl_offset.pl $(SDL_OBJDIR)/quake.refmap))
+		$(TOOLSDIR)/ovl_offset.pl $(SDL_OBJDIR)/quake.refelf))
 
 $(SDL_OBJDIR)/quake.ovl: $(SDL_OBJ) $(QUAKE_OBJ) $(TLSFLIB) $(QUAKE_OUTLDS)
 	$(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
diff --git a/apps/plugins/sdl/src/video/math_private.h b/apps/plugins/sdl/src/video/math_private.h
index 1087d7dea2..eb265de44f 100644
--- a/apps/plugins/sdl/src/video/math_private.h
+++ b/apps/plugins/sdl/src/video/math_private.h
@@ -11,7 +11,6 @@
 
 /*
  * from: @(#)fdlibm.h 5.1 93/09/24
- * $Id$
  */
 
 #ifndef _MATH_PRIVATE_H_
diff --git a/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h b/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h
index 2da5c0e69d..d480e43950 100644
--- a/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h
+++ b/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  *
diff --git a/apps/plugins/search.c b/apps/plugins/search.c
index f27d2045b1..9272e656c9 100644
--- a/apps/plugins/search.c
+++ b/apps/plugins/search.c
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Stefan Meyer
  *
diff --git a/apps/plugins/searchengine/dbinterface.c b/apps/plugins/searchengine/dbinterface.c
index 91df10fb04..812c060d82 100644
--- a/apps/plugins/searchengine/dbinterface.c
+++ b/apps/plugins/searchengine/dbinterface.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Michiel van der Kolk 
  *
diff --git a/apps/plugins/searchengine/dbinterface.h b/apps/plugins/searchengine/dbinterface.h
index e165aeff79..6dd8ef537a 100644
--- a/apps/plugins/searchengine/dbinterface.h
+++ b/apps/plugins/searchengine/dbinterface.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Michiel van der Kolk 
  *
diff --git a/apps/plugins/searchengine/parser.c b/apps/plugins/searchengine/parser.c
index 1a5f156649..7a83b7de85 100644
--- a/apps/plugins/searchengine/parser.c
+++ b/apps/plugins/searchengine/parser.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Michiel van der Kolk 
  *
diff --git a/apps/plugins/searchengine/parser.h b/apps/plugins/searchengine/parser.h
index 5f042fbc3e..3aa34a9e0d 100644
--- a/apps/plugins/searchengine/parser.h
+++ b/apps/plugins/searchengine/parser.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Michiel van der Kolk 
  *
diff --git a/apps/plugins/searchengine/searchengine.c b/apps/plugins/searchengine/searchengine.c
index 4e8bc452f1..60e4f0e093 100644
--- a/apps/plugins/searchengine/searchengine.c
+++ b/apps/plugins/searchengine/searchengine.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Michiel van der Kolk 
  *
diff --git a/apps/plugins/searchengine/searchengine.h b/apps/plugins/searchengine/searchengine.h
index 00bedd816b..71c9880222 100644
--- a/apps/plugins/searchengine/searchengine.h
+++ b/apps/plugins/searchengine/searchengine.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Michiel van der Kolk 
  *
diff --git a/apps/plugins/searchengine/token.c b/apps/plugins/searchengine/token.c
index 89f238c2d6..f613aa95c4 100644
--- a/apps/plugins/searchengine/token.c
+++ b/apps/plugins/searchengine/token.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Michiel van der Kolk 
  *
diff --git a/apps/plugins/searchengine/token.h b/apps/plugins/searchengine/token.h
index ffbed90c0a..9b8d01bb25 100644
--- a/apps/plugins/searchengine/token.h
+++ b/apps/plugins/searchengine/token.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Michiel van der Kolk 
  *
diff --git a/apps/plugins/settings_dumper.c b/apps/plugins/settings_dumper.c
index 3394fc8c80..d5ad70076e 100644
--- a/apps/plugins/settings_dumper.c
+++ b/apps/plugins/settings_dumper.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/plugins/shopper.c b/apps/plugins/shopper.c
index 25a484a31e..1837d1ad13 100644
--- a/apps/plugins/shopper.c
+++ b/apps/plugins/shopper.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Daniel Rigby
  *
diff --git a/apps/plugins/shortcuts/shortcuts.h b/apps/plugins/shortcuts/shortcuts.h
index 3d6c421c5a..bb2b67f250 100644
--- a/apps/plugins/shortcuts/shortcuts.h
+++ b/apps/plugins/shortcuts/shortcuts.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Bryan Childs
  * Copyright (c) 2007 Alexander Levin
diff --git a/apps/plugins/shortcuts/shortcuts.make b/apps/plugins/shortcuts/shortcuts.make
index c91c992dd9..dc778365c2 100644
--- a/apps/plugins/shortcuts/shortcuts.make
+++ b/apps/plugins/shortcuts/shortcuts.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 SHCUTSRCDIR := $(APPSDIR)/plugins/shortcuts
diff --git a/apps/plugins/shortcuts/shortcuts_append.c b/apps/plugins/shortcuts/shortcuts_append.c
index 0c4534a6b9..397997c66c 100644
--- a/apps/plugins/shortcuts/shortcuts_append.c
+++ b/apps/plugins/shortcuts/shortcuts_append.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Bryan Childs
  * Copyright (c) 2007 Alexander Levin
diff --git a/apps/plugins/shortcuts/shortcuts_common.c b/apps/plugins/shortcuts/shortcuts_common.c
index fe4f07798b..c4e0cc57f5 100644
--- a/apps/plugins/shortcuts/shortcuts_common.c
+++ b/apps/plugins/shortcuts/shortcuts_common.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Bryan Childs
  * Copyright (c) 2007 Alexander Levin
diff --git a/apps/plugins/shortcuts/shortcuts_view.c b/apps/plugins/shortcuts/shortcuts_view.c
index fadf111c6d..35c2ff48fd 100644
--- a/apps/plugins/shortcuts/shortcuts_view.c
+++ b/apps/plugins/shortcuts/shortcuts_view.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Bryan Childs
  * Copyright (c) 2007 Alexander Levin
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index 63121edba1..d3c223e2ec 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Vicentini Martin
  *
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c
index 4055087159..a2213cf0b5 100644
--- a/apps/plugins/snake.c
+++ b/apps/plugins/snake.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Itai Shaked
  *
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index d8a97f159f..9a269b48be 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Mat Holton
  *
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c
index c7d7ad31d8..34408f7ccf 100644
--- a/apps/plugins/snow.c
+++ b/apps/plugins/snow.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Itai Shaked
  *
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 7b6e79f70b..ae5ccf1574 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Eric Linenberg
  * February 2003: Robert Hak performs a cleanup/rewrite/feature addition.
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 6205c186ca..215412164a 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004-2007 Antoine Cellerier <dionoea @t videolan d.t org>
  *
diff --git a/apps/plugins/sort.c b/apps/plugins/sort.c
index 2bcbf4ae6b..ca1f5f8ce0 100644
--- a/apps/plugins/sort.c
+++ b/apps/plugins/sort.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Linus Nielsen Feltzing
  *
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index 38ee7504ac..1555c2d4ad 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Mat Holton
  *
diff --git a/apps/plugins/speedread.c b/apps/plugins/speedread.c
index 0284b27358..9c6a50cbdd 100644
--- a/apps/plugins/speedread.c
+++ b/apps/plugins/speedread.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Franklin Wei
  *
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index 856a2af51a..14c4d671e2 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Frederic Dang Ngoc
  *
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c
index 8a511bea42..2a0fc83b70 100644
--- a/apps/plugins/stats.c
+++ b/apps/plugins/stats.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Jonas Haggqvist
  *
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index edfc37c8b7..c0a6b2dc01 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 Mike Holden
  *
diff --git a/apps/plugins/stopwatch.lua b/apps/plugins/stopwatch.lua
index 34a3c57d72..d2975054a0 100644
--- a/apps/plugins/stopwatch.lua
+++ b/apps/plugins/stopwatch.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
 
  Port of Stopwatch to Lua for touchscreen targets.
  Original copyright: Copyright (C) 2004 Mike Holden
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c
index 1b3f41b317..3f192e9f0c 100644
--- a/apps/plugins/sudoku/sudoku.c
+++ b/apps/plugins/sudoku/sudoku.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index 8df6fcb870..fe2bf6c592 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/apps/plugins/sudoku/sudoku.make b/apps/plugins/sudoku/sudoku.make
index 11bf7690de..0120bd4045 100644
--- a/apps/plugins/sudoku/sudoku.make
+++ b/apps/plugins/sudoku/sudoku.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 SUDOKUSRCDIR := $(APPSDIR)/plugins/sudoku
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c
index 55966ea5b7..03d6c039eb 100644
--- a/apps/plugins/superdom.c
+++ b/apps/plugins/superdom.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Will Robertson
  *
diff --git a/apps/plugins/tagcache/tagcache.c b/apps/plugins/tagcache/tagcache.c
index c5ee21e870..58d263da7b 100644
--- a/apps/plugins/tagcache/tagcache.c
+++ b/apps/plugins/tagcache/tagcache.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2023 by William Wilgus
  *
diff --git a/apps/plugins/tagcache/tagcache.h b/apps/plugins/tagcache/tagcache.h
index e416289741..e96bc973ea 100644
--- a/apps/plugins/tagcache/tagcache.h
+++ b/apps/plugins/tagcache/tagcache.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C)
  *
diff --git a/apps/plugins/tagcache/tagcache.make b/apps/plugins/tagcache/tagcache.make
index 5d6d65cb0e..eda6845504 100644
--- a/apps/plugins/tagcache/tagcache.make
+++ b/apps/plugins/tagcache/tagcache.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 TCPLUG_SRCDIR := $(APPSDIR)/plugins/tagcache
diff --git a/apps/plugins/test_boost.c b/apps/plugins/test_boost.c
index bb9d943edf..3e4907c5af 100644
--- a/apps/plugins/test_boost.c
+++ b/apps/plugins/test_boost.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 Björn Stenberg
 *
diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c
index 95dcb687cb..ba5b264372 100644
--- a/apps/plugins/test_codec.c
+++ b/apps/plugins/test_codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/apps/plugins/test_core_jpeg.c b/apps/plugins/test_core_jpeg.c
index 76dbac847e..5e68cf8eed 100644
--- a/apps/plugins/test_core_jpeg.c
+++ b/apps/plugins/test_core_jpeg.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   ( (__) )  \___|    ( | \_\ ( (__) )    (
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Andrew Mahone
  *
diff --git a/apps/plugins/test_disk.c b/apps/plugins/test_disk.c
index 6be18caa81..d53f641b85 100644
--- a/apps/plugins/test_disk.c
+++ b/apps/plugins/test_disk.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jens Arnold
  *
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c
index 65072cb8b9..e47360df25 100644
--- a/apps/plugins/test_fps.c
+++ b/apps/plugins/test_fps.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Peter D'Hoye
  *
diff --git a/apps/plugins/test_gfx.c b/apps/plugins/test_gfx.c
index 60e2836463..a4a1811a18 100644
--- a/apps/plugins/test_gfx.c
+++ b/apps/plugins/test_gfx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Jens Arnold
  *
diff --git a/apps/plugins/test_grey.c b/apps/plugins/test_grey.c
index 07fda1b9c6..abf4f328c6 100644
--- a/apps/plugins/test_grey.c
+++ b/apps/plugins/test_grey.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Jens Arnold
  *
diff --git a/apps/plugins/test_greylib_bitmap_scale.c b/apps/plugins/test_greylib_bitmap_scale.c
index 6362aa766e..c0198ca402 100644
--- a/apps/plugins/test_greylib_bitmap_scale.c
+++ b/apps/plugins/test_greylib_bitmap_scale.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   ( (__) )  \___|    ( | \_\ ( (__) )    (
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Andrew Mahone
  *
diff --git a/apps/plugins/test_kbd.c b/apps/plugins/test_kbd.c
index a40aa4c76a..34dd6b4720 100644
--- a/apps/plugins/test_kbd.c
+++ b/apps/plugins/test_kbd.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/plugins/test_mem.c b/apps/plugins/test_mem.c
index e7eb08608f..2b421a98e9 100644
--- a/apps/plugins/test_mem.c
+++ b/apps/plugins/test_mem.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2010 Thomas Martitz, Andree Buschmann
 *
diff --git a/apps/plugins/test_mem_jpeg.c b/apps/plugins/test_mem_jpeg.c
index 72f613135a..855bf71677 100644
--- a/apps/plugins/test_mem_jpeg.c
+++ b/apps/plugins/test_mem_jpeg.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   ( (__) )  \___|    ( | \_\ ( (__) )    (
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Andrew Mahone
  *
diff --git a/apps/plugins/test_resize.c b/apps/plugins/test_resize.c
index 443067c7e1..b09281e371 100644
--- a/apps/plugins/test_resize.c
+++ b/apps/plugins/test_resize.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonas Hurrelmann
  *
diff --git a/apps/plugins/test_sampr.c b/apps/plugins/test_sampr.c
index e3a0b0c420..3943afa043 100644
--- a/apps/plugins/test_sampr.c
+++ b/apps/plugins/test_sampr.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Michael Sevakis
  *
diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c
index 52d3c267e6..8bd1dc2ba2 100644
--- a/apps/plugins/test_scanrate.c
+++ b/apps/plugins/test_scanrate.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2006 Jens Arnold
 *
diff --git a/apps/plugins/test_touchscreen.c b/apps/plugins/test_touchscreen.c
index 97e1544c5e..af130c4016 100644
--- a/apps/plugins/test_touchscreen.c
+++ b/apps/plugins/test_touchscreen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Rob Purchase
  *
diff --git a/apps/plugins/test_usb.c b/apps/plugins/test_usb.c
index 11c058757a..c9f9b2d807 100644
--- a/apps/plugins/test_usb.c
+++ b/apps/plugins/test_usb.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/apps/plugins/test_viewports.c b/apps/plugins/test_viewports.c
index 6eff0249a2..6c31b97fe1 100644
--- a/apps/plugins/test_viewports.c
+++ b/apps/plugins/test_viewports.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/apps/plugins/test_viewports.lua b/apps/plugins/test_viewports.lua
index b9963ccf16..4de826842b 100644
--- a/apps/plugins/test_viewports.lua
+++ b/apps/plugins/test_viewports.lua
@@ -5,7 +5,6 @@
    Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
    Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
                      \/            \/     \/    \/            \/
- $Id$
 
  Port of test_viewports.c to Lua
 
diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c
index 60ddb23466..2fcdb90b9a 100644
--- a/apps/plugins/text_editor.c
+++ b/apps/plugins/text_editor.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
@@ -204,14 +203,16 @@ static bool save_changes(int overwrite)
     }
 
     rb->lcd_clear_display();
-    cpuboost(1);
 
-    for (i=0;i<line_count;i++)
+    cpuboost(1);
+    for (i=0;i<line_count - 1;i++)
     {
         rb->fdprintf(fd,"%s%s", do_action(ACTION_GET, 0, i), eol);
     }
-
+    if (line_count > 0)  /* No EOL for last item */
+        rb->fdprintf(fd,"%s", do_action(ACTION_GET, 0, line_count - 1));
     cpuboost(0);
+
     rb->close(fd);
 
     if (newfile || !overwrite)
@@ -522,6 +523,7 @@ enum plugin_status plugin_start(const void* parameter)
             case ACTION_STD_MENU:
 #endif
             {
+                rb->gui_synclist_scroll_stop(&lists);
                 /* do the item menu */
                 switch (do_item_menu(cur_sel))
                 {
@@ -540,6 +542,7 @@ enum plugin_status plugin_start(const void* parameter)
             case ACTION_STD_CANCEL:
                 if (changed)
                 {
+                    rb->gui_synclist_scroll_stop(&lists);
                     MENUITEM_STRINGLIST(menu, "Text Editor", NULL,
                                         "Return",
                                         "Playback Control", "Save Changes",
diff --git a/apps/plugins/text_viewer/text_viewer.c b/apps/plugins/text_viewer/text_viewer.c
index 91c3ae9237..34d7f91d75 100644
--- a/apps/plugins/text_viewer/text_viewer.c
+++ b/apps/plugins/text_viewer/text_viewer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/text_viewer.make b/apps/plugins/text_viewer/text_viewer.make
index 8cb2963faf..61e7bf6015 100644
--- a/apps/plugins/text_viewer/text_viewer.make
+++ b/apps/plugins/text_viewer/text_viewer.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 TEXT_VIEWER_SRCDIR := $(APPSDIR)/plugins/text_viewer
diff --git a/apps/plugins/text_viewer/tv_action.c b/apps/plugins/text_viewer/tv_action.c
index b10a650013..adbc48262e 100644
--- a/apps/plugins/text_viewer/tv_action.c
+++ b/apps/plugins/text_viewer/tv_action.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_action.h b/apps/plugins/text_viewer/tv_action.h
index 5b3571db30..1cd98dbd3f 100644
--- a/apps/plugins/text_viewer/tv_action.h
+++ b/apps/plugins/text_viewer/tv_action.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_bookmark.c b/apps/plugins/text_viewer/tv_bookmark.c
index 1ae75d69b5..f6f44084bc 100644
--- a/apps/plugins/text_viewer/tv_bookmark.c
+++ b/apps/plugins/text_viewer/tv_bookmark.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_bookmark.h b/apps/plugins/text_viewer/tv_bookmark.h
index 85b52b2c4f..4388682389 100644
--- a/apps/plugins/text_viewer/tv_bookmark.h
+++ b/apps/plugins/text_viewer/tv_bookmark.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h
index a7a38221d0..03256fe3fd 100644
--- a/apps/plugins/text_viewer/tv_button.h
+++ b/apps/plugins/text_viewer/tv_button.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_display.c b/apps/plugins/text_viewer/tv_display.c
index 62e811cbb0..543a1f7e62 100644
--- a/apps/plugins/text_viewer/tv_display.c
+++ b/apps/plugins/text_viewer/tv_display.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/apps/plugins/text_viewer/tv_display.h b/apps/plugins/text_viewer/tv_display.h
index 448957837c..34dc038dc2 100644
--- a/apps/plugins/text_viewer/tv_display.h
+++ b/apps/plugins/text_viewer/tv_display.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/apps/plugins/text_viewer/tv_menu.c b/apps/plugins/text_viewer/tv_menu.c
index 572f9263f0..3c0c572692 100644
--- a/apps/plugins/text_viewer/tv_menu.c
+++ b/apps/plugins/text_viewer/tv_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_menu.h b/apps/plugins/text_viewer/tv_menu.h
index 42da8b09cf..620a87128b 100644
--- a/apps/plugins/text_viewer/tv_menu.h
+++ b/apps/plugins/text_viewer/tv_menu.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_pager.c b/apps/plugins/text_viewer/tv_pager.c
index 628d67f959..1948b241a9 100644
--- a/apps/plugins/text_viewer/tv_pager.c
+++ b/apps/plugins/text_viewer/tv_pager.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
@@ -318,7 +317,7 @@ void tv_move_screen(int page_offset, int line_offset, int whence)
     cur_pos.line = new_pos.line;
     if (cur_pos.line >= lines_per_page)
         cur_pos.line = lines_per_page - 1;
-    else if (cur_pos.line < 0)
+    if (cur_pos.line < 0)
     {
         cur_pos.line += lines_per_page;
         if (cur_pos.line < 0)
diff --git a/apps/plugins/text_viewer/tv_pager.h b/apps/plugins/text_viewer/tv_pager.h
index 27795a1637..f7559a0abb 100644
--- a/apps/plugins/text_viewer/tv_pager.h
+++ b/apps/plugins/text_viewer/tv_pager.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_preferences.c b/apps/plugins/text_viewer/tv_preferences.c
index fdfe068068..e77feea328 100644
--- a/apps/plugins/text_viewer/tv_preferences.c
+++ b/apps/plugins/text_viewer/tv_preferences.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_preferences.h b/apps/plugins/text_viewer/tv_preferences.h
index 4f36dc1fb6..4bfc1b0fd0 100644
--- a/apps/plugins/text_viewer/tv_preferences.h
+++ b/apps/plugins/text_viewer/tv_preferences.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_reader.c b/apps/plugins/text_viewer/tv_reader.c
index d9c6a9c246..d4f9040609 100644
--- a/apps/plugins/text_viewer/tv_reader.c
+++ b/apps/plugins/text_viewer/tv_reader.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_reader.h b/apps/plugins/text_viewer/tv_reader.h
index 0b079edddb..d8016b43f5 100644
--- a/apps/plugins/text_viewer/tv_reader.h
+++ b/apps/plugins/text_viewer/tv_reader.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_screen_pos.c b/apps/plugins/text_viewer/tv_screen_pos.c
index 001bd478de..bc79f08518 100644
--- a/apps/plugins/text_viewer/tv_screen_pos.c
+++ b/apps/plugins/text_viewer/tv_screen_pos.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_screen_pos.h b/apps/plugins/text_viewer/tv_screen_pos.h
index 3ee8c10d89..10e3875b67 100644
--- a/apps/plugins/text_viewer/tv_screen_pos.h
+++ b/apps/plugins/text_viewer/tv_screen_pos.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_settings.c b/apps/plugins/text_viewer/tv_settings.c
index 3cb1f21a58..4430537354 100644
--- a/apps/plugins/text_viewer/tv_settings.c
+++ b/apps/plugins/text_viewer/tv_settings.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_settings.h b/apps/plugins/text_viewer/tv_settings.h
index afcf532cd0..357481f3f4 100644
--- a/apps/plugins/text_viewer/tv_settings.h
+++ b/apps/plugins/text_viewer/tv_settings.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_text_processor.c b/apps/plugins/text_viewer/tv_text_processor.c
index 8bc8519780..68e8829f80 100644
--- a/apps/plugins/text_viewer/tv_text_processor.c
+++ b/apps/plugins/text_viewer/tv_text_processor.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
@@ -362,7 +361,7 @@ static int tv_parse_text(const unsigned char *src, ucschar_t *ucs,
     int line_end_chars   = 0;
     int width = 0;
     bool is_space = false;
-
+    bool is_align_right = (preferences->alignment == AL_RIGHT);
     while (true) {
         cur = next;
         if (cur >= end_ptr)
@@ -410,7 +409,7 @@ static int tv_parse_text(const unsigned char *src, ucschar_t *ucs,
             }
 
             /* when the alignment is RIGHT, ignores indent spaces. */
-            if (preferences->alignment == AL_RIGHT && is_indent)
+            if (is_align_right && is_indent)
                 continue;
         }
         else
@@ -427,8 +426,17 @@ static int tv_parse_text(const unsigned char *src, ucschar_t *ucs,
             width -= gw;
             if (is_space)
             {
-                line_end_ptr   = cur;
-                line_end_chars = chars;
+                /*Bugfix if not align right leave the space on this line */
+                if (is_align_right)
+                {
+                    line_end_ptr   = cur;
+                    line_end_chars = chars;
+                }
+                else
+                {
+                    line_end_ptr   = next;
+                    line_end_chars = ++chars;
+                }
             }
             is_break_line = true;
             break;
diff --git a/apps/plugins/text_viewer/tv_text_processor.h b/apps/plugins/text_viewer/tv_text_processor.h
index 33e6a021f9..4766ccac92 100644
--- a/apps/plugins/text_viewer/tv_text_processor.h
+++ b/apps/plugins/text_viewer/tv_text_processor.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_text_reader.c b/apps/plugins/text_viewer/tv_text_reader.c
index ec1c138df0..3841894909 100644
--- a/apps/plugins/text_viewer/tv_text_reader.c
+++ b/apps/plugins/text_viewer/tv_text_reader.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_text_reader.h b/apps/plugins/text_viewer/tv_text_reader.h
index 5162892f4b..1a7209a3c3 100644
--- a/apps/plugins/text_viewer/tv_text_reader.h
+++ b/apps/plugins/text_viewer/tv_text_reader.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/text_viewer/tv_window.c b/apps/plugins/text_viewer/tv_window.c
index cbef2e0ef7..98be7a7fa0 100644
--- a/apps/plugins/text_viewer/tv_window.c
+++ b/apps/plugins/text_viewer/tv_window.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
@@ -57,7 +56,7 @@ static void tv_draw_bookmarks(const struct tv_screen_pos *top_pos)
 void tv_update_sbs_title(void)
 {
     if (tv_set_sbs_title())
-        rb->send_event(GUI_EVENT_ACTIONUPDATE, (void*)1);
+        rb->send_event(GUI_EVENT_ACTIONREDRAW, (void*)1);
 }
 
 void tv_draw_window(void)
diff --git a/apps/plugins/text_viewer/tv_window.h b/apps/plugins/text_viewer/tv_window.h
index 80f1d6f1ed..c0523553b4 100644
--- a/apps/plugins/text_viewer/tv_window.h
+++ b/apps/plugins/text_viewer/tv_window.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Gilles Roux
  *               2003 Garrett Derner
diff --git a/apps/plugins/theme_remove.c b/apps/plugins/theme_remove.c
index 6f5353f3f6..a110c2b29d 100644
--- a/apps/plugins/theme_remove.c
+++ b/apps/plugins/theme_remove.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/apps/plugins/vbrfix.c b/apps/plugins/vbrfix.c
index 4f12183aed..9bd553cae4 100644
--- a/apps/plugins/vbrfix.c
+++ b/apps/plugins/vbrfix.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 Linus Nielsen Feltzing
  *
diff --git a/apps/plugins/view_text.c b/apps/plugins/view_text.c
index 0e3c99f79d..8c5b2f4ed1 100644
--- a/apps/plugins/view_text.c
+++ b/apps/plugins/view_text.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/plugins/wav2wv.c b/apps/plugins/wav2wv.c
index b7e9727230..5a84d6d262 100644
--- a/apps/plugins/wav2wv.c
+++ b/apps/plugins/wav2wv.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 David Bryant
  *
diff --git a/apps/plugins/wavview.c b/apps/plugins/wavview.c
index 82e75e0427..d16001234e 100644
--- a/apps/plugins/wavview.c
+++ b/apps/plugins/wavview.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Peter D'Hoye
  *
@@ -112,7 +111,7 @@ static int readwavpeaks(const char *filename)
     int hours;
     int minutes;
     int seconds;
-    uint32_t peakcount = 0;
+//    uint32_t peakcount = 0;
     struct peakstruct* peak = NULL;
 
     if(rb->strcasecmp (filename + rb->strlen (filename) - 3, "wav"))
@@ -207,7 +206,7 @@ static int readwavpeaks(const char *filename)
         sampleval = letoh16(*(sampleshort+1));
         peak->rmin = sampleval;
         peak->rmax = sampleval;
-    
+
         while(bytes_read)
         {
             sampleval = letoh16(*sampleshort++);
@@ -223,7 +222,7 @@ static int readwavpeaks(const char *filename)
                 peak->rmax = sampleval;
 
             bytes_read -= 4;
-            peakcount++;
+//            peakcount++;
             fppmp_count--;
             if(!fppmp_count)
             {
diff --git a/apps/plugins/windows_lnk.c b/apps/plugins/windows_lnk.c
index 93a423fefa..ee30b46db4 100644
--- a/apps/plugins/windows_lnk.c
+++ b/apps/plugins/windows_lnk.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Sebastian Leonhardt
  *
diff --git a/apps/plugins/wolf3d.c b/apps/plugins/wolf3d.c
index 2e08ff628d..91f5d68eed 100644
--- a/apps/plugins/wolf3d.c
+++ b/apps/plugins/wolf3d.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Franklin Wei
  *
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index c02234d500..5c30c7eb72 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Philipp Pertermann
  *
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index f82cde1c32..84f8fe8698 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Eli Sherer
  *               2007 Antoine Cellerier
diff --git a/apps/plugins/xrick/config.h b/apps/plugins/xrick/config.h
index 31ecc79bb7..643cc4a98f 100644
--- a/apps/plugins/xrick/config.h
+++ b/apps/plugins/xrick/config.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/system/main_rockbox.c b/apps/plugins/xrick/system/main_rockbox.c
index e273e1dc8d..d4229ae728 100644
--- a/apps/plugins/xrick/system/main_rockbox.c
+++ b/apps/plugins/xrick/system/main_rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/system/rockboxcodes.h b/apps/plugins/xrick/system/rockboxcodes.h
index ca56c338b6..48f0531c3b 100644
--- a/apps/plugins/xrick/system/rockboxcodes.h
+++ b/apps/plugins/xrick/system/rockboxcodes.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/system/sysarg_rockbox.c b/apps/plugins/xrick/system/sysarg_rockbox.c
index fa502ff4b0..a9b99a69e7 100644
--- a/apps/plugins/xrick/system/sysarg_rockbox.c
+++ b/apps/plugins/xrick/system/sysarg_rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/system/sysevt_rockbox.c b/apps/plugins/xrick/system/sysevt_rockbox.c
index f5314712e8..8fbfea1ce5 100644
--- a/apps/plugins/xrick/system/sysevt_rockbox.c
+++ b/apps/plugins/xrick/system/sysevt_rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/system/sysfile_rockbox.c b/apps/plugins/xrick/system/sysfile_rockbox.c
index 06227caec1..a35f8c1a44 100644
--- a/apps/plugins/xrick/system/sysfile_rockbox.c
+++ b/apps/plugins/xrick/system/sysfile_rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/system/sysmem_rockbox.c b/apps/plugins/xrick/system/sysmem_rockbox.c
index 06a683a463..b1cda50e8a 100644
--- a/apps/plugins/xrick/system/sysmem_rockbox.c
+++ b/apps/plugins/xrick/system/sysmem_rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/system/sysmenu_rockbox.c b/apps/plugins/xrick/system/sysmenu_rockbox.c
index feada4a4bb..b13fcce9a4 100644
--- a/apps/plugins/xrick/system/sysmenu_rockbox.c
+++ b/apps/plugins/xrick/system/sysmenu_rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/system/sysmenu_rockbox.h b/apps/plugins/xrick/system/sysmenu_rockbox.h
index fcd13606fa..fb0152b479 100644
--- a/apps/plugins/xrick/system/sysmenu_rockbox.h
+++ b/apps/plugins/xrick/system/sysmenu_rockbox.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/system/syssnd_rockbox.c b/apps/plugins/xrick/system/syssnd_rockbox.c
index 63cddbd10f..c3fd6fb92e 100644
--- a/apps/plugins/xrick/system/syssnd_rockbox.c
+++ b/apps/plugins/xrick/system/syssnd_rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/system/syssnd_rockbox.h b/apps/plugins/xrick/system/syssnd_rockbox.h
index 41bd7d8454..4d2c9b04fa 100644
--- a/apps/plugins/xrick/system/syssnd_rockbox.h
+++ b/apps/plugins/xrick/system/syssnd_rockbox.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/system/system_rockbox.c b/apps/plugins/xrick/system/system_rockbox.c
index 3b5f96a4ed..2a740db594 100644
--- a/apps/plugins/xrick/system/system_rockbox.c
+++ b/apps/plugins/xrick/system/system_rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/system/sysvid_rockbox.c b/apps/plugins/xrick/system/sysvid_rockbox.c
index e93522f6c9..86bdb49a81 100644
--- a/apps/plugins/xrick/system/sysvid_rockbox.c
+++ b/apps/plugins/xrick/system/sysvid_rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Port of xrick, a Rick Dangerous clone, to Rockbox.
  * See http://www.bigorno.net/xrick/
diff --git a/apps/plugins/xrick/xrick.make b/apps/plugins/xrick/xrick.make
index 57a84cf0e2..09b81b5197 100644
--- a/apps/plugins/xrick/xrick.make
+++ b/apps/plugins/xrick/xrick.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 XRICKSRCDIR := $(APPSDIR)/plugins/xrick
diff --git a/apps/plugins/xworld/awendian.h b/apps/plugins/xworld/awendian.h
index 863b19bb47..dd31214e89 100644
--- a/apps/plugins/xworld/awendian.h
+++ b/apps/plugins/xworld/awendian.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  *
diff --git a/apps/plugins/xworld/bank.c b/apps/plugins/xworld/bank.c
index e2cfbd4680..e535f2f6e3 100644
--- a/apps/plugins/xworld/bank.c
+++ b/apps/plugins/xworld/bank.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/bank.h b/apps/plugins/xworld/bank.h
index 6f280c5271..7f49eb4f64 100644
--- a/apps/plugins/xworld/bank.h
+++ b/apps/plugins/xworld/bank.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/engine.c b/apps/plugins/xworld/engine.c
index d99d9df6c6..80544d2c70 100644
--- a/apps/plugins/xworld/engine.c
+++ b/apps/plugins/xworld/engine.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
@@ -306,6 +305,8 @@ void engine_processInput(struct Engine* e) {
     }
 }
 
+#undef strncpy
+
 void engine_makeGameStateName(struct Engine* e, uint8_t slot, char *buf, int sz) {
     (void) e;
     rb->snprintf(buf, sz, "xworld_save.s%02d", slot);
@@ -325,7 +326,7 @@ void engine_saveGameState(struct Engine* e, uint8_t slot, const char *desc) {
         file_writeUint16BE(&f, CUR_VER);
         file_writeUint16BE(&f, 0);
         char hdrdesc[32];
-        strncpy(hdrdesc, desc, sizeof(hdrdesc) - 1);
+        rb->strncpy(hdrdesc, desc, sizeof(hdrdesc) - 1);
         file_write(&f, hdrdesc, sizeof(hdrdesc));
         /* contents */
         struct Serializer s;
diff --git a/apps/plugins/xworld/engine.h b/apps/plugins/xworld/engine.h
index a0ad2b469e..a52586a24a 100644
--- a/apps/plugins/xworld/engine.h
+++ b/apps/plugins/xworld/engine.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/file.c b/apps/plugins/xworld/file.c
index 8353544ef5..cb6a242eaa 100644
--- a/apps/plugins/xworld/file.c
+++ b/apps/plugins/xworld/file.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/file.h b/apps/plugins/xworld/file.h
index b24cdaf19e..15e3a50bb4 100644
--- a/apps/plugins/xworld/file.h
+++ b/apps/plugins/xworld/file.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/intern.h b/apps/plugins/xworld/intern.h
index 90b640858d..cd6b6dfc46 100644
--- a/apps/plugins/xworld/intern.h
+++ b/apps/plugins/xworld/intern.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/mixer.c b/apps/plugins/xworld/mixer.c
index 6035045239..5fd6345d57 100644
--- a/apps/plugins/xworld/mixer.c
+++ b/apps/plugins/xworld/mixer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/mixer.h b/apps/plugins/xworld/mixer.h
index 9447bcfb81..709ae8be00 100644
--- a/apps/plugins/xworld/mixer.h
+++ b/apps/plugins/xworld/mixer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/parts.c b/apps/plugins/xworld/parts.c
index 12b0b3b7b6..709f5f6221 100644
--- a/apps/plugins/xworld/parts.c
+++ b/apps/plugins/xworld/parts.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/parts.h b/apps/plugins/xworld/parts.h
index 684306cc6d..f0767bd114 100644
--- a/apps/plugins/xworld/parts.h
+++ b/apps/plugins/xworld/parts.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/resource.c b/apps/plugins/xworld/resource.c
index 29b875f9af..4f67106c26 100644
--- a/apps/plugins/xworld/resource.c
+++ b/apps/plugins/xworld/resource.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
@@ -84,7 +83,9 @@ void res_readEntries(struct Resource* res) {
     File f;
     file_create(&f, false);
 
+#ifdef XWORLD_DEBUG
     int resourceCounter = 0;
+#endif
 
     if (!file_open(&f, "memlist.bin", res->_dataDir, "rb")) {
         error("Could not open 'MEMLIST.BIN', data files missing");
@@ -140,7 +141,9 @@ void res_readEntries(struct Resource* res) {
               memEntry->size,
               memEntry->size ? (memEntry->size - memEntry->packedSize) / (float)memEntry->size * 100.0f : 0.0f);
 
+#ifdef XWORLD_DEBUG
         resourceCounter++;
+#endif
 
         res->_numMemList++;
         memEntry++;
diff --git a/apps/plugins/xworld/resource.h b/apps/plugins/xworld/resource.h
index 3242777bc2..ecb7134e78 100644
--- a/apps/plugins/xworld/resource.h
+++ b/apps/plugins/xworld/resource.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/serializer.c b/apps/plugins/xworld/serializer.c
index 5268c2784c..c92fc223fb 100644
--- a/apps/plugins/xworld/serializer.c
+++ b/apps/plugins/xworld/serializer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/serializer.h b/apps/plugins/xworld/serializer.h
index fde8f6d076..df03b87624 100644
--- a/apps/plugins/xworld/serializer.h
+++ b/apps/plugins/xworld/serializer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/sfxplayer.c b/apps/plugins/xworld/sfxplayer.c
index 9bdc143d02..324de3b086 100644
--- a/apps/plugins/xworld/sfxplayer.c
+++ b/apps/plugins/xworld/sfxplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/sfxplayer.h b/apps/plugins/xworld/sfxplayer.h
index 0bf92b93d0..635dd44ad4 100644
--- a/apps/plugins/xworld/sfxplayer.h
+++ b/apps/plugins/xworld/sfxplayer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/sys.c b/apps/plugins/xworld/sys.c
index f51d7e3357..30801adb4a 100644
--- a/apps/plugins/xworld/sys.c
+++ b/apps/plugins/xworld/sys.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  *
diff --git a/apps/plugins/xworld/sys.h b/apps/plugins/xworld/sys.h
index 4b1ec9b13a..84721455ce 100644
--- a/apps/plugins/xworld/sys.h
+++ b/apps/plugins/xworld/sys.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/util.c b/apps/plugins/xworld/util.c
index b82691ad29..d7893c9474 100644
--- a/apps/plugins/xworld/util.c
+++ b/apps/plugins/xworld/util.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/util.h b/apps/plugins/xworld/util.h
index bacb149da9..f130adfe28 100644
--- a/apps/plugins/xworld/util.h
+++ b/apps/plugins/xworld/util.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/video.c b/apps/plugins/xworld/video.c
index b4182df7a7..a353b5b342 100644
--- a/apps/plugins/xworld/video.c
+++ b/apps/plugins/xworld/video.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/video.h b/apps/plugins/xworld/video.h
index d4ff64f5b5..cf355d0bce 100644
--- a/apps/plugins/xworld/video.h
+++ b/apps/plugins/xworld/video.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/video_data.c b/apps/plugins/xworld/video_data.c
index afed9e06ea..30791aeb19 100644
--- a/apps/plugins/xworld/video_data.c
+++ b/apps/plugins/xworld/video_data.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/video_data.h b/apps/plugins/xworld/video_data.h
index cd53205744..27a70f7b90 100644
--- a/apps/plugins/xworld/video_data.h
+++ b/apps/plugins/xworld/video_data.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei
  *
diff --git a/apps/plugins/xworld/vm.c b/apps/plugins/xworld/vm.c
index 10c3957ad7..b06fc1191e 100644
--- a/apps/plugins/xworld/vm.c
+++ b/apps/plugins/xworld/vm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/vm.h b/apps/plugins/xworld/vm.h
index 1409dd47e3..79ac22eca4 100644
--- a/apps/plugins/xworld/vm.h
+++ b/apps/plugins/xworld/vm.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/xworld.c b/apps/plugins/xworld/xworld.c
index 5ba97e8096..c6a7dfde73 100644
--- a/apps/plugins/xworld/xworld.c
+++ b/apps/plugins/xworld/xworld.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Franklin Wei, Benjamin Brown
  * Copyright (C) 2004 Gregory Montoir
diff --git a/apps/plugins/xworld/xworld.make b/apps/plugins/xworld/xworld.make
index 7d6966842b..4572b3cb93 100644
--- a/apps/plugins/xworld/xworld.make
+++ b/apps/plugins/xworld/xworld.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 XWORLDSRCDIR := $(APPSDIR)/plugins/xworld
diff --git a/apps/plugins/zxbox/zxbox.c b/apps/plugins/zxbox/zxbox.c
index 0291c22ce5..ee24e9bb16 100644
--- a/apps/plugins/zxbox/zxbox.c
+++ b/apps/plugins/zxbox/zxbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2006 Anton Romanov
  *
diff --git a/apps/plugins/zxbox/zxbox.make b/apps/plugins/zxbox/zxbox.make
index 53c7232405..6b09e85204 100644
--- a/apps/plugins/zxbox/zxbox.make
+++ b/apps/plugins/zxbox/zxbox.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 ZXBOX_SRCDIR = $(APPSDIR)/plugins/zxbox
@@ -38,7 +37,7 @@ $(ZXBOX_OBJDIR)/zxbox.refmap: $(ZXBOX_OBJ)
 
 $(ZXBOX_OUTLDS): $(PLUGIN_LDS) $(ZXBOX_OBJDIR)/zxbox.refmap
 	$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DPLUGIN -DOVERLAY_OFFSET=$(shell \
-		$(TOOLSDIR)/ovl_offset.pl $(ZXBOX_OBJDIR)/zxbox.refmap))
+		$(TOOLSDIR)/ovl_offset.pl $(ZXBOX_OBJDIR)/zxbox.refelf))
 
 $(ZXBOX_OBJDIR)/zxbox.ovl: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS)
 	$(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
diff --git a/apps/radio/presets.c b/apps/radio/presets.c
index 9ac4b75ee3..0c80031fe3 100644
--- a/apps/radio/presets.c
+++ b/apps/radio/presets.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Linus Nielsen Feltzing
  *
@@ -43,6 +42,7 @@
 #include "filetree.h"
 #include "dir.h"
 #include "presets.h"
+#include "core_alloc.h"
 
 static int curr_preset = -1;
 
@@ -53,16 +53,41 @@ void remember_frequency(void);
 #define MAX_PRESETS 64
 static bool presets_loaded = false;
 static bool presets_changed = false;
+static int preset_handle = 0;
+static int num_presets = 0; /* The number of presets in the preset list */
 
-static struct fmstation
+struct fmstation
 {
     int frequency; /* In Hz */
     char name[MAX_FMPRESET_LEN+1];
-} presets[MAX_PRESETS];
+};
+struct fmstation_buf /* Allocd on first use of presets */
+{
+    struct fmstation fmstation[MAX_PRESETS];
+    char filepreset[MAX_PATH];
+};
 
-static char filepreset[MAX_PATH]; /* preset filename variable */
 
-static int num_presets = 0; /* The number of presets in the preset list */
+static struct fmstation_buf *presets_get(void)
+{
+    if (preset_handle <= 0)
+    {
+        preset_handle = core_alloc(sizeof(struct fmstation_buf));
+    }
+    if (preset_handle > 0)
+    {
+        return core_get_data_pinned(preset_handle);
+    }
+    return NULL;
+}
+
+static void presets_put(struct fmstation_buf *presets)
+{
+    if (presets != NULL)
+    {
+        core_put_data_pinned(presets);
+    }
+}
 
 int radio_current_preset(void)
 {
@@ -82,16 +107,24 @@ bool presets_have_changed(void)
 /* Find a matching preset to freq */
 int preset_find(int freq)
 {
+    int ret = -1;
     int i;
     if(num_presets < 1)
         return -1;
-    for(i = 0;i < MAX_PRESETS;i++)
+    struct fmstation_buf *presets = presets_get();
+    if (presets != NULL)
     {
-        if(freq == presets[i].frequency)
-            return i;
+        for(i = 0;i < MAX_PRESETS;i++)
+        {
+            if(freq == presets->fmstation[i].frequency)
+            {
+                ret = i;
+                break;
+            }
+        }
+        presets_put(presets);
     }
-
-    return -1;
+    return ret;
 }
 
 /* Return the closest preset encountered in the search direction with
@@ -106,41 +139,47 @@ static int find_closest_preset(int freq, int direction)
     if (direction == 0) /* direction == 0 isn't really used */
         return 0;
 
-    for (i = 0; i < num_presets; i++)
+    struct fmstation_buf *presets = presets_get();
+    if (presets != NULL)
     {
-        int f = presets[i].frequency;
-        if (f == freq)
-            return i; /* Exact match = stop */
-
-        /* remember the highest and lowest presets for wraparound */
-        if (f < presets[lowpreset].frequency)
-            lowpreset = i;
-        if (f > presets[highpreset].frequency)
-            highpreset = i;
-
-        /* find the closest preset in the given direction */
-        if (direction > 0 && f > freq)
+        for (i = 0; i < num_presets; i++)
         {
-            if (closest < 0 || f < presets[closest].frequency)
-                closest = i;
+            int f = presets->fmstation[i].frequency;
+            if (f == freq)
+            {
+                closest = i; /* Exact match = stop */
+                break;
+            }
+            /* remember the highest and lowest presets for wraparound */
+            if (f < presets->fmstation[lowpreset].frequency)
+                lowpreset = i;
+            if (f > presets->fmstation[highpreset].frequency)
+                highpreset = i;
+
+            /* find the closest preset in the given direction */
+            if (direction > 0 && f > freq)
+            {
+                if (closest < 0 || f < presets->fmstation[closest].frequency)
+                    closest = i;
+            }
+            else if (direction < 0 && f < freq)
+            {
+                if (closest < 0 || f > presets->fmstation[closest].frequency)
+                    closest = i;
+            }
         }
-        else if (direction < 0 && f < freq)
+
+        if (closest < 0)
         {
-            if (closest < 0 || f > presets[closest].frequency)
-                closest = i;
+            /* no presets in the given direction */
+            /* wrap around depending on direction */
+            if (direction < 0)
+                closest = highpreset;
+            else
+                closest = lowpreset;
         }
+        presets_put(presets);
     }
-
-    if (closest < 0)
-    {
-        /* no presets in the given direction */
-        /* wrap around depending on direction */
-        if (direction < 0)
-            closest = highpreset;
-        else
-            closest = lowpreset;
-    }
-
     return closest;
 }
 
@@ -149,18 +188,23 @@ void preset_next(int direction)
     if (num_presets < 1)
         return;
 
-    int curr_freq = radio_get_current_frequency();
+    struct fmstation_buf *presets = presets_get();
+    if (presets != NULL)
+    {
+        int curr_freq = radio_get_current_frequency();
 
-    if (curr_preset == -1)
-        curr_preset = find_closest_preset(curr_freq, direction);
-    else
-        curr_preset = (curr_preset + direction + num_presets) % num_presets;
+        if (curr_preset == -1)
+            curr_preset = find_closest_preset(curr_freq, direction);
+        else
+            curr_preset = (curr_preset + direction + num_presets) % num_presets;
 
-    /* Must stay on the current grid for the region */
-    curr_freq = snap_freq_to_grid(presets[curr_preset].frequency);
-    radio_set_current_frequency(curr_freq);
-    tuner_set(RADIO_FREQUENCY, curr_freq);
-    remember_frequency();
+        /* Must stay on the current grid for the region */
+        curr_freq = snap_freq_to_grid(presets->fmstation[curr_preset].frequency);
+        radio_set_current_frequency(curr_freq);
+        tuner_set(RADIO_FREQUENCY, curr_freq);
+        remember_frequency();
+        presets_put(presets);
+    }
 }
 
 void preset_set_current(int preset)
@@ -175,10 +219,15 @@ void preset_talk(int preset, bool fallback, bool enqueue)
         talk_number(preset + 1, enqueue);
     else
     { /* spell */
-        if(presets[preset].name[0])
-            talk_spell(presets[preset].name, enqueue);
-        else if(fallback)
-            talk_value_decimal(presets[preset].frequency, UNIT_INT, 6, enqueue);
+        struct fmstation_buf *presets = presets_get();
+        if (presets != NULL)
+        {
+            if(presets->fmstation[preset].name[0])
+                talk_spell(presets->fmstation[preset].name, enqueue);
+            else if(fallback)
+                talk_value_decimal(presets->fmstation[preset].frequency, UNIT_INT, 6, enqueue);
+            presets_put(presets);
+        }
     }
 }
 
@@ -187,22 +236,28 @@ void radio_save_presets(void)
     int fd;
     int i;
 
-    fd = creat(filepreset, 0666);
-    if(fd >= 0)
+    struct fmstation_buf *presets = presets_get();
+    if (presets != NULL)
     {
-        for(i = 0;i < num_presets;i++)
+        char *filepreset = presets->filepreset;
+        fd = creat(filepreset, 0666);
+        if(fd >= 0)
         {
-            fdprintf(fd, "%d:%s\n", presets[i].frequency, presets[i].name);
-        }
-        close(fd);
+            for(i = 0;i < num_presets;i++)
+            {
+                fdprintf(fd, "%d:%s\n", presets->fmstation[i].frequency, presets->fmstation[i].name);
+            }
+            close(fd);
 
-        if (strcasestr(filepreset, FMPRESET_PATH))
-            set_file(filepreset, global_settings.fmr_file);
-        presets_changed = false;
-    }
-    else
-    {
-        splash(HZ, ID2P(LANG_FM_PRESET_SAVE_FAILED));
+            if (strcasestr(filepreset, FMPRESET_PATH))
+                set_file(filepreset, global_settings.fmr_file);
+            presets_changed = false;
+        }
+        else
+        {
+            splash(HZ, ID2P(LANG_FM_PRESET_SAVE_FAILED));
+        }
+        presets_put(presets);
     }
 }
 
@@ -216,13 +271,20 @@ void radio_load_presets(const char *filename)
     bool done = false;
     int f;
 
-    memset(presets, 0, sizeof(presets));
     num_presets = 0;
+    struct fmstation_buf *presets = presets_get();
+    if (presets == NULL)
+        return;
+
+    memset(presets->fmstation, 0, sizeof(presets->fmstation));
+
+    char *filepreset = presets->filepreset;
 
     /* No Preset in configuration. */
     if(filename[0] == '\0' || filename[0] == '-')
     {
         filepreset[0] = '\0';
+        presets_put(presets);
         return;
     }
 
@@ -230,12 +292,12 @@ void radio_load_presets(const char *filename)
 
     if(filename[0] != '/') /* Preset within radio screen */
     {
-        snprintf(filepreset, sizeof(filepreset), "%s/%s.fmr",
+        snprintf(filepreset, MAX_PATH, "%s/%s.fmr",
                                          FMPRESET_PATH, filename);;
     }
     else
     {
-        strmemccpy(filepreset, filename, sizeof(filepreset));
+        strmemccpy(filepreset, filename, MAX_PATH);
     }
 
     /* Preset inside the default folder? */
@@ -256,7 +318,7 @@ void radio_load_presets(const char *filename)
                     f = atoi(freq);
                     if(f) /* For backwards compatibility */
                     {
-                        struct fmstation * const fms = &presets[num_presets];
+                        struct fmstation * const fms = &presets->fmstation[num_presets];
                         fms->frequency = f;
                         strmemccpy(fms->name, name, MAX_FMPRESET_LEN+1);
                         num_presets++;
@@ -273,46 +335,53 @@ void radio_load_presets(const char *filename)
 
     presets_loaded = num_presets > 0;
     presets_changed = false;
+    presets_put(presets);
 }
 
 int radio_get_preset_freq(int preset)
 {
-    if (preset < num_presets)
-        return presets[preset].frequency;
-    return -1;
-}
+    int freq = -1;
+    struct fmstation_buf *presets = presets_get();
+    if (presets != NULL)
+    {
+        if (preset < num_presets)
+            freq = presets->fmstation[preset].frequency;
 
-const char* radio_get_preset_name(int preset)
-{
-    if (preset < num_presets)
-        return presets[preset].name;
-    return NULL;
+        presets_put(presets);
+    }
+    return freq;
 }
 
 int handle_radio_add_preset(void)
 {
+    int ret = 0;
     char buf[MAX_FMPRESET_LEN + 1];
 
-    if(num_presets < MAX_PRESETS)
+    if(preset_handle > 0 && num_presets < MAX_PRESETS)
     {
-        buf[0] = '\0';
-
-        if (!kbd_input(buf, MAX_FMPRESET_LEN + 1, NULL))
+        struct fmstation_buf *presets = presets_get();
+        if (presets != NULL)
         {
-            struct fmstation * const fms = &presets[num_presets];
-            strcpy(fms->name, buf);
-            fms->frequency = radio_get_current_frequency();
-            num_presets++;
-            presets_changed = true;
-            presets_loaded = num_presets > 0;
-            return true;
+            buf[0] = '\0';
+            if (!kbd_input(buf, sizeof(buf), NULL))
+            {
+                struct fmstation * const fms = &presets->fmstation[num_presets];
+                strcpy(fms->name, buf);
+                fms->frequency = radio_get_current_frequency();
+                num_presets++;
+                presets_changed = true;
+                presets_loaded = num_presets > 0;
+                ret = 1;
+            }
+            presets_put(presets);
         }
     }
     else
     {
         splash(HZ, ID2P(LANG_FM_NO_FREE_PRESETS));
     }
-    return false;
+
+    return ret;
 }
 
 /* needed to know which preset we are edit/delete-ing */
@@ -323,14 +392,19 @@ static int radio_edit_preset(void)
 
     if (num_presets > 0)
     {
-        struct fmstation * const fms = &presets[selected_preset];
-
-        strcpy(buf, fms->name);
-
-        if (!kbd_input(buf, MAX_FMPRESET_LEN + 1, NULL))
+        struct fmstation_buf *presets = presets_get();
+        if (presets != NULL)
         {
-            strcpy(fms->name, buf);
-            presets_changed = true;
+            struct fmstation * const fms = &presets->fmstation[selected_preset];
+
+            strcpy(buf, fms->name);
+
+            if (!kbd_input(buf, MAX_FMPRESET_LEN + 1, NULL))
+            {
+                strcpy(fms->name, buf);
+                presets_changed = true;
+            }
+            presets_put(presets);
         }
     }
 
@@ -341,16 +415,21 @@ static int radio_delete_preset(void)
 {
     if (num_presets > 0)
     {
-        struct fmstation * const fms = &presets[selected_preset];
+        struct fmstation_buf *presets = presets_get();
+        if (presets != NULL)
+        {
+            struct fmstation * const fms = &presets->fmstation[selected_preset];
 
-        if (selected_preset >= --num_presets)
-            selected_preset = num_presets - 1;
+            if (selected_preset >= --num_presets)
+                selected_preset = num_presets - 1;
 
-        memmove(fms, fms + 1, (uintptr_t)(fms + num_presets) -
-                              (uintptr_t)fms);
+            memmove(fms, fms + 1, (uintptr_t)(fms + num_presets) -
+                                  (uintptr_t)fms);
 
-        if (curr_preset >= num_presets)
-            --curr_preset;
+            if (curr_preset >= num_presets)
+                --curr_preset;
+            presets_put(presets);
+        }
     }
 
      /* Don't ask to save when all presets are deleted. */
@@ -392,12 +471,15 @@ int preset_list_save(void)
         if(!dir_exists(FMPRESET_PATH)) /* Check if there is preset folder */
             mkdir(FMPRESET_PATH);
 
+        struct fmstation_buf *p = presets_get();
+        char *filepreset = p->filepreset;
+
         create_numbered_filename(filepreset, FMPRESET_PATH, "preset",
                                  ".fmr", 2 IF_CNFN_NUM_(, NULL));
 
         while(bad_file_name)
         {
-            if(!kbd_input(filepreset, sizeof(filepreset), NULL))
+            if(!kbd_input(filepreset, MAX_PATH, NULL))
             {
                 /* check the name: max MAX_FILENAME (20) chars */
                 char* p2;
@@ -426,30 +508,37 @@ int preset_list_save(void)
             else
             {
                 /* user aborted */
-                return false;
+                break;
             }
         }
+        presets_put(p);
     }
     else
         splash(HZ, ID2P(LANG_FM_NO_PRESETS));
 
-    return true;
+    return 0;
 }
 
 int preset_list_clear(void)
 {
-    /* Clear all the preset entries */
-    memset(presets, 0, sizeof (presets));
+    if (preset_handle <= 0)
+        return 0;
+    struct fmstation_buf *presets = presets_get();
+    if (presets != NULL)
+    {
+        /* Clear all the preset entries */
+        memset(presets->fmstation, 0, sizeof(presets->fmstation));
 
-    num_presets = 0;
-    presets_loaded = false;
-    /* The preset list will be cleared switch to Scan Mode. */
-    radio_set_mode(RADIO_SCAN_MODE);
-    curr_preset = -1;
-    presets_changed = false; /* Don't ask to save when clearing the list. */
-    global_settings.fmr_file[0] = '-';
-
-    return true;
+        num_presets = 0;
+        presets_loaded = false;
+        /* The preset list will be cleared switch to Scan Mode. */
+        radio_set_mode(RADIO_SCAN_MODE);
+        curr_preset = -1;
+        presets_changed = false; /* Don't ask to save when clearing the list. */
+        global_settings.fmr_file[0] = '-';
+        presets_put(presets);
+    }
+    return 0;
 }
 
 MENUITEM_FUNCTION(radio_edit_preset_item, MENU_FUNC_CHECK_RETVAL,
@@ -475,15 +564,21 @@ MAKE_MENU(handle_radio_preset_menu, ID2P(LANG_PRESET),
 static const char* presets_get_name(int selected_item, void *data,
                                     char *buffer, size_t buffer_len)
 {
-    (void)data;
-    struct fmstation *p = &presets[selected_item];
+    struct fmstation * stations = (struct fmstation *) data;
+
+    struct fmstation *p = &stations[selected_item];
     if(p->name[0])
-        return p->name;
-    int freq = p->frequency / FREQ_DISP_DIVISOR;
-    int frac = freq % 100;
-    freq /= 100;
-    snprintf(buffer, buffer_len,
-             str(LANG_FM_DEFAULT_PRESET_NAME), freq, frac);
+    {
+        snprintf(buffer, buffer_len, "%s", p->name);
+    }
+    else
+    {
+        int freq = p->frequency / FREQ_DISP_DIVISOR;
+        int frac = freq % 100;
+        freq /= 100;
+        snprintf(buffer, buffer_len,
+                 str(LANG_FM_DEFAULT_PRESET_NAME), freq, frac);
+    }
     return buffer;
 }
 
@@ -494,6 +589,19 @@ static int presets_speak_name(int selected_item, void * data)
     return 0;
 }
 
+const char* radio_get_preset_name(int preset, char *buffer, size_t buffer_len)
+{
+    buffer[0] = '\0'; /* skin_tokens.c get_radio_token() doesn't check for success */
+    struct fmstation_buf *presets = presets_get();
+    if (presets != NULL)
+    {
+        presets_get_name(preset, presets->fmstation, buffer, buffer_len);
+        presets_put(presets);
+        return buffer;
+    }
+    return NULL;
+}
+
 int handle_radio_presets(void)
 {
     struct gui_synclist lists;
@@ -503,7 +611,11 @@ int handle_radio_presets(void)
     if(presets_loaded == false)
         return result;
 
-    gui_synclist_init(&lists, presets_get_name, NULL, false, 1, NULL);
+    struct fmstation_buf *presets = presets_get();
+    if (presets == NULL)
+        return result;
+
+    gui_synclist_init(&lists, presets_get_name, presets->fmstation, false, 1, NULL);
     gui_synclist_set_title(&lists, str(LANG_PRESET), NOICON);
     if(global_settings.talk_file)
         gui_synclist_set_voice_callback(&lists, presets_speak_name);
@@ -522,14 +634,14 @@ int handle_radio_presets(void)
                 {
                     gui_synclist_set_nb_items(&lists, num_presets);
                     gui_synclist_select_item(&lists, num_presets - 1);
-        }
+                }
                 break;
             case ACTION_STD_CANCEL:
                 result = 1;
                 break;
             case ACTION_STD_OK:
                 curr_preset = gui_synclist_get_sel_pos(&lists);
-                radio_set_current_frequency(presets[curr_preset].frequency);
+                radio_set_current_frequency(presets->fmstation[curr_preset].frequency);
                 next_station(0);
                 result = 1;
                 break;
@@ -545,6 +657,7 @@ int handle_radio_presets(void)
                     result = 2;
         }
     }
+    presets_put(presets);
     return result - 1;
 }
 
@@ -563,12 +676,26 @@ int presets_scan(void *viewports)
 
     if(do_scan)
     {
+        struct fmstation_buf *presets = presets_get();
+        if (presets == NULL)
+            return 1;
+        if(get_radio_status() == FMRADIO_OFF)
+        {
+            audio_stop();
+            /* turn on radio */
+            /* This should be done before touching audio settings */
+            while (!pcm_is_initialized())
+               sleep(0);
+
+            audio_set_input_source(AUDIO_SRC_FMRADIO, SRCF_FMRADIO_PLAYING);
+        }
+
         const struct fm_region_data * const fmr =
             &fm_region_data[global_settings.fm_region];
 
         curr_freq = fmr->freq_min;
         num_presets = 0;
-        memset(presets, 0, sizeof(presets));
+        memset(presets->fmstation, 0, sizeof(presets->fmstation));
 
         tuner_set(RADIO_MUTE, 1);
 
@@ -595,8 +722,8 @@ int presets_scan(void *viewports)
             if(tuner_set(RADIO_SCAN_FREQUENCY, curr_freq))
             {
                 /* add preset */
-                presets[num_presets].name[0] = '\0';
-                presets[num_presets].frequency = curr_freq;
+                presets->fmstation[num_presets].name[0] = '\0';
+                presets->fmstation[num_presets].frequency = curr_freq;
                 num_presets++;
             }
 
@@ -619,7 +746,7 @@ int presets_scan(void *viewports)
 
         if(num_presets > 0)
         {
-            radio_set_current_frequency(presets[0].frequency);
+            radio_set_current_frequency(presets->fmstation[0].frequency);
             radio_set_mode(RADIO_PRESET_MODE);
             presets_loaded = true;
             next_station(0);
@@ -630,17 +757,24 @@ int presets_scan(void *viewports)
             presets_loaded = false;
             next_station(1);
         }
+        presets_put(presets);
     }
-    return true;
+
+    return 1;
 }
 
 
 void presets_save(void)
 {
-    if(filepreset[0] == '\0')
-        preset_list_save();
-    else
-        radio_save_presets();
+    struct fmstation_buf *p = presets_get();
+    if (p != NULL)
+    {
+        if(p->filepreset[0] == '\0')
+            preset_list_save();
+        else
+            radio_save_presets();
+        presets_put(p);
+    }
 }
 
 #if 0 /* disabled in draw_progressbar() */
diff --git a/apps/radio/presets.h b/apps/radio/presets.h
index 7640bdfb15..927dcb3dc8 100644
--- a/apps/radio/presets.h
+++ b/apps/radio/presets.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Bertrik Sikken
  *
diff --git a/apps/radio/radio.c b/apps/radio/radio.c
index 73f1f2c4d8..a9b53971b2 100644
--- a/apps/radio/radio.c
+++ b/apps/radio/radio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Linus Nielsen Feltzing
  *
diff --git a/apps/radio/radio.h b/apps/radio/radio.h
index 6de69af0e2..283edfb8dd 100644
--- a/apps/radio/radio.h
+++ b/apps/radio/radio.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Linus Nielsen Feltzing
  *
@@ -61,7 +60,7 @@ void toggle_mono_mode(bool mono);
 #define MAX_FMPRESET_LEN 27
 
 int radio_get_preset_freq(int preset);
-const char* radio_get_preset_name(int preset);
+const char* radio_get_preset_name(int preset, char *buffer, size_t buffer_len);
 #if 0 /* disabled in draw_progressbar() */
 void presets_draw_markers(struct screen *screen, int x, int y, int w, int h);
 #endif
diff --git a/apps/radio/radio_skin.c b/apps/radio/radio_skin.c
index 987524ad13..f0c11791fb 100644
--- a/apps/radio/radio_skin.c
+++ b/apps/radio/radio_skin.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *
diff --git a/apps/radio/radioart.c b/apps/radio/radioart.c
index 9eaec0aead..d750d69d60 100644
--- a/apps/radio/radioart.c
+++ b/apps/radio/radioart.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *
@@ -112,37 +111,40 @@ int radio_get_art_hid(struct dim *requested_dim)
     if (!buf || (radio_get_mode() == RADIO_SCAN_MODE) || preset < 0)
         return -1;
 
-    preset_name = radio_get_preset_name(preset);
-    for (int i=0; i<MAX_RADIOART_IMAGES; i++)
+    char buffer[MAX_FMPRESET_LEN + 1];
+    preset_name = radio_get_preset_name(preset, buffer, sizeof(buffer));
+    if (preset_name != NULL)
     {
-        if (radioart[i].handle < 0)
+        for (int i=0; i<MAX_RADIOART_IMAGES; i++)
         {
-            free_idx = i;
+            if (radioart[i].handle < 0)
+            {
+                free_idx = i;
+            }
+            else if (!strcmp(radioart[i].name, preset_name) &&
+                     radioart[i].dim.width == requested_dim->width &&
+                     radioart[i].dim.height == requested_dim->height)
+            {
+                radioart[i].last_tick = current_tick;
+                return radioart[i].handle;
+            }
         }
-        else if (!strcmp(radioart[i].name, preset_name) &&
-                 radioart[i].dim.width == requested_dim->width &&
-                 radioart[i].dim.height == requested_dim->height)
+        if (free_idx >= 0)
         {
-            radioart[i].last_tick = current_tick;
-            return radioart[i].handle;
-        }
-    }
-    if (free_idx >= 0)
-    {
-        return load_radioart_image(&radioart[free_idx], 
-                                   preset_name, requested_dim);
-    }
-    else
-    {
-        int i = find_oldest_image_index();
-        if (i != -1)
-        {
-            bufclose(radioart[i].handle);
-            return load_radioart_image(&radioart[i],
+            return load_radioart_image(&radioart[free_idx], 
                                        preset_name, requested_dim);
         }
+        else
+        {
+            int i = find_oldest_image_index();
+            if (i != -1)
+            {
+                bufclose(radioart[i].handle);
+                return load_radioart_image(&radioart[i],
+                                           preset_name, requested_dim);
+            }
+        }
     }
-        
     return -1;
 }
 
diff --git a/apps/rbcodec_helpers.c b/apps/rbcodec_helpers.c
index 197c0d4595..d9704d4457 100644
--- a/apps/rbcodec_helpers.c
+++ b/apps/rbcodec_helpers.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Nicolas Pitre <nico@cam.org>
  * Copyright (C) 2006-2007 by Stéphane Doyon <s.doyon@videotron.ca>
diff --git a/apps/recorder/albumart.c b/apps/recorder/albumart.c
index 50794c06c8..78a6b8e594 100644
--- a/apps/recorder/albumart.c
+++ b/apps/recorder/albumart.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin
  *
@@ -56,9 +55,9 @@
  * The function return parameter is a pointer to the filename
  *   inside the given fullpath.
  */
-static char* strip_filename(char* buf, int buf_size, const char* fullpath)
+static const char* strip_filename(char* buf, int buf_size, const char* fullpath)
 {
-    char* sep;
+    const char* sep;
     int   len;
 
     if (!buf || buf_size <= 0 || !fullpath)
diff --git a/apps/recorder/albumart.h b/apps/recorder/albumart.h
index 0d663d3d92..caccc6ed43 100644
--- a/apps/recorder/albumart.h
+++ b/apps/recorder/albumart.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin
  *
diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c
index b11c41b424..71d55b31c4 100644
--- a/apps/recorder/bmp.c
+++ b/apps/recorder/bmp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/apps/recorder/bmp.h b/apps/recorder/bmp.h
index 610ec29f21..8f746e4678 100644
--- a/apps/recorder/bmp.h
+++ b/apps/recorder/bmp.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c
index de623d28b7..89d4d5432d 100644
--- a/apps/recorder/icons.c
+++ b/apps/recorder/icons.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Robert E. Hak
  *
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h
index 643b19b580..3e2c0a85d9 100644
--- a/apps/recorder/icons.h
+++ b/apps/recorder/icons.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Robert E. Hak
  *
diff --git a/apps/recorder/jpeg_common.h b/apps/recorder/jpeg_common.h
index de998f1ddd..fb152feb05 100644
--- a/apps/recorder/jpeg_common.h
+++ b/apps/recorder/jpeg_common.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * JPEG image viewer
 * Common structs and defines for plugin and core JPEG decoders
diff --git a/apps/recorder/jpeg_idct_arm.S b/apps/recorder/jpeg_idct_arm.S
index e706a17384..c403da5aeb 100644
--- a/apps/recorder/jpeg_idct_arm.S
+++ b/apps/recorder/jpeg_idct_arm.S
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * JPEG assembly IDCT
 *
@@ -225,7 +224,7 @@ jpeg_idct4v:
     ldmia sp!, { r4-r8, pc }
 #else /* ARMv6+ */
     stmdb  sp!, { r4-r10, lr }
-    ldrd   r2,  .Lpool4
+    ldrd   r2, r3, .Lpool4
     mov    r12, #1024
 1:
     ldr    r6,  [r0, #32]
@@ -371,7 +370,7 @@ jpeg_idct4h:
     ldmia sp!, { r4-r9, pc }
 #else /* ARMv6+ */
     stmdb sp!, { r4-r9, lr }
-    ldrd   r4,  .Lpool4
+    ldrd   r4, r5, .Lpool4
     mov    r9,  r4,  lsr #16
 1:
     ldmia  r0,  { r12, r14 }
@@ -853,7 +852,7 @@ jpeg_idct8v:
     bcc    1b
     ldmia  sp!, { r4-r11, pc }
 2:
-    ldrd   r8,  .Lpool8
+    ldrd   r8, r9, .Lpool8
     mov    r12, r4,  lsl #16
     add    r10, r5,  r7              /* r10 = d2 + d6 */
     add    r12, r12, #8192
@@ -873,7 +872,7 @@ jpeg_idct8v:
     sadd16 r8,  r3,  r6              /* z3, z4 */
     stmdb  sp,   { r10-r12, r14 }    /* tmp10 tmp13 tmp11 tmp12 */
     smuad  r5,  r9,  r8              /* r5  = z5 = (z3[o] + z4[o]) * 9633 */
-    ldrd   r10, .Lpool8+8
+    ldrd   r10, r11, .Lpool8+8
     sadd16 r7,  r4,  r6              /* r7  = (z1, z2) */
     smlatt r9,  r10, r8,  r5         /* r9  = z4 = z5 - z4 * 16069 */
     smlabb r8,  r10, r8,  r5         /* r8  = z3 = z5 - z3 * 3196 */
@@ -881,7 +880,7 @@ jpeg_idct8v:
     smlabb r12, r11, r7,  r8         /* r12 = z1 + z3 */
     smlatt r5,  r11, r7,  r9         /* r5  = z2 + z4 */
     smlatt r7,  r11, r7,  r8         /* r7  = z2 + z3 */
-    ldrd   r8,  .Lpool8+16
+    ldrd   r8, r9, .Lpool8+16
     smlabt r7,  r9,  r4,  r7         /* r7  = tmp2 */
     smlatb r14, r9,  r4,  r14        /* r14 = tmp3 */
     ldmdb  sp,  { r4, r9-r11 }       /* tmp10 tmp13 tmp11 tmp12 */
@@ -958,7 +957,7 @@ jpeg_idct8h:
     bcc    1b
     ldmia  sp!, { r4-r11, pc }
 2:
-    ldrd   r8,  .Lpool8
+    ldrd   r8, r9, .Lpool8
     sadd16 r10, r5,  r7              /* r10 = (d2 + d6, d3 + d7) */
     ssub16 r12, r4,  r6              /* r12 = (d0 - d4, d1 - d5) */
     sadd16 r11, r4,  r6              /* r11 = (d0 + d4, d1 + d5) */
@@ -977,7 +976,7 @@ jpeg_idct8h:
     add    r12, r7,  r12, lsl #13    /* r12 = tmp11 */
     stmdb  sp,   { r10-r12, r14 }    /* tmp10 tmp13 tmp11 tmp12 */
     smuad  r5,  r9,  r8              /* r5  = z5 = (z3[o] + z4[o]) * 9633 */
-    ldrd   r10, .Lpool8+8
+    ldrd   r10, r11, .Lpool8+8
     sadd16 r7,  r4,  r6              /* r7  = (z1, z2) */
     smlatt r9,  r10, r8,  r5         /* r9  = z4 = z5 - z4 * 16069 */
     smlabb r8,  r10, r8,  r5         /* r8  = z3 = z5 - z3 * 3196 */
@@ -985,7 +984,7 @@ jpeg_idct8h:
     smlabb r12, r11, r7,  r8         /* r12 = z1 + z3 */
     smlatt r5,  r11, r7,  r9         /* r5  = z2 + z4 */
     smlatt r7,  r11, r7,  r8         /* r7  = z2 + z3 */
-    ldrd   r8,  .Lpool8+16
+    ldrd   r8, r9, .Lpool8+16
     smlabt r7,  r9,  r4,  r7         /* r7  = tmp2 */
     smlatb r14, r9,  r4,  r14        /* r14 = tmp3 */
     ldmdb  sp,  { r4, r9-r11 }       /* tmp10 tmp13 tmp11 tmp12 */
diff --git a/apps/recorder/jpeg_load.c b/apps/recorder/jpeg_load.c
index c9c6982b4d..3214cc9763 100644
--- a/apps/recorder/jpeg_load.c
+++ b/apps/recorder/jpeg_load.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * JPEG image viewer
 * (This is a real mess if it has to be coded in one single C file)
diff --git a/apps/recorder/jpeg_load.h b/apps/recorder/jpeg_load.h
index d4c345d06c..bef78b94e3 100644
--- a/apps/recorder/jpeg_load.h
+++ b/apps/recorder/jpeg_load.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * JPEG image viewer
 * (This is a real mess if it has to be coded in one single C file)
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index 22fbbb2395..ee47470bb1 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
@@ -33,6 +32,7 @@
 #include "icon.h"
 #include "pcmbuf.h"
 #include "lang.h"
+#include "bidi.h"
 #include "keyboard.h"
 #include "viewport.h"
 #include "file.h"
@@ -210,6 +210,11 @@ static int kbd_create_viewports(struct keyboard_parameters * kbd_param)
         {
             struct viewport *vp = &kbd_param[l].kbd_viewports[i];
             viewport_set_defaults(vp, l);
+            /* The keyboard lays out its own cells/grid by absolute x, so the
+             * automatic RTL right-alignment (which mirrors every putsxy) would
+             * reverse the picker grid and the edit line. Clear it here and do
+             * RTL handling explicitly in kbd_draw_edit_line instead. */
+            vp->flags &= ~VP_FLAG_ALIGNMENT_MASK;
             vp->font = FONT_UI;
         }
     }
@@ -727,11 +732,15 @@ int kbd_input(char* text, int buflen, ucschar_t *kbd)
                 break;
 
             case ACTION_KBD_CURSOR_RIGHT:
-                kbd_move_cursor(&state, 1);
+                /* move the caret to the visual right: one position forward in
+                 * LTR text, one position back in RTL text */
+                kbd_move_cursor(&state,
+                    text_is_rtl((const unsigned char *)state.text) ? -1 : 1);
                 break;
 
             case ACTION_KBD_CURSOR_LEFT:
-                kbd_move_cursor(&state, -1);
+                kbd_move_cursor(&state,
+                    text_is_rtl((const unsigned char *)state.text) ? 1 : -1);
                 break;
 
             case ACTION_NONE:
@@ -1088,12 +1097,81 @@ static void kbd_draw_picker(struct keyboard_parameters *pm,
     sc->set_viewport(last);
 }
 
+/* Pixel width of the single UTF-8 character that starts at `p`. */
+static int kbd_char_width(struct screen *sc, const unsigned char *p)
+{
+    ucschar_t c;
+    unsigned char tmp[8];
+    unsigned char *e;
+    int w;
+    utf8decode(p, &c);
+    e = utf8encode(c, tmp);
+    *e = '\0';
+    sc->getstringsize((char *)tmp, &w, NULL);
+    return w;
+}
+
+/* Visual x-offset (pixels, from the start of the drawn line) of the caret that
+ * sits at logical character index `cpos` of the visible string `vis`. It mirrors
+ * how the text engine lays the line out: bidi with LTR base orientation, where
+ * non-RTL runs keep their order while Hebrew/Arabic runs are reversed in place.
+ * The string is scanned once, run by run, accumulating a running offset and
+ * stopping at the run that holds the caret, so no per-character buffer is kept.
+ * (Like the rest of the edit line, it does not handle diacritics that combine
+ * several codepoints into a single displayed glyph.) */
+static int kbd_caret_visual_x(struct screen *sc, const char *vis, int cpos)
+{
+    const unsigned char *p = (const unsigned char *)vis;
+    int x = 0;          /* offset contributed by runs to the left of the caret */
+    int pos = 0;        /* logical index of the next character */
+
+    while (*p)
+    {
+        ucschar_t c;
+        utf8decode(p, &c);
+        bool heb = is_rtl_char(c);
+        int run_start = pos;
+        int w_run = 0;      /* total width of this run */
+        int w_before = 0;   /* width of this run's chars before the caret */
+
+        while (*p)
+        {
+            const unsigned char *next = utf8decode(p, &c);
+            /* Spaces/tabs are direction-neutral: they stay inside the current
+             * run so a multi-word Hebrew string is one reversed run (matching
+             * the bidi engine) instead of splitting at every space, which would
+             * misplace the caret. */
+            if ((bool)is_rtl_char(c) != heb && c != ' ' && c != '\t')
+                break;       /* end of run */
+            int w = kbd_char_width(sc, p);
+            if (pos < cpos)
+                w_before += w;
+            w_run += w;
+            pos++;
+            if (next == p)   /* guard against a malformed byte */
+                break;
+            p = next;
+        }
+
+        if (cpos <= run_start)          /* caret is before this run */
+            break;
+        if (cpos >= pos)                /* caret is past this whole run */
+        {
+            x += w_run;
+            continue;
+        }
+        /* caret is inside this run */
+        x += heb ? (w_run - w_before)   /* reversed: later chars sit to the left */
+                 : w_before;            /* in order: earlier chars sit to the left */
+        break;
+    }
+    return x;
+}
+
 static void kbd_draw_edit_line(struct keyboard_parameters *pm,
                                struct screen *sc, struct edit_state *state)
 {
-    char outline[8];
-    unsigned char *utf8;
-    int i = 0, j = 0, w;
+    int w;
     int icon_w, icon_y;
     struct viewport *last;
     struct viewport *vp = &pm->kbd_viewports[eKBD_VP_TEXT];
@@ -1104,77 +1182,131 @@ static void kbd_draw_edit_line(struct keyboard_parameters *pm,
     int sc_w = vp->width;
     int y = (vp->height - pm->font_h) / 2;
 
-
-    int text_margin = (sc_w - pm->text_w * pm->max_chars_text) / 2;
-
-#if 0
-    /* Clear text area one pixel above separator line so any overdraw
-       doesn't collide */
-    screen_clear_area(sc, 0, y - 1, sc_w, pm->font_h + 6);
-
-    sc->hline(0, sc_w - 1, y);
-#endif
-    /* write out the text */
     sc->setfont(pm->curfont);
 
-    pm->leftpos = MAX(0, MIN(state->len_utf8, state->editpos + 2)
-                            - pm->max_chars_text);
-
-    pm->curpos = state->editpos - pm->leftpos;
-    utf8 = state->text + utf8seek(state->text, pm->leftpos);
-
-    while (*utf8 && i < pm->max_chars_text)
-    {
-        j = utf8seek(utf8, 1);
-        strmemccpy(outline, utf8, j+1);
-        sc->getstringsize(outline, &w, NULL);
-        sc->putsxy(text_margin + i*pm->text_w + (pm->text_w-w)/2,
-                   y, outline);
-        utf8 += j;
-        i++;
-    }
+    /* Base direction follows the text itself (first strong character): a
+     * Hebrew/Arabic name is laid out right-to-left while a Latin name stays
+     * readable left-to-right, even under an RTL UI language. */
+    bool rtl = text_is_rtl((const unsigned char *)state->text);
 
     icon_w = get_icon_width(sc->screen_type);
     icon_y = (vp->height - get_icon_height(sc->screen_type)) / 2;
+
+    /* Decide how much of the text to show. If the whole name fits we show it
+     * all using (almost) the full width; only when it is genuinely too long do
+     * we scroll and reserve a slot on each side for the scroll indicators.
+     * Widths are measured per glyph (not from a fixed representative width), so
+     * every pixel is used and a name that fits is never shown as "scrolled". */
+    int total_w;
+    sc->getstringsize(state->text, &total_w, NULL);
+
+    int pad = 2;
+    bool overflow = total_w > sc_w - 2 * pad;
+    int margin = overflow ? (icon_w + 2) : pad;
+    int area_l = margin;
+    int area_r = sc_w - margin;
+    int avail  = area_r - area_l;
+    if (avail < 1)
+        avail = sc_w;
+
+    int leftpos, endchar;
+    if (!overflow)
+    {
+        leftpos = 0;
+        endchar = state->len_utf8;
+    }
+    else
+    {
+        /* keep the caret in view: take the characters just before it until the
+         * line is full, then extend forward as far as still fits */
+        int acc = 0;
+        leftpos = state->editpos;
+        while (leftpos > 0)
+        {
+            int cw = kbd_char_width(sc,
+                        state->text + utf8seek(state->text, leftpos - 1));
+            if (acc + cw > avail)
+                break;
+            acc += cw;
+            leftpos--;
+        }
+        endchar = state->editpos;
+        while (endchar < state->len_utf8)
+        {
+            int cw = kbd_char_width(sc,
+                        state->text + utf8seek(state->text, endchar));
+            if (acc + cw > avail)
+                break;
+            acc += cw;
+            endchar++;
+        }
+    }
+    pm->leftpos = leftpos;
+    pm->curpos = state->editpos - leftpos;
+
+    /* The whole visible window is drawn as ONE string so the bidi engine lays
+     * out mixed Hebrew/Latin runs correctly (splitting it at the caret would
+     * break a run and garble the text). The caret is placed from the width of
+     * the logical text before it: exact for uniform-direction text, and a
+     * sensible approximation inside mixed runs. */
+    int startbyte = utf8seek(state->text, leftpos);
+    int endbyte   = utf8seek(state->text, endchar);
+
+    char linebuf[256];
+    int vlen = endbyte - startbyte;
+    if (vlen < 0) vlen = 0;
+    if (vlen >= (int)sizeof(linebuf)) vlen = sizeof(linebuf) - 1;
+    memcpy(linebuf, state->text + startbyte, vlen);
+    linebuf[vlen] = '\0';
+
+    int vis_w = 0;
+    sc->getstringsize(linebuf, &vis_w, NULL);
+
+    /* Place the line: right-aligned for an RTL name, left-aligned otherwise. */
+    int textx = rtl ? (area_r - vis_w) : area_l;
+    if (textx < area_l)
+        textx = area_l;
+    sc->putsxy(textx, y, linebuf);
+
+    /* Caret = line origin + the visual offset of the logical caret position,
+     * computed the same way bidi lays the line out (so it is correct for mixed
+     * Hebrew/Latin too). */
+    int cursor_x = textx + kbd_caret_visual_x(sc, linebuf, pm->curpos);
+
+    /* indicator: earlier text scrolled out of view (opposite side for RTL) */
     if (pm->leftpos > 0)
     {
-        /* Draw nicer bitmap arrow if room, else settle for "<". */
-        if (text_margin >= icon_w)
-        {
+        if (margin >= icon_w)
             screen_put_icon_with_offset(sc, 0, 0,
-                                        (text_margin - icon_w) / 2,
-                                        icon_y, Icon_Reverse_Cursor);
-        }
+                rtl ? (sc_w - icon_w) : 0, icon_y,
+                rtl ? Icon_Cursor : Icon_Reverse_Cursor);
         else
         {
-            sc->getstringsize("<", &w, NULL);
-            sc->putsxy(text_margin - w, y, "<");
+            sc->getstringsize(rtl ? ">" : "<", &w, NULL);
+            sc->putsxy(rtl ? (sc_w - w) : 0, y, rtl ? ">" : "<");
         }
     }
 
-    if (state->len_utf8 - pm->leftpos > pm->max_chars_text)
+    /* indicator: later text scrolled out of view */
+    if (endchar < state->len_utf8)
     {
-        /* Draw nicer bitmap arrow if room, else settle for ">". */
-        if (text_margin >= icon_w)
-        {
+        if (margin >= icon_w)
             screen_put_icon_with_offset(sc, 0, 0,
-                                        sc_w - (text_margin + icon_w) / 2,
-                                        icon_y, Icon_Cursor);
-        }
+                rtl ? 0 : (sc_w - icon_w), icon_y,
+                rtl ? Icon_Reverse_Cursor : Icon_Cursor);
         else
         {
-            sc->putsxy(sc_w - text_margin, y, ">");
+            sc->getstringsize(rtl ? "<" : ">", &w, NULL);
+            sc->putsxy(rtl ? 0 : (sc_w - w), y, rtl ? "<" : ">");
         }
     }
 
-    /* cursor */
-    i = text_margin + pm->curpos * pm->text_w;
-
+    /* caret */
     if (state->cur_blink)
-        sc->vline(i, y, y + pm->font_h - 1);
+        sc->vline(cursor_x, y, y + pm->font_h - 1);
 
     if (state->hangul) /* draw underbar */
-        sc->hline(i - pm->text_w, i, y + pm->font_h - 1);
+        sc->hline(cursor_x - pm->text_w, cursor_x, y + pm->font_h - 1);
 
     if (pm->line_edit)
     {
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c
index 0d5581563f..90d1627c01 100644
--- a/apps/recorder/pcm_record.c
+++ b/apps/recorder/pcm_record.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Linus Nielsen Feltzing
  * Copyright (C) 2006 Antonius Hellmann
diff --git a/apps/recorder/pcm_record.h b/apps/recorder/pcm_record.h
index cf7197946a..ff7e9ff7fa 100644
--- a/apps/recorder/pcm_record.h
+++ b/apps/recorder/pcm_record.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  * Copyright (C) 2006-2013 by Michael Sevakis
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index f9bfa1b77b..aac1d3c077 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Philipp Pertermann
  *
diff --git a/apps/recorder/peakmeter.h b/apps/recorder/peakmeter.h
index b1226d444c..8c0d0d1486 100644
--- a/apps/recorder/peakmeter.h
+++ b/apps/recorder/peakmeter.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Philipp Pertermann
  *
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 253142bd97..4f7ccc1be9 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/apps/recorder/recording.h b/apps/recorder/recording.h
index 12088f84f6..3eab0427b3 100644
--- a/apps/recorder/recording.h
+++ b/apps/recorder/recording.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Linus Nielsen Feltzing
  *
diff --git a/apps/recorder/resize.c b/apps/recorder/resize.c
index c16cec9dc9..df948f7aac 100644
--- a/apps/recorder/resize.c
+++ b/apps/recorder/resize.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Akio Idehara, Andrew Mahone
  *
diff --git a/apps/recorder/resize.h b/apps/recorder/resize.h
index 0282a17197..ef0c73e50c 100644
--- a/apps/recorder/resize.h
+++ b/apps/recorder/resize.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Akio Idehara
  *
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 35cd63d5fb..a546432d85 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
@@ -212,8 +211,7 @@ static int browser(void* param)
                         static const struct text_message message={lines, 2};
                         if(gui_syncyesno_run(&message, NULL, NULL) == YESNO_NO)
                             break;
-                        FOR_NB_SCREENS(i)
-                            screens[i].clear_display();
+                        clear_screen_buffer(false);
 
                         /* Start initialisation */
                         tagcache_rebuild();
@@ -793,8 +791,8 @@ static int load_plugin_screen(char *key)
 
         if (ret == PLUGIN_USB_CONNECTED || ret == PLUGIN_ERROR)
             ret_val = GO_TO_ROOT;
-        else if (ret == PLUGIN_GOTO_WPS)
-            ret_val = GO_TO_WPS;
+        else if (ret == PLUGIN_GOTO_WPS) /* prevent infinite loop */
+            ret_val = old_global == GO_TO_WPS ? GO_TO_BROWSEPLUGINS : GO_TO_WPS;
         else if (ret == PLUGIN_GOTO_PLUGIN)
         {
             if(op_entry->lang_id == LANG_OPEN_PLUGIN)
@@ -856,7 +854,8 @@ static int root_menu_setup_screens(void)
     else
         new_screen = global_settings.start_in_screen - 2;
 
-    if (new_screen >= NUM_ITEMS)
+    if (new_screen >= NUM_ITEMS ||
+        (new_screen == GO_TO_WPS && global_status.resume_index == -1))
         new_screen = GO_TO_ROOT;
     else if (new_screen == GO_TO_PLUGIN)
     {
@@ -1019,7 +1018,7 @@ void root_menu(void)
                             key = ID2P(LANG_START_SCREEN);
                             break;
                         case GO_TO_WPS:
-                            key = ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN);
+                            key = ID2P(LANG_ONPLAY_MENU_TITLE);
                             break;
                         case GO_TO_SHORTCUTMENU:
                             key = ID2P(LANG_SHORTCUTS);
diff --git a/apps/root_menu.h b/apps/root_menu.h
index 55ea6c72d6..4c4a81466b 100644
--- a/apps/root_menu.h
+++ b/apps/root_menu.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2007 Jonathan Gordon
 *
diff --git a/apps/screen_access.c b/apps/screen_access.c
index 0db57cb442..ed497fc9e4 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
@@ -58,9 +57,11 @@ static int screen_helper_getnblines(void)
 
 void screen_helper_setfont(int font)
 {
-    (void)font;
     if (font == FONT_UI)
+    {
         font = global_status.font_id[SCREEN_MAIN];
+        set_ui_font(font);
+    }
     lcd_setfont(font);
 }
 
@@ -72,6 +73,7 @@ static int screen_helper_getuifont(void)
 static void screen_helper_setuifont(int font)
 {
     global_status.font_id[SCREEN_MAIN] = font;
+    set_ui_font(font);
 }
 
 static void screen_helper_set_drawmode(int mode)
diff --git a/apps/screen_access.h b/apps/screen_access.h
index f2f299a537..9d857e9c29 100644
--- a/apps/screen_access.h
+++ b/apps/screen_access.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
diff --git a/apps/screens.c b/apps/screens.c
index e6031d8f57..59a7c25806 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
@@ -822,7 +821,7 @@ refresh_info:
     gui_synclist_draw(&id3_lists);
     gui_synclist_speak_item(&id3_lists);
     while (true) {
-        if(!list_do_action(CONTEXT_LIST,HZ/2, &id3_lists, &key)
+        if(!list_do_action(CONTEXT_LIST|ALLOW_SOFTLOCK,HZ/2, &id3_lists, &key)
            && key!=ACTION_NONE && key!=ACTION_UNKNOWN)
         {
             if (key == ACTION_STD_OK)
diff --git a/apps/screens.h b/apps/screens.h
index 690f89157e..4a43cd51cf 100644
--- a/apps/screens.h
+++ b/apps/screens.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/settings.c b/apps/settings.c
index a87844ac24..afe62299e3 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Stuart Martin
  *
@@ -109,11 +108,6 @@ static long lasttime = 0;
 
 #if defined(DX50) || defined(DX90)
 #include "governor-ibasso.h"
-#include "usb-ibasso.h"
-#endif
-
-#if (defined(HIBY_R3PROII) || defined(HIBY_R1))
-#include "usb-hiby-gadget.h"
 #endif
 
 #ifdef LOGF_ENABLE
@@ -1131,11 +1125,7 @@ void settings_apply(bool read_disk)
     memcpy(&calibration_parameters, &global_settings.ts_calibration_data, sizeof(struct touchscreen_parameter));
 #endif
 
-#if defined(DX50) || defined(DX90)
-    ibasso_set_usb_mode(global_settings.usb_mode);
-#elif (defined(HIBY_R3PROII) || defined(HIBY_R1)) && !defined(SIMULATOR)
-    hiby_set_usb_mode(global_settings.usb_mode);
-#elif defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR)
+#if !defined(SIMULATOR) && !defined(USB_NONE) && (defined(HAVE_USB_ADB) || defined(HAVE_USB_POWER))
     usb_set_mode(global_settings.usb_mode);
 #endif
 #if defined(HAVE_GENERAL_PURPOSE_LED)
diff --git a/apps/settings.h b/apps/settings.h
index 618e91184a..178817f280 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Stuart Martin
  *
@@ -844,10 +843,11 @@ struct user_settings
 #ifdef HAVE_HOTKEY
     /* hotkey assignments - acceptable values are in
        hotkey_action enum in onplay.h */
-    int hotkey_wps;
     int hotkey_tree;
 #endif
-
+    /* WPS context assignments - acceptable values are in
+       hotkey_action enum in onplay.h */
+    int context_wps;
     /* When resuming playback (after a stop), rewind this number of seconds */
     int resume_rewind;
 
@@ -915,7 +915,7 @@ struct user_settings
 #if defined(DX50) || defined(DX90)
     int governor;
 #endif
-#if defined(DX50) || defined(DX90) || (defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR))
+#if !defined(SIMULATOR) && !defined(USB_NONE) && (defined(HAVE_USB_ADB) || defined(HAVE_USB_POWER))
     int usb_mode;
 #endif
 #if defined(BUTTON_REC) || \
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 7601cf66ca..1f24a8e0af 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
@@ -61,10 +60,10 @@
 #include "touchscreen.h"
 #include "ctype.h" /* For isspace() */
 #endif
-#ifdef HAVE_HOTKEY
+
 #include "onplay.h"
 #include "misc.h" /* current activity */
-#endif
+
 #include "playlist.h"
 #include "tree.h"
 #include "iap-usb.h"
@@ -73,7 +72,6 @@
 
 #if defined(DX50) || defined(DX90)
 #include "governor-ibasso.h"
-#include "usb-ibasso.h"
 #endif
 
 #define UNUSED {.RESERVED=NULL}
@@ -690,6 +688,21 @@ struct eq_band_setting eq_defaults[EQ_NUM_BANDS] = {
     { 16000, 7, 0 },
 };
 
+static const int wps_context_menu_default =
+    HK_CTX_SET(0, HOTKEY_VIEW_PLAYLIST) /* hotkey*/
+  | HK_CTX_SET(1, HOTKEY_SHOW_TRACK_INFO)
+  | HK_CTX_SET(2, HOTKEY_SHOW_IN_FILES)
+#ifdef HAVE_PITCHCONTROL
+  | HK_CTX_SET(3, HOTKEY_PITCHSCREEN)
+#else
+  | HK_CTX_SET(3, HOTKEY_DELETE)
+#endif
+  | HK_CTX_SET(4, HOTKEY_ALBUMART);
+
+#ifdef HAVE_HOTKEY
+static const int tree_hotkey_default = HOTKEY_OFF;
+#endif
+
 #ifndef __PCTOOL__
 static void eq_load_from_cfg(void *setting, char *value)
 {
@@ -884,29 +897,6 @@ static void tsc_set_default(void* setting, void* defaultval)
     memcpy(setting, defaultval, sizeof(struct touchscreen_parameter));
 }
 #endif
-#ifdef HAVE_HOTKEY
-static void hotkey_callback(int var)
-{
-    if (get_current_activity() != ACTIVITY_QUICKSCREEN)
-    {
-        if (get_hotkey(var)->action == HOTKEY_PLUGIN)
-            open_plugin_browse(ID2P(LANG_HOTKEY_WPS));
-    }
-}
-static const char* hotkey_formatter(char* buffer, size_t buffer_size, int value,
-                              const char* unit)
-{
-    (void)buffer;
-    (void)buffer_size;
-    (void)unit;
-    return str(get_hotkey(value)->lang_id);
-}
-static int32_t hotkey_getlang(int value, int unit)
-{
-    (void)unit;
-    return get_hotkey(value)->lang_id;
-}
-#endif /* HAVE_HOTKEY */
 
 static void start_in_callback(int var)
 {
@@ -2338,40 +2328,19 @@ const struct settings_list settings[] = {
 #ifdef HAVE_MORSE_INPUT
     OFFON_SETTING(0, morse_input, LANG_MORSE_INPUT, false, "morse input", NULL),
 #endif
+   CUSTOM_SETTING(0, context_wps,
+                  LANG_ONPLAY_MENU_TITLE, /* lang string here is never actually used */
+                  &wps_context_menu_default, "context_wps",
+                  wps_context_menu_load_from_cfg, wps_context_menu_write_to_cfg,
+                  wps_context_menu_is_changed, wps_context_menu_set_default),
 
 #ifdef HAVE_HOTKEY
-/* WPS HOTKEY */
-    TABLE_SETTING(F_CB_ON_SELECT_ONLY, hotkey_wps,
-        LANG_HOTKEY_WPS, HOTKEY_VIEW_PLAYLIST, "hotkey wps",
-        "off,view playlist,show track info,pitchscreen,open with,delete,bookmark,plugin,bookmark list"
-#ifdef HAVE_ALBUMART
-        ",show_album_art,context menu"
-        ,UNIT_INT, hotkey_formatter, hotkey_getlang, hotkey_callback,11,
-#else
-        ",context menu"
-        ,UNIT_INT, hotkey_formatter, hotkey_getlang, hotkey_callback,10,
-#endif
-        HOTKEY_OFF, HOTKEY_VIEW_PLAYLIST, HOTKEY_SHOW_TRACK_INFO, HOTKEY_PITCHSCREEN,
-        HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_BOOKMARK, HOTKEY_PLUGIN, HOTKEY_BOOKMARK_LIST,
-#ifdef HAVE_ALBUMART
-        HOTKEY_ALBUMART,
-#endif
-        HOTKEY_CONTEXT_MENU),
-/* TREE HOTKEY */
-    TABLE_SETTING(0, hotkey_tree,
-        LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree",
-#ifdef HAVE_TAGCACHE
-        "off,properties,pictureflow,open with,delete,insert,insert shuffled,context menu",
-        UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 8,
-#else
-        "off,properties,open with,delete,insert,insert shuffled,context menu",
-        UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 7,
-#endif
-        HOTKEY_OFF,HOTKEY_PROPERTIES,
-#ifdef HAVE_TAGCACHE
-        HOTKEY_PICTUREFLOW,
-#endif
-        HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_INSERT, HOTKEY_INSERT_SHUFFLED, HOTKEY_CONTEXT_MENU),
+   CUSTOM_SETTING(0, hotkey_tree,
+                  LANG_HOTKEY_FILE_BROWSER, /* lang string here is never actually used */
+                  &tree_hotkey_default, "hotkey tree",
+                  wps_context_menu_load_from_cfg, wps_context_menu_write_to_cfg,
+                  wps_context_menu_is_changed, wps_context_menu_set_default),
+
 #endif /* HAVE_HOTKEY */
 
     INT_SETTING(F_TIME_SETTING, resume_rewind, LANG_RESUME_REWIND, 0,
@@ -2398,31 +2367,26 @@ const struct settings_list settings[] = {
                    "Powersave",
                    "Performance"),
 #endif
-#if defined(DX50) || defined(DX90) || (defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR))
+#if !defined(SIMULATOR) && !defined(USB_NONE) && (defined(HAVE_USB_ADB) || defined(HAVE_USB_POWER))
     CHOICE_SETTING(0,
                    usb_mode,
                    LANG_USB_MODE,
                    USBMODE_DEFAULT,
                    "usb mode",
                    "mass storage,charge"
-#if defined(DX50) || defined(DX90) || defined(HIBY_R3PROII) || defined(HIBY_R1)
+#if defined(HAVE_USB_ADB)
                    ",adb"
 #endif
                    ,
-#if defined(DX50) || defined(DX90)
-                   ibasso_set_usb_mode,
-                   3,
-#else
                    usb_set_mode,
-#if defined(HIBY_R3PROII) || defined(HIBY_R1)
+#if defined(HAVE_USB_ADB)
                    3,
 #else
                    2,
-#endif
 #endif
                    ID2P(LANG_USB_MODE_MASS_STORAGE),
                    ID2P(LANG_USB_MODE_CHARGE)
-#if defined(DX50) || defined(DX90) || defined(HIBY_R3PROII) || defined(HIBY_R1)
+#if defined(HAVE_USB_ADB)
                    ,ID2P(LANG_USB_MODE_ADB)
 #endif
         ),
diff --git a/apps/settings_list.h b/apps/settings_list.h
index dce448423f..6828cb5dfc 100644
--- a/apps/settings_list.h
+++ b/apps/settings_list.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *
diff --git a/apps/shortcuts.c b/apps/shortcuts.c
index fece4c5030..257b2be9c3 100644
--- a/apps/shortcuts.c
+++ b/apps/shortcuts.c
@@ -334,106 +334,102 @@ static int readline_cb(int n, char *buf, void *parameters)
             return 1;
         init_shortcut(sc);
         *param = sc;
+        return 0;
     }
-    else if (sc && settings_parseline(buf, &name, &value))
-    {
-        static const char * const nm_options[] = {"type", "name", "data",
-                                                  "icon", "talkclip", NULL};
-        int nm_op = string_option(name, nm_options, false);
 
-        if (nm_op == 0) /*type*/
+    if (!sc || !settings_parseline(buf, &name, &value))
+        return 0;
+
+    static const char * const nm_options[] = {"type", "name", "data",
+                                              "icon", "talkclip", NULL};
+    int nm_op = string_option(name, nm_options, false);
+    if (nm_op == 0) /*type*/
+    {
+        int t = 0;
+        for (t=0; t<SHORTCUT_TYPE_COUNT && sc->type == SHORTCUT_UNDEFINED; t++)
+            if (!strcmp(value, type_strings[t]))
+                sc->type = t;
+    }
+    else if (nm_op == 1) /*name*/
+        strmemccpy(sc->name, value, MAX_SHORTCUT_NAME);
+    else if (nm_op == 2) /*data*/
+    {
+        switch (sc->type)
         {
-            int t = 0;
-            for (t=0; t<SHORTCUT_TYPE_COUNT && sc->type == SHORTCUT_UNDEFINED; t++)
-                if (!strcmp(value, type_strings[t]))
-                    sc->type = t;
-        }
-        else if (nm_op == 1) /*name*/
-        {
-            strmemccpy(sc->name, value, MAX_SHORTCUT_NAME);
-        }
-        else if (nm_op == 2) /*data*/
-        {
-            switch (sc->type)
+            case SHORTCUT_UNDEFINED:
+            case SHORTCUT_TYPE_COUNT:
+                *param = NULL;
+                break;
+            case SHORTCUT_BROWSER:
             {
-                case SHORTCUT_UNDEFINED:
-                case SHORTCUT_TYPE_COUNT:
-                    *param = NULL;
-                    break;
-                case SHORTCUT_BROWSER:
+                char *p = strmemccpy(sc->u.path, value, MAX_PATH);
+                if (p && dir_exists(value))
                 {
-                    char *p = strmemccpy(sc->u.path, value, MAX_PATH);
-                    if (p && dir_exists(value))
-                    {
-                        /* ensure ending slash */
-                        *p = '\0';
-                        if (*(p-2) != '/')
-                            *(p-1) = '/';
-                    }
-                    break;
+                    /* ensure ending slash */
+                    *p = '\0';
+                    if (*(p-2) != '/')
+                        *(p-1) = '/';
                 }
-                case SHORTCUT_FILE:
-                case SHORTCUT_DEBUGITEM:
-                case SHORTCUT_PLAYLISTMENU:
+                break;
+            }
+            case SHORTCUT_FILE:
+            case SHORTCUT_DEBUGITEM:
+            case SHORTCUT_PLAYLISTMENU:
+            {
+                strmemccpy(sc->u.path, value, MAX_PATH);
+                break;
+            }
+            case SHORTCUT_SETTING_APPLY:
+            case SHORTCUT_SETTING:
+                /* can handle 'name: value' pair for either type */
+                if (settings_parseline(value, &name, &value))
                 {
+                    sc->setting = find_setting_by_cfgname(name);
                     strmemccpy(sc->u.path, value, MAX_PATH);
-                    break;
                 }
-                case SHORTCUT_SETTING_APPLY:
-                case SHORTCUT_SETTING:
-                    /* can handle 'name: value' pair for either type */
-                    if (settings_parseline(value, &name, &value))
-                    {
-                        sc->setting = find_setting_by_cfgname(name);
-                        strmemccpy(sc->u.path, value, MAX_PATH);
-                    }
-                    else /* force SHORTCUT_SETTING, no 'name: value' pair */
-                    {
-                        sc->type = SHORTCUT_SETTING;
-                        sc->setting = find_setting_by_cfgname(value);
-                    }
-                    break;
-                case SHORTCUT_TIME:
+                else /* force SHORTCUT_SETTING, no 'name: value' pair */
+                {
+                    sc->type = SHORTCUT_SETTING;
+                    sc->setting = find_setting_by_cfgname(value);
+                }
+                break;
+            case SHORTCUT_TIME:
 #if CONFIG_RTC
-                    sc->u.timedata.talktime = false;
-                    if (!strcasecmp(value, "talk"))
-                        sc->u.timedata.talktime = true;
-                    else
+                sc->u.timedata.talktime = false;
+                if (!strcasecmp(value, "talk"))
+                    sc->u.timedata.talktime = true;
+                else
 #endif
-                    if (!strncasecmp(value, "sleep", sizeof("sleep")-1))
-                    {
-                        /* 'sleep' may appear alone or followed by number after a space */
-                        if (strlen(value) > sizeof("sleep")) /* sizeof 1 larger (+space chr..) */
-                            sc->u.timedata.sleep_timeout = atoi(&value[sizeof("sleep")-1]);
-                        else
-                            sc->u.timedata.sleep_timeout = -1;
-                    }
+                if (!strncasecmp(value, "sleep", sizeof("sleep")-1))
+                {
+                    /* 'sleep' may appear alone or followed by number after a space */
+                    if (strlen(value) > sizeof("sleep")) /* sizeof 1 larger (+space chr..) */
+                        sc->u.timedata.sleep_timeout = atoi(&value[sizeof("sleep")-1]);
                     else
-                        sc->type = SHORTCUT_UNDEFINED; /* error */
-                    break;
-                case SHORTCUT_SEPARATOR:
-                case SHORTCUT_SHUTDOWN:
-                case SHORTCUT_REBOOT:
-                    break;
-            }
-        }
-        else if (nm_op == 3) /*icon*/
-        {
-            if (!strcmp(value, "filetype") && sc->type != SHORTCUT_SETTING
-                && sc->type != SHORTCUT_SETTING_APPLY && sc->u.path[0])
-            {
-                sc->icon = filetype_get_icon(filetype_get_attr(sc->u.path));
-            }
-            else
-            {
-                sc->icon = atoi(value);
-            }
-        }
-        else if (nm_op == 4) /*talkclip*/
-        {
-            strmemccpy(sc->talk_clip, value, MAX_PATH);
+                        sc->u.timedata.sleep_timeout = -1;
+                }
+                else
+                    sc->type = SHORTCUT_UNDEFINED; /* error */
+                break;
+            case SHORTCUT_SEPARATOR:
+            case SHORTCUT_SHUTDOWN:
+            case SHORTCUT_REBOOT:
+                break;
         }
     }
+    else if (nm_op == 3) /*icon*/
+    {
+        if (!strcmp(value, "filetype") && sc->type != SHORTCUT_SETTING
+            && sc->type != SHORTCUT_SETTING_APPLY && sc->u.path[0])
+        {
+            sc->icon = filetype_get_icon(filetype_get_attr(sc->u.path));
+        }
+        else
+            sc->icon = atoi(value);
+    }
+    else if (nm_op == 4) /*talkclip*/
+        strmemccpy(sc->talk_clip, value, MAX_PATH);
+
     return 0;
 }
 
@@ -538,90 +534,86 @@ static int shortcut_menu_speak_item(int selected_item, void * data)
 {
     (void)data;
     struct shortcut *sc = get_shortcut(selected_item, NULL);
-    if (sc)
+
+    if (!sc)
+        return 0;
+
+    if (sc->talk_clip[0])
     {
-        if (sc->talk_clip[0])
+        talk_file(NULL, NULL, sc->talk_clip, NULL, NULL, false);
+        return 0;
+    }
+    switch (sc->type)
+    {
+    case SHORTCUT_BROWSER:;
+        DIR* dir;
+        struct dirent* entry;
+        char* slash = strrchr(sc->u.path, PATH_SEPCH);
+        char* filename = slash + 1;
+
+        if (!slash || *filename == '\0')
         {
-            talk_file(NULL, NULL, sc->talk_clip, NULL, NULL, false);
+            talk_dir_or_spell(sc->u.path, NULL, false);
+            break;
         }
-        else
+
+        *slash = '\0'; /* terminate the path to open the directory */
+        dir = opendir(sc->u.path);
+        *slash = PATH_SEPCH; /* restore fullpath */
+        if (dir)
         {
-            switch (sc->type)
+            while ((entry = readdir(dir)))
             {
-            case SHORTCUT_BROWSER:
-                {
-                    DIR* dir;
-                    struct dirent* entry;
-                    char* slash = strrchr(sc->u.path, PATH_SEPCH);
-                    char* filename = slash + 1;
-                    if (slash && *filename != '\0')
-                    {
-                        *slash = '\0'; /* terminate the path to open the directory */
-                        dir = opendir(sc->u.path);
-                        *slash = PATH_SEPCH; /* restore fullpath */
-                        if (dir)
-                        {
-                            while (0 != (entry = readdir(dir)))
-                            {
-                                if (!strcmp(entry->d_name, filename))
-                                {
-                                    struct dirinfo info = dir_get_info(dir, entry);
+                if (strcmp(entry->d_name, filename))
+                    continue;
 
-                                    if (info.attribute & ATTR_DIRECTORY)
-                                        talk_dir_or_spell(sc->u.path, NULL, false);
-                                    else
-                                        talk_file_or_spell(NULL, sc->u.path, NULL, false);
+                struct dirinfo info = dir_get_info(dir, entry);
 
-                                    closedir(dir);
-                                    return 0;
-                                }
-                            }
-                            closedir(dir);
-                        }
-                    }
-                    else
-                    {
-                        talk_dir_or_spell(sc->u.path, NULL, false);
-                        break;
-                    }
-                    talk_spell(sc->u.path, false);
-                }
-                break;
-            case SHORTCUT_FILE:
-            case SHORTCUT_PLAYLISTMENU:
-                talk_file_or_spell(NULL, sc->u.path, NULL, false);
-                break;
-            case SHORTCUT_SETTING_APPLY:
-            case SHORTCUT_SETTING:
-                talk_id(sc->setting->lang_id, false);
-                if (sc->type == SHORTCUT_SETTING_APPLY)
-                    talk_spell(sc->u.path, true);
-                break;
-
-            case SHORTCUT_TIME:
-#if CONFIG_RTC
-                if (sc->u.timedata.talktime)
-                    talk_timedate();
+                if (info.attribute & ATTR_DIRECTORY)
+                    talk_dir_or_spell(sc->u.path, NULL, false);
                 else
-#endif
-                if (sc->name[0] && sc->u.timedata.sleep_timeout >= 0)
-                    talk_spell(sc->name, false);
-                else
-                    talk_sleeptimer(sc->u.timedata.sleep_timeout);
-                break;
-            case SHORTCUT_SHUTDOWN:
-            case SHORTCUT_REBOOT:
-                if (!sc->name[0])
-                {
-                    talk_spell(type_strings[sc->type], false);
-                    break;
-                }
-                /* fall-through */
-            default:
-                talk_spell(sc->name[0] ? sc->name : sc->u.path, false);
-                break;
+                    talk_file_or_spell(NULL, sc->u.path, NULL, false);
+
+                closedir(dir);
+                return 0;
             }
+            closedir(dir);
         }
+        talk_spell(sc->u.path, false);
+        break;
+    case SHORTCUT_FILE:
+    case SHORTCUT_PLAYLISTMENU:
+        talk_file_or_spell(NULL, sc->u.path, NULL, false);
+        break;
+    case SHORTCUT_SETTING_APPLY:
+    case SHORTCUT_SETTING:
+        talk_id(sc->setting->lang_id, false);
+        if (sc->type == SHORTCUT_SETTING_APPLY)
+            talk_spell(sc->u.path, true);
+        break;
+
+    case SHORTCUT_TIME:
+#if CONFIG_RTC
+        if (sc->u.timedata.talktime)
+            talk_timedate();
+        else
+#endif
+        if (sc->name[0] && sc->u.timedata.sleep_timeout >= 0)
+            talk_spell(sc->name, false);
+        else
+            talk_sleeptimer(sc->u.timedata.sleep_timeout);
+        break;
+    case SHORTCUT_SHUTDOWN:
+    case SHORTCUT_REBOOT:
+        if (!sc->name[0])
+        {
+            talk_spell(type_strings[sc->type], false);
+            break;
+        }
+        /* fall-through */
+    default:
+        talk_spell(sc->name[0] ? sc->name : sc->u.path, false);
+        break;
     }
     return 0;
 }
@@ -721,6 +713,7 @@ static void apply_new_setting(const struct settings_list *setting)
 int do_shortcut_menu(void *ignored)
 {
     (void)ignored;
+    char timer_buf[10];
     struct simplelist_info list;
     struct shortcut *sc;
     int done = GO_TO_PREVIOUS;
@@ -750,114 +743,104 @@ int do_shortcut_menu(void *ignored)
         list.get_talk = global_settings.talk_menu ? shortcut_menu_speak_item : NULL;
 
         if (simplelist_show_list(&list))
-            break; /* some error happened?! */
-
+            break; /* returning from USB screen */
         if (list.selection == -1)
-            break;
-        else
+            break; /* canceled */
+        if (list.selection == -2)
         {
-            sc = get_shortcut(list.selection, NULL);
+            done = GO_TO_WPS;
+            break;
+        }
 
-            if (!sc)
-                continue;
+        sc = get_shortcut(list.selection, NULL);
+        if (!sc)
+            continue;
 
-            switch (sc->type)
-            {
-                case SHORTCUT_PLAYLISTMENU:
-                    if (!file_exists(sc->u.path))
-                    {
-                        splash(HZ, ID2P(LANG_NO_FILES));
-                        break;
-                    }
-                    else
-                    {
-                        onplay_show_playlist_menu(sc->u.path,
-                                                  dir_exists(sc->u.path) ? ATTR_DIRECTORY :
-                                                  filetype_get_attr(sc->u.path),
-                                                  NULL);
-                    }
-                    break;
-                case SHORTCUT_FILE:
-                    if (!file_exists(sc->u.path))
-                    {
-                        splash(HZ, ID2P(LANG_NO_FILES));
-                        break;
-                    }
-                    /* else fall through */
-                case SHORTCUT_BROWSER:
-                {
-                    if(open_plugin_add_path(ID2P(LANG_SHORTCUTS), sc->u.path, NULL) != 0)
-                    {
-                        done = GO_TO_PLUGIN;
-                        break;
-                    }
-                    struct browse_context browse = {
-                        .dirfilter = global_settings.dirfilter,
-                        .icon = Icon_NOICON,
-                        .root = sc->u.path,
-                    };
-                    if (sc->type == SHORTCUT_FILE)
-                        browse.flags |= BROWSE_RUNFILE;
-                    done = rockbox_browse(&browse);
-
-                }
+        switch (sc->type)
+        {
+            case SHORTCUT_PLAYLISTMENU:
+                if (!file_exists(sc->u.path))
+                    splash(HZ, ID2P(LANG_NO_FILES));
+                else
+                    onplay_show_playlist_menu(sc->u.path,
+                                              dir_exists(sc->u.path) ?
+                                              ATTR_DIRECTORY :
+                                              filetype_get_attr(sc->u.path),
+                                              NULL);
                 break;
-                case SHORTCUT_SETTING_APPLY:
+            case SHORTCUT_FILE:
+                if (!file_exists(sc->u.path))
                 {
-                    bool theme_changed;
-                    string_to_cfg(sc->setting->cfg_name, sc->u.path, &theme_changed);
-                    settings_save();
-                    apply_new_setting(sc->setting);
+                    splash(HZ, ID2P(LANG_NO_FILES));
                     break;
                 }
-                case SHORTCUT_SETTING:
+                /* else fall through */
+            case SHORTCUT_BROWSER:
+                if (open_plugin_add_path(ID2P(LANG_SHORTCUTS),
+                                         sc->u.path, NULL) != 0)
                 {
-                    do_setting_screen(sc->setting,
-                        sc->name[0] ? sc->name : P2STR(ID2P(sc->setting->lang_id)),NULL);
-                    apply_new_setting(sc->setting);
+                    done = GO_TO_PLUGIN;
                     break;
                 }
-                case SHORTCUT_DEBUGITEM:
-                    run_debug_screen(sc->u.path);
-                    break;
-                case SHORTCUT_SHUTDOWN:
+                struct browse_context browse = {
+                    .dirfilter = SHOW_ALL, /* ignored for SHORTCUT_BROWSER */
+                    .icon = Icon_NOICON,
+                    .root = sc->u.path,
+                };
+                if (sc->type == SHORTCUT_FILE)
+                    browse.flags = BROWSE_RUNFILE | BROWSE_DIRFILTER;
+                done = rockbox_browse(&browse);
+                break;
+            case SHORTCUT_SETTING_APPLY:;
+                bool theme_changed;
+                string_to_cfg(sc->setting->cfg_name, sc->u.path, &theme_changed);
+                settings_save();
+                apply_new_setting(sc->setting);
+                break;
+            case SHORTCUT_SETTING:
+                do_setting_screen(sc->setting, sc->name[0] ?
+                                  sc->name : P2STR(ID2P(sc->setting->lang_id)),
+                                  NULL);
+                apply_new_setting(sc->setting);
+                break;
+            case SHORTCUT_DEBUGITEM:
+                run_debug_screen(sc->u.path);
+                break;
+            case SHORTCUT_SHUTDOWN:
 #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
-                    if (charger_inserted())
-                        charging_splash();
-                    else
+                if (charger_inserted())
+                    charging_splash();
+                else
 #endif
-                        sys_poweroff();
-                    break;
-                case SHORTCUT_REBOOT:
+                    sys_poweroff();
+                break;
+            case SHORTCUT_REBOOT:
 #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
-                    if (charger_inserted())
-                        charging_splash();
-                    else
+                if (charger_inserted())
+                    charging_splash();
+                else
 #endif
-                        sys_reboot();
-                    break;
-                case SHORTCUT_TIME:
+                    sys_reboot();
+                break;
+            case SHORTCUT_TIME:
 #if CONFIG_RTC
-                  if (!sc->u.timedata.talktime)
+                if (sc->u.timedata.talktime)
+                    break;
 #endif
-                    {
-                        char timer_buf[10];
-                        if (sc->u.timedata.sleep_timeout >= 0)
-                        {
-                            set_sleeptimer_duration(sc->u.timedata.sleep_timeout);
-                            splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER),
-                                    format_sleeptimer(timer_buf, sizeof(timer_buf),
-                                                          sc->u.timedata.sleep_timeout,
-                                                          NULL));
-                        }
-                        else
-                            toggle_sleeptimer();
-                    }
+                if (sc->u.timedata.sleep_timeout < 0)
+                {
+                    toggle_sleeptimer();
                     break;
-                case SHORTCUT_UNDEFINED:
-                default:
-                    break;
-            }
+                }
+                set_sleeptimer_duration(sc->u.timedata.sleep_timeout);
+                splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER),
+                        format_sleeptimer(timer_buf, sizeof(timer_buf),
+                                          sc->u.timedata.sleep_timeout,
+                                          NULL));
+                break;
+            case SHORTCUT_UNDEFINED:
+            default:
+                break;
         }
     }
     if (GO_TO_PLUGIN == done)
diff --git a/apps/shortcuts.h b/apps/shortcuts.h
index 70c2b66c4f..5f38301b51 100644
--- a/apps/shortcuts.h
+++ b/apps/shortcuts.h
@@ -6,7 +6,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Jonathan Gordon
  *
diff --git a/apps/sound_menu.h b/apps/sound_menu.h
index 1ff2019a8f..f3064d9652 100644
--- a/apps/sound_menu.h
+++ b/apps/sound_menu.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/apps/status.c b/apps/status.c
index 57f2984402..1ab2bdb445 100644
--- a/apps/status.c
+++ b/apps/status.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/apps/status.h b/apps/status.h
index c038b793af..b84d4dad5e 100644
--- a/apps/status.h
+++ b/apps/status.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Linus Nielsen Feltzing
  *
diff --git a/apps/tagcache.c b/apps/tagcache.c
index d87a28d232..d5c8f79a7a 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Miika Pekkarinen
  *
@@ -2292,8 +2291,9 @@ static void NO_INLINE add_tagcache(char *path, unsigned long mtime)
     }
 
     /* Check if the file is supported. */
-    if (probe_file_format(path) == AFMT_UNKNOWN)
-        return ;
+    int afmt = probe_file_format(path);
+    if (afmt == AFMT_UNKNOWN)
+        return;
 
     /* Check if the file is already cached. */
 #if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE)
@@ -2339,7 +2339,7 @@ static void NO_INLINE add_tagcache(char *path, unsigned long mtime)
     /*memset(&id3, 0, sizeof(struct mp3entry)); -- get_metadata does this for us */
     memset(&entry, 0, sizeof(struct temp_file_entry));
     memset(&tracknumfix, 0, sizeof(tracknumfix));
-    ret = get_metadata_ex(&id3, -1, path, METADATA_EXCLUDE_ID3_PATH);
+    ret = get_metadata_afmt(&id3, -1, path, afmt, METADATA_EXCLUDE_ID3_PATH);
 
     if (!ret)
     {
diff --git a/apps/tagcache.h b/apps/tagcache.h
index 4604fab1d7..6a16829d4d 100644
--- a/apps/tagcache.h
+++ b/apps/tagcache.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Miika Pekkarinen
  *
diff --git a/apps/tagtree.c b/apps/tagtree.c
index 67ff646205..83aa2fe21e 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Miika Pekkarinen
  *
@@ -1795,7 +1794,7 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
             { /* Fallback to basename */
                 char *lastname = dptr->name;
                 dptr->name = core_get_data(c->cache.name_buffer_handle)+namebufused;
-                if ((c->cache.name_buffer_size - namebufused) > 0 && 
+                if ((c->cache.name_buffer_size - namebufused) > 0 &&
                     tagcache_retrieve(&tcs, tcs.idx_id, tag_virt_basename, dptr->name,
                                       c->cache.name_buffer_size - namebufused))
                 {
@@ -2649,17 +2648,17 @@ static bool tagtree_insert_selection(int position, bool queue,
     return ret;
 }
 
-/* Execute action_cb for all subentries of the current table's
+/* Execute action_cb for all entries of the current table's
  * selected item, handing over each entry's filename in the
  * callback function parameter. Parameter will be NULL for
  * entries whose filename couldn't be retrieved.
  */
-bool tagtree_subentries_do_action(bool (*action_cb)(const char *file_name))
+bool tagtree_entries_iterate(struct tagcache_search *tcs,
+                             bool (*action_cb)(const char *file_name),
+                             char* buf, size_t buf_sz)
 {
-    struct tagcache_search tcs;
     int i, n;
     unsigned long last_tick;
-    char buf[MAX_PATH];
     int ret = true;
     int dirlevel = tc->dirlevel;
     int selected_item = tc->selected_item;
@@ -2668,7 +2667,7 @@ bool tagtree_subentries_do_action(bool (*action_cb)(const char *file_name))
     cpu_boost(true);
     if (!goto_allsubentries(newtable))
         ret = false;
-    else if (tagcache_search(&tcs, tag_filename))
+    else if (tagcache_search(tcs, tag_filename))
     {
         last_tick = current_tick + HZ/2;
         splash_progress_set_delay(HZ / 2); /* wait 1/2 sec before progress */
@@ -2684,8 +2683,8 @@ bool tagtree_subentries_do_action(bool (*action_cb)(const char *file_name))
                 last_tick = current_tick;
             }
 
-            if (!action_cb(tagcache_retrieve(&tcs, tagtree_get_entry(tc, i)->extraseek,
-                                             tcs.type, buf, sizeof buf) ? buf : NULL))
+            if (!action_cb(tagcache_retrieve(tcs, tagtree_get_entry(tc, i)->extraseek,
+                                             tcs->type, buf, buf_sz) ? buf : NULL))
             {
                 ret = false;
                 break;
@@ -2693,7 +2692,7 @@ bool tagtree_subentries_do_action(bool (*action_cb)(const char *file_name))
             yield();
         }
 
-        tagcache_search_finish(&tcs);
+        tagcache_search_finish(tcs);
     }
     else
     {
diff --git a/apps/tagtree.h b/apps/tagtree.h
index a57a5c2f80..8b24dd162a 100644
--- a/apps/tagtree.h
+++ b/apps/tagtree.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Miika Pekkarinen
  *
@@ -47,7 +46,9 @@ int tagtree_get_icon(struct tree_context* c);
 int tagtree_get_filename(struct tree_context* c, char *buf, int buflen);
 int tagtree_get_custom_action(struct tree_context* c);
 bool tagtree_get_subentry_filename(char *buf, size_t bufsize);
-bool tagtree_subentries_do_action(bool (*action_cb)(const char *file_name));
+bool tagtree_entries_iterate(struct tagcache_search *tcs,
+                             bool (*action_cb)(const char *file_name),
+                             char *buf, size_t buf_sz);
 
 #endif
 #endif
diff --git a/apps/talk.h b/apps/talk.h
index 507d5cbed1..ab270f12a0 100644
--- a/apps/talk.h
+++ b/apps/talk.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 Jörg Hohensohn
  *
diff --git a/apps/tree.c b/apps/tree.c
index 797e5a3936..7f3bee1113 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Daniel Stenberg
  *
@@ -522,7 +521,12 @@ static int update_dir(void)
     gui_synclist_set_nb_items(list, tc.filesindir);
     gui_synclist_set_icon_callback(list,
                             global_settings.show_icons?tree_get_fileicon:NULL);
-    gui_synclist_set_voice_callback(list, &tree_voice_cb);
+#ifdef HAVE_TAGCACHE
+    if(!id3db || global_settings.talk_menu)
+#endif
+    {
+        gui_synclist_set_voice_callback(list, &tree_voice_cb);
+    }
 #ifdef HAVE_LCD_COLOR
     gui_synclist_set_color_callback(list, &tree_get_filecolor);
 #endif
diff --git a/apps/tree.h b/apps/tree.h
index 4c7c2e8fe7..cf8b4833c1 100644
--- a/apps/tree.h
+++ b/apps/tree.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Daniel Stenberg
  *
diff --git a/apps/usb_keymaps.c b/apps/usb_keymaps.c
index f7505aa754..7eab397354 100644
--- a/apps/usb_keymaps.c
+++ b/apps/usb_keymaps.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Tomer Shalev
  *
diff --git a/apps/usb_keymaps.h b/apps/usb_keymaps.h
index 6b727bea6b..5ef44f12d7 100644
--- a/apps/usb_keymaps.h
+++ b/apps/usb_keymaps.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Tomer Shalev
  *
diff --git a/apps/voice_thread.c b/apps/voice_thread.c
index 3e83138d6c..817544970d 100644
--- a/apps/voice_thread.c
+++ b/apps/voice_thread.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Michael Sevakis
  *
diff --git a/apps/voice_thread.h b/apps/voice_thread.h
index c0122f0fb9..e90ba6dc4b 100644
--- a/apps/voice_thread.h
+++ b/apps/voice_thread.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Michael Sevakis
  *
diff --git a/bootloader/Makefile b/bootloader/Makefile
index 3e606cdc68..6580af368b 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 INCLUDES= $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(OBJDIR)	\
diff --git a/bootloader/bootloader.make b/bootloader/bootloader.make
index 06055068e5..7f11366b20 100644
--- a/bootloader/bootloader.make
+++ b/bootloader/bootloader.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 INCLUDES += -I$(APPSDIR)
diff --git a/bootloader/common.c b/bootloader/common.c
index 0770237d68..705441357a 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: main.c 11997 2007-01-13 09:08:18Z miipekk $
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  *
@@ -166,3 +165,17 @@ int load_raw_firmware(unsigned char* buf, char* firmware, int buffer_size)
     close(fd);
     return len;
 }
+
+#if (!defined(MISC_H) && CONFIG_PLATFORM & PLATFORM_HOSTED)
+/* open but with a builtin printf for assembling the path */
+int open_pathfmt(char *buf, size_t size, int oflag, const char *pathfmt, ...)
+{
+    va_list ap;
+    va_start(ap, pathfmt);
+    vsnprintf(buf, size, pathfmt, ap);
+    va_end(ap);
+    if ((oflag & O_PATH) == O_PATH)
+        return -1;
+    return open(buf, oflag, 0666);
+}
+#endif
diff --git a/bootloader/common.h b/bootloader/common.h
index 8b95c8e175..a5b8330dfc 100644
--- a/bootloader/common.h
+++ b/bootloader/common.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  *
diff --git a/bootloader/echoplayer.c b/bootloader/echoplayer.c
index 97b5ec2749..922c4c4c22 100644
--- a/bootloader/echoplayer.c
+++ b/bootloader/echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/bootloader/fat32format.c b/bootloader/fat32format.c
index a885a5fced..b2cbeb2913 100644
--- a/bootloader/fat32format.c
+++ b/bootloader/fat32format.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: fat32format.c 30351 2011-08-25 19:58:47Z thomasjfox $
  *
  *
  * FAT32 formatting functions.  Based on:
diff --git a/bootloader/format.c b/bootloader/format.c
index 8f28444b8c..665fa6e3e1 100644
--- a/bootloader/format.c
+++ b/bootloader/format.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Gary Czvitkovicz
  * Copyright (C) 2017 by William Wilgus
diff --git a/bootloader/format.h b/bootloader/format.h
index 30a072aca8..dcba402ab7 100644
--- a/bootloader/format.h
+++ b/bootloader/format.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Felix Arends
  *
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index 831f854dc8..b0c9b54f4d 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Greg White
  *
diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c
index b56cc13655..6904d2ff0c 100644
--- a/bootloader/gigabeat.c
+++ b/bootloader/gigabeat.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Greg White
  *
diff --git a/bootloader/iaudio_coldfire.c b/bootloader/iaudio_coldfire.c
index 173d9f3f89..cdc5ca8bd5 100644
--- a/bootloader/iaudio_coldfire.c
+++ b/bootloader/iaudio_coldfire.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Linus Nielsen Feltzing
  *
diff --git a/bootloader/imx233.c b/bootloader/imx233.c
index bb8189cf6e..e58763e297 100644
--- a/bootloader/imx233.c
+++ b/bootloader/imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/bootloader/ipod-s5l87xx.c b/bootloader/ipod-s5l87xx.c
index 0558d8da5b..077fa1d3e6 100644
--- a/bootloader/ipod-s5l87xx.c
+++ b/bootloader/ipod-s5l87xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  *
diff --git a/bootloader/ipod.c b/bootloader/ipod.c
index 8b7127c605..653169dade 100644
--- a/bootloader/ipod.c
+++ b/bootloader/ipod.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  *
diff --git a/bootloader/ipodnano2g.c b/bootloader/ipodnano2g.c
index 23a3557ae2..b01965a3a6 100644
--- a/bootloader/ipodnano2g.c
+++ b/bootloader/ipodnano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Dave Chapman
  *
@@ -263,10 +262,10 @@ void main(void)
 
     /* Disable caches and protection unit */
     asm volatile(
-        "mrc 15, 0, r0, c1, c0, 0 \n"
-        "bic r0, r0, #0x1000      \n"
-        "bic r0, r0, #0x5         \n"
-        "mcr 15, 0, r0, c1, c0, 0 \n"
+        "mrc p15, 0, r0, c1, c0, 0 \n"
+        "bic r0, r0, #0x1000       \n"
+        "bic r0, r0, #0x5          \n"
+        "mcr p15, 0, r0, c1, c0, 0 \n"
     );
 
     /* Branch to start of DRAM */
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c
index b6f09a0e09..68c00390a4 100644
--- a/bootloader/iriver_h1x0.c
+++ b/bootloader/iriver_h1x0.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  *
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c
index 6810a447c3..28f99597c7 100644
--- a/bootloader/iriver_h300.c
+++ b/bootloader/iriver_h300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Linus Nielsen Feltzing
  *
diff --git a/bootloader/main-e200r-installer.c b/bootloader/main-e200r-installer.c
index 63b3fcb142..9ae1905574 100644
--- a/bootloader/main-e200r-installer.c
+++ b/bootloader/main-e200r-installer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c
index 581f486a21..2be849f237 100644
--- a/bootloader/main-pp.c
+++ b/bootloader/main-pp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/bootloader/main-ppsansawipe.c b/bootloader/main-ppsansawipe.c
index d85a228167..eef2d8190a 100644
--- a/bootloader/main-ppsansawipe.c
+++ b/bootloader/main-ppsansawipe.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: main-e200r-installer.c 15599 2007-11-12 18:49:53Z amiconn $
  *
  * Copyright (C) 2011 by Frank Gevaerts
  *
diff --git a/bootloader/mpio_hd200_hd300.c b/bootloader/mpio_hd200_hd300.c
index 7067a9d790..0cf9b75627 100644
--- a/bootloader/mpio_hd200_hd300.c
+++ b/bootloader/mpio_hd200_hd300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/bootloader/mrobe500.c b/bootloader/mrobe500.c
index 57356ab71d..547efb4a19 100644
--- a/bootloader/mrobe500.c
+++ b/bootloader/mrobe500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/bootloader/nwz_linux.c b/bootloader/nwz_linux.c
index 9b524d0eb9..b283c45b03 100644
--- a/bootloader/nwz_linux.c
+++ b/bootloader/nwz_linux.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/bootloader/ondavx747.c b/bootloader/ondavx747.c
index b32a2ab151..1cc786efcf 100644
--- a/bootloader/ondavx747.c
+++ b/bootloader/ondavx747.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/bootloader/rk27xx.c b/bootloader/rk27xx.c
index 69b7f6a0aa..4f04bebfc8 100644
--- a/bootloader/rk27xx.c
+++ b/bootloader/rk27xx.c
@@ -67,7 +67,7 @@ static void enter_rkusb(void)
         "ldr     r1, [r0] \n"
         "ldr     r2, =0xa1000604 \n"
         "cmp     r1, r2 \n"
-        "bne     rk27xx_new \n"
+        "bne     2f \n"
 
         /* Setup stacks in unmapped
          * iram just as rom will do.
@@ -77,16 +77,16 @@ static void enter_rkusb(void)
          * but memory addresses are slightly
          * different.
          */
-        "rk27xx_old: \n"
+        "1: \n"  /* rk27xx_old */
         "ldr     r1, =0x18200258 \n"
         "ldr     r0, =0xaf0 \n"
-        "b       jump_to_rom \n"
+        "b       3f \n"
 
-        "rk27xx_new: \n"
+        "2: \n"  /* rk27xx_new */
         "ldr     r1, =0x18200274 \n"
         "ldr     r0, =0xec0 \n"
 
-        "jump_to_rom: \n"
+        "3: \n"  /* jump to ROM */
         "msr     cpsr, #0xd2 \n"
         "add     r1, r1, #0x200 \n"
         "mov     sp, r1 \n"
diff --git a/bootloader/samsung_yps3.c b/bootloader/samsung_yps3.c
index 9a09b11d2a..b0900470ef 100644
--- a/bootloader/samsung_yps3.c
+++ b/bootloader/samsung_yps3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index 3938f819b4..b268055f2f 100644
--- a/bootloader/sansa_as3525.c
+++ b/bootloader/sansa_as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Rafaël Carré
  *
diff --git a/bootloader/sansaconnect.c b/bootloader/sansaconnect.c
index c8cfecbc61..d58f304998 100644
--- a/bootloader/sansaconnect.c
+++ b/bootloader/sansaconnect.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id: $
 *
 * Copyright (C) 2011-2021 by Tomasz Moń
 *
diff --git a/bootloader/show_logo.c b/bootloader/show_logo.c
index cafcb45dcf..f24c6b72ac 100644
--- a/bootloader/show_logo.c
+++ b/bootloader/show_logo.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Barry Wardell
  *
diff --git a/bootloader/snprintf.c b/bootloader/snprintf.c
index d64bb32447..79087ba52e 100644
--- a/bootloader/snprintf.c
+++ b/bootloader/snprintf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Gary Czvitkovicz
  *
diff --git a/bootloader/telechips.c b/bootloader/telechips.c
index 2c5c919b1b..3d08a25579 100644
--- a/bootloader/telechips.c
+++ b/bootloader/telechips.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Dave Chapman
  *
diff --git a/bootloader/x1000/boot.c b/bootloader/x1000/boot.c
index 8b44641604..e196159617 100644
--- a/bootloader/x1000/boot.c
+++ b/bootloader/x1000/boot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021-2022 Aidan MacDonald
  *
diff --git a/bootloader/x1000/gui.c b/bootloader/x1000/gui.c
index a235618e70..705cc82e3d 100644
--- a/bootloader/x1000/gui.c
+++ b/bootloader/x1000/gui.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021-2022 Aidan MacDonald
  *
diff --git a/bootloader/x1000/install.c b/bootloader/x1000/install.c
index 18b853df7c..ffdbee709e 100644
--- a/bootloader/x1000/install.c
+++ b/bootloader/x1000/install.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021-2022 Aidan MacDonald
  *
diff --git a/bootloader/x1000/main.c b/bootloader/x1000/main.c
index 5fd3d7f7d4..41009253cd 100644
--- a/bootloader/x1000/main.c
+++ b/bootloader/x1000/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/bootloader/x1000/recovery.c b/bootloader/x1000/recovery.c
index 371500826f..5ca700a970 100644
--- a/bootloader/x1000/recovery.c
+++ b/bootloader/x1000/recovery.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021-2022 Aidan MacDonald
  *
diff --git a/bootloader/x1000/utils.c b/bootloader/x1000/utils.c
index 5aeb0d8a25..2cfde16ff9 100644
--- a/bootloader/x1000/utils.c
+++ b/bootloader/x1000/utils.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/bootloader/x1000/x1000bootloader.h b/bootloader/x1000/x1000bootloader.h
index 44e56cda80..da7b567551 100644
--- a/bootloader/x1000/x1000bootloader.h
+++ b/bootloader/x1000/x1000bootloader.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021-2022 Aidan MacDonald
  *
diff --git a/bootloader/xduoox3.c b/bootloader/xduoox3.c
index 4a680664e0..996546a019 100644
--- a/bootloader/xduoox3.c
+++ b/bootloader/xduoox3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/docs/CONTRIBUTING b/docs/CONTRIBUTING
index 6cc92e24f1..fd52e069b4 100644
--- a/docs/CONTRIBUTING
+++ b/docs/CONTRIBUTING
@@ -75,11 +75,25 @@ environment and how to upload a change you have made for review.
 We strongly prefer that you don't submit patches to the bug tracker,
 as it's much harder to read and discuss them there.
 
-Credits
--------
-We believe in crediting all contributors by name. Before committing a patch to
-Git, we ask that you give us your full real name (no pseudonyms or nicknames)
-for adding to the credits list.
+Real Names
+----------
+Rockbox has the policy that all contributors must supply their real name.
+This includes any code or manual change committed to Git, any contribution
+to the documentation in the Rockbox wiki, and any themes uploaded to the
+official theme site.  Contributors are also credited in our documentation.
+
+There are several reasons for this, but ultimately they come down to
+protecting Rockbox (as an ongoing project) and its individual
+contributors from legal risks.  These risks are not theoretical; in the
+past we have received legal nastygrams accusing us of misappropriating
+private/proprietary code or other IP, forcing us to prove where certain
+contributions had come from.
+
+Contributions without your full real name will be rejected.
+
+For a more in-depth explanation, please read:
+
+  https://www.rockbox.org/wiki/WhyRealNames
 
 Generative AI
 -------------
@@ -92,8 +106,7 @@ Code is of no value to Rockbox if it is not maintainable, and it cannot
 be maintained if it is not understood.  Quality is more important than
 quantity.
 
-If you really *must* submit AI-generated code, you will need to include
-prompt provenance including the model used, dates and full content of
-prompts, and the unedited LLM output.  See the article "Track Prompt
-Provenance in Version Control" at https://medium.com/@psluaces/track-prompt-provenance-in-version-control-8746e2bad3c2)
-by Pablo Santos Luaces.
+If you really *must* submit AI-generated code, you must also document
+its provenance including the tools/models used, structure the commits in
+a logical, consistent manner, and be prepared to justify every code
+change.
diff --git a/docs/CREDITS b/docs/CREDITS
index f1affc6eb8..d1ac0cfdc7 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -761,6 +761,8 @@ Javier Gutiérrez Gertrúdix
 Sergey Puskov
 Eivind Ødegård
 Teun van Dalen
+Adam N. Burke
+Lê Khánh Bình
 
 The libmad team
 The wavpack team
diff --git a/docs/PLUGIN_API b/docs/PLUGIN_API
index 01acbe2181..afe701efe2 100644
--- a/docs/PLUGIN_API
+++ b/docs/PLUGIN_API
@@ -6,7 +6,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Generated from https://git.rockbox.org/cgit/rockbox.git/aapps/plugin.h
 #
@@ -2765,7 +2764,7 @@ void tagcache_search_set_uniqbuf(struct tagcache_search *tcs, void *buffer, long
     \param length
     \description
 
-bool tagtree_subentries_do_action(bool (*action_cb)(const char *file_name))
+bool tagtree_entries_iterate(bool (*action_cb)(const char *file_name), char* buf, size_t buf_sz)
     \group metadata
     \conditions (defined(HAVE_TAGCACHE))
     \param action_cb
diff --git a/docs/usb-api.md b/docs/usb-api.md
index a21d6fd703..8e95cdbda9 100644
--- a/docs/usb-api.md
+++ b/docs/usb-api.md
@@ -3,38 +3,21 @@ Handling USB control requests
 
 API overview
 ------------
+A control request goes through from device driver to class drivers, via usb core.
+Each step is done by those functions:
 
-    enum usb_control_response {
-        USB_CONTROL_ACK,
-        USB_CONTROL_STALL,
-        USB_CONTROL_RECEIVE,
-    };
+    # from device driver to usb core
+    void usb_core_setup_received(struct usb_ctrlrequest* req);
+    # from usb core to class drivers
+    bool usb_class_driver::control_request(struct usb_ctrlrequest* req);
 
-    void usb_core_control_request(struct usb_ctrlrequest* req, void* reqdata);
-    void usb_core_control_complete(int status);
-    void usb_drv_control_response(enum usb_control_response resp,
-                                  void* data, int length);
+Also control response goes through the inverse steps, and the following
+functions are used:
 
-The two `usb_core` functions are common to all targets with a USB stack and
-are implemented in `usb_core.c`. The USB driver calls them to inform the core
-when a control request arrives or is completed.
-
-Each USB driver implements `usb_drv_control_response()`. The core calls this
-to let the driver know how to respond to each control request.
-
-### Legacy API
-
-    void usb_core_legacy_control_request(struct usb_ctrlrequest* req);
-
-The old control request API is available through this function. Drivers which
-don't yet implement the new API can use the legacy API instead. To support
-legacy drivers, the USB core implements all functions in the new API and
-emulates the old control request handling behavior, bugs included.
-
-This is intended as a stopgap measure so that old drivers keep working as-is.
-The core can start using the new API right away, and drivers can be ported
-one-by-one as time allows. Once all drivers are ported to the new API, all
-legacy driver support can be removed.
+    # from class drivers to usb core
+    void usb_core_control_response(enum usb_control_response response, const void* data, size_t size);
+    # from usb core to device drivers
+    int usb_drv_{send,recv}_nonblocking(int endpoint, void *ptr, int length);
 
 Request handling process
 ------------------------
@@ -45,100 +28,17 @@ submitted. This mirrors normal USB operation.
 
 When the USB driver receives a setup packet from the host, it submits it
 to the core to begin handling the control transfer. The driver calls
-`usb_core_control_request(req, NULL)`, passing the setup packet in `req`.
-The second argument, `reqdata`, is not used at this time and is passed
-as `NULL`.
+`usb_core_setup_received(req)`, passing the setup packet in `req`.
 
-The core processes the setup packet and calls `usb_drv_control_response()`
-when it's done. The allowed responses depend on the type of control transfer
-being processed.
+If the request was a Non-data transfer, the core or recipient class driver will
+call `usb_core_control_response(USB_CONTROL_ACK, NULL, 0)` for ACK or
+`usb_core_control_response(USB_CONTROL_STALL, NULL, 0)` for NAK.
 
-### Non-data transfers
+If the request was a Control read transfer, the core or recipient class driver
+will call `usb_core_control_response(USB_CONTROL_ACK, data, size)` to send data packets,
+or `usb_core_control_response(false, USB_CONTROL_STALL, 0)` for NAK.
 
-- `USB_CONTROL_ACK`, to indicate the request was processed successfully.
-- `USB_CONTROL_STALL`, if the request is unsupported or cannot be processed.
-
-### Control read transfers
-
-- `USB_CONTROL_ACK`, to indicate the request was processed successfully.
-  The core must provide a valid `data` buffer with `length` not exceeding
-  the `wLength` field in the setup packet; otherwise, driver behavior is
-  undefined. The driver will transfer this data to the host during the
-  data phase of the control transfer, and then acknowledge the host's OUT
-  packet to complete the transfer successfully.
-- `USB_CONTROL_STALL`, if the request is unsupported or cannot be processed.
-
-### Control write transfers
-
-The driver calls `usb_core_control_request()` twice to handle control writes.
-The first call allows the core to handle the setup packet, and if the core
-decides to accept the data phase, the second call is made when the data has
-been received without error.
-
-#### Setup phase
-
-The first call is made at the end of the setup phase, after receiving the
-setup packet. The driver passes `reqdata = NULL` to indicate this.
-
-The core can decide whether it wants to receive the data phase:
-
-- `USB_CONTROL_RECEIVE`, if the core wishes to continue to the data phase.
-  The core must provide a valid `data` buffer with `length` greater than or
-  equal to the `wLength` specified in the setup packet; otherwise, driver
-  behavior is undefined. The driver will proceed to the data phase and store
-  received data into the provided buffer.
-- `USB_CONTROL_STALL`, if the request is unsupported or cannot be processed.
-
-If the core accepts the data phase, the driver will re-submit the request
-when the data phase is completed correctly. If any error occurs during the
-data phase, the driver will not re-submit the request; instead, it will
-call `usb_core_control_complete()` with a non-zero status code.
-
-#### Status phase
-
-The second call to `usb_core_control_request()` is made at the end of the data
-phase. The `reqdata` passed by the driver is the same one that the core passed
-in its `USB_CONTROL_RECEIVE` response.
-
-The core's allowed responses are:
-
-- `USB_CONTROL_ACK`, to indicate the request was processed successfully.
-- `USB_CONTROL_STALL`, if the request is unsupported or cannot be processed.
-
-### Request completion
-
-The driver will notify the core when a request has completed by calling
-`usb_core_control_complete()`. A status code of zero means the request was
-completed successfully; a non-zero code means it failed. Note that failure
-can occur even if the request was successful from the core's perspective.
-
-If the core response is `USB_CONTROL_STALL` at any point, the request is
-considered complete. In this case, the driver won't deliver a completion
-notification because it would be redundant.
-
-The driver may only complete a request after the core has provided a response
-to any pending `usb_core_control_request()` call. Specifically, if the core
-has not yet responded to a request, the driver needs to defer the completion
-notification until it sees the core's response. If the core's response is a
-stall, then the notification should be silently dropped.
-
-### Notes
-
-- Driver behavior is undefined if the core makes an inappropriate response
-  to a request, for example, responding with `USB_CONTROL_ACK` in the setup
-  phase of a control write or `USB_CONTROL_RECEIVE` to a non-data request.
-  The only permissible responses are the documented ones.
-
-- If a response requires a buffer, then `data` must be non-NULL unless the
-  `length` is also zero. If a buffer is not required, the core must pass
-  `data = NULL` and `length = 0`. Otherwise, driver behavior is undefined.
-  There are two responses which require a buffer:
-  + `USB_CONTROL_ACK` to a control read
-  + `USB_CONTROL_RECEIVE` to the setup phase of a control write
-
-- Drivers must be prepared to accept a setup packet at any time, including
-  in the middle of a control request. In such a case, devices are required
-  to abort the ongoing request and start handling the new request. (This is
-  intended as an error recovery mechanism and should not be abused by hosts
-  in normal operation.) The driver must take care to notify the core of the
-  current request's failure, and then submit the new request.
+If the request was a Control write transfer, the core firstly receive data packets
+using `usb_drv_recv_nonblocking`. Once it's done, the core or recipient class
+driver will process it, then `usb_core_control_response(USB_CONTROL_ACK, NULL, 0)` for ACK
+or `usb_core_control_response(USB_CONTROL_STALL, NULL, 0)` for NAK.
diff --git a/firmware/SOURCES b/firmware/SOURCES
index b80dc1a272..20158f8489 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -350,12 +350,14 @@ libc/memcmp.c
 
 libc/qsort.c
 libc/random.c
+libc/sscanf.c
 libc/strcat.c
 libc/strchr.c
 libc/strcmp.c
 libc/strcpy.c
 libc/strcspn.c
 libc/strncmp.c
+libc/strncpy.c
 libc/strrchr.c
 libc/strstr.c
 libc/mktime.c
@@ -1752,6 +1754,7 @@ target/mips/ingenic_x1000/pwm-x1000.c
 target/mips/ingenic_x1000/sfc-x1000.c
 target/mips/ingenic_x1000/system-x1000.c
 target/mips/ingenic_x1000/timer-x1000.c
+target/mips/ingenic_x1000/uart-x1000.c
 #ifndef USB_NONE
 target/mips/ingenic_x1000/usb-x1000.c
 #endif
diff --git a/firmware/asm/arm/beep.c b/firmware/asm/arm/beep.c
index f3c3e2e0d2..90e135bc13 100644
--- a/firmware/asm/arm/beep.c
+++ b/firmware/asm/arm/beep.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 Michael Sevakis
  *
diff --git a/firmware/asm/arm/corelock.c b/firmware/asm/arm/corelock.c
index a60299436f..7326478657 100644
--- a/firmware/asm/arm/corelock.c
+++ b/firmware/asm/arm/corelock.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Daniel Ankers
  *
diff --git a/firmware/asm/arm/ffs.S b/firmware/asm/arm/ffs.S
index b7d4307803..146d11936f 100644
--- a/firmware/asm/arm/ffs.S
+++ b/firmware/asm/arm/ffs.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Michael Sevakis
  *
diff --git a/firmware/asm/arm/lcd-as-memframe.S b/firmware/asm/arm/lcd-as-memframe.S
index f69f6e5080..c5f3cc681c 100644
--- a/firmware/asm/arm/lcd-as-memframe.S
+++ b/firmware/asm/arm/lcd-as-memframe.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/asm/arm/memcpy.S b/firmware/asm/arm/memcpy.S
index 1fbb6660e9..c2fd8bb35a 100644
--- a/firmware/asm/arm/memcpy.S
+++ b/firmware/asm/arm/memcpy.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Free Software Foundation, Inc.
  * This file was originally part of the GNU C Library
diff --git a/firmware/asm/arm/memmove.S b/firmware/asm/arm/memmove.S
index cf22a74622..45a826c67f 100644
--- a/firmware/asm/arm/memmove.S
+++ b/firmware/asm/arm/memmove.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Free Software Foundation, Inc.
  * This file was originally part of the GNU C Library
diff --git a/firmware/asm/arm/memset.S b/firmware/asm/arm/memset.S
index ef5cdb5819..843a20ae49 100644
--- a/firmware/asm/arm/memset.S
+++ b/firmware/asm/arm/memset.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Thom Johansen
  *
diff --git a/firmware/asm/arm/memset16.S b/firmware/asm/arm/memset16.S
index 851b9207a2..f9b07ae929 100644
--- a/firmware/asm/arm/memset16.S
+++ b/firmware/asm/arm/memset16.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Thom Johansen
  *
diff --git a/firmware/asm/arm/pcm-mixer-armv4.c b/firmware/asm/arm/pcm-mixer-armv4.c
index cb138fc565..11144ab5c0 100644
--- a/firmware/asm/arm/pcm-mixer-armv4.c
+++ b/firmware/asm/arm/pcm-mixer-armv4.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Michael Sevakis
  *
diff --git a/firmware/asm/arm/pcm-mixer-armv5.c b/firmware/asm/arm/pcm-mixer-armv5.c
index 399e6a4373..f33736a862 100644
--- a/firmware/asm/arm/pcm-mixer-armv5.c
+++ b/firmware/asm/arm/pcm-mixer-armv5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Michael Sevakis
  *
diff --git a/firmware/asm/arm/pcm-mixer-armv6.c b/firmware/asm/arm/pcm-mixer-armv6.c
index 7bf83ecf66..613a9ed25a 100644
--- a/firmware/asm/arm/pcm-mixer-armv6.c
+++ b/firmware/asm/arm/pcm-mixer-armv6.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Michael Sevakis
  *
diff --git a/firmware/asm/arm/thread-classic.c b/firmware/asm/arm/thread-classic.c
index d2014fc951..17720d0634 100644
--- a/firmware/asm/arm/thread-classic.c
+++ b/firmware/asm/arm/thread-classic.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Thom Johansen
  *
diff --git a/firmware/asm/arm/thread-classic.h b/firmware/asm/arm/thread-classic.h
index 533a088979..9834927f61 100644
--- a/firmware/asm/arm/thread-classic.h
+++ b/firmware/asm/arm/thread-classic.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Ulf Ralberg
  *
diff --git a/firmware/asm/arm/thread-micro.c b/firmware/asm/arm/thread-micro.c
index 95992c39c3..4f7a60bc68 100644
--- a/firmware/asm/arm/thread-micro.c
+++ b/firmware/asm/arm/thread-micro.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Thom Johansen
  * Copyright (C) 2026 by Aidan MacDonald
diff --git a/firmware/asm/arm/thread-micro.h b/firmware/asm/arm/thread-micro.h
index 67c5b4de80..4469b2db00 100644
--- a/firmware/asm/arm/thread-micro.h
+++ b/firmware/asm/arm/thread-micro.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Ulf Ralberg
  * Copyright (C) 2026 by Aidan MacDonald
diff --git a/firmware/asm/beep.c b/firmware/asm/beep.c
index d430dff14d..e4bc201040 100644
--- a/firmware/asm/beep.c
+++ b/firmware/asm/beep.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 Michael Sevakis
  *
diff --git a/firmware/asm/corelock.c b/firmware/asm/corelock.c
index 51d1d71961..aec4661dab 100644
--- a/firmware/asm/corelock.c
+++ b/firmware/asm/corelock.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Daniel Ankers
  *
diff --git a/firmware/asm/ffs.c b/firmware/asm/ffs.c
index a4512e0c55..a509abfe99 100644
--- a/firmware/asm/ffs.c
+++ b/firmware/asm/ffs.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Michael Sevakis
  *
diff --git a/firmware/asm/m68k/beep.c b/firmware/asm/m68k/beep.c
index 5461a4ef20..46cd0a42e6 100644
--- a/firmware/asm/m68k/beep.c
+++ b/firmware/asm/m68k/beep.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 Michael Sevakis
  *
diff --git a/firmware/asm/m68k/ffs.S b/firmware/asm/m68k/ffs.S
index 87421ffe10..8035684f36 100644
--- a/firmware/asm/m68k/ffs.S
+++ b/firmware/asm/m68k/ffs.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Michael Sevakis
  *
diff --git a/firmware/asm/m68k/memcpy.S b/firmware/asm/m68k/memcpy.S
index a88ac3d091..3654937090 100644
--- a/firmware/asm/m68k/memcpy.S
+++ b/firmware/asm/m68k/memcpy.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004-2005 by Jens Arnold
  *
diff --git a/firmware/asm/m68k/memmove.S b/firmware/asm/m68k/memmove.S
index 736cd619e1..10a3574482 100644
--- a/firmware/asm/m68k/memmove.S
+++ b/firmware/asm/m68k/memmove.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Jens Arnold
  *
diff --git a/firmware/asm/m68k/memset.S b/firmware/asm/m68k/memset.S
index 839b305a05..93063ff449 100644
--- a/firmware/asm/m68k/memset.S
+++ b/firmware/asm/m68k/memset.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Jens Arnold
  *
diff --git a/firmware/asm/m68k/memset16.S b/firmware/asm/m68k/memset16.S
index 1673038d03..050609aab9 100644
--- a/firmware/asm/m68k/memset16.S
+++ b/firmware/asm/m68k/memset16.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Jens Arnold
  *
diff --git a/firmware/asm/m68k/pcm-mixer.c b/firmware/asm/m68k/pcm-mixer.c
index cee2074cd1..3513fb85fa 100644
--- a/firmware/asm/m68k/pcm-mixer.c
+++ b/firmware/asm/m68k/pcm-mixer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Michael Sevakis
  *
diff --git a/firmware/asm/m68k/strlen.S b/firmware/asm/m68k/strlen.S
index 765969da04..9be9c52f9c 100644
--- a/firmware/asm/m68k/strlen.S
+++ b/firmware/asm/m68k/strlen.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Nils Wallménius
  *
diff --git a/firmware/asm/m68k/thread.c b/firmware/asm/m68k/thread.c
index 8681ce179c..cf2073401e 100644
--- a/firmware/asm/m68k/thread.c
+++ b/firmware/asm/m68k/thread.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Linus Nielsen Feltzing
  *
diff --git a/firmware/asm/m68k/thread.h b/firmware/asm/m68k/thread.h
index 9bdbed0c3e..1c2cefb774 100644
--- a/firmware/asm/m68k/thread.h
+++ b/firmware/asm/m68k/thread.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Ulf Ralberg
  *
diff --git a/firmware/asm/memset16.c b/firmware/asm/memset16.c
index 12f3388a8d..ba8fea17db 100644
--- a/firmware/asm/memset16.c
+++ b/firmware/asm/memset16.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Jens Arnold
  *
diff --git a/firmware/asm/mips/ffs.S b/firmware/asm/mips/ffs.S
index a2a82a6a32..13a628b836 100644
--- a/firmware/asm/mips/ffs.S
+++ b/firmware/asm/mips/ffs.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  * based on ffs-arm.S by Michael Sevakis
diff --git a/firmware/asm/mips/memcpy.S b/firmware/asm/mips/memcpy.S
index ec1625bb4f..5274b0c61f 100644
--- a/firmware/asm/mips/memcpy.S
+++ b/firmware/asm/mips/memcpy.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002, 2003 Free Software Foundation, Inc.
  * This file was originally part of the GNU C Library
diff --git a/firmware/asm/mips/memset.S b/firmware/asm/mips/memset.S
index 6dfe0bf864..d584b56bcd 100644
--- a/firmware/asm/mips/memset.S
+++ b/firmware/asm/mips/memset.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * This file was originally part of the Linux/MIPS GNU C Library
  * Copyright (C) 1998 by Ralf Baechle
diff --git a/firmware/asm/mips/thread-mips32.c b/firmware/asm/mips/thread-mips32.c
index f930a41c68..ecf0651574 100644
--- a/firmware/asm/mips/thread-mips32.c
+++ b/firmware/asm/mips/thread-mips32.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/asm/mips/thread.h b/firmware/asm/mips/thread.h
index ac37560a68..1342f54ed9 100644
--- a/firmware/asm/mips/thread.h
+++ b/firmware/asm/mips/thread.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Ulf Ralberg
  *
diff --git a/firmware/asm/pcm-mixer.c b/firmware/asm/pcm-mixer.c
index 9bdb962576..ffa99edec6 100644
--- a/firmware/asm/pcm-mixer.c
+++ b/firmware/asm/pcm-mixer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Michael Sevakis
  *
diff --git a/firmware/asm/stack-protector.c b/firmware/asm/stack-protector.c
index b0de405980..73770ba26f 100644
--- a/firmware/asm/stack-protector.c
+++ b/firmware/asm/stack-protector.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2026 by Aidan MacDonald
 *
diff --git a/firmware/asm/thread-unix.c b/firmware/asm/thread-unix.c
index 8538515a76..5ed5de7edb 100644
--- a/firmware/asm/thread-unix.c
+++ b/firmware/asm/thread-unix.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Thomas Martitz
  *
diff --git a/firmware/asm/thread-win32.c b/firmware/asm/thread-win32.c
index 9125819ade..cfa9876b4f 100644
--- a/firmware/asm/thread-win32.c
+++ b/firmware/asm/thread-win32.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/asm/thread.h b/firmware/asm/thread.h
index 6301b0cb05..999dd2ac48 100644
--- a/firmware/asm/thread.h
+++ b/firmware/asm/thread.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Ulf Ralberg
  *
diff --git a/firmware/ata_idle_notify.c b/firmware/ata_idle_notify.c
index f56dea5c11..0de6eb4530 100644
--- a/firmware/ata_idle_notify.c
+++ b/firmware/ata_idle_notify.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/firmware/backlight-sw-fading.c b/firmware/backlight-sw-fading.c
index 67c479f4c4..f0ae8a1641 100644
--- a/firmware/backlight-sw-fading.c
+++ b/firmware/backlight-sw-fading.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Thomas Martitz
  * Copyright (C) 2008 by Martin Ritter
diff --git a/firmware/backlight.c b/firmware/backlight.c
index 3623162adb..781434e07b 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  * Additional work by Martin Ritter (2007) and Thomas Martitz (2008)
diff --git a/firmware/bidi.c b/firmware/bidi.c
index 310de36c91..1fbc8f1d70 100644
--- a/firmware/bidi.c
+++ b/firmware/bidi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Gadi Cohen
  *
@@ -37,13 +36,37 @@
 #define _HEB_ORIENTATION_LTR 1
 #define _HEB_ORIENTATION_RTL 0
 
-#define ischar(c) ((c > 0x0589 && c < 0x0700) || \
-                   (c >= 0xfb50 && c <= 0xfefc) ? 1 : 0)
+/* ischar() now lives in bidi.h as the shared is_rtl_char() macro */
 #define _isblank(c) ((c==' ' || c=='\t') ? 1 : 0)
 #define _isnewline(c) ((c=='\n' || c=='\r') ? 1 : 0)
+/* ctype ispunct() is only defined for unsigned char values; feeding it a
+ * decoded Unicode codepoint (e.g. Hebrew final kaf U+05DA, gimel U+05D2) is
+ * undefined and some libcs then mis-report it as punctuation, which trims the
+ * final letter off its RTL block and throws it to the wrong end of the line.
+ * Restrict the punctuation test to ASCII. */
+#define _ispunct(c) ((c) < 0x80 && ispunct((int)(c)))
 #define XOR(a,b) ((a||b) && !(a&&b))
 
 #ifndef BOOTLOADER
+/* True if the first strongly-directional character of the string is RTL, i.e.
+ * the string should be laid out right-to-left. */
+bool text_is_rtl(const unsigned char *str)
+{
+    while (*str)
+    {
+        ucschar_t c;
+        const unsigned char *next = utf8decode(str, &c);
+        if (is_rtl_char(c))
+            return true;
+        if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'))
+            return false;
+        if (next == str)
+            break;
+        str = next;
+    }
+    return false;
+}
+
 static const arab_t * arab_lookup(ucschar_t uchar)
 {
     if (uchar >= 0x621 && uchar <= 0x63a)
@@ -179,14 +202,14 @@ ucschar_t *bidi_l2v(const unsigned char *str, int orientation)
         target--;
     }
 
-    if (ischar(*tmp))
+    if (is_rtl_char(*tmp))
         block_type = _HEB_BLOCK_TYPE_HEB;
     else
         block_type = _HEB_BLOCK_TYPE_ENG;
 
     do {
-        while((XOR(ischar(*(tmp+1)),block_type)
-               || _isblank(*(tmp+1)) || ispunct((int)*(tmp+1))
+        while((XOR(is_rtl_char(*(tmp+1)),block_type)
+               || _isblank(*(tmp+1)) || _ispunct(*(tmp+1))
                || *(tmp+1)=='\n')
               && block_end < length-1) {
                 tmp++;
@@ -195,7 +218,7 @@ ucschar_t *bidi_l2v(const unsigned char *str, int orientation)
         }
 
         if (block_type != orientation) {
-            while ((_isblank(*tmp) || ispunct((int)*tmp))
+            while ((_isblank(*tmp) || _ispunct(*tmp))
                    && *tmp!='/' && *tmp!='-' && block_end>block_start) {
                 tmp--;
                 block_end--;
diff --git a/firmware/buflib_malloc.c b/firmware/buflib_malloc.c
index 0cd292f1e0..59accfdb19 100644
--- a/firmware/buflib_malloc.c
+++ b/firmware/buflib_malloc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2023 Aidan MacDonald
  *
diff --git a/firmware/buflib_mempool.c b/firmware/buflib_mempool.c
index 9d1c055bb9..2b3cd5a06f 100644
--- a/firmware/buflib_mempool.c
+++ b/firmware/buflib_mempool.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * This is a memory allocator designed to provide reasonable management of free
 * space and fast access to allocated data. More than one allocator can be used
diff --git a/firmware/chunk_alloc.c b/firmware/chunk_alloc.c
index 02cc7a056c..5f2e324761 100644
--- a/firmware/chunk_alloc.c
+++ b/firmware/chunk_alloc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2023 by William Wilgus
  *
diff --git a/firmware/common/adler32.c b/firmware/common/adler32.c
index 419eb02e44..3b84d90e77 100644
--- a/firmware/common/adler32.c
+++ b/firmware/common/adler32.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 James Buren (adaptations from tinf/zlib)
  *
diff --git a/firmware/common/ap_int.c b/firmware/common/ap_int.c
index 12214534dd..dc075447f8 100644
--- a/firmware/common/ap_int.c
+++ b/firmware/common/ap_int.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2018 by Michael A. Sevakis
  *
diff --git a/firmware/common/config.c b/firmware/common/config.c
index 5245d34135..6741297039 100644
--- a/firmware/common/config.c
+++ b/firmware/common/config.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/firmware/common/crc32.c b/firmware/common/crc32.c
index c8ed8f5350..1bf89acb43 100644
--- a/firmware/common/crc32.c
+++ b/firmware/common/crc32.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Jörg Hohensohn [IDC]Dragon
  *
diff --git a/firmware/common/diacritic.c b/firmware/common/diacritic.c
index 1cba32e483..f8598d06a1 100644
--- a/firmware/common/diacritic.c
+++ b/firmware/common/diacritic.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Phinitnun Chanasabaeng
  *     Initial work
diff --git a/firmware/common/dir.c b/firmware/common/dir.c
index 9a78d910a7..1f04c4f46b 100644
--- a/firmware/common/dir.c
+++ b/firmware/common/dir.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  * Copyright (C) 2014 by Michael Sevakis
diff --git a/firmware/common/dircache.c b/firmware/common/dircache.c
index 116148ee6a..4b584fca56 100644
--- a/firmware/common/dircache.c
+++ b/firmware/common/dircache.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Miika Pekkarinen
  * Copyright (C) 2014 by Michael Sevakis
diff --git a/firmware/common/disk.c b/firmware/common/disk.c
index bc3b05d890..4a660eb705 100644
--- a/firmware/common/disk.c
+++ b/firmware/common/disk.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
@@ -509,9 +508,7 @@ int disk_mount_all(void)
 
     for (int i = 0; i < NUM_DRIVES; i++)
     {
-    #ifdef HAVE_HOTSWAP
         if (storage_present(i))
-    #endif
             mounted += disk_mount(i);
     }
 
@@ -555,9 +552,7 @@ int disk_unmount_all(void)
 
     for (int i = 0; i < NUM_DRIVES; i++)
     {
-    #ifdef HAVE_HOTSWAP
         if (storage_present(i))
-    #endif
             unmounted += disk_unmount(i);
     }
 
diff --git a/firmware/common/disk_cache.c b/firmware/common/disk_cache.c
index 74c4d5f35b..f47579dee7 100644
--- a/firmware/common/disk_cache.c
+++ b/firmware/common/disk_cache.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/common/fat.c b/firmware/common/fat.c
index 9a4446ef25..38b15aebdb 100644
--- a/firmware/common/fat.c
+++ b/firmware/common/fat.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  * Copyright (C) 2014 by Michael Sevakis
diff --git a/firmware/common/fdprintf.c b/firmware/common/fdprintf.c
index 3dabbf3462..86f30792bb 100644
--- a/firmware/common/fdprintf.c
+++ b/firmware/common/fdprintf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Felix Arends
  *
diff --git a/firmware/common/file.c b/firmware/common/file.c
index bb64ccc340..12505381fc 100644
--- a/firmware/common/file.c
+++ b/firmware/common/file.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  * Copyright (C) 2014 by Michael Sevakis
diff --git a/firmware/common/file_internal.c b/firmware/common/file_internal.c
index e4554670af..b6b9b6e9bf 100644
--- a/firmware/common/file_internal.c
+++ b/firmware/common/file_internal.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/common/fileobj_mgr.c b/firmware/common/fileobj_mgr.c
index da82681acc..3e740f50d7 100644
--- a/firmware/common/fileobj_mgr.c
+++ b/firmware/common/fileobj_mgr.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/common/inflate.c b/firmware/common/inflate.c
index e39fe3a14e..8b79ce5a74 100644
--- a/firmware/common/inflate.c
+++ b/firmware/common/inflate.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 by James Buren (libflate adaptations for RockBox)
  *
diff --git a/firmware/common/linked_list.c b/firmware/common/linked_list.c
index 30e4e6079a..226e9fc1bb 100644
--- a/firmware/common/linked_list.c
+++ b/firmware/common/linked_list.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/common/pathfuncs.c b/firmware/common/pathfuncs.c
index b2aadfb5fe..4023835730 100644
--- a/firmware/common/pathfuncs.c
+++ b/firmware/common/pathfuncs.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/common/rb_namespace.c b/firmware/common/rb_namespace.c
index 5069a8681e..cdc84bcc89 100644
--- a/firmware/common/rb_namespace.c
+++ b/firmware/common/rb_namespace.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 by Michael Sevakis
  *
diff --git a/firmware/common/rectangle.c b/firmware/common/rectangle.c
index 3ce09f5145..2a90a3ea9f 100644
--- a/firmware/common/rectangle.c
+++ b/firmware/common/rectangle.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/firmware/common/strlcpy.c b/firmware/common/strlcpy.c
index 5107ea1207..48b8a9740e 100644
--- a/firmware/common/strlcpy.c
+++ b/firmware/common/strlcpy.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 William Wilgus
  *
diff --git a/firmware/common/strmemccpy.c b/firmware/common/strmemccpy.c
index 830907f55e..fe91d621ab 100644
--- a/firmware/common/strmemccpy.c
+++ b/firmware/common/strmemccpy.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 William Wilgus
  *
diff --git a/firmware/common/strptokspn.c b/firmware/common/strptokspn.c
index 16aafc66ef..1b92763987 100644
--- a/firmware/common/strptokspn.c
+++ b/firmware/common/strptokspn.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 by William WIlgus
  *
diff --git a/firmware/common/timefuncs.c b/firmware/common/timefuncs.c
index 1405a8d926..80f1fd6f80 100644
--- a/firmware/common/timefuncs.c
+++ b/firmware/common/timefuncs.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/common/unicode.c b/firmware/common/unicode.c
index f7d44e1ee2..7e5bac8d91 100644
--- a/firmware/common/unicode.c
+++ b/firmware/common/unicode.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2004,2005 by Marcoen Hirschberg
  *
diff --git a/firmware/common/version.c b/firmware/common/version.c
index bb856e4219..0904e6839e 100644
--- a/firmware/common/version.c
+++ b/firmware/common/version.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Frank Gevaerts
  *
diff --git a/firmware/common/vuprintf.c b/firmware/common/vuprintf.c
index 0ea5833984..b6fc4bd5a5 100644
--- a/firmware/common/vuprintf.c
+++ b/firmware/common/vuprintf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Gary Czvitkovicz
  * Copyright (C) 2017 by Michael A. Sevakis
diff --git a/firmware/common/zip.c b/firmware/common/zip.c
index 2d560e472e..345eb6cb35 100644
--- a/firmware/common/zip.c
+++ b/firmware/common/zip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 by James Buren
  *
diff --git a/firmware/core_alloc.c b/firmware/core_alloc.c
index 6789ff2499..95642e806b 100644
--- a/firmware/core_alloc.c
+++ b/firmware/core_alloc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Thomas Martitz
  *
diff --git a/firmware/debug.c b/firmware/debug.c
index 34f89908a3..035ee840d4 100644
--- a/firmware/debug.c
+++ b/firmware/debug.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/drivers/adc-as3514.c b/firmware/drivers/adc-as3514.c
index 9a81a52cc7..0556e9d062 100644
--- a/firmware/drivers/adc-as3514.c
+++ b/firmware/drivers/adc-as3514.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index 9d89f8d3dd..2244a03a0d 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/drivers/audio/aic310x.c b/firmware/drivers/audio/aic310x.c
index 3f96f0b2a0..585d9d6628 100644
--- a/firmware/drivers/audio/aic310x.c
+++ b/firmware/drivers/audio/aic310x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Aidan MacDonald
  *
diff --git a/firmware/drivers/audio/aic3x.c b/firmware/drivers/audio/aic3x.c
index 39576e9f47..f93c961762 100644
--- a/firmware/drivers/audio/aic3x.c
+++ b/firmware/drivers/audio/aic3x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/drivers/audio/ak4376.c b/firmware/drivers/audio/ak4376.c
index 8d2b9f44f3..05b1645120 100644
--- a/firmware/drivers/audio/ak4376.c
+++ b/firmware/drivers/audio/ak4376.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/drivers/audio/ak4537.c b/firmware/drivers/audio/ak4537.c
index 3a014f7527..f268d61517 100644
--- a/firmware/drivers/audio/ak4537.c
+++ b/firmware/drivers/audio/ak4537.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2009 Mark Arigo
  *
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c
index c55c7ba0a2..f8d13e93e8 100644
--- a/firmware/drivers/audio/as3514.c
+++ b/firmware/drivers/audio/as3514.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Driver for AS3514 and compatible audio codec
  *
diff --git a/firmware/drivers/audio/audiohw-swcodec.c b/firmware/drivers/audio/audiohw-swcodec.c
index b627c1eeff..7a004a181f 100644
--- a/firmware/drivers/audio/audiohw-swcodec.c
+++ b/firmware/drivers/audio/audiohw-swcodec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Thom Johansen
  *
diff --git a/firmware/drivers/audio/cs42l55.c b/firmware/drivers/audio/cs42l55.c
index 43f6e1db4c..25f29d6b52 100644
--- a/firmware/drivers/audio/cs42l55.c
+++ b/firmware/drivers/audio/cs42l55.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: wm8975.c 28572 2010-11-13 11:38:38Z theseven $
  *
  * Driver for Cirrus Logic CS42L55 audio codec
  *
diff --git a/firmware/drivers/audio/cs4398.c b/firmware/drivers/audio/cs4398.c
index 35aa99d08c..fef4e1ced8 100644
--- a/firmware/drivers/audio/cs4398.c
+++ b/firmware/drivers/audio/cs4398.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/drivers/audio/ctru.c b/firmware/drivers/audio/ctru.c
index 70a4170557..05cca2e76f 100644
--- a/firmware/drivers/audio/ctru.c
+++ b/firmware/drivers/audio/ctru.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2010 Thomas Martitz
  *
diff --git a/firmware/drivers/audio/dac3550a.c b/firmware/drivers/audio/dac3550a.c
index 0ff5d8ad21..0160dc920e 100644
--- a/firmware/drivers/audio/dac3550a.c
+++ b/firmware/drivers/audio/dac3550a.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/drivers/audio/df1704.c b/firmware/drivers/audio/df1704.c
index 917cecb767..9cc50b8484 100644
--- a/firmware/drivers/audio/df1704.c
+++ b/firmware/drivers/audio/df1704.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/firmware/drivers/audio/dummy_codec.c b/firmware/drivers/audio/dummy_codec.c
index fbbe836499..ac3595a75d 100644
--- a/firmware/drivers/audio/dummy_codec.c
+++ b/firmware/drivers/audio/dummy_codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2011 Andrew Ryabinin
diff --git a/firmware/drivers/audio/eros_qn_codec.c b/firmware/drivers/audio/eros_qn_codec.c
index 741f3fb24f..fc01f7fd09 100644
--- a/firmware/drivers/audio/eros_qn_codec.c
+++ b/firmware/drivers/audio/eros_qn_codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Andrew Ryabinin, Dana Conrad
  *
diff --git a/firmware/drivers/audio/es9018.c b/firmware/drivers/audio/es9018.c
index 6a73f7a2d3..5891b2408b 100644
--- a/firmware/drivers/audio/es9018.c
+++ b/firmware/drivers/audio/es9018.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/drivers/audio/es9018k2m.c b/firmware/drivers/audio/es9018k2m.c
index 00eeebd7b3..3dd982f816 100644
--- a/firmware/drivers/audio/es9018k2m.c
+++ b/firmware/drivers/audio/es9018k2m.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2023 Dana Conrad
diff --git a/firmware/drivers/audio/es9218.c b/firmware/drivers/audio/es9218.c
index 76d387221a..9ab7b1a501 100644
--- a/firmware/drivers/audio/es9218.c
+++ b/firmware/drivers/audio/es9218.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/drivers/audio/imx233-codec.c b/firmware/drivers/audio/imx233-codec.c
index d56eb44d57..d111955b68 100644
--- a/firmware/drivers/audio/imx233-codec.c
+++ b/firmware/drivers/audio/imx233-codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/drivers/audio/pcm1792.c b/firmware/drivers/audio/pcm1792.c
index a048d07eb3..550794c9a5 100644
--- a/firmware/drivers/audio/pcm1792.c
+++ b/firmware/drivers/audio/pcm1792.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/firmware/drivers/audio/rk27xx_codec.c b/firmware/drivers/audio/rk27xx_codec.c
index 2b0f2dbb22..4357a4c356 100644
--- a/firmware/drivers/audio/rk27xx_codec.c
+++ b/firmware/drivers/audio/rk27xx_codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Driver for internal Rockchip rk27xx audio codec
  * (shCODlp-100.01-HD IP core from Dolphin)
diff --git a/firmware/drivers/audio/sdl.c b/firmware/drivers/audio/sdl.c
index 89f40baedf..7250f36124 100644
--- a/firmware/drivers/audio/sdl.c
+++ b/firmware/drivers/audio/sdl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2010 Thomas Martitz
  *
diff --git a/firmware/drivers/audio/tlv320.c b/firmware/drivers/audio/tlv320.c
index 19212155b1..5d020606d5 100644
--- a/firmware/drivers/audio/tlv320.c
+++ b/firmware/drivers/audio/tlv320.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Christian Gmeiner
  *
diff --git a/firmware/drivers/audio/tsc2100.c b/firmware/drivers/audio/tsc2100.c
index b74d445056..be3609ea72 100644
--- a/firmware/drivers/audio/tsc2100.c
+++ b/firmware/drivers/audio/tsc2100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Driver for TSC2100 audio codec
  *
diff --git a/firmware/drivers/audio/uda1341.c b/firmware/drivers/audio/uda1341.c
index 75573105de..420948169c 100644
--- a/firmware/drivers/audio/uda1341.c
+++ b/firmware/drivers/audio/uda1341.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: uda1380.c 21975 2009-07-19 22:45:32Z bertrik $
  *
  * Copyright (C) 2009 by Bob Cousins
  *
diff --git a/firmware/drivers/audio/uda1380.c b/firmware/drivers/audio/uda1380.c
index 079175d966..cb686dffcc 100644
--- a/firmware/drivers/audio/uda1380.c
+++ b/firmware/drivers/audio/uda1380.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Andy Young
  *
diff --git a/firmware/drivers/audio/wm8731.c b/firmware/drivers/audio/wm8731.c
index 98155a71eb..f17d8f039c 100644
--- a/firmware/drivers/audio/wm8731.c
+++ b/firmware/drivers/audio/wm8731.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Driver for WM8711/WM8721/WM8731 audio codecs
  *
diff --git a/firmware/drivers/audio/wm8740.c b/firmware/drivers/audio/wm8740.c
index d88f53bd75..22aa733281 100644
--- a/firmware/drivers/audio/wm8740.c
+++ b/firmware/drivers/audio/wm8740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/drivers/audio/wm8751.c b/firmware/drivers/audio/wm8751.c
index 1b4af3eca8..9a688f6589 100644
--- a/firmware/drivers/audio/wm8751.c
+++ b/firmware/drivers/audio/wm8751.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Driver for WM8751 audio codec
  *
diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c
index df90081354..b4e9913a65 100644
--- a/firmware/drivers/audio/wm8758.c
+++ b/firmware/drivers/audio/wm8758.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Driver for WM8758 audio codec - based on datasheet for WM8983
  *
diff --git a/firmware/drivers/audio/wm8975.c b/firmware/drivers/audio/wm8975.c
index a1af1331f2..46128cc79d 100644
--- a/firmware/drivers/audio/wm8975.c
+++ b/firmware/drivers/audio/wm8975.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Driver for WM8975 audio codec
  *
diff --git a/firmware/drivers/audio/wm8978.c b/firmware/drivers/audio/wm8978.c
index adc46c316f..886767ab56 100644
--- a/firmware/drivers/audio/wm8978.c
+++ b/firmware/drivers/audio/wm8978.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Michael Sevakis
  *
diff --git a/firmware/drivers/audio/wm8985.c b/firmware/drivers/audio/wm8985.c
index 21b2463272..c5c3c48347 100644
--- a/firmware/drivers/audio/wm8985.c
+++ b/firmware/drivers/audio/wm8985.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/firmware/drivers/audio/x1000-codec.c b/firmware/drivers/audio/x1000-codec.c
index c083882dab..358b299eaa 100644
--- a/firmware/drivers/audio/x1000-codec.c
+++ b/firmware/drivers/audio/x1000-codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021-2022 Aidan MacDonald
  * Copyright 2014 Ingenic Semiconductor Co.,Ltd
diff --git a/firmware/drivers/axp-2101.c b/firmware/drivers/axp-2101.c
index bf1782f6d8..7cac31eb9c 100644
--- a/firmware/drivers/axp-2101.c
+++ b/firmware/drivers/axp-2101.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/drivers/axp-pmu.c b/firmware/drivers/axp-pmu.c
index 66949e338c..50486abd67 100644
--- a/firmware/drivers/axp-pmu.c
+++ b/firmware/drivers/axp-pmu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index a68b343629..cd424d4245 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
@@ -201,7 +200,9 @@ static void button_tick(void)
 {
     static int count = 0;
     static int repeat_speed = REPEAT_INTERVAL_START;
+#ifdef HAVE_SW_POWEROFF
     static int repeat_count = 0;
+#endif
     static bool repeat = false;
     static bool post = false;
 #ifdef HAVE_BACKLIGHT
@@ -291,12 +292,12 @@ static void button_tick(void)
 
                         count = repeat_speed;
 
+#ifdef HAVE_SW_POWEROFF
                         repeat_count++;
-
                         /* Send a SYS_POWEROFF event if we have a device
                            which doesn't shut down easily with the OFF
                            key */
-#ifdef HAVE_SW_POWEROFF
+
                         if (enable_sw_poweroff &&
                             (btn & POWEROFF_BUTTON
 #ifdef RC_POWEROFF_BUTTON
@@ -336,7 +337,9 @@ static void button_tick(void)
                     {
                         post = true;
                         repeat = true;
+#ifdef HAVE_SW_POWEROFF
                         repeat_count = 0;
+#endif
                         /* initial repeat */
 #ifdef HAVE_TOUCHSCREEN
                         if (btn & BUTTON_TOUCHSCREEN)
@@ -456,7 +459,6 @@ static int button_flip(int button)
 {
     int newbutton = button;
 
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
     newbutton &= ~(
 #if defined(BUTTON_LEFT) && defined(BUTTON_RIGHT)
         BUTTON_LEFT | BUTTON_RIGHT
@@ -518,7 +520,6 @@ static int button_flip(int button)
     if (button & BUTTON_PREV)
         newbutton |= BUTTON_NEXT;
 #endif
-#endif /* !SIMULATOR */
     return newbutton;
 }
 
diff --git a/firmware/drivers/button_queue.c b/firmware/drivers/button_queue.c
index fc87732cef..3c6dd9ed74 100644
--- a/firmware/drivers/button_queue.c
+++ b/firmware/drivers/button_queue.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
diff --git a/firmware/drivers/cw2015.c b/firmware/drivers/cw2015.c
index 705ca16e22..db4ef2bdca 100644
--- a/firmware/drivers/cw2015.c
+++ b/firmware/drivers/cw2015.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/drivers/eeprom_24cxx.c b/firmware/drivers/eeprom_24cxx.c
index 5d26bd8eaf..5832735cf9 100644
--- a/firmware/drivers/eeprom_24cxx.c
+++ b/firmware/drivers/eeprom_24cxx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Miika Pekkarinen
  *
diff --git a/firmware/drivers/ft6x06.c b/firmware/drivers/ft6x06.c
index c605ee0944..42cdb28d10 100644
--- a/firmware/drivers/ft6x06.c
+++ b/firmware/drivers/ft6x06.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/drivers/generic_i2c.c b/firmware/drivers/generic_i2c.c
index 9fd90b5b2c..a73d63c793 100644
--- a/firmware/drivers/generic_i2c.c
+++ b/firmware/drivers/generic_i2c.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/drivers/i2c-async.c b/firmware/drivers/i2c-async.c
index f18bea565f..044310537c 100644
--- a/firmware/drivers/i2c-async.c
+++ b/firmware/drivers/i2c-async.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/drivers/isp1362.c b/firmware/drivers/isp1362.c
index 7c2cd6f745..a9bc6af343 100644
--- a/firmware/drivers/isp1362.c
+++ b/firmware/drivers/isp1362.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jens Arnold
  *
diff --git a/firmware/drivers/isp1583.c b/firmware/drivers/isp1583.c
index 93aba17a7b..5392b56b6e 100644
--- a/firmware/drivers/isp1583.c
+++ b/firmware/drivers/isp1583.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Tomasz Malesinski
  * Copyright (C) 2008 by Maurus Cuelenaere
@@ -343,7 +342,7 @@ static void usb_handle_setup_rx(void)
     if (len == 8)
     {
         ISP1583_DFLOW_CTRLFUN |= DFLOW_CTRLFUN_STATUS; /* Acknowledge packet */
-        usb_core_legacy_control_request((struct usb_ctrlrequest*)setup_pkt_buf);
+        usb_core_setup_received((struct usb_ctrlrequest*)setup_pkt_buf);
     }
     else
     {
diff --git a/firmware/drivers/lcd-16bit-common.c b/firmware/drivers/lcd-16bit-common.c
index 6108832cb4..a2469b2cad 100644
--- a/firmware/drivers/lcd-16bit-common.c
+++ b/firmware/drivers/lcd-16bit-common.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  *
@@ -508,6 +507,8 @@ static void ICODE_ATTR lcd_alpha_bitmap_part_mix(
         if (alpha_pixels) { \
             alpha_data = *alpha++ ^ dmask; \
             alpha_data >>= ALPHA_BPP; \
+        } else { \
+            alpha_data = 0; \
         } \
     } while(0)
 #define START_ALPHA() do { } while(0)
diff --git a/firmware/drivers/lcd-16bit-vert.c b/firmware/drivers/lcd-16bit-vert.c
index 6532ea5121..3bc33dd535 100644
--- a/firmware/drivers/lcd-16bit-vert.c
+++ b/firmware/drivers/lcd-16bit-vert.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  * Copyright (C) 2009 by Karl Kurbjun
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index f4adbe8b33..d3262a8e02 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  * Copyright (C) 2009 by Karl Kurbjun
diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c
index 214d26b964..10ec460dc5 100644
--- a/firmware/drivers/lcd-1bit-vert.c
+++ b/firmware/drivers/lcd-1bit-vert.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/drivers/lcd-24bit.c b/firmware/drivers/lcd-24bit.c
index 64ddf4a201..85914dc151 100644
--- a/firmware/drivers/lcd-24bit.c
+++ b/firmware/drivers/lcd-24bit.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  * Copyright (C) 2009 by Karl Kurbjun
diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c
index abe7443e01..0fbd941fec 100644
--- a/firmware/drivers/lcd-2bit-horz.c
+++ b/firmware/drivers/lcd-2bit-horz.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * LCD driver for horizontally-packed 2bpp greyscale display
  *
diff --git a/firmware/drivers/lcd-2bit-vert.c b/firmware/drivers/lcd-2bit-vert.c
index 6ea367e695..634f7daa4f 100644
--- a/firmware/drivers/lcd-2bit-vert.c
+++ b/firmware/drivers/lcd-2bit-vert.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Linus Nielsen Feltzing
  *
diff --git a/firmware/drivers/lcd-2bit-vi.c b/firmware/drivers/lcd-2bit-vi.c
index 5c615c4c9e..316ec49659 100644
--- a/firmware/drivers/lcd-2bit-vi.c
+++ b/firmware/drivers/lcd-2bit-vi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jens Arnold
  *
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index e57ab97611..68299df246 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *     Text rendering
diff --git a/firmware/drivers/lcd-color-common.c b/firmware/drivers/lcd-color-common.c
index 1ec965d816..c7c51c40e8 100644
--- a/firmware/drivers/lcd-color-common.c
+++ b/firmware/drivers/lcd-color-common.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  * Copyright (C) 2009 by Karl Kurbjun
diff --git a/firmware/drivers/lcd-memframe.c b/firmware/drivers/lcd-memframe.c
index bb1682b074..fd61f87bc4 100644
--- a/firmware/drivers/lcd-memframe.c
+++ b/firmware/drivers/lcd-memframe.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2007, 2011 Michael Sevakis
  *
diff --git a/firmware/drivers/lcd-remote-1bit-v.c b/firmware/drivers/lcd-remote-1bit-v.c
index 24b91509c7..38c613fcd8 100644
--- a/firmware/drivers/lcd-remote-1bit-v.c
+++ b/firmware/drivers/lcd-remote-1bit-v.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Richard S. La Charité III
  *
diff --git a/firmware/drivers/lcd-remote-2bit-vi.c b/firmware/drivers/lcd-remote-2bit-vi.c
index fd4de6f6af..c485ce21aa 100644
--- a/firmware/drivers/lcd-remote-2bit-vi.c
+++ b/firmware/drivers/lcd-remote-2bit-vi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jens Arnold
  *
diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c
index ca52476b87..ca225ac3bf 100644
--- a/firmware/drivers/lcd-scroll.c
+++ b/firmware/drivers/lcd-scroll.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/drivers/led.c b/firmware/drivers/led.c
index 36a4e4eb87..8ed90f7533 100644
--- a/firmware/drivers/led.c
+++ b/firmware/drivers/led.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/drivers/libertas/if_spi.c b/firmware/drivers/libertas/if_spi.c
index be564cc64f..1a51d6aa09 100644
--- a/firmware/drivers/libertas/if_spi.c
+++ b/firmware/drivers/libertas/if_spi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 by Tomasz Moń
  * Ported from Linux libertas driver
diff --git a/firmware/drivers/libertas/if_spi.h b/firmware/drivers/libertas/if_spi.h
index bfca12981a..ee9d9d59bb 100644
--- a/firmware/drivers/libertas/if_spi.h
+++ b/firmware/drivers/libertas/if_spi.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 by Tomasz Moń
  * Ported from Linux libertas driver
diff --git a/firmware/drivers/libertas/if_spi_drv.h b/firmware/drivers/libertas/if_spi_drv.h
index 6c8b5c3d92..87a9aee22c 100644
--- a/firmware/drivers/libertas/if_spi_drv.h
+++ b/firmware/drivers/libertas/if_spi_drv.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 by Tomasz Moń
  *
diff --git a/firmware/drivers/m5636.c b/firmware/drivers/m5636.c
index 193d3dcc47..930395a9c7 100644
--- a/firmware/drivers/m5636.c
+++ b/firmware/drivers/m5636.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Ulrich Pegelow
  *
diff --git a/firmware/drivers/m66591.c b/firmware/drivers/m66591.c
index 6095e085e3..7a4f7da1c8 100644
--- a/firmware/drivers/m66591.c
+++ b/firmware/drivers/m66591.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Karl Kurbjun
  * Portions Copyright (C) 2007 by Catalin Patulea
@@ -210,7 +209,7 @@ static void control_received(void) {
     /* acknowledge packet recieved (clear valid) */
     M66591_INTSTAT_MAIN &= ~(1<<3);
 
-    usb_core_legacy_control_request(&temp);
+    usb_core_setup_received(&temp);
 }
 
 /* This is a helper function, it is used to notife the stack that a transfer is
diff --git a/firmware/drivers/nand_id.c b/firmware/drivers/nand_id.c
index 56132ab090..2281eb83f2 100644
--- a/firmware/drivers/nand_id.c
+++ b/firmware/drivers/nand_id.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/drivers/pca9555.c b/firmware/drivers/pca9555.c
index 78326f308e..9a958dd889 100644
--- a/firmware/drivers/pca9555.c
+++ b/firmware/drivers/pca9555.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/firmware/drivers/pcf50605.c b/firmware/drivers/pcf50605.c
index a76c1dbc3c..41a40b64fd 100644
--- a/firmware/drivers/pcf50605.c
+++ b/firmware/drivers/pcf50605.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Driver for pcf50605 PMU and RTC
  *
diff --git a/firmware/drivers/pcf50606.c b/firmware/drivers/pcf50606.c
index fb89c827e5..6edd5065bf 100644
--- a/firmware/drivers/pcf50606.c
+++ b/firmware/drivers/pcf50606.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Rob Purchase
  *
diff --git a/firmware/drivers/pcf50635.c b/firmware/drivers/pcf50635.c
index 38104b8d04..8eda8b5781 100644
--- a/firmware/drivers/pcf50635.c
+++ b/firmware/drivers/pcf50635.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Rob Purchase
  *
diff --git a/firmware/drivers/qt1106.c b/firmware/drivers/qt1106.c
index 67573fe0ae..e774106715 100644
--- a/firmware/drivers/qt1106.c
+++ b/firmware/drivers/qt1106.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Frank Gevaerts
  *
diff --git a/firmware/drivers/ramdisk.c b/firmware/drivers/ramdisk.c
index edcf5cba4e..2071529e29 100644
--- a/firmware/drivers/ramdisk.c
+++ b/firmware/drivers/ramdisk.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Frank Gevaerts
  *
diff --git a/firmware/drivers/rds.c b/firmware/drivers/rds.c
index 48c7d398a9..4daef46a54 100644
--- a/firmware/drivers/rds.c
+++ b/firmware/drivers/rds.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 by Bertrik Sikken
  *
diff --git a/firmware/drivers/rtc/rtc_as3514.c b/firmware/drivers/rtc/rtc_as3514.c
index 3ece1de67e..226f7aacf6 100644
--- a/firmware/drivers/rtc/rtc_as3514.c
+++ b/firmware/drivers/rtc/rtc_as3514.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Barry Wardell
  *
diff --git a/firmware/drivers/rtc/rtc_d2.c b/firmware/drivers/rtc/rtc_d2.c
index 726564a255..94d98b34c6 100644
--- a/firmware/drivers/rtc/rtc_d2.c
+++ b/firmware/drivers/rtc/rtc_d2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Rob Purchase
  *
diff --git a/firmware/drivers/rtc/rtc_ds1339_ds3231.c b/firmware/drivers/rtc/rtc_ds1339_ds3231.c
index b77e059595..53fd344bc7 100644
--- a/firmware/drivers/rtc/rtc_ds1339_ds3231.c
+++ b/firmware/drivers/rtc/rtc_ds1339_ds3231.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Robert Kukla 
  * based on Archos code by Linus Nielsen Feltzing, Uwe Freese, Laurent Baum   
diff --git a/firmware/drivers/rtc/rtc_e8564.c b/firmware/drivers/rtc/rtc_e8564.c
index 7bd90fe2a3..a4af9caf13 100644
--- a/firmware/drivers/rtc/rtc_e8564.c
+++ b/firmware/drivers/rtc/rtc_e8564.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing, Uwe Freese, Laurent Baum,
  *                       Przemyslaw Holubowski
diff --git a/firmware/drivers/rtc/rtc_imx233.c b/firmware/drivers/rtc/rtc_imx233.c
index 72f11a78c8..111cac3bf0 100644
--- a/firmware/drivers/rtc/rtc_imx233.c
+++ b/firmware/drivers/rtc/rtc_imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
@@ -38,7 +37,7 @@ void rtc_init(void)
     /* rtc-imx233 is initialized by the system */
 }
 
-static void seconds_to_datetime(uint32_t seconds, struct tm *tm)
+static void seconds_to_datetime(time_t seconds, struct tm *tm)
 {
 #ifdef USE_PERSISTENT
     /* The OF uses PERSISTENT2 register to keep the adjustment and only changes
diff --git a/firmware/drivers/rtc/rtc_jz4740.c b/firmware/drivers/rtc/rtc_jz4740.c
index b82978ed21..f438a01b60 100644
--- a/firmware/drivers/rtc/rtc_jz4740.c
+++ b/firmware/drivers/rtc/rtc_jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/drivers/rtc/rtc_jz4760.c b/firmware/drivers/rtc/rtc_jz4760.c
index cda618d617..1e7c9cd257 100644
--- a/firmware/drivers/rtc/rtc_jz4760.c
+++ b/firmware/drivers/rtc/rtc_jz4760.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/drivers/rtc/rtc_mc13783.c b/firmware/drivers/rtc/rtc_mc13783.c
index aedf5f6fa5..b93dcd88c9 100644
--- a/firmware/drivers/rtc/rtc_mc13783.c
+++ b/firmware/drivers/rtc/rtc_mc13783.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Michael Sevakis
  *
@@ -69,7 +68,7 @@ static const unsigned char rtc_registers[RTC_NUM_REGS_RD] =
 
 /* was it an alarm that triggered power on ? */
 static bool alarm_start = false;
-static unsigned long rtc_is_dirty = 1; /* force a read right away */
+static uint32_t rtc_is_dirty = 1; /* force a read right away */
 
 static const unsigned short month_table[13] =
 {
diff --git a/firmware/drivers/rtc/rtc_mr100.c b/firmware/drivers/rtc/rtc_mr100.c
index 2f44137e38..7e035580ea 100644
--- a/firmware/drivers/rtc/rtc_mr100.c
+++ b/firmware/drivers/rtc/rtc_mr100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Robert Kukla 
  * 
diff --git a/firmware/drivers/rtc/rtc_pcf50605.c b/firmware/drivers/rtc/rtc_pcf50605.c
index 4d2560284c..ddfff4d40c 100644
--- a/firmware/drivers/rtc/rtc_pcf50605.c
+++ b/firmware/drivers/rtc/rtc_pcf50605.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing, Uwe Freese, Laurent Baum
  *
diff --git a/firmware/drivers/rtc/rtc_pcf50606.c b/firmware/drivers/rtc/rtc_pcf50606.c
index 8f5371635c..94607bbe7a 100644
--- a/firmware/drivers/rtc/rtc_pcf50606.c
+++ b/firmware/drivers/rtc/rtc_pcf50606.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing, Uwe Freese, Laurent Baum
  *
diff --git a/firmware/drivers/rtc/rtc_rx5x348ab.c b/firmware/drivers/rtc/rtc_rx5x348ab.c
index d95186e8be..b580a45d1d 100644
--- a/firmware/drivers/rtc/rtc_rx5x348ab.c
+++ b/firmware/drivers/rtc/rtc_rx5x348ab.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jonathan Gordon
  *
diff --git a/firmware/drivers/rtc/rtc_s35380a.c b/firmware/drivers/rtc/rtc_s35380a.c
index 23f3c229e9..9b5db1c98e 100644
--- a/firmware/drivers/rtc/rtc_s35380a.c
+++ b/firmware/drivers/rtc/rtc_s35380a.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * adopted for HD300 by Marcin Bukat
  * Copyright (C) 2009 by Bertrik Sikken
diff --git a/firmware/drivers/rtc/rtc_s3c2440.c b/firmware/drivers/rtc/rtc_s3c2440.c
index 480df929a0..38d7c4307b 100644
--- a/firmware/drivers/rtc/rtc_s3c2440.c
+++ b/firmware/drivers/rtc/rtc_s3c2440.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing, Uwe Freese, Laurent Baum
  *
diff --git a/firmware/drivers/rtc/rtc_stm32h7.c b/firmware/drivers/rtc/rtc_stm32h7.c
index 436f262dd5..26879489ab 100644
--- a/firmware/drivers/rtc/rtc_stm32h7.c
+++ b/firmware/drivers/rtc/rtc_stm32h7.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/drivers/rtc/rtc_x1000.c b/firmware/drivers/rtc/rtc_x1000.c
index 1d3a5484e9..1a423ff735 100644
--- a/firmware/drivers/rtc/rtc_x1000.c
+++ b/firmware/drivers/rtc/rtc_x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/drivers/rtc/rtc_zenvisionm.c b/firmware/drivers/rtc/rtc_zenvisionm.c
index 244d7557f0..5504c14487 100644
--- a/firmware/drivers/rtc/rtc_zenvisionm.c
+++ b/firmware/drivers/rtc/rtc_zenvisionm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/drivers/sd.c b/firmware/drivers/sd.c
index 2a6373b56c..157e22ae7b 100644
--- a/firmware/drivers/sd.c
+++ b/firmware/drivers/sd.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 by Rafaël Carré
  *
diff --git a/firmware/drivers/sdmmc_host.c b/firmware/drivers/sdmmc_host.c
index 4cb6fff919..eae852bcbf 100644
--- a/firmware/drivers/sdmmc_host.c
+++ b/firmware/drivers/sdmmc_host.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c
index 70f395bc32..5a4444af4f 100644
--- a/firmware/drivers/serial.c
+++ b/firmware/drivers/serial.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
diff --git a/firmware/drivers/sw_i2c.c b/firmware/drivers/sw_i2c.c
index 028995e768..ea6c682b5c 100644
--- a/firmware/drivers/sw_i2c.c
+++ b/firmware/drivers/sw_i2c.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Miika Pekkarinen
  *
diff --git a/firmware/drivers/synaptics-mep.c b/firmware/drivers/synaptics-mep.c
index 2bf35639f7..4b4c5222fe 100644
--- a/firmware/drivers/synaptics-mep.c
+++ b/firmware/drivers/synaptics-mep.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/drivers/touchpad.c b/firmware/drivers/touchpad.c
index 1d78ee1c3e..4d24db1407 100644
--- a/firmware/drivers/touchpad.c
+++ b/firmware/drivers/touchpad.c
@@ -5,7 +5,6 @@
  * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
  * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
  * \/ \/ \/ \/ \/
- * $Id$
  *
  * Copyright (C) 2013 by Jean-Louis Biasini
  *
diff --git a/firmware/drivers/touchscreen.c b/firmware/drivers/touchscreen.c
index 572f05ab7f..45386415e2 100644
--- a/firmware/drivers/touchscreen.c
+++ b/firmware/drivers/touchscreen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/drivers/tsc200x.c b/firmware/drivers/tsc200x.c
index 4af8118d26..facbd8a040 100644
--- a/firmware/drivers/tsc200x.c
+++ b/firmware/drivers/tsc200x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Jonas Aaberg, Rob Purchase
  *
diff --git a/firmware/drivers/tsc2100.c b/firmware/drivers/tsc2100.c
index 433e1ce6a5..062afadf3d 100644
--- a/firmware/drivers/tsc2100.c
+++ b/firmware/drivers/tsc2100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jonathan Gordon
  *
diff --git a/firmware/drivers/tuner/ipod_remote_tuner.c b/firmware/drivers/tuner/ipod_remote_tuner.c
index 077d541a1a..8c26c22a98 100644
--- a/firmware/drivers/tuner/ipod_remote_tuner.c
+++ b/firmware/drivers/tuner/ipod_remote_tuner.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * tuner for the ipod fm remote and other ipod remote tuners
  *
  * Copyright (C) 2009 Laurent Gautier
diff --git a/firmware/drivers/tuner/lv24020lp.c b/firmware/drivers/tuner/lv24020lp.c
index 2fbf88b01b..426dfb8be4 100644
--- a/firmware/drivers/tuner/lv24020lp.c
+++ b/firmware/drivers/tuner/lv24020lp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Tuner driver for the Sanyo LV24020LP
  *
  * Copyright (C) 2007 Ivan Zupan
diff --git a/firmware/drivers/tuner/rda5802.c b/firmware/drivers/tuner/rda5802.c
index 55e775e985..150576a0cf 100644
--- a/firmware/drivers/tuner/rda5802.c
+++ b/firmware/drivers/tuner/rda5802.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Tuner "middleware" for RDA5802 chip present in some Sansa Clip+ players
  *
diff --git a/firmware/drivers/tuner/si4700.c b/firmware/drivers/tuner/si4700.c
index 8b4d0a1b19..2767cbbfe8 100644
--- a/firmware/drivers/tuner/si4700.c
+++ b/firmware/drivers/tuner/si4700.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Tuner "middleware" for Silicon Labs SI4700 chip
  *
diff --git a/firmware/drivers/tuner/stfm1000.c b/firmware/drivers/tuner/stfm1000.c
index 4330d06d72..aa4747edc7 100644
--- a/firmware/drivers/tuner/stfm1000.c
+++ b/firmware/drivers/tuner/stfm1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/drivers/tuner/tea5760uk.c b/firmware/drivers/tuner/tea5760uk.c
index d74aa18a00..707fe5867c 100644
--- a/firmware/drivers/tuner/tea5760uk.c
+++ b/firmware/drivers/tuner/tea5760uk.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Tuner "middleware" for Philips TEA5760UK chip
  *
  * Copyright (C) 2004 Jörg Hohensohn
diff --git a/firmware/drivers/tuner/tea5767.c b/firmware/drivers/tuner/tea5767.c
index 4d1e9d67af..f298fa1000 100644
--- a/firmware/drivers/tuner/tea5767.c
+++ b/firmware/drivers/tuner/tea5767.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Tuner "middleware" for Philips TEA5767 chip
  *
  * Copyright (C) 2004 Jörg Hohensohn
diff --git a/firmware/drivers/usb-designware.c b/firmware/drivers/usb-designware.c
index 9968778dde..3a46a367ee 100644
--- a/firmware/drivers/usb-designware.c
+++ b/firmware/drivers/usb-designware.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009-2014 by Michael Sparmann
  * Copyright © 2010 Amaury Pouly
@@ -41,7 +40,6 @@
 /*#define LOGF_ENABLE*/
 #include "logf.h"
 
-
 /* The ARM940T uses a subset of the ARMv4 functions, not
  * supporting clean/invalidate cache entries using MVA.
  */
@@ -109,30 +107,6 @@ enum usb_dw_epdir
     USB_DW_EPDIR_OUT = 1,
 };
 
-enum usb_dw_ep0_state
-{
-    /* Waiting for a setup packet to arrive. This is the default state. */
-    EP0_SETUP,
-
-    /* Request wait states -- after submitting a request, we enter EP0_REQ
-     * (or EP0_REQ_CTRLWRITE for control writes). EP0_REQ is also used for
-     * the 2nd phase of a control write. EP0_REQ_CANCELLED is entered if we
-     * receive a setup packet before getting a response from the USB stack. */
-    EP0_REQ,
-    EP0_REQ_CTRLWRITE,
-    EP0_REQ_CANCELLED,
-
-    /* Waiting for a data phase to complete. */
-    EP0_DATA_IN,
-    EP0_DATA_OUT,
-
-    /* Waiting for the status phase */
-    EP0_STATUS_IN,
-    EP0_STATUS_OUT,
-
-    EP0_NUM_STATES
-};
-
 /* Internal EP state/info */
 struct usb_dw_ep
 {
@@ -147,42 +121,14 @@ struct usb_dw_ep
     uint8_t busy;
 };
 
-/* Additional state for EP0 */
-struct usb_dw_ep0
-{
-    enum usb_dw_ep0_state state;
-    struct usb_ctrlrequest active_req;
-    struct usb_ctrlrequest pending_req;
-};
-
 static const char* const dw_dir_str[USB_DW_NUM_DIRS] =
 {
     [USB_DW_EPDIR_IN]  = "IN",
     [USB_DW_EPDIR_OUT] = "OUT",
 };
 
-static const char* const dw_state_str[EP0_NUM_STATES] =
-{
-    [EP0_SETUP]         = "setup",
-    [EP0_REQ]           = "req",
-    [EP0_REQ_CTRLWRITE] = "req_cw",
-    [EP0_DATA_IN]       = "dat_in",
-    [EP0_DATA_OUT]      = "dat_out",
-    [EP0_STATUS_IN]     = "sts_in",
-    [EP0_STATUS_OUT]    = "sts_out",
-};
-
-#if 0
-static const char* const dw_resp_str[3] =
-{
-    [USB_CONTROL_ACK]     = "ACK",
-    [USB_CONTROL_RECEIVE] = "RECV",
-    [USB_CONTROL_STALL]   = "STALL",
-};
-#endif
-
 static struct usb_dw_ep usb_dw_ep_list[USB_NUM_ENDPOINTS][USB_DW_NUM_DIRS];
-static struct usb_dw_ep0 ep0;
+
 static uint8_t _ep0_buffer[64] USB_DEVBSS_ATTR __attribute__((aligned(32)));
 static uint8_t* ep0_buffer; /* Uncached, unless NO_UNCACHED_ADDR is defined */
 
@@ -750,26 +696,6 @@ static void usb_dw_epstart(int epnum, enum usb_dw_epdir epdir,
     dw_ep->status = -1;
     dw_ep->busy = true;
 
-    if (epnum == 0 && epdir == USB_DW_EPDIR_OUT)
-    {
-        /* FIXME: there's an extremely rare race condition here.
-         *
-         * 1. Host sends a control write.
-         * 2. We process the request.
-         * 3. (time passes)
-         * 4. This function is called via USB_CONTROL_RECEIVE response.
-         * 5. Right before we set CNAK, host sends another control write.
-         *
-         * So we may unintentionally receive data from the second request.
-         * It's possible to detect this when we see a setup packet because
-         * EP0 OUT will be busy. In principle it should even be possible to
-         * handle the 2nd request correctly. Currently we don't attempt to
-         * detect or recover from this error.
-         */
-        DWC_DOEPCTL(0) |= CNAK;
-        return;
-    }
-
     uint32_t maxpktsize = usb_dw_maxpktsize(epnum, epdir);
     uint32_t packets = usb_dw_calc_packets(xfersize, maxpktsize);
     uint32_t eptsiz = PKTCNT(packets) | xfersize;
@@ -847,139 +773,6 @@ static void usb_dw_abort_endpoint(int epnum, enum usb_dw_epdir epdir)
     }
 }
 
-static void usb_dw_control_received(struct usb_ctrlrequest* req)
-{
-    logf("%s(%p) state=%s", __func__, req, dw_state_str[ep0.state]);
-    logf(" bRequestType=%02x bRequest=%02x", req->bRequestType, req->bRequest);
-    logf(" wValue=%04x wIndex=%u wLength=%u", req->wValue, req->wIndex, req->wLength);
-
-    switch(ep0.state) {
-    case EP0_REQ:
-    case EP0_REQ_CTRLWRITE:
-    case EP0_REQ_CANCELLED:
-        /* Save the request for later */
-        memcpy(&ep0.pending_req, req, sizeof(*req));
-        ep0.state = EP0_REQ_CANCELLED;
-        break;
-
-    case EP0_DATA_IN:
-    case EP0_STATUS_IN:
-    case EP0_DATA_OUT:
-    case EP0_STATUS_OUT:
-        usb_core_control_complete(-1);
-        /* fallthrough */
-
-    case EP0_SETUP:
-        /* Save the request */
-        memcpy(&ep0.active_req, req, sizeof(*req));
-        req = &ep0.active_req;
-
-        /* Check for a SET ADDRESS request, which we must handle here */
-        if ((req->bRequestType & USB_RECIP_MASK) == USB_RECIP_DEVICE &&
-            (req->bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD &&
-            (req->bRequest == USB_REQ_SET_ADDRESS))
-            usb_dw_set_address(req->wValue);
-
-        /* Check for control writes */
-        if (req->wLength > 0 && !(req->bRequestType & USB_DIR_IN))
-            ep0.state = EP0_REQ_CTRLWRITE;
-        else
-            ep0.state = EP0_REQ;
-
-        usb_dw_flush_endpoint(0, USB_DW_EPDIR_IN);
-        usb_core_control_request(req, NULL);
-        break;
-
-    default:
-        panicf("%s: bad state=%s", __func__, ep0.state >= EP0_NUM_STATES ? "unk" : dw_state_str[ep0.state]);
-    }
-}
-
-/* note: must be called with IRQs disabled */
-static void usb_dw_control_response(enum usb_control_response resp,
-                                    void* data, int length)
-{
-    struct usb_ctrlrequest* req = &ep0.active_req;
-
-    switch(ep0.state) {
-    case EP0_REQ:
-    case EP0_REQ_CTRLWRITE:
-        switch(resp) {
-        case USB_CONTROL_ACK:
-            if(req->wLength > 0 && (req->bRequestType & USB_DIR_IN))
-                ep0.state = EP0_DATA_IN; /* control read */
-            else
-                ep0.state = EP0_STATUS_IN; /* non-data or write */
-
-            usb_dw_transfer(0, USB_DW_EPDIR_IN, data, length);
-            break;
-
-        case USB_CONTROL_RECEIVE:
-            if(ep0.state != EP0_REQ_CTRLWRITE)
-                panicf("%s: bad response", __func__);
-
-            ep0.state = EP0_DATA_OUT;
-            usb_dw_transfer(0, USB_DW_EPDIR_OUT, data, length);
-            break;
-
-        case USB_CONTROL_STALL:
-            if(ep0.state == EP0_REQ_CTRLWRITE)
-                usb_dw_set_stall(0, USB_DW_EPDIR_OUT, 1);
-            else
-                usb_dw_set_stall(0, USB_DW_EPDIR_IN, 1);
-
-            ep0.state = EP0_SETUP;
-            break;
-        }
-        break;
-
-    case EP0_REQ_CANCELLED:
-        /* Terminate the old request */
-        usb_core_control_complete(-3);
-
-        /* Submit the pending request */
-        ep0.state = EP0_SETUP;
-        usb_dw_control_received(&ep0.pending_req);
-        break;
-
-    default:
-        panicf("%s: bad state=%s", __func__, dw_state_str[ep0.state]);
-    }
-}
-
-static void usb_dw_ep0_xfer_complete(enum usb_dw_epdir epdir,
-                                     int status, int transferred)
-{
-    struct usb_dw_ep* dw_ep = usb_dw_get_ep(0, epdir);
-
-    switch((ep0.state << 1) | epdir)
-    {
-    case (EP0_DATA_IN << 1) | USB_DW_EPDIR_IN:
-        ep0.state = EP0_STATUS_OUT;
-        usb_dw_transfer(0, USB_DW_EPDIR_OUT, NULL, 0);
-        break;
-
-    case (EP0_DATA_OUT << 1) | USB_DW_EPDIR_OUT:
-        ep0.state = EP0_REQ;
-        usb_core_control_request(&ep0.active_req, dw_ep->req_addr);
-        break;
-
-    case (EP0_STATUS_IN << 1) | USB_DW_EPDIR_IN:
-    case (EP0_STATUS_OUT << 1) | USB_DW_EPDIR_OUT:
-        if(status != 0 || transferred != 0)
-            usb_core_control_complete(-2);
-        else
-            usb_core_control_complete(0);
-
-        ep0.state = EP0_SETUP;
-        break;
-
-    default:
-        panicf("%s: state=%s dir=%s", __func__,
-               dw_state_str[ep0.state], dw_dir_str[epdir]);
-    }
-}
-
 static void usb_dw_handle_xfer_complete(int epnum, enum usb_dw_epdir epdir)
 {
     struct usb_dw_ep* dw_ep = usb_dw_get_ep(epnum, epdir);
@@ -993,7 +786,7 @@ static void usb_dw_handle_xfer_complete(int epnum, enum usb_dw_epdir epdir)
     }
 
     uint32_t bytes_left = DWC_EPTSIZ(epnum, epdir) & 0x7ffff;
-    uint32_t transferred = (is_ep0out ? 64 : dw_ep->size) - bytes_left;
+    uint32_t transferred = dw_ep->size - bytes_left;
 
     if(transferred > dw_ep->sizeleft)
     {
@@ -1008,7 +801,9 @@ static void usb_dw_handle_xfer_complete(int epnum, enum usb_dw_epdir epdir)
 #if !defined(USB_DW_ARCH_SLAVE) && defined(NO_UNCACHED_ADDR) && defined(POST_DMA_FLUSH)
         DISCARD_DCACHE_RANGE(ep0_buffer, 64);
 #endif
+#ifdef USB_DW_ARCH_SLAVE
         memcpy(dw_ep->addr, ep0_buffer, transferred);
+#endif
         usb_dw_ep0_recv();
     }
 
@@ -1058,15 +853,8 @@ static void usb_dw_handle_xfer_complete(int epnum, enum usb_dw_epdir epdir)
     semaphore_release(&dw_ep->complete);
 
     int total_bytes = dw_ep->req_size - dw_ep->sizeleft;
-    if (epnum == 0)
-    {
-        usb_dw_ep0_xfer_complete(epdir, dw_ep->status, total_bytes);
-    }
-    else
-    {
-        usb_core_transfer_complete(epnum, (epdir == USB_DW_EPDIR_OUT) ?
-                    USB_DIR_OUT : USB_DIR_IN, dw_ep->status, total_bytes);
-    }
+    usb_core_transfer_complete(epnum, (epdir == USB_DW_EPDIR_OUT) ?
+                USB_DIR_OUT : USB_DIR_IN, dw_ep->status, total_bytes);
 }
 
 static void usb_dw_handle_setup_received(void)
@@ -1076,10 +864,15 @@ static void usb_dw_handle_setup_received(void)
 #endif
     struct usb_ctrlrequest req;
     memcpy(&req, ep0_buffer, sizeof(struct usb_ctrlrequest));
-
+    usb_dw_flush_endpoint(0, USB_DW_EPDIR_IN);
     usb_dw_ep0_recv();
 
-    usb_dw_control_received(&req);
+    if ((req.bRequestType & USB_RECIP_MASK) == USB_RECIP_DEVICE &&
+        (req.bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD &&
+        (req.bRequest == USB_REQ_SET_ADDRESS))
+        usb_dw_set_address(req.wValue);
+
+    usb_core_setup_received(&req);
 }
 
 #ifdef USB_DW_SHARED_FIFO
@@ -1133,29 +926,106 @@ static void usb_dw_handle_token_mismatch(void)
 }
 #endif /* USB_DW_SHARED_FIFO */
 
+static void usb_dw_iepint(int ep)
+{
+    uint32_t epints = DWC_DIEPINT(ep);
+    DWC_DIEPINT(ep) = epints;
+
+    if (epints & TOC)
+    {
+        usb_dw_abort_endpoint(ep, USB_DW_EPDIR_IN);
+    }
+
+#ifdef USB_DW_SHARED_FIFO
+    if (epints & ITTXFE)
+    {
+        if (epmis_msk & (1 << ep))
+        {
+            DWC_DIEPCTL(ep) |= EPENA;
+            epmis_msk &= ~(1 << ep);
+            if (!epmis_msk)
+                DWC_DIEPMSK &= ~ITTXFE;
+        }
+    }
+
+#elif defined(USB_DW_ARCH_SLAVE)
+    if (epints & TXFE)
+    {
+        usb_dw_handle_dtxfifo(ep);
+    }
+#endif
+
+    if (epints & XFRC)
+    {
+        usb_dw_handle_xfer_complete(ep, USB_DW_EPDIR_IN);
+    }
+}
+
+static void usb_dw_oepint(int ep)
+{
+    uint32_t epints = DWC_DOEPINT(ep);
+    DWC_DOEPINT(ep) = epints;
+
+    if (!ep)
+    {
+        if (epints & STUP)
+        {
+            usb_dw_handle_setup_received();
+        }
+
+        if (epints & XFRC)
+        {
+            if(epints & STATUSRECVD)
+            {
+                /* At the end of a control write's data phase, the
+                 * controller writes a spurious OUTDONE token to the
+                 * FIFO and raises StatusRecvd | XferCompl.
+                 *
+                 * We do not need or want this -- we've already handled
+                 * the data phase by this point -- but EP0 is stopped
+                 * as a side effect of XferCompl, so we need to restart
+                 * it to keep receiving packets. */
+                usb_dw_ep0_recv();
+            }
+            else if(!(epints & SETUPRECVD))
+            {
+                /* Only call this for normal data packets. Setup
+                 * packets use the STUP interrupt handler instead. */
+                usb_dw_handle_xfer_complete(0, USB_DW_EPDIR_OUT);
+            }
+        }
+    }
+    else
+    {
+        if (epints & XFRC)
+        {
+            usb_dw_handle_xfer_complete(ep, USB_DW_EPDIR_OUT);
+        }
+    }
+}
+
 static void usb_dw_irq(void)
 {
     int ep;
-    uint32_t daint;
+    uint32_t gintsts = DWC_GINTSTS & DWC_GINTMSK;
 
 #ifdef USB_DW_ARCH_SLAVE
     /* Handle one packet at a time, the IRQ will re-trigger if there's
        something left. */
-    if (DWC_GINTSTS & RXFLVL)
+    if (gintsts & RXFLVL)
     {
         usb_dw_handle_rxfifo();
     }
 #endif
 
 #ifdef USB_DW_SHARED_FIFO
-    if (DWC_GINTSTS & EPMIS)
+    if (gintsts & EPMIS)
     {
         usb_dw_handle_token_mismatch();
         DWC_GINTSTS = EPMIS;
     }
 
 #ifdef USB_DW_ARCH_SLAVE
-    uint32_t gintsts = DWC_GINTSTS & DWC_GINTMSK;
     if (gintsts & PTXFE)
     {
         /* First disable the IRQ, it will be re-enabled later if there
@@ -1180,99 +1050,29 @@ static void usb_dw_irq(void)
 #endif /* USB_DW_ARCH_SLAVE */
 #endif /* USB_DW_SHARED_FIFO */
 
-    daint = DWC_DAINT;
-
-    /* IN */
-    for (ep = 0; ep < USB_NUM_ENDPOINTS; ep++)
+    if (gintsts & (OEPINT | IEPINT))
     {
-        if (daint & (1 << ep))
+        uint32_t daint = DWC_DAINT & DWC_DAINTMSK;
+        uint32_t daint_out = daint >> 16;
+        uint32_t daint_in = daint & 0xffff;
+        for (ep = 0; ep < USB_NUM_ENDPOINTS && daint_in; ep++, daint_in >>= 1)
         {
-            uint32_t epints = DWC_DIEPINT(ep);
-
-            if (epints & TOC)
+            if (daint_in & 1)
             {
-                usb_dw_abort_endpoint(ep, USB_DW_EPDIR_IN);
+                usb_dw_iepint(ep);
             }
+        }
 
-#ifdef USB_DW_SHARED_FIFO
-            if (epints & ITTXFE)
+        for (ep = 0; ep < USB_NUM_ENDPOINTS && daint_out; ep++, daint_out >>= 1)
+        {
+            if (daint_out & 1)
             {
-                if (epmis_msk & (1 << ep))
-                {
-                    DWC_DIEPCTL(ep) |= EPENA;
-                    epmis_msk &= ~(1 << ep);
-                    if (!epmis_msk)
-                        DWC_DIEPMSK &= ~ITTXFE;
-                }
-            }
-
-#elif defined(USB_DW_ARCH_SLAVE)
-            if (epints & TXFE)
-            {
-                usb_dw_handle_dtxfifo(ep);
-            }
-#endif
-
-            /* Clear XFRC here, if this is a 'multi-transfer' request then
-               a new transfer is going to be launched, this ensures it will
-               not miss a single interrupt. */
-            DWC_DIEPINT(ep) = epints;
-
-            if (epints & XFRC)
-            {
-                usb_dw_handle_xfer_complete(ep, USB_DW_EPDIR_IN);
+                usb_dw_oepint(ep);
             }
         }
     }
 
-    /* OUT */
-    for (ep = 0; ep < USB_NUM_ENDPOINTS; ep++)
-    {
-        if (daint & (1 << (ep + 16)))
-        {
-            uint32_t epints = DWC_DOEPINT(ep);
-            DWC_DOEPINT(ep) = epints;
-
-            if (!ep)
-            {
-                if (epints & STUP)
-                {
-                    usb_dw_handle_setup_received();
-                }
-
-                if (epints & XFRC)
-                {
-                    if(epints & STATUSRECVD)
-                    {
-                        /* At the end of a control write's data phase, the
-                         * controller writes a spurious OUTDONE token to the
-                         * FIFO and raises StatusRecvd | XferCompl.
-                         *
-                         * We do not need or want this -- we've already handled
-                         * the data phase by this point -- but EP0 is stopped
-                         * as a side effect of XferCompl, so we need to restart
-                         * it to keep receiving packets. */
-                        usb_dw_ep0_recv();
-                    }
-                    else if(!(epints & SETUPRECVD))
-                    {
-                        /* Only call this for normal data packets. Setup
-                         * packets use the STUP interrupt handler instead. */
-                        usb_dw_handle_xfer_complete(0, USB_DW_EPDIR_OUT);
-                    }
-                }
-            }
-            else
-            {
-                if (epints & XFRC)
-                {
-                    usb_dw_handle_xfer_complete(ep, USB_DW_EPDIR_OUT);
-                }
-            }
-        }
-    }
-
-    if (DWC_GINTSTS & USBRST)
+    if (gintsts & USBRST)
     {
         DWC_GINTSTS = USBRST;
         usb_dw_set_address(0);
@@ -1280,10 +1080,9 @@ static void usb_dw_irq(void)
         usb_core_bus_reset();
     }
 
-    if (DWC_GINTSTS & ENUMDNE)
+    if (gintsts & ENUMDNE)
     {
         DWC_GINTSTS = ENUMDNE;
-        ep0.state = EP0_SETUP;
         usb_dw_ep0_recv();
     }
 }
@@ -1708,14 +1507,6 @@ int usb_drv_send(int endpoint, void *ptr, int length)
     return dw_ep->status;
 }
 
-void usb_drv_control_response(enum usb_control_response resp,
-                              void* data, int length)
-{
-    usb_dw_target_disable_irq();
-    usb_dw_control_response(resp, data, length);
-    usb_dw_target_enable_irq();
-}
-
 int usb_drv_get_frame_number()
 {
     // SOFFN is 14 bits, the least significant 3 appear to be some sort of microframe count.
diff --git a/firmware/eeprom_settings.c b/firmware/eeprom_settings.c
index 6972edf2c5..b2e75ebf54 100644
--- a/firmware/eeprom_settings.c
+++ b/firmware/eeprom_settings.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Miika Pekkarinen
  *
diff --git a/firmware/elf_loader.c b/firmware/elf_loader.c
index 637dadb886..7fc8b13728 100644
--- a/firmware/elf_loader.c
+++ b/firmware/elf_loader.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Aidan MacDonald
  *
diff --git a/firmware/enc_base.c b/firmware/enc_base.c
index d120cdb07d..b1549b8acc 100644
--- a/firmware/enc_base.c
+++ b/firmware/enc_base.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Michael Sevakis
  *
diff --git a/firmware/events.c b/firmware/events.c
index 9b810c5d0d..f9aed9b1e3 100644
--- a/firmware/events.c
+++ b/firmware/events.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Miika Pekkarinen
  *
diff --git a/firmware/export/adc.h b/firmware/export/adc.h
index 623d1675c9..e396dc19c8 100644
--- a/firmware/export/adc.h
+++ b/firmware/export/adc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/aic310x.h b/firmware/export/aic310x.h
index dfb514c6cb..14d120a630 100644
--- a/firmware/export/aic310x.h
+++ b/firmware/export/aic310x.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Aidan MacDonald
  *
diff --git a/firmware/export/aic3x.h b/firmware/export/aic3x.h
index 1baf52684a..3528b6805c 100644
--- a/firmware/export/aic3x.h
+++ b/firmware/export/aic3x.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/export/ak4376.h b/firmware/export/ak4376.h
index ad842b2b80..5d1e2d9398 100644
--- a/firmware/export/ak4376.h
+++ b/firmware/export/ak4376.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/export/ak4537.h b/firmware/export/ak4537.h
index 0ab0ca1594..5148d73248 100644
--- a/firmware/export/ak4537.h
+++ b/firmware/export/ak4537.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Mark Arigo
  *
diff --git a/firmware/export/akcodec.h b/firmware/export/akcodec.h
index 7cb2bad7e5..6fb0e7f8b8 100644
--- a/firmware/export/akcodec.h
+++ b/firmware/export/akcodec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Marcoen Hirschberg
  *
diff --git a/firmware/export/android_codec.h b/firmware/export/android_codec.h
index 13e3ed30c8..091cb0a030 100644
--- a/firmware/export/android_codec.h
+++ b/firmware/export/android_codec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h
index 944d6109c2..a66451c35a 100644
--- a/firmware/export/as3514.h
+++ b/firmware/export/as3514.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Daniel Ankers
  *
diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h
index 0d4b02844d..9b6e059b53 100644
--- a/firmware/export/as3525.h
+++ b/firmware/export/as3525.h
@@ -20,6 +20,10 @@
 #ifndef __AS3525_H__
 #define __AS3525_H__
 
+#if !defined(__ASSEMBLER__)
+#include <stdint.h>
+#endif
+
 #define CACHEALIGN_BITS (5)
 #define CACHEALIGN_SIZE (32)
 
@@ -103,26 +107,26 @@
 ------------------------------------------------------------------------
 */
 
-#define CCU_SRC           (*(volatile unsigned long *)(CCU_BASE + 0x00))
-#define CCU_SRL           (*(volatile unsigned long *)(CCU_BASE + 0x04))
-#define CCU_MEMMAP        (*(volatile unsigned long *)(CCU_BASE + 0x08))
-#define CCU_IO            (*(volatile unsigned long *)(CCU_BASE + 0x0C))
-#define CCU_SCON          (*(volatile unsigned long *)(CCU_BASE + 0x10))
-#define CCU_VERS          (*(volatile unsigned long *)(CCU_BASE + 0x14))
-#define CCU_SPARE1        (*(volatile unsigned long *)(CCU_BASE + 0x18))
-#define CCU_SPARE2        (*(volatile unsigned long *)(CCU_BASE + 0x1C))
+#define CCU_SRC           (*(volatile uint32_t*)(CCU_BASE + 0x00))
+#define CCU_SRL           (*(volatile uint32_t*)(CCU_BASE + 0x04))
+#define CCU_MEMMAP        (*(volatile uint32_t*)(CCU_BASE + 0x08))
+#define CCU_IO            (*(volatile uint32_t*)(CCU_BASE + 0x0C))
+#define CCU_SCON          (*(volatile uint32_t*)(CCU_BASE + 0x10))
+#define CCU_VERS          (*(volatile uint32_t*)(CCU_BASE + 0x14))
+#define CCU_SPARE1        (*(volatile uint32_t*)(CCU_BASE + 0x18))
+#define CCU_SPARE2        (*(volatile uint32_t*)(CCU_BASE + 0x1C))
 
 /* DBOP */
-#define DBOP_TIMPOL_01    (*(volatile unsigned long *)(DBOP_BASE + 0x00))
-#define DBOP_TIMPOL_23    (*(volatile unsigned long *)(DBOP_BASE + 0x04))
-#define DBOP_CTRL         (*(volatile unsigned long *)(DBOP_BASE + 0x08))
-#define DBOP_STAT         (*(volatile unsigned long *)(DBOP_BASE + 0x0C))
+#define DBOP_TIMPOL_01    (*(volatile uint32_t*)(DBOP_BASE + 0x00))
+#define DBOP_TIMPOL_23    (*(volatile uint32_t*)(DBOP_BASE + 0x04))
+#define DBOP_CTRL         (*(volatile uint32_t*)(DBOP_BASE + 0x08))
+#define DBOP_STAT         (*(volatile uint32_t*)(DBOP_BASE + 0x0C))
 /* default is 16bit, but we switch to 32bit for some targets for better speed */
-#define DBOP_DOUT8        (*(volatile unsigned  char*)(DBOP_BASE + 0x10))
-#define DBOP_DOUT         (*(volatile unsigned short*)(DBOP_BASE + 0x10))
-#define DBOP_DOUT16       (*(volatile unsigned short*)(DBOP_BASE + 0x10))
-#define DBOP_DOUT32       (*(volatile unsigned long *)(DBOP_BASE + 0x10))
-#define DBOP_DIN          (*(volatile unsigned short*)(DBOP_BASE + 0x14))
+#define DBOP_DOUT8        (*(volatile uint8_t*)(DBOP_BASE + 0x10))
+#define DBOP_DOUT         (*(volatile uint16_t*)(DBOP_BASE + 0x10))
+#define DBOP_DOUT16       (*(volatile uint16_t*)(DBOP_BASE + 0x10))
+#define DBOP_DOUT32       (*(volatile uint32_t*)(DBOP_BASE + 0x10))
+#define DBOP_DIN          (*(volatile uint16_t*)(DBOP_BASE + 0x14))
 
 
 /**
@@ -205,21 +209,21 @@ CE lines
 ------------------------------------------------------------------------
 */
 
-#define CGU_PLLA         (*(volatile unsigned long *)(CGU_BASE + 0x00))
-#define CGU_PLLB         (*(volatile unsigned long *)(CGU_BASE + 0x04))
-#define CGU_PLLASUP      (*(volatile unsigned long *)(CGU_BASE + 0x08))
-#define CGU_PLLBSUP      (*(volatile unsigned long *)(CGU_BASE + 0x0C))
-#define CGU_PROC         (*(volatile unsigned long *)(CGU_BASE + 0x10))
-#define CGU_PERI         (*(volatile unsigned long *)(CGU_BASE + 0x14))
-#define CGU_AUDIO        (*(volatile unsigned long *)(CGU_BASE + 0x18))
-#define CGU_USB          (*(volatile unsigned long *)(CGU_BASE + 0x1C))
-#define CGU_INTCTRL      (*(volatile unsigned long *)(CGU_BASE + 0x20))
-#define CGU_IRQ          (*(volatile unsigned long *)(CGU_BASE + 0x24))
-#define CGU_COUNTA       (*(volatile unsigned long *)(CGU_BASE + 0x28))
-#define CGU_COUNTB       (*(volatile unsigned long *)(CGU_BASE + 0x2C))
-#define CGU_IDE          (*(volatile unsigned long *)(CGU_BASE + 0x30))
-#define CGU_MEMSTICK     (*(volatile unsigned long *)(CGU_BASE + 0x34))
-#define CGU_DBOP         (*(volatile unsigned long *)(CGU_BASE + 0x38))
+#define CGU_PLLA         (*(volatile uint32_t*)(CGU_BASE + 0x00))
+#define CGU_PLLB         (*(volatile uint32_t*)(CGU_BASE + 0x04))
+#define CGU_PLLASUP      (*(volatile uint32_t*)(CGU_BASE + 0x08))
+#define CGU_PLLBSUP      (*(volatile uint32_t*)(CGU_BASE + 0x0C))
+#define CGU_PROC         (*(volatile uint32_t*)(CGU_BASE + 0x10))
+#define CGU_PERI         (*(volatile uint32_t*)(CGU_BASE + 0x14))
+#define CGU_AUDIO        (*(volatile uint32_t*)(CGU_BASE + 0x18))
+#define CGU_USB          (*(volatile uint32_t*)(CGU_BASE + 0x1C))
+#define CGU_INTCTRL      (*(volatile uint32_t*)(CGU_BASE + 0x20))
+#define CGU_IRQ          (*(volatile uint32_t*)(CGU_BASE + 0x24))
+#define CGU_COUNTA       (*(volatile uint32_t*)(CGU_BASE + 0x28))
+#define CGU_COUNTB       (*(volatile uint32_t*)(CGU_BASE + 0x2C))
+#define CGU_IDE          (*(volatile uint32_t*)(CGU_BASE + 0x30))
+#define CGU_MEMSTICK     (*(volatile uint32_t*)(CGU_BASE + 0x34))
+#define CGU_DBOP         (*(volatile uint32_t*)(CGU_BASE + 0x38))
 
 #define CGU_VIC_CLOCK_ENABLE                 ( 1 << 23 ) /* vic */
 /* --- are disabled after reset --- */
@@ -297,35 +301,35 @@ CE lines
 
 
 
-#define UART_DATA_REG       (*(volatile unsigned long*)(UART0_BASE + 0x00)) /* Data register */
-#define UART_DLO_REG        (*(volatile unsigned long*)(UART0_BASE + 0x00)) /* Clock divider(lower byte) register */
-#define UART_DHI_REG        (*(volatile unsigned long*)(UART0_BASE + 0x04)) /* Clock divider(higher byte) register */
-#define UART_INTEN_REG      (*(volatile unsigned long*)(UART0_BASE + 0x04)) /* Interrupt enable register */
-#define UART_INTSTATUS_REG  (*(volatile unsigned long*)(UART0_BASE + 0x08)) /* Interrupt status register */
-#define UART_FCTL_REG       (*(volatile unsigned long*)(UART0_BASE + 0x0C)) /* Fifo control  register */
-#define UART_FSTATUS_REG    (*(volatile unsigned long*)(UART0_BASE + 0x0C)) /* Fifo status register */
-#define UART_LNCTL_REG      (*(volatile unsigned long*)(UART0_BASE + 0x10)) /* Line control register */
-#define UART_LNSTATUS_REG   (*(volatile unsigned long*)(UART0_BASE + 0x14)) /* Line status register */
+#define UART_DATA_REG       (*(volatile uint32_t*)(UART0_BASE + 0x00)) /* Data register */
+#define UART_DLO_REG        (*(volatile uint32_t*)(UART0_BASE + 0x00)) /* Clock divider(lower byte) register */
+#define UART_DHI_REG        (*(volatile uint32_t*)(UART0_BASE + 0x04)) /* Clock divider(higher byte) register */
+#define UART_INTEN_REG      (*(volatile uint32_t*)(UART0_BASE + 0x04)) /* Interrupt enable register */
+#define UART_INTSTATUS_REG  (*(volatile uint32_t*)(UART0_BASE + 0x08)) /* Interrupt status register */
+#define UART_FCTL_REG       (*(volatile uint32_t*)(UART0_BASE + 0x0C)) /* Fifo control  register */
+#define UART_FSTATUS_REG    (*(volatile uint32_t*)(UART0_BASE + 0x0C)) /* Fifo status register */
+#define UART_LNCTL_REG      (*(volatile uint32_t*)(UART0_BASE + 0x10)) /* Line control register */
+#define UART_LNSTATUS_REG   (*(volatile uint32_t*)(UART0_BASE + 0x14)) /* Line status register */
 
 
-#define SD_MCI_POWER        (*(volatile unsigned long*)(SD_MCI_BASE + 0x0))
+#define SD_MCI_POWER        (*(volatile uint32_t*)(SD_MCI_BASE + 0x0))
 
 
-#define TIMER1_LOAD      (*(volatile unsigned long*)(TIMER_BASE + 0x00)) /* 32-bit width */
-#define TIMER1_VALUE     (*(volatile unsigned long*)(TIMER_BASE + 0x04)) /* 32 bit width */
-#define TIMER1_CONTROL   (*(volatile unsigned long*)(TIMER_BASE + 0x08)) /*  8 bit width */
-#define TIMER1_INTCLR    (*(volatile unsigned long*)(TIMER_BASE + 0x0C)) /* clears ir by write access */
-#define TIMER1_RIS       (*(volatile unsigned long*)(TIMER_BASE + 0x10)) /*  1 bit width */
-#define TIMER1_MIS       (*(volatile unsigned long*)(TIMER_BASE + 0x14)) /*  1 bit width */
-#define TIMER1_BGLOAD    (*(volatile unsigned long*)(TIMER_BASE + 0x18)) /* 32-bit width */
+#define TIMER1_LOAD      (*(volatile uint32_t*)(TIMER_BASE + 0x00)) /* 32-bit width */
+#define TIMER1_VALUE     (*(volatile uint32_t*)(TIMER_BASE + 0x04)) /* 32 bit width */
+#define TIMER1_CONTROL   (*(volatile uint32_t*)(TIMER_BASE + 0x08)) /*  8 bit width */
+#define TIMER1_INTCLR    (*(volatile uint32_t*)(TIMER_BASE + 0x0C)) /* clears ir by write access */
+#define TIMER1_RIS       (*(volatile uint32_t*)(TIMER_BASE + 0x10)) /*  1 bit width */
+#define TIMER1_MIS       (*(volatile uint32_t*)(TIMER_BASE + 0x14)) /*  1 bit width */
+#define TIMER1_BGLOAD    (*(volatile uint32_t*)(TIMER_BASE + 0x18)) /* 32-bit width */
 
-#define TIMER2_LOAD      (*(volatile unsigned long*)(TIMER_BASE + 0x20)) /* 32-bit width */
-#define TIMER2_VALUE     (*(volatile unsigned long*)(TIMER_BASE + 0x24)) /* 32 bit width */
-#define TIMER2_CONTROL   (*(volatile unsigned long*)(TIMER_BASE + 0x28)) /*  8 bit width */
-#define TIMER2_INTCLR    (*(volatile unsigned long*)(TIMER_BASE + 0x2C)) /* clears ir by write access */
-#define TIMER2_RIS       (*(volatile unsigned long*)(TIMER_BASE + 0x30)) /*  1 bit width */
-#define TIMER2_MIS       (*(volatile unsigned long*)(TIMER_BASE + 0x34)) /*  1 bit width */
-#define TIMER2_BGLOAD    (*(volatile unsigned long*)(TIMER_BASE + 0x38)) /* 32-bit width */
+#define TIMER2_LOAD      (*(volatile uint32_t*)(TIMER_BASE + 0x20)) /* 32-bit width */
+#define TIMER2_VALUE     (*(volatile uint32_t*)(TIMER_BASE + 0x24)) /* 32 bit width */
+#define TIMER2_CONTROL   (*(volatile uint32_t*)(TIMER_BASE + 0x28)) /*  8 bit width */
+#define TIMER2_INTCLR    (*(volatile uint32_t*)(TIMER_BASE + 0x2C)) /* clears ir by write access */
+#define TIMER2_RIS       (*(volatile uint32_t*)(TIMER_BASE + 0x30)) /*  1 bit width */
+#define TIMER2_MIS       (*(volatile uint32_t*)(TIMER_BASE + 0x34)) /*  1 bit width */
+#define TIMER2_BGLOAD    (*(volatile uint32_t*)(TIMER_BASE + 0x38)) /* 32-bit width */
 
 /**
 * Counter/Timer control register bits
@@ -341,114 +345,114 @@ CE lines
 
 
 /* Watchdog registers */
-#define WDT_LOAD        (*(volatile unsigned long*)(WDT_BASE))
-#define WDT_CONTROL     (*(volatile unsigned long*)(WDT_BASE+8))
+#define WDT_LOAD        (*(volatile uint32_t*)(WDT_BASE))
+#define WDT_CONTROL     (*(volatile uint32_t*)(WDT_BASE+8))
 
 
 /* GPIO registers */
-#define GPIOA_DIR       (*(volatile unsigned char*)(GPIOA_BASE+0x400))
-#define GPIOA_IS        (*(volatile unsigned char*)(GPIOA_BASE+0x404))
-#define GPIOA_IBE       (*(volatile unsigned char*)(GPIOA_BASE+0x408))
-#define GPIOA_IEV       (*(volatile unsigned char*)(GPIOA_BASE+0x40C))
-#define GPIOA_IE        (*(volatile unsigned char*)(GPIOA_BASE+0x410))
-#define GPIOA_RIS       (*(volatile unsigned char*)(GPIOA_BASE+0x414))
-#define GPIOA_MIS       (*(volatile unsigned char*)(GPIOA_BASE+0x418))
-#define GPIOA_IC        (*(volatile unsigned char*)(GPIOA_BASE+0x41C))
-#define GPIOA_AFSEL     (*(volatile unsigned char*)(GPIOA_BASE+0x420))
-#define GPIOA_PIN(a)    (*(volatile unsigned char*)(GPIOA_BASE+(1<<((a)+2))))
-#define GPIOA_PIN_MASK(m) (*(volatile unsigned char *)(GPIOA_BASE+(((m)&0xff)<<2)))
-#define GPIOA_DATA      (*(volatile unsigned char*)(GPIOA_BASE+(0xff<<2)))
+#define GPIOA_DIR       (*(volatile uint8_t*)(GPIOA_BASE+0x400))
+#define GPIOA_IS        (*(volatile uint8_t*)(GPIOA_BASE+0x404))
+#define GPIOA_IBE       (*(volatile uint8_t*)(GPIOA_BASE+0x408))
+#define GPIOA_IEV       (*(volatile uint8_t*)(GPIOA_BASE+0x40C))
+#define GPIOA_IE        (*(volatile uint8_t*)(GPIOA_BASE+0x410))
+#define GPIOA_RIS       (*(volatile uint8_t*)(GPIOA_BASE+0x414))
+#define GPIOA_MIS       (*(volatile uint8_t*)(GPIOA_BASE+0x418))
+#define GPIOA_IC        (*(volatile uint8_t*)(GPIOA_BASE+0x41C))
+#define GPIOA_AFSEL     (*(volatile uint8_t*)(GPIOA_BASE+0x420))
+#define GPIOA_PIN(a)    (*(volatile uint8_t*)(GPIOA_BASE+(1<<((a)+2))))
+#define GPIOA_PIN_MASK(m) (*(volatile uint8_t*)(GPIOA_BASE+(((m)&0xff)<<2)))
+#define GPIOA_DATA      (*(volatile uint8_t*)(GPIOA_BASE+(0xff<<2)))
 
 
-#define GPIOB_DIR       (*(volatile unsigned char*)(GPIOB_BASE+0x400))
-#define GPIOB_IS        (*(volatile unsigned char*)(GPIOB_BASE+0x404))
-#define GPIOB_IBE       (*(volatile unsigned char*)(GPIOB_BASE+0x408))
-#define GPIOB_IEV       (*(volatile unsigned char*)(GPIOB_BASE+0x40C))
-#define GPIOB_IE        (*(volatile unsigned char*)(GPIOB_BASE+0x410))
-#define GPIOB_RIS       (*(volatile unsigned char*)(GPIOB_BASE+0x414))
-#define GPIOB_MIS       (*(volatile unsigned char*)(GPIOB_BASE+0x418))
-#define GPIOB_IC        (*(volatile unsigned char*)(GPIOB_BASE+0x41C))
-#define GPIOB_AFSEL     (*(volatile unsigned char*)(GPIOB_BASE+0x420))
-#define GPIOB_PIN(a)    (*(volatile unsigned char*)(GPIOB_BASE+(1<<((a)+2))))
-#define GPIOB_PIN_MASK(m) (*(volatile unsigned char *)(GPIOB_BASE+(((m)&0xff)<<2)))
-#define GPIOB_DATA      (*(volatile unsigned char*)(GPIOB_BASE+(0xff<<2)))
+#define GPIOB_DIR       (*(volatile uint8_t*)(GPIOB_BASE+0x400))
+#define GPIOB_IS        (*(volatile uint8_t*)(GPIOB_BASE+0x404))
+#define GPIOB_IBE       (*(volatile uint8_t*)(GPIOB_BASE+0x408))
+#define GPIOB_IEV       (*(volatile uint8_t*)(GPIOB_BASE+0x40C))
+#define GPIOB_IE        (*(volatile uint8_t*)(GPIOB_BASE+0x410))
+#define GPIOB_RIS       (*(volatile uint8_t*)(GPIOB_BASE+0x414))
+#define GPIOB_MIS       (*(volatile uint8_t*)(GPIOB_BASE+0x418))
+#define GPIOB_IC        (*(volatile uint8_t*)(GPIOB_BASE+0x41C))
+#define GPIOB_AFSEL     (*(volatile uint8_t*)(GPIOB_BASE+0x420))
+#define GPIOB_PIN(a)    (*(volatile uint8_t*)(GPIOB_BASE+(1<<((a)+2))))
+#define GPIOB_PIN_MASK(m) (*(volatile uint8_t*)(GPIOB_BASE+(((m)&0xff)<<2)))
+#define GPIOB_DATA      (*(volatile uint8_t*)(GPIOB_BASE+(0xff<<2)))
 
-#define GPIOC_DIR       (*(volatile unsigned char*)(GPIOC_BASE+0x400))
-#define GPIOC_IS        (*(volatile unsigned char*)(GPIOC_BASE+0x404))
-#define GPIOC_IBE       (*(volatile unsigned char*)(GPIOC_BASE+0x408))
-#define GPIOC_IEV       (*(volatile unsigned char*)(GPIOC_BASE+0x40C))
-#define GPIOC_IE        (*(volatile unsigned char*)(GPIOC_BASE+0x410))
-#define GPIOC_RIS       (*(volatile unsigned char*)(GPIOC_BASE+0x414))
-#define GPIOC_MIS       (*(volatile unsigned char*)(GPIOC_BASE+0x418))
-#define GPIOC_IC        (*(volatile unsigned char*)(GPIOC_BASE+0x41C))
-#define GPIOC_AFSEL     (*(volatile unsigned char*)(GPIOC_BASE+0x420))
-#define GPIOC_PIN(a)    (*(volatile unsigned char*)(GPIOC_BASE+(1<<((a)+2))))
-#define GPIOC_PIN_MASK(m) (*(volatile unsigned char *)(GPIOC_BASE+(((m)&0xff)<<2)))
-#define GPIOC_DATA      (*(volatile unsigned char*)(GPIOC_BASE+(0xff<<2)))
+#define GPIOC_DIR       (*(volatile uint8_t*)(GPIOC_BASE+0x400))
+#define GPIOC_IS        (*(volatile uint8_t*)(GPIOC_BASE+0x404))
+#define GPIOC_IBE       (*(volatile uint8_t*)(GPIOC_BASE+0x408))
+#define GPIOC_IEV       (*(volatile uint8_t*)(GPIOC_BASE+0x40C))
+#define GPIOC_IE        (*(volatile uint8_t*)(GPIOC_BASE+0x410))
+#define GPIOC_RIS       (*(volatile uint8_t*)(GPIOC_BASE+0x414))
+#define GPIOC_MIS       (*(volatile uint8_t*)(GPIOC_BASE+0x418))
+#define GPIOC_IC        (*(volatile uint8_t*)(GPIOC_BASE+0x41C))
+#define GPIOC_AFSEL     (*(volatile uint8_t*)(GPIOC_BASE+0x420))
+#define GPIOC_PIN(a)    (*(volatile uint8_t*)(GPIOC_BASE+(1<<((a)+2))))
+#define GPIOC_PIN_MASK(m) (*(volatile uint8_t*)(GPIOC_BASE+(((m)&0xff)<<2)))
+#define GPIOC_DATA      (*(volatile uint8_t*)(GPIOC_BASE+(0xff<<2)))
 
-#define GPIOD_DIR       (*(volatile unsigned char*)(GPIOD_BASE+0x400))
-#define GPIOD_IS        (*(volatile unsigned char*)(GPIOD_BASE+0x404))
-#define GPIOD_IBE       (*(volatile unsigned char*)(GPIOD_BASE+0x408))
-#define GPIOD_IEV       (*(volatile unsigned char*)(GPIOD_BASE+0x40C))
-#define GPIOD_IE        (*(volatile unsigned char*)(GPIOD_BASE+0x410))
-#define GPIOD_RIS       (*(volatile unsigned char*)(GPIOD_BASE+0x414))
-#define GPIOD_MIS       (*(volatile unsigned char*)(GPIOD_BASE+0x418))
-#define GPIOD_IC        (*(volatile unsigned char*)(GPIOD_BASE+0x41C))
-#define GPIOD_AFSEL     (*(volatile unsigned char*)(GPIOD_BASE+0x420))
-#define GPIOD_PIN(a)    (*(volatile unsigned char*)(GPIOD_BASE+(1<<((a)+2))))
-#define GPIOD_PIN_MASK(m) (*(volatile unsigned char *)(GPIOD_BASE+(((m)&0xff)<<2)))
-#define GPIOD_DATA      (*(volatile unsigned char*)(GPIOD_BASE+(0xff<<2)))
+#define GPIOD_DIR       (*(volatile uint8_t*)(GPIOD_BASE+0x400))
+#define GPIOD_IS        (*(volatile uint8_t*)(GPIOD_BASE+0x404))
+#define GPIOD_IBE       (*(volatile uint8_t*)(GPIOD_BASE+0x408))
+#define GPIOD_IEV       (*(volatile uint8_t*)(GPIOD_BASE+0x40C))
+#define GPIOD_IE        (*(volatile uint8_t*)(GPIOD_BASE+0x410))
+#define GPIOD_RIS       (*(volatile uint8_t*)(GPIOD_BASE+0x414))
+#define GPIOD_MIS       (*(volatile uint8_t*)(GPIOD_BASE+0x418))
+#define GPIOD_IC        (*(volatile uint8_t*)(GPIOD_BASE+0x41C))
+#define GPIOD_AFSEL     (*(volatile uint8_t*)(GPIOD_BASE+0x420))
+#define GPIOD_PIN(a)    (*(volatile uint8_t*)(GPIOD_BASE+(1<<((a)+2))))
+#define GPIOD_PIN_MASK(m) (*(volatile uint8_t*)(GPIOD_BASE+(((m)&0xff)<<2)))
+#define GPIOD_DATA      (*(volatile uint8_t*)(GPIOD_BASE+(0xff<<2)))
 
 /* ARM PL172 Memory Controller registers */
 
-#define MPMC_CONTROL              (*(volatile unsigned long*)(MPMC_BASE+0x000))
-#define MPMC_STATUS               (*(volatile unsigned long*)(MPMC_BASE+0x004))
-#define MPMC_CONFIG               (*(volatile unsigned long*)(MPMC_BASE+0x008))
+#define MPMC_CONTROL              (*(volatile uint32_t*)(MPMC_BASE+0x000))
+#define MPMC_STATUS               (*(volatile uint32_t*)(MPMC_BASE+0x004))
+#define MPMC_CONFIG               (*(volatile uint32_t*)(MPMC_BASE+0x008))
 
-#define MPMC_DYNAMIC_CONTROL      (*(volatile unsigned long*)(MPMC_BASE+0x020))
-#define MPMC_DYNAMIC_REFRESH      (*(volatile unsigned long*)(MPMC_BASE+0x024))
-#define MPMC_DYNAMIC_READ_CONFIG  (*(volatile unsigned long*)(MPMC_BASE+0x028))
-#define MPMC_DYNAMIC_tRP          (*(volatile unsigned long*)(MPMC_BASE+0x030))
-#define MPMC_DYNAMIC_tRAS         (*(volatile unsigned long*)(MPMC_BASE+0x034))
-#define MPMC_DYNAMIC_tSREX        (*(volatile unsigned long*)(MPMC_BASE+0x038))
-#define MPMC_DYNAMIC_tAPR         (*(volatile unsigned long*)(MPMC_BASE+0x03C))
-#define MPMC_DYNAMIC_tDAL         (*(volatile unsigned long*)(MPMC_BASE+0x040))
-#define MPMC_DYNAMIC_tWR          (*(volatile unsigned long*)(MPMC_BASE+0x044))
-#define MPMC_DYNAMIC_tRC          (*(volatile unsigned long*)(MPMC_BASE+0x048))
-#define MPMC_DYNAMIC_tRFC         (*(volatile unsigned long*)(MPMC_BASE+0x04C))
-#define MPMC_DYNAMIC_tXSR         (*(volatile unsigned long*)(MPMC_BASE+0x050))
-#define MPMC_DYNAMIC_tRRD         (*(volatile unsigned long*)(MPMC_BASE+0x054))
-#define MPMC_DYNAMIC_tMRD         (*(volatile unsigned long*)(MPMC_BASE+0x058))
+#define MPMC_DYNAMIC_CONTROL      (*(volatile uint32_t*)(MPMC_BASE+0x020))
+#define MPMC_DYNAMIC_REFRESH      (*(volatile uint32_t*)(MPMC_BASE+0x024))
+#define MPMC_DYNAMIC_READ_CONFIG  (*(volatile uint32_t*)(MPMC_BASE+0x028))
+#define MPMC_DYNAMIC_tRP          (*(volatile uint32_t*)(MPMC_BASE+0x030))
+#define MPMC_DYNAMIC_tRAS         (*(volatile uint32_t*)(MPMC_BASE+0x034))
+#define MPMC_DYNAMIC_tSREX        (*(volatile uint32_t*)(MPMC_BASE+0x038))
+#define MPMC_DYNAMIC_tAPR         (*(volatile uint32_t*)(MPMC_BASE+0x03C))
+#define MPMC_DYNAMIC_tDAL         (*(volatile uint32_t*)(MPMC_BASE+0x040))
+#define MPMC_DYNAMIC_tWR          (*(volatile uint32_t*)(MPMC_BASE+0x044))
+#define MPMC_DYNAMIC_tRC          (*(volatile uint32_t*)(MPMC_BASE+0x048))
+#define MPMC_DYNAMIC_tRFC         (*(volatile uint32_t*)(MPMC_BASE+0x04C))
+#define MPMC_DYNAMIC_tXSR         (*(volatile uint32_t*)(MPMC_BASE+0x050))
+#define MPMC_DYNAMIC_tRRD         (*(volatile uint32_t*)(MPMC_BASE+0x054))
+#define MPMC_DYNAMIC_tMRD         (*(volatile uint32_t*)(MPMC_BASE+0x058))
 
-#define MPMC_STATIC_EXTENDED_WAIT (*(volatile unsigned long*)(MPMC_BASE+0x080))
+#define MPMC_STATIC_EXTENDED_WAIT (*(volatile uint32_t*)(MPMC_BASE+0x080))
 
-#define MPMC_DYNAMIC_CONFIG_0     (*(volatile unsigned long*)(MPMC_BASE+0x100))
-#define MPMC_DYNAMIC_CONFIG_1     (*(volatile unsigned long*)(MPMC_BASE+0x120))
-#define MPMC_DYNAMIC_CONFIG_2     (*(volatile unsigned long*)(MPMC_BASE+0x140))
-#define MPMC_DYNAMIC_CONFIG_3     (*(volatile unsigned long*)(MPMC_BASE+0x160))
+#define MPMC_DYNAMIC_CONFIG_0     (*(volatile uint32_t*)(MPMC_BASE+0x100))
+#define MPMC_DYNAMIC_CONFIG_1     (*(volatile uint32_t*)(MPMC_BASE+0x120))
+#define MPMC_DYNAMIC_CONFIG_2     (*(volatile uint32_t*)(MPMC_BASE+0x140))
+#define MPMC_DYNAMIC_CONFIG_3     (*(volatile uint32_t*)(MPMC_BASE+0x160))
 
-#define MPMC_DYNAMIC_RASCAS_0     (*(volatile unsigned long*)(MPMC_BASE+0x104))
-#define MPMC_DYNAMIC_RASCAS_1     (*(volatile unsigned long*)(MPMC_BASE+0x124))
-#define MPMC_DYNAMIC_RASCAS_2     (*(volatile unsigned long*)(MPMC_BASE+0x144))
-#define MPMC_DYNAMIC_RASCAS_3     (*(volatile unsigned long*)(MPMC_BASE+0x164))
+#define MPMC_DYNAMIC_RASCAS_0     (*(volatile uint32_t*)(MPMC_BASE+0x104))
+#define MPMC_DYNAMIC_RASCAS_1     (*(volatile uint32_t*)(MPMC_BASE+0x124))
+#define MPMC_DYNAMIC_RASCAS_2     (*(volatile uint32_t*)(MPMC_BASE+0x144))
+#define MPMC_DYNAMIC_RASCAS_3     (*(volatile uint32_t*)(MPMC_BASE+0x164))
 
-#define MPMC_PERIPH_ID2           (*(volatile unsigned long*)(MPMC_BASE+0xFE8))
+#define MPMC_PERIPH_ID2           (*(volatile uint32_t*)(MPMC_BASE+0xFE8))
 
 /* VIC controller (PL190) registers */
 
-#define VIC_IRQ_STATUS      (*(volatile unsigned long*)(VIC_BASE+0x00))
-#define VIC_FIQ_STATUS      (*(volatile unsigned long*)(VIC_BASE+0x04))
-#define VIC_RAW_INTR        (*(volatile unsigned long*)(VIC_BASE+0x08))
-#define VIC_INT_SELECT      (*(volatile unsigned long*)(VIC_BASE+0x0C))
-#define VIC_INT_ENABLE      (*(volatile unsigned long*)(VIC_BASE+0x10))
-#define VIC_INT_EN_CLEAR    (*(volatile unsigned long*)(VIC_BASE+0x14))
-#define VIC_SOFT_INT        (*(volatile unsigned long*)(VIC_BASE+0x18))
-#define VIC_SOFT_INT_CLEAR  (*(volatile unsigned long*)(VIC_BASE+0x1C))
-#define VIC_PROTECTION      (*(volatile unsigned long*)(VIC_BASE+0x20))
+#define VIC_IRQ_STATUS      (*(volatile uint32_t*)(VIC_BASE+0x00))
+#define VIC_FIQ_STATUS      (*(volatile uint32_t*)(VIC_BASE+0x04))
+#define VIC_RAW_INTR        (*(volatile uint32_t*)(VIC_BASE+0x08))
+#define VIC_INT_SELECT      (*(volatile uint32_t*)(VIC_BASE+0x0C))
+#define VIC_INT_ENABLE      (*(volatile uint32_t*)(VIC_BASE+0x10))
+#define VIC_INT_EN_CLEAR    (*(volatile uint32_t*)(VIC_BASE+0x14))
+#define VIC_SOFT_INT        (*(volatile uint32_t*)(VIC_BASE+0x18))
+#define VIC_SOFT_INT_CLEAR  (*(volatile uint32_t*)(VIC_BASE+0x1C))
+#define VIC_PROTECTION      (*(volatile uint32_t*)(VIC_BASE+0x20))
 #define VIC_VECT_ADDR       ((void (* volatile *) (void)) (VIC_BASE+0x30))
 #define VIC_DEF_VECT_ADDR   ((void (* volatile *) (void)) (VIC_BASE+0x34))
 #define VIC_VECT_ADDRS      ((void (* volatile *) (void)) (VIC_BASE+0x100))
-#define VIC_VECT_CNTLS      ((volatile unsigned long*)(VIC_BASE+0x200))
+#define VIC_VECT_CNTLS      ((volatile uint32_t*)(VIC_BASE+0x200))
 
 /* Interrupt sources (for vectors setup) */
 #define INT_SRC_WATCHDOG      0
@@ -506,26 +510,26 @@ CE lines
 
 /* I2SOUT registers */
 
-#define I2SOUT_CONTROL      (*(volatile unsigned char*)(I2SOUT_BASE+0x00))
-#define I2SOUT_MASK         (*(volatile unsigned char*)(I2SOUT_BASE+0x04))
-#define I2SOUT_RAW_STATUS   (*(volatile unsigned char*)(I2SOUT_BASE+0x08))
-#define I2SOUT_STATUS       (*(volatile unsigned char*)(I2SOUT_BASE+0x0C))
-#define I2SOUT_CLEAR        (*(volatile unsigned char*)(I2SOUT_BASE+0x10))
-#define I2SOUT_DATA         (volatile unsigned long*)(I2SOUT_BASE+0x14)
+#define I2SOUT_CONTROL      (*(volatile uint8_t*)(I2SOUT_BASE+0x00))
+#define I2SOUT_MASK         (*(volatile uint8_t*)(I2SOUT_BASE+0x04))
+#define I2SOUT_RAW_STATUS   (*(volatile uint8_t*)(I2SOUT_BASE+0x08))
+#define I2SOUT_STATUS       (*(volatile uint8_t*)(I2SOUT_BASE+0x0C))
+#define I2SOUT_CLEAR        (*(volatile uint8_t*)(I2SOUT_BASE+0x10))
+#define I2SOUT_DATA         (volatile uint32_t*)(I2SOUT_BASE+0x14)
 
 
 /* SSP registers (PrimeCell PL022) */
 
-#define SSP_CR0             (*(volatile unsigned short*)(SSP_BASE+0x00))
-#define SSP_CR1             (*(volatile unsigned char*)(SSP_BASE+0x04))
-#define SSP_DATA            (*(volatile unsigned short*)(SSP_BASE+0x08))
-#define SSP_SR              (*(volatile unsigned char*)(SSP_BASE+0x0C))
-#define SSP_CPSR            (*(volatile unsigned char*)(SSP_BASE+0x10))
-#define SSP_IMSC            (*(volatile unsigned char*)(SSP_BASE+0x14))
-#define SSP_IRS             (*(volatile unsigned char*)(SSP_BASE+0x18))
-#define SSP_MIS             (*(volatile unsigned char*)(SSP_BASE+0x1C))
-#define SSP_ICR             (*(volatile unsigned char*)(SSP_BASE+0x20))
-#define SSP_DMACR           (*(volatile unsigned char*)(SSP_BASE+0x24))
+#define SSP_CR0             (*(volatile uint16_t*)(SSP_BASE+0x00))
+#define SSP_CR1             (*(volatile uint8_t*)(SSP_BASE+0x04))
+#define SSP_DATA            (*(volatile uint16_t*)(SSP_BASE+0x08))
+#define SSP_SR              (*(volatile uint8_t*)(SSP_BASE+0x0C))
+#define SSP_CPSR            (*(volatile uint8_t*)(SSP_BASE+0x10))
+#define SSP_IMSC            (*(volatile uint8_t*)(SSP_BASE+0x14))
+#define SSP_IRS             (*(volatile uint8_t*)(SSP_BASE+0x18))
+#define SSP_MIS             (*(volatile uint8_t*)(SSP_BASE+0x1C))
+#define SSP_ICR             (*(volatile uint8_t*)(SSP_BASE+0x20))
+#define SSP_DMACR           (*(volatile uint8_t*)(SSP_BASE+0x24))
 
 /* PCM addresses for obtaining buffers will be what DMA is using (physical) */
 #define HAVE_PCM_DMA_ADDRESS
@@ -539,13 +543,13 @@ CE lines
 
 /* I2SIN registers */
 
-#define I2SIN_CONTROL      (*(volatile unsigned long*)(I2SIN_BASE+0x00))
-#define I2SIN_MASK         (*(volatile unsigned char*)(I2SIN_BASE+0x04))
-#define I2SIN_RAW_STATUS   (*(volatile unsigned char*)(I2SIN_BASE+0x08))
-#define I2SIN_STATUS       (*(volatile unsigned char*)(I2SIN_BASE+0x0C))
-#define I2SIN_CLEAR        (*(volatile unsigned char*)(I2SIN_BASE+0x10))
-#define I2SIN_DATA         (volatile unsigned long*)(I2SIN_BASE+0x14)
-#define I2SIN_SPDIF_STATUS (*(volatile unsigned long*)(I2SIN_BASE+0x18))
+#define I2SIN_CONTROL      (*(volatile uint32_t*)(I2SIN_BASE+0x00))
+#define I2SIN_MASK         (*(volatile uint8_t*)(I2SIN_BASE+0x04))
+#define I2SIN_RAW_STATUS   (*(volatile uint8_t*)(I2SIN_BASE+0x08))
+#define I2SIN_STATUS       (*(volatile uint8_t*)(I2SIN_BASE+0x0C))
+#define I2SIN_CLEAR        (*(volatile uint8_t*)(I2SIN_BASE+0x10))
+#define I2SIN_DATA         (volatile uint32_t*)(I2SIN_BASE+0x14)
+#define I2SIN_SPDIF_STATUS (*(volatile uint32_t*)(I2SIN_BASE+0x18))
 
 /* I2SIN_MASK */
 
diff --git a/firmware/export/as3525v2.h b/firmware/export/as3525v2.h
index f68a07a2fb..c4bf3bffac 100644
--- a/firmware/export/as3525v2.h
+++ b/firmware/export/as3525v2.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Rafaël Carré
  *
@@ -34,13 +33,13 @@
 #undef IRAM_SIZE
 #define IRAM_SIZE 0x100000
 
-#define CGU_SDSLOT         (*(volatile unsigned long *)(CGU_BASE + 0x3C))
+#define CGU_SDSLOT         (*(volatile uint32_t*)(CGU_BASE + 0x3C))
 
 #undef USB_NUM_ENDPOINTS
 /* 7 available EPs (0b00000000010101010000000000101011), 6 used */
 #define USB_NUM_ENDPOINTS   6
 
-#define CCU_USB         (*(volatile unsigned long *)(CCU_BASE + 0x20))
+#define CCU_USB         (*(volatile uint32_t*)(CCU_BASE + 0x20))
 
 #undef USB_DEVBSS_ATTR
 #define USB_DEVBSS_ATTR __attribute__((aligned(32)))
diff --git a/firmware/export/ascodec.h b/firmware/export/ascodec.h
index b9c58c08ba..2be6f8e0d7 100644
--- a/firmware/export/ascodec.h
+++ b/firmware/export/ascodec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Dave Chapman
  *
diff --git a/firmware/export/ata-defines.h b/firmware/export/ata-defines.h
index 70249ed0a0..ffdb8ed554 100644
--- a/firmware/export/ata-defines.h
+++ b/firmware/export/ata-defines.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: ata.h 28951 2011-01-02 23:02:55Z theseven $
  *
  * Copyright (C) 2011 by Michael Sparmann
  *
diff --git a/firmware/export/ata-driver.h b/firmware/export/ata-driver.h
index 7c69322bfb..5c5ba620d4 100644
--- a/firmware/export/ata-driver.h
+++ b/firmware/export/ata-driver.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Boris Gjenero
  *
diff --git a/firmware/export/ata.h b/firmware/export/ata.h
index 0ab504c7e3..ff08eaf5d0 100644
--- a/firmware/export/ata.h
+++ b/firmware/export/ata.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
@@ -169,6 +168,9 @@ int ata_spinup_time(void); /* ticks */
 /* Returns 1 if drive is solid-state */
 static inline int ata_disk_isssd(void)
 {
+#ifdef SIMULATOR
+    return 0;
+#else
     unsigned short *identify_info = ata_get_identify();
     /*
        Offset 217 is "Nominal Rotation rate"
@@ -207,6 +209,7 @@ static inline int ata_disk_isssd(void)
              || ((identify_info[83] & (1<<2)) &&          /* CFA compliant */
                  ((identify_info[160] & (1<<15)) == 0))   /* CF power level 0 */
            );
+#endif
 }
 
 /* Returns 1 if the drive supports power management commands */
diff --git a/firmware/export/ata_idle_notify.h b/firmware/export/ata_idle_notify.h
index 8f2d4e26c4..546b04e308 100644
--- a/firmware/export/ata_idle_notify.h
+++ b/firmware/export/ata_idle_notify.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/firmware/export/ata_mmc.h b/firmware/export/ata_mmc.h
index cde1fc7ad1..a87aa0482c 100644
--- a/firmware/export/ata_mmc.h
+++ b/firmware/export/ata_mmc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Jens Arnold
  *
diff --git a/firmware/export/audio.h b/firmware/export/audio.h
index 30acfd1e3c..87771dfbdd 100644
--- a/firmware/export/audio.h
+++ b/firmware/export/audio.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h
index ec465ca7b7..25e6f46b3d 100644
--- a/firmware/export/audiohw.h
+++ b/firmware/export/audiohw.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Christian Gmeiner
  *
diff --git a/firmware/export/audiohw_settings.h b/firmware/export/audiohw_settings.h
index 8010963ea4..c5a39ead75 100644
--- a/firmware/export/audiohw_settings.h
+++ b/firmware/export/audiohw_settings.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  * Copyright (C) 2007 by Christian Gmeiner
diff --git a/firmware/export/axp-2101.h b/firmware/export/axp-2101.h
index cd810ff006..4db100ddaa 100644
--- a/firmware/export/axp-2101.h
+++ b/firmware/export/axp-2101.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/export/axp-pmu.h b/firmware/export/axp-pmu.h
index 77ef1cc356..c20ff9d188 100644
--- a/firmware/export/axp-pmu.h
+++ b/firmware/export/axp-pmu.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/export/backlight-sw-fading.h b/firmware/export/backlight-sw-fading.h
index 7a0dedaf46..c1829a3bf2 100644
--- a/firmware/export/backlight-sw-fading.h
+++ b/firmware/export/backlight-sw-fading.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Thomas Martitz
  *
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h
index 77a47fc9fa..77ce125d96 100644
--- a/firmware/export/backlight.h
+++ b/firmware/export/backlight.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
diff --git a/firmware/export/backtrace.h b/firmware/export/backtrace.h
index fb007ab004..ca00447922 100644
--- a/firmware/export/backtrace.h
+++ b/firmware/export/backtrace.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 by Amaury Pouly
  *
diff --git a/firmware/export/bidi.h b/firmware/export/bidi.h
index dc52e8671e..27b884beda 100644
--- a/firmware/export/bidi.h
+++ b/firmware/export/bidi.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Gadi Cohen
  *
@@ -21,6 +20,32 @@
 #ifndef BIDI_H
 #define BIDI_H
 
+#include <stdbool.h>
+
+/* True for code points that belong to a right-to-left script (Hebrew, Arabic
+ * and the Arabic presentation forms). Shared by the bidi engine and by callers
+ * that need to know a string's direction. */
+static inline bool is_rtl_char(ucschar_t c)
+{
+   return ((c >= 0x0590 && c <= 0x06ff) /* Hebrew + Arabic */ ||
+           (c >= 0x0750 && c <= 0x077f) /* Arabic Supp */ ||
+           (c >= 0x0870 && c <= 0x08ff) /* Arabic Ext B+A */ ||
+           (c >= 0xfb50 && c <= 0xfdff) /* Arabic Pres A */ ||
+           (c >= 0xfe70 && c <= 0xfefc) /* Arabic Pres B */
+#ifdef UNICODE32
+           || (c >= 0x10e60 && c <= 0x107ef) /* Rumi Numerals */
+           || (c >= 0x10ec0 && c <= 0x10eff) /* Arabic Ext C */
+           || (c >= 0x1ec70 && c <= 0x1ecbf) /* Indic Siyaq Numerals */
+           || (c >= 0x1ed00 && c <= 0x1ed4f) /* Ottoman Siyaq Numerals */
+           || (c >= 0x1ee00 && c <= 0x1eeff) /* Arabic Mathenatical Symbols */
+#endif
+           );
+}
+
+/* True if the string's first strongly-directional character is RTL, i.e. the
+ * string should be laid out right-to-left. */
+bool text_is_rtl(const unsigned char *str);
+
 ucschar_t *bidi_l2v(const unsigned char *str, int orientation);
 
 #endif /* BIDI_H */
diff --git a/firmware/export/bitswap.h b/firmware/export/bitswap.h
index 0e0fbae66d..68be1fcf3e 100644
--- a/firmware/export/bitswap.h
+++ b/firmware/export/bitswap.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Jens Arnold
  *
diff --git a/firmware/export/bootchart.h b/firmware/export/bootchart.h
index 04f1a73670..8ea170ae90 100644
--- a/firmware/export/bootchart.h
+++ b/firmware/export/bootchart.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Torne Wuff
  *
diff --git a/firmware/export/button.h b/firmware/export/button.h
index e3c3126a1b..dadbf4e5a2 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 4b0a16f0f1..997d14e010 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
@@ -1335,7 +1334,6 @@ Lyre prototype 1 */
 /* Define the implemented USB transport classes */
 #if CONFIG_USBOTG == USBOTG_ISP1583
 #define USB_HAS_BULK
-#define USB_LEGACY_CONTROL_API
 #elif (CONFIG_USBOTG == USBOTG_DESIGNWARE)
 #define USB_HAS_BULK
 #define USB_HAS_INTERRUPT
@@ -1352,13 +1350,10 @@ Lyre prototype 1 */
 #if (CONFIG_USBOTG == USBOTG_ARC)
 #define USB_HAS_ISOCHRONOUS
 #endif
-#define USB_LEGACY_CONTROL_API
 #elif defined(CPU_TCC780X)
 #define USB_HAS_BULK
-#define USB_LEGACY_CONTROL_API
 #elif CONFIG_USBOTG == USBOTG_S3C6400X
 #define USB_HAS_BULK
-#define USB_LEGACY_CONTROL_API
 //#define USB_HAS_INTERRUPT -- seems to be broken
 #endif /* CONFIG_USBOTG */
 
diff --git a/firmware/export/config/hibyr1.h b/firmware/export/config/hibyr1.h
index f5b3707f6f..f830791d9e 100644
--- a/firmware/export/config/hibyr1.h
+++ b/firmware/export/config/hibyr1.h
@@ -83,6 +83,8 @@
 #define BOOTDIR      "/.rockbox"
 
 /* USB */
+#define HAVE_USB_ADB
+#define HAVE_USB_POWER
 #define USB_VID_STR "32BB"
 #define USB_PID_STR "0101"
 
diff --git a/firmware/export/config/hibyr3proii.h b/firmware/export/config/hibyr3proii.h
index 32a30887c2..ffb0c69f16 100644
--- a/firmware/export/config/hibyr3proii.h
+++ b/firmware/export/config/hibyr3proii.h
@@ -86,6 +86,8 @@
 #define BOOTDIR      "/.rockbox"
 
 /* USB */
+#define HAVE_USB_ADB
+#define HAVE_USB_POWER
 #define USB_VID_STR "32BB"
 #define USB_PID_STR "0101"
 
diff --git a/firmware/export/config/ibassodx50.h b/firmware/export/config/ibassodx50.h
index f8784ad1cc..1636aaba59 100644
--- a/firmware/export/config/ibassodx50.h
+++ b/firmware/export/config/ibassodx50.h
@@ -35,8 +35,8 @@
 
 #define MODEL_NAME "iBasso DX50"
 
-#define USB_NONE
 #define HAVE_USB_POWER
+#define HAVE_USB_ADB
 
 /* define this if you have a colour LCD */
 #define HAVE_LCD_COLOR
diff --git a/firmware/export/config/ibassodx90.h b/firmware/export/config/ibassodx90.h
index dd7b406ea6..1274a890f0 100644
--- a/firmware/export/config/ibassodx90.h
+++ b/firmware/export/config/ibassodx90.h
@@ -35,8 +35,8 @@
 
 #define MODEL_NAME   "iBasso DX90"
 
-#define USB_NONE
 #define HAVE_USB_POWER
+#define HAVE_USB_ADB
 
 /* define this if you have a colour LCD */
 #define HAVE_LCD_COLOR
diff --git a/firmware/export/config/mrobe500.h b/firmware/export/config/mrobe500.h
index 04570411b8..7492b52f27 100644
--- a/firmware/export/config/mrobe500.h
+++ b/firmware/export/config/mrobe500.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/export/config/ondavx747.h b/firmware/export/config/ondavx747.h
index 8966b0dc09..03ace8f966 100644
--- a/firmware/export/config/ondavx747.h
+++ b/firmware/export/config/ondavx747.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/export/config/ondavx767.h b/firmware/export/config/ondavx767.h
index 769e417bd6..143215dc7c 100644
--- a/firmware/export/config/ondavx767.h
+++ b/firmware/export/config/ondavx767.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/export/config/ondavx777.h b/firmware/export/config/ondavx777.h
index 6074d480ac..b6a91a6f16 100644
--- a/firmware/export/config/ondavx777.h
+++ b/firmware/export/config/ondavx777.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h
index 5dcbadf6ba..4aa0d96d42 100644
--- a/firmware/export/config/sansaclipzip.h
+++ b/firmware/export/config/sansaclipzip.h
@@ -76,7 +76,7 @@
 #endif
 
 /* define this if you can flip your LCD */
-//#define HAVE_LCD_FLIP
+#define HAVE_LCD_FLIP
 
 /* define this if you can invert the pixels */
 //#define HAVE_LCD_INVERT
diff --git a/firmware/export/config_caps.h b/firmware/export/config_caps.h
index fe32e4953c..1fe7e584e7 100644
--- a/firmware/export/config_caps.h
+++ b/firmware/export/config_caps.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/export/cpu.h b/firmware/export/cpu.h
index 6c817ad46d..411ad330a5 100644
--- a/firmware/export/cpu.h
+++ b/firmware/export/cpu.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/cs42l55.h b/firmware/export/cs42l55.h
index 11ceb9b88a..2ff49c89d7 100644
--- a/firmware/export/cs42l55.h
+++ b/firmware/export/cs42l55.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: wm8975.h 28159 2010-09-24 22:42:06Z Buschel $
  *
  * Copyright (C) 2010 by Michael Sparmann
  *
diff --git a/firmware/export/cscodec.h b/firmware/export/cscodec.h
index dcf6c30e06..c046ec4595 100644
--- a/firmware/export/cscodec.h
+++ b/firmware/export/cscodec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: wmcodec.h 17847 2008-06-28 18:10:04Z bagder $
  *
  * Copyright (C) 2006 by Marcoen Hirschberg
  *
diff --git a/firmware/export/cw2015.h b/firmware/export/cw2015.h
index c810d1b7b5..98c85b3fc6 100644
--- a/firmware/export/cw2015.h
+++ b/firmware/export/cw2015.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/export/dac3550a.h b/firmware/export/dac3550a.h
index 50bf922e90..f7806e6804 100644
--- a/firmware/export/dac3550a.h
+++ b/firmware/export/dac3550a.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/debug.h b/firmware/export/debug.h
index 623b9e4827..0cda5618bd 100644
--- a/firmware/export/debug.h
+++ b/firmware/export/debug.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/df1704.h b/firmware/export/df1704.h
index 81848d8c6f..4f61cac301 100644
--- a/firmware/export/df1704.h
+++ b/firmware/export/df1704.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2013 Andrew Ryabinin
diff --git a/firmware/export/disk.h b/firmware/export/disk.h
index 5e91c91e3d..6e4d236d9b 100644
--- a/firmware/export/disk.h
+++ b/firmware/export/disk.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/export/dm320.h b/firmware/export/dm320.h
index 07e31d89ce..e232d820b5 100644
--- a/firmware/export/dm320.h
+++ b/firmware/export/dm320.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  * Copyright (C) 2008 by Maurus Cuelenaere
diff --git a/firmware/export/ds2411.h b/firmware/export/ds2411.h
index a90afc462c..703aa3a3bd 100644
--- a/firmware/export/ds2411.h
+++ b/firmware/export/ds2411.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/export/dsp-util.h b/firmware/export/dsp-util.h
index 6ac878f64c..22dd0def01 100644
--- a/firmware/export/dsp-util.h
+++ b/firmware/export/dsp-util.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Michael Sevakis
  *
diff --git a/firmware/export/dummy_codec.h b/firmware/export/dummy_codec.h
index 7337c2c730..7ae3d2beb5 100644
--- a/firmware/export/dummy_codec.h
+++ b/firmware/export/dummy_codec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2011 Andrew Ryabinin
diff --git a/firmware/export/echoplayer_codec.h b/firmware/export/echoplayer_codec.h
index 4f3d1e0f49..83bcf5548c 100644
--- a/firmware/export/echoplayer_codec.h
+++ b/firmware/export/echoplayer_codec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/export/eeprom_24cxx.h b/firmware/export/eeprom_24cxx.h
index 9a2efb915d..f95e561e92 100644
--- a/firmware/export/eeprom_24cxx.h
+++ b/firmware/export/eeprom_24cxx.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Miika Pekkarinen
  *
diff --git a/firmware/export/eeprom_settings.h b/firmware/export/eeprom_settings.h
index 92584e9c91..7a6fe2eab9 100644
--- a/firmware/export/eeprom_settings.h
+++ b/firmware/export/eeprom_settings.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Miika Pekkarinen
  *
diff --git a/firmware/export/enc_base.h b/firmware/export/enc_base.h
index 7228dc4c83..34cb4c4ab0 100644
--- a/firmware/export/enc_base.h
+++ b/firmware/export/enc_base.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Base declarations for working with software encoders
  *
diff --git a/firmware/export/eros_qn_codec.h b/firmware/export/eros_qn_codec.h
index c06cee30b6..a09fc64747 100644
--- a/firmware/export/eros_qn_codec.h
+++ b/firmware/export/eros_qn_codec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2021 Andrew Ryabinin, Dana Conrad
diff --git a/firmware/export/es9018.h b/firmware/export/es9018.h
index 41ea0d0b1c..57c487f45c 100644
--- a/firmware/export/es9018.h
+++ b/firmware/export/es9018.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/export/es9018k2m.h b/firmware/export/es9018k2m.h
index 2824fed505..19f7ca87bf 100644
--- a/firmware/export/es9018k2m.h
+++ b/firmware/export/es9018k2m.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2023 Dana Conrad
diff --git a/firmware/export/es9218.h b/firmware/export/es9218.h
index 1492304c67..5736a35b9a 100644
--- a/firmware/export/es9218.h
+++ b/firmware/export/es9218.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/export/events.h b/firmware/export/events.h
index 8bdf1b55e2..f365b77599 100644
--- a/firmware/export/events.h
+++ b/firmware/export/events.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Miika Pekkarinen
  *
diff --git a/firmware/export/fat.h b/firmware/export/fat.h
index 767c416d60..5436ca9806 100644
--- a/firmware/export/fat.h
+++ b/firmware/export/fat.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/fmradio.h b/firmware/export/fmradio.h
index 1c364c23ea..ce4ce563f7 100644
--- a/firmware/export/fmradio.h
+++ b/firmware/export/fmradio.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Driver to control the (Samsung) tuner via port-banging SPI
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
diff --git a/firmware/export/fmradio_3wire.h b/firmware/export/fmradio_3wire.h
index cafce9c8ec..ca3318f91b 100644
--- a/firmware/export/fmradio_3wire.h
+++ b/firmware/export/fmradio_3wire.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Physical interface of the Philips TEA5767
  *
  * Copyright (C) 2014 by Szymon Dziok
diff --git a/firmware/export/fmradio_i2c.h b/firmware/export/fmradio_i2c.h
index f8f6e4f646..db0f5f71cd 100644
--- a/firmware/export/fmradio_i2c.h
+++ b/firmware/export/fmradio_i2c.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Physical interface of the Philips TEA5767 in Archos Ondio
  *
  * Copyright (C) 2004 by Jörg Hohensohn
diff --git a/firmware/export/font.h b/firmware/export/font.h
index 604635f985..7040cbef2f 100644
--- a/firmware/export/font.h
+++ b/firmware/export/font.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2002 by Greg Haerr <greg@censoft.com>
  *
@@ -54,6 +53,7 @@ enum {
 /* SYSFONT, FONT_UI, FONT_UI_REMOTE + MAXUSERFONTS fonts in skins */
 #define MAXFONTS (FONT_FIRSTUSERFONT + MAXUSERFONTS)
 #define FONT_UI MAXFONTS
+#define FONT_LASTUSERFONT (MAXFONTS-1)
 
 /*
  * .fnt loadable font file format definition
@@ -132,6 +132,9 @@ void font_disable_all(void);
 void font_enable_all(void);
 
 struct font* font_get(int font);
+void set_ui_font(int font); /* when FONT_UI is supplied this font will be tried first */
+
+int font_measurestring(const unsigned char *str, size_t maxbytes, size_t maxwidth, int *w, int *h, int fontnum);
 int font_getstringnsize(const unsigned char *str, size_t maxbytes, int *w, int *h, int fontnumber);
 int font_getstringsize(const unsigned char *str, int *w, int *h, int fontnumber);
 int font_get_width(struct font* ft, ucschar_t ch);
diff --git a/firmware/export/ft6x06.h b/firmware/export/ft6x06.h
index 6596f89272..334e7f33fc 100644
--- a/firmware/export/ft6x06.h
+++ b/firmware/export/ft6x06.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/export/gdb_api.h b/firmware/export/gdb_api.h
index d2358ee3bb..ebb8661645 100644
--- a/firmware/export/gdb_api.h
+++ b/firmware/export/gdb_api.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Tomasz Malesinski
  *
diff --git a/firmware/export/general.h b/firmware/export/general.h
index 9762823998..9424735487 100644
--- a/firmware/export/general.h
+++ b/firmware/export/general.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michael Sevakis
  *
diff --git a/firmware/export/generic_i2c.h b/firmware/export/generic_i2c.h
index 9fdba26836..3dbaf9e1fa 100644
--- a/firmware/export/generic_i2c.h
+++ b/firmware/export/generic_i2c.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/hd66789r.h b/firmware/export/hd66789r.h
index f0b2c2bb71..f23b616365 100644
--- a/firmware/export/hd66789r.h
+++ b/firmware/export/hd66789r.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/hwcompat.h b/firmware/export/hwcompat.h
index ea167a4adf..4820639f6b 100644
--- a/firmware/export/hwcompat.h
+++ b/firmware/export/hwcompat.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/i2c-async.h b/firmware/export/i2c-async.h
index f31a73452b..259dfada4c 100644
--- a/firmware/export/i2c-async.h
+++ b/firmware/export/i2c-async.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/export/i2c-coldfire.h b/firmware/export/i2c-coldfire.h
index f98daf5d5f..35379cf467 100644
--- a/firmware/export/i2c-coldfire.h
+++ b/firmware/export/i2c-coldfire.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/i2c-pp.h b/firmware/export/i2c-pp.h
index f126fa812d..b1cb4daae1 100644
--- a/firmware/export/i2c-pp.h
+++ b/firmware/export/i2c-pp.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * PP502X and PP5002 I2C driver
  *
diff --git a/firmware/export/i2c-rk27xx.h b/firmware/export/i2c-rk27xx.h
index d16d4c3dbb..0a4bfc75f6 100644
--- a/firmware/export/i2c-rk27xx.h
+++ b/firmware/export/i2c-rk27xx.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/export/i2c-s5l8700.h b/firmware/export/i2c-s5l8700.h
index 607f361384..3255383fce 100644
--- a/firmware/export/i2c-s5l8700.h
+++ b/firmware/export/i2c-s5l8700.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/export/i2c-s5l8702.h b/firmware/export/i2c-s5l8702.h
index a1e7be04b4..caf92e2c62 100644
--- a/firmware/export/i2c-s5l8702.h
+++ b/firmware/export/i2c-s5l8702.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: i2c-s5l8700.h 21533 2009-06-27 20:11:11Z bertrik $
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/export/i2c.h b/firmware/export/i2c.h
index 08562b198c..16b4f0a7c4 100644
--- a/firmware/export/i2c.h
+++ b/firmware/export/i2c.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/i2s.h b/firmware/export/i2s.h
index 78dc424a0e..1c4a549737 100644
--- a/firmware/export/i2s.h
+++ b/firmware/export/i2s.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Daniel Ankers
  *
diff --git a/firmware/export/iap.h b/firmware/export/iap.h
index cd793937d7..54f891e446 100644
--- a/firmware/export/iap.h
+++ b/firmware/export/iap.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/export/imx233-codec.h b/firmware/export/imx233-codec.h
index 040a829284..11a657a73f 100644
--- a/firmware/export/imx233-codec.h
+++ b/firmware/export/imx233-codec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/export/imx233.h b/firmware/export/imx233.h
index 251f4c6b55..ec4e1c2b9c 100644
--- a/firmware/export/imx233.h
+++ b/firmware/export/imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/export/imx31l.h b/firmware/export/imx31l.h
index ca4ab0c019..6ff132cfc2 100644
--- a/firmware/export/imx31l.h
+++ b/firmware/export/imx31l.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by James Espinoza
  *
@@ -21,17 +20,21 @@
 #ifndef __IMX31L_H__
 #define __IMX31L_H__
 
+#if !defined(__ASSEMBLER__)
+#include <stdint.h>
+#endif
+
 /* Most(if not all) of these defines are copied from Nand-Boot v4 provided w/ the Imx31 Linux Bsp*/
 
-#define REG8_PTR_T  volatile unsigned char *
-#define REG16_PTR_T volatile unsigned short *
-#define REG32_PTR_T volatile unsigned long *
+#define REG8_PTR_T  volatile uint8_t *
+#define REG16_PTR_T volatile uint16_t *
+#define REG32_PTR_T volatile uint32_t *
 
 /* Place in the section with the framebuffer */
 #define TTB_BASE_ADDR (CSD0_BASE_ADDR + (MEMORYSIZE*0x100000) - TTB_SIZE)
 #define TTB_SIZE      (0x4000)
 #define IRAM_SIZE     (0x4000)
-#define TTB_BASE      ((unsigned long *)TTB_BASE_ADDR)
+#define TTB_BASE      ((uint32_t *)TTB_BASE_ADDR)
 #define FRAME_SIZE    (240*320*2)
 /* Rockbox framebuffer address, not retail OS */
 #define FRAME_PHYS_ADDR (TTB_BASE_ADDR - FRAME_SIZE)
diff --git a/firmware/export/isp1362.h b/firmware/export/isp1362.h
index 99abaa764f..5417c90a57 100644
--- a/firmware/export/isp1362.h
+++ b/firmware/export/isp1362.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jens Arnold
  *
diff --git a/firmware/export/isp1583.h b/firmware/export/isp1583.h
index fb150fb704..2dc5a57a28 100644
--- a/firmware/export/isp1583.h
+++ b/firmware/export/isp1583.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/export/jz4740-codec.h b/firmware/export/jz4740-codec.h
index 4a2ca19a82..c19d93ed04 100644
--- a/firmware/export/jz4740-codec.h
+++ b/firmware/export/jz4740-codec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/firmware/export/jz4740.h b/firmware/export/jz4740.h
index b317ca59c3..fff8735903 100644
--- a/firmware/export/jz4740.h
+++ b/firmware/export/jz4740.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  * Copyright (C) 2006-2007 by Ingenic Semiconductor Inc.
diff --git a/firmware/export/jz4760b.h b/firmware/export/jz4760b.h
index c17939937e..8f00096df2 100644
--- a/firmware/export/jz4760b.h
+++ b/firmware/export/jz4760b.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  * Copyright (C) 2008 Ingenic Semiconductor Inc.
diff --git a/firmware/export/jz_mxu.h b/firmware/export/jz_mxu.h
index b833aedceb..fc6416990e 100644
--- a/firmware/export/jz_mxu.h
+++ b/firmware/export/jz_mxu.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  * Copyright (C) 2006-2007 by Ingenic Semiconductor Inc.
diff --git a/firmware/export/lc-dlopen.h b/firmware/export/lc-dlopen.h
index ef3b88d2a0..7af04cb278 100644
--- a/firmware/export/lc-dlopen.h
+++ b/firmware/export/lc-dlopen.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/export/lc-rock.h b/firmware/export/lc-rock.h
index 43fd815f3a..38d808fbe4 100644
--- a/firmware/export/lc-rock.h
+++ b/firmware/export/lc-rock.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index 93ca1fac7e..5faf8179b8 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Richard S. La Charité
  *
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index f81e7b9c5f..f3d7483a70 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/export/led.h b/firmware/export/led.h
index bcc9a31286..ee25db7639 100644
--- a/firmware/export/led.h
+++ b/firmware/export/led.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/export/linuxboot.h b/firmware/export/linuxboot.h
index de6f24bf57..42c6b67dad 100644
--- a/firmware/export/linuxboot.h
+++ b/firmware/export/linuxboot.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/firmware/export/load_code.h b/firmware/export/load_code.h
index c2595f7b04..63f4661318 100644
--- a/firmware/export/load_code.h
+++ b/firmware/export/load_code.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/export/logdiskf.h b/firmware/export/logdiskf.h
index 76ab78606d..26102da854 100644
--- a/firmware/export/logdiskf.h
+++ b/firmware/export/logdiskf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Michael Giacomelli
  *
diff --git a/firmware/export/logf.h b/firmware/export/logf.h
index 7fbe5976a4..9bf2f8b6be 100644
--- a/firmware/export/logf.h
+++ b/firmware/export/logf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Daniel Stenberg
  *
diff --git a/firmware/export/ltv350qv.h b/firmware/export/ltv350qv.h
index 31fb58ac6c..c3ff9d9e5f 100644
--- a/firmware/export/ltv350qv.h
+++ b/firmware/export/ltv350qv.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/export/lv24020lp.h b/firmware/export/lv24020lp.h
index f2e123b094..a693d60ace 100644
--- a/firmware/export/lv24020lp.h
+++ b/firmware/export/lv24020lp.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Tuner header for the Sanyo LV24020LP
  *
  * Copyright (C) 2007 Michael Sevakis
diff --git a/firmware/export/m5636.h b/firmware/export/m5636.h
index d787792b5f..fbd4b46df5 100644
--- a/firmware/export/m5636.h
+++ b/firmware/export/m5636.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Ulrich Pegelow
  *
diff --git a/firmware/export/m66591.h b/firmware/export/m66591.h
index b1a0883549..1a5e695b6a 100644
--- a/firmware/export/m66591.h
+++ b/firmware/export/m66591.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Karl Kurbjun
  *
diff --git a/firmware/export/mc13783.h b/firmware/export/mc13783.h
index 83edd31904..be417d8eb2 100644
--- a/firmware/export/mc13783.h
+++ b/firmware/export/mc13783.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2008 by Michael Sevakis
  *
diff --git a/firmware/export/mcf5249.h b/firmware/export/mcf5249.h
index ed4f4d1915..7ec88028fd 100644
--- a/firmware/export/mcf5249.h
+++ b/firmware/export/mcf5249.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/mcf5250.h b/firmware/export/mcf5250.h
index e46fd15f2f..7f7c55eecb 100644
--- a/firmware/export/mcf5250.h
+++ b/firmware/export/mcf5250.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Christian Gmeiner
  *
diff --git a/firmware/export/mmc.h b/firmware/export/mmc.h
index 1d5e3393e5..95c75b87c8 100644
--- a/firmware/export/mmc.h
+++ b/firmware/export/mmc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  * Copyright (C) 2008 by Frank Gevaerts
diff --git a/firmware/export/mpr121.h b/firmware/export/mpr121.h
index 50c13a1c7b..62dc24aa89 100644
--- a/firmware/export/mpr121.h
+++ b/firmware/export/mpr121.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/firmware/export/mv.h b/firmware/export/mv.h
index 9d202a8087..5f4972414a 100644
--- a/firmware/export/mv.h
+++ b/firmware/export/mv.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Frank Gevaerts
  *
diff --git a/firmware/export/nand.h b/firmware/export/nand.h
index 6f9f504c44..bf597f5f6a 100644
--- a/firmware/export/nand.h
+++ b/firmware/export/nand.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  * Copyright (C) 2008 by Frank Gevaerts
diff --git a/firmware/export/nand_id.h b/firmware/export/nand_id.h
index 712fcdc606..6b3de29855 100644
--- a/firmware/export/nand_id.h
+++ b/firmware/export/nand_id.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/export/ohci.h b/firmware/export/ohci.h
index 4a82781c5d..0afb40fc0d 100644
--- a/firmware/export/ohci.h
+++ b/firmware/export/ohci.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * OHCI data structures and registers
  *
diff --git a/firmware/export/panic.h b/firmware/export/panic.h
index 8e35bfff16..70be95c780 100644
--- a/firmware/export/panic.h
+++ b/firmware/export/panic.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by wavey@wavey.org
  *
diff --git a/firmware/export/pathfuncs.h b/firmware/export/pathfuncs.h
index fce8e5851c..d85a812127 100644
--- a/firmware/export/pathfuncs.h
+++ b/firmware/export/pathfuncs.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/export/pca9555.h b/firmware/export/pca9555.h
index 3180114e14..41759584e8 100644
--- a/firmware/export/pca9555.h
+++ b/firmware/export/pca9555.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/firmware/export/pcf50605.h b/firmware/export/pcf50605.h
index cd38cc14fc..b6ba8590cc 100644
--- a/firmware/export/pcf50605.h
+++ b/firmware/export/pcf50605.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  *
diff --git a/firmware/export/pcf50606.h b/firmware/export/pcf50606.h
index 4ae3d83f97..d9302582b0 100644
--- a/firmware/export/pcf50606.h
+++ b/firmware/export/pcf50606.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/pcf5060x.h b/firmware/export/pcf5060x.h
index e2af9d7122..dd4516e10b 100644
--- a/firmware/export/pcf5060x.h
+++ b/firmware/export/pcf5060x.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Rob Purchase
  *
diff --git a/firmware/export/pcf50635.h b/firmware/export/pcf50635.h
index 716ed52899..76d17c8762 100644
--- a/firmware/export/pcf50635.h
+++ b/firmware/export/pcf50635.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Rob Purchase
  *
diff --git a/firmware/export/pcf5063x.h b/firmware/export/pcf5063x.h
index 2751b67b57..84e9a60e56 100644
--- a/firmware/export/pcf5063x.h
+++ b/firmware/export/pcf5063x.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Philips PCF50633 Power Managemnt Unit (PMU) driver
  * (C) 2006-2007 by Openmoko, Inc.
diff --git a/firmware/export/pcm-internal.h b/firmware/export/pcm-internal.h
index 4b4890d35a..4f69f77806 100644
--- a/firmware/export/pcm-internal.h
+++ b/firmware/export/pcm-internal.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  * Copyright (C) 2011 by Michael Sevakis
diff --git a/firmware/export/pcm.h b/firmware/export/pcm.h
index 42931fbf21..9c01554178 100644
--- a/firmware/export/pcm.h
+++ b/firmware/export/pcm.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/pcm1792.h b/firmware/export/pcm1792.h
index 917599edbf..a18e3949f4 100644
--- a/firmware/export/pcm1792.h
+++ b/firmware/export/pcm1792.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2013 Andrew Ryabinin
diff --git a/firmware/export/pcm_mixer.h b/firmware/export/pcm_mixer.h
index d98a24e54a..a003100285 100644
--- a/firmware/export/pcm_mixer.h
+++ b/firmware/export/pcm_mixer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Michael Sevakis
  *
diff --git a/firmware/export/pcm_sampr.h b/firmware/export/pcm_sampr.h
index fc48a943fd..77fc628566 100644
--- a/firmware/export/pcm_sampr.h
+++ b/firmware/export/pcm_sampr.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michael Sevakis
  *
diff --git a/firmware/export/pcm_sink.h b/firmware/export/pcm_sink.h
index a4945d3534..522a5aa853 100644
--- a/firmware/export/pcm_sink.h
+++ b/firmware/export/pcm_sink.h
@@ -49,7 +49,6 @@ struct pcm_sink {
     /* runtime states */
     unsigned long pending_freq;
     unsigned long configured_freq;
-    unsigned long pcm_is_ready;
 };
 
 enum pcm_sink_ids {
diff --git a/firmware/export/pcm_sw_volume.h b/firmware/export/pcm_sw_volume.h
index 5088eadeb1..5aba259b2a 100644
--- a/firmware/export/pcm_sw_volume.h
+++ b/firmware/export/pcm_sw_volume.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Michael Sevakis
  *
diff --git a/firmware/export/pl080.h b/firmware/export/pl080.h
index fe0013b59d..1976aba98f 100644
--- a/firmware/export/pl080.h
+++ b/firmware/export/pl080.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Cástor Muñoz
  *
diff --git a/firmware/export/pl081.h b/firmware/export/pl081.h
index 3a75104ab6..fe0a54bd97 100644
--- a/firmware/export/pl081.h
+++ b/firmware/export/pl081.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
@@ -24,33 +23,33 @@
 
 /* ARM PrimeCell PL081 Single Master DMA controller */
 
-#define DMAC_INT_STATUS           (*(volatile unsigned long*)(DMAC_BASE+0x000))
-#define DMAC_INT_TC_STATUS        (*(volatile unsigned long*)(DMAC_BASE+0x004))
-#define DMAC_INT_TC_CLEAR         (*(volatile unsigned long*)(DMAC_BASE+0x008))
-#define DMAC_INT_ERROR_STATUS     (*(volatile unsigned long*)(DMAC_BASE+0x00C))
-#define DMAC_INT_ERR_CLEAR        (*(volatile unsigned long*)(DMAC_BASE+0x010))
-#define DMAC_RAW_INT_TC_STATUS    (*(volatile unsigned long*)(DMAC_BASE+0x014))
-#define DMAC_RAW_INT_ERROR_STATUS (*(volatile unsigned long*)(DMAC_BASE+0x018))
-#define DMAC_ENBLD_CHANS          (*(volatile unsigned long*)(DMAC_BASE+0x01C))
-#define DMAC_SOFT_B_REQ           (*(volatile unsigned long*)(DMAC_BASE+0x020))
-#define DMAC_SOFT_S_REQ           (*(volatile unsigned long*)(DMAC_BASE+0x024))
-#define DMAC_SOFT_LB_REQ          (*(volatile unsigned long*)(DMAC_BASE+0x028))
-#define DMAC_SOFT_LS_REQ          (*(volatile unsigned long*)(DMAC_BASE+0x02C))
-#define DMAC_CONFIGURATION        (*(volatile unsigned long*)(DMAC_BASE+0x030))
-#define DMAC_SYNC                 (*(volatile unsigned long*)(DMAC_BASE+0x034))
+#define DMAC_INT_STATUS           (*(volatile uint32_t*)(DMAC_BASE+0x000))
+#define DMAC_INT_TC_STATUS        (*(volatile uint32_t*)(DMAC_BASE+0x004))
+#define DMAC_INT_TC_CLEAR         (*(volatile uint32_t*)(DMAC_BASE+0x008))
+#define DMAC_INT_ERROR_STATUS     (*(volatile uint32_t*)(DMAC_BASE+0x00C))
+#define DMAC_INT_ERR_CLEAR        (*(volatile uint32_t*)(DMAC_BASE+0x010))
+#define DMAC_RAW_INT_TC_STATUS    (*(volatile uint32_t*)(DMAC_BASE+0x014))
+#define DMAC_RAW_INT_ERROR_STATUS (*(volatile uint32_t*)(DMAC_BASE+0x018))
+#define DMAC_ENBLD_CHANS          (*(volatile uint32_t*)(DMAC_BASE+0x01C))
+#define DMAC_SOFT_B_REQ           (*(volatile uint32_t*)(DMAC_BASE+0x020))
+#define DMAC_SOFT_S_REQ           (*(volatile uint32_t*)(DMAC_BASE+0x024))
+#define DMAC_SOFT_LB_REQ          (*(volatile uint32_t*)(DMAC_BASE+0x028))
+#define DMAC_SOFT_LS_REQ          (*(volatile uint32_t*)(DMAC_BASE+0x02C))
+#define DMAC_CONFIGURATION        (*(volatile uint32_t*)(DMAC_BASE+0x030))
+#define DMAC_SYNC                 (*(volatile uint32_t*)(DMAC_BASE+0x034))
 
 /* Channel registers (0 & 1) */
-#define DMAC_CH_SRC_ADDR(c)       (*(volatile unsigned long*)(DMAC_BASE+0x100+(0x20*c)))
-#define DMAC_CH_DST_ADDR(c)       (*(volatile unsigned long*)(DMAC_BASE+0x104+(0x20*c)))
-#define DMAC_CH_LLI(c)            (*(volatile unsigned long*)(DMAC_BASE+0x108+(0x20*c)))
-#define DMAC_CH_CONTROL(c)        (*(volatile unsigned long*)(DMAC_BASE+0x10C+(0x20*c)))
-#define DMAC_CH_CONFIGURATION(c)  (*(volatile unsigned long*)(DMAC_BASE+0x110+(0x20*c)))
+#define DMAC_CH_SRC_ADDR(c)       (*(volatile uint32_t*)(DMAC_BASE+0x100+(0x20*c)))
+#define DMAC_CH_DST_ADDR(c)       (*(volatile uint32_t*)(DMAC_BASE+0x104+(0x20*c)))
+#define DMAC_CH_LLI(c)            (*(volatile uint32_t*)(DMAC_BASE+0x108+(0x20*c)))
+#define DMAC_CH_CONTROL(c)        (*(volatile uint32_t*)(DMAC_BASE+0x10C+(0x20*c)))
+#define DMAC_CH_CONFIGURATION(c)  (*(volatile uint32_t*)(DMAC_BASE+0x110+(0x20*c)))
 
 /* Test registers */
-#define DMAC_ITCR                 (*(volatile unsigned long*)(DMAC_BASE+0x500))
-#define DMAC_ITOP1                (*(volatile unsigned long*)(DMAC_BASE+0x504))
-#define DMAC_ITOP2                (*(volatile unsigned long*)(DMAC_BASE+0x508))
-#define DMAC_ITOP3                (*(volatile unsigned long*)(DMAC_BASE+0x50C))
+#define DMAC_ITCR                 (*(volatile uint32_t*)(DMAC_BASE+0x500))
+#define DMAC_ITOP1                (*(volatile uint32_t*)(DMAC_BASE+0x504))
+#define DMAC_ITOP2                (*(volatile uint32_t*)(DMAC_BASE+0x508))
+#define DMAC_ITOP3                (*(volatile uint32_t*)(DMAC_BASE+0x50C))
 
 /* Flow controllers */
 
diff --git a/firmware/export/pl180.h b/firmware/export/pl180.h
index 23343771b1..92fbab716d 100644
--- a/firmware/export/pl180.h
+++ b/firmware/export/pl180.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/export/power.h b/firmware/export/power.h
index 21b0f772b7..884a9c1320 100644
--- a/firmware/export/power.h
+++ b/firmware/export/power.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h
index 2a7ca30f02..6bcb82b7e2 100644
--- a/firmware/export/powermgmt.h
+++ b/firmware/export/powermgmt.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  *
diff --git a/firmware/export/pp5002.h b/firmware/export/pp5002.h
index 5cfc0c5442..ed4dc075a5 100644
--- a/firmware/export/pp5002.h
+++ b/firmware/export/pp5002.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Thom Johansen 
  *
diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h
index 04bd7c44f3..e733d91cc4 100644
--- a/firmware/export/pp5020.h
+++ b/firmware/export/pp5020.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Thom Johansen
  *
diff --git a/firmware/export/pp5024.h b/firmware/export/pp5024.h
index 6875115127..95134173fc 100644
--- a/firmware/export/pp5024.h
+++ b/firmware/export/pp5024.h
@@ -7,7 +7,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Daniel Stenberg
  *
diff --git a/firmware/export/pp6100.h b/firmware/export/pp6100.h
index 68d8af83f7..2507c04f61 100644
--- a/firmware/export/pp6100.h
+++ b/firmware/export/pp6100.h
@@ -7,7 +7,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Robert Keevil
  *
diff --git a/firmware/export/profile.h b/firmware/export/profile.h
index 18a6f8679f..f1de0ac711 100644
--- a/firmware/export/profile.h
+++ b/firmware/export/profile.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Profiling routines counts ticks and calls to each profiled function.
  *
diff --git a/firmware/export/qt1106.h b/firmware/export/qt1106.h
index 94f3c8f507..416dcdeb1d 100644
--- a/firmware/export/qt1106.h
+++ b/firmware/export/qt1106.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Frank Gevaerts
  *
diff --git a/firmware/export/r61509.h b/firmware/export/r61509.h
index 5d45c4ebcd..caa34266a5 100644
--- a/firmware/export/r61509.h
+++ b/firmware/export/r61509.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/export/ramdisk.h b/firmware/export/ramdisk.h
index 8e3baf8e3e..2d97fcf58b 100644
--- a/firmware/export/ramdisk.h
+++ b/firmware/export/ramdisk.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  * Copyright (C) 2008 by Frank Gevaerts
diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h
index b00a0aba46..08691eb0a3 100644
--- a/firmware/export/rbpaths.h
+++ b/firmware/export/rbpaths.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/firmware/export/rda5802.h b/firmware/export/rda5802.h
index 0dae3ab5d2..ed1d8751f2 100644
--- a/firmware/export/rda5802.h
+++ b/firmware/export/rda5802.h
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  *
- * $Id$
  *
  * Tuner header for the RDA Microelectronics RDA5802 FM tuner chip
  *
diff --git a/firmware/export/rds.h b/firmware/export/rds.h
index 6c42e16f56..dcdc76167f 100644
--- a/firmware/export/rds.h
+++ b/firmware/export/rds.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 by Bertrik Sikken
  *
diff --git a/firmware/export/rectangle.h b/firmware/export/rectangle.h
index 0962611791..9606f7b516 100644
--- a/firmware/export/rectangle.h
+++ b/firmware/export/rectangle.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/firmware/export/reggen.h b/firmware/export/reggen.h
index 4a15ddb912..5bbb2e8ae7 100644
--- a/firmware/export/reggen.h
+++ b/firmware/export/reggen.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  * Based on headergen_v2 macro.h (see utils/regtools)
diff --git a/firmware/export/rk27xx_codec.h b/firmware/export/rk27xx_codec.h
index 28ab4730d8..f8711b509a 100644
--- a/firmware/export/rk27xx_codec.h
+++ b/firmware/export/rk27xx_codec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Driver for internal Rockchip rk27xx audio codec
  * (shCODlp-100.01-HD IP core from Dolphin)
diff --git a/firmware/export/rolo.h b/firmware/export/rolo.h
index 4b6c8abf64..b0d467db1d 100644
--- a/firmware/export/rolo.h
+++ b/firmware/export/rolo.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Randy D. Wood
  *
diff --git a/firmware/export/rtc.h b/firmware/export/rtc.h
index a668c9c729..7051bcf4a4 100644
--- a/firmware/export/rtc.h
+++ b/firmware/export/rtc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing, Uwe Freese
  *
diff --git a/firmware/export/s3c2440.h b/firmware/export/s3c2440.h
index c0dc97aed5..9bd908997c 100644
--- a/firmware/export/s3c2440.h
+++ b/firmware/export/s3c2440.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Marcoen Hirschberg
  *
@@ -30,24 +29,24 @@
 #define TTB_BASE_ADDR   (0x30000000 + (MEMORYSIZE*1024*1024) - TTB_SIZE)
 #define LCD_FRAME_ADDR  (TTB_BASE_ADDR - LCD_BUFFER_SIZE)
 
-#define TTB_BASE   ((unsigned long *)TTB_BASE_ADDR) /* End of memory */
-#define FRAME           ((unsigned short *)LCD_FRAME_ADDR)  /* Right before TTB */
+#define TTB_BASE    ((uint32_t *)TTB_BASE_ADDR) /* End of memory */
+#define FRAME       ((unsigned short *)LCD_FRAME_ADDR)  /* Right before TTB */
 
 /* Memory Controllers */
 
-#define BWSCON (*(volatile unsigned long *)0x48000000) /* Bus width & wait status control */
-#define BANKCON0 (*(volatile unsigned long *)0x48000004) /* Boot ROM control */
-#define BANKCON1 (*(volatile unsigned long *)0x48000008) /* BANK1 control */
-#define BANKCON2 (*(volatile unsigned long *)0x4800000C) /* BANK2 control */
-#define BANKCON3 (*(volatile unsigned long *)0x48000010) /* BANK3 control */
-#define BANKCON4 (*(volatile unsigned long *)0x48000014) /* BANK4 control */
-#define BANKCON5 (*(volatile unsigned long *)0x48000018) /* BANK5 control */
-#define BANKCON6 (*(volatile unsigned long *)0x4800001C) /* BANK6 control */
-#define BANKCON7 (*(volatile unsigned long *)0x48000020) /* BANK7 control */
-#define REFRESH (*(volatile unsigned long *)0x48000024) /* DRAM/SDRAM refresh control */
-#define BANKSIZE (*(volatile unsigned long *)0x48000028) /* Flexible bank size */
-#define MRSRB6 (*(volatile unsigned long *)0x4800002C) /* Mode register set for SDRAM BANK6 */
-#define MRSRB7 (*(volatile unsigned long *)0x48000030) /* Mode register set for SDRAM BANK7 */
+#define BWSCON (*(volatile uint32_t *)0x48000000) /* Bus width & wait status control */
+#define BANKCON0 (*(volatile uint32_t *)0x48000004) /* Boot ROM control */
+#define BANKCON1 (*(volatile uint32_t *)0x48000008) /* BANK1 control */
+#define BANKCON2 (*(volatile uint32_t *)0x4800000C) /* BANK2 control */
+#define BANKCON3 (*(volatile uint32_t *)0x48000010) /* BANK3 control */
+#define BANKCON4 (*(volatile uint32_t *)0x48000014) /* BANK4 control */
+#define BANKCON5 (*(volatile uint32_t *)0x48000018) /* BANK5 control */
+#define BANKCON6 (*(volatile uint32_t *)0x4800001C) /* BANK6 control */
+#define BANKCON7 (*(volatile uint32_t *)0x48000020) /* BANK7 control */
+#define REFRESH (*(volatile uint32_t *)0x48000024) /* DRAM/SDRAM refresh control */
+#define BANKSIZE (*(volatile uint32_t *)0x48000028) /* Flexible bank size */
+#define MRSRB6 (*(volatile uint32_t *)0x4800002C) /* Mode register set for SDRAM BANK6 */
+#define MRSRB7 (*(volatile uint32_t *)0x48000030) /* Mode register set for SDRAM BANK7 */
 
 /* USB Host Controller */
 
@@ -55,14 +54,14 @@
 
 /* Interrupt Controller */
 
-#define SRCPND (*(volatile unsigned long *)0x4A000000) /* Interrupt request status */
-#define INTMOD (*(volatile unsigned long *)0x4A000004) /* Interrupt mode control */
-#define INTMSK (*(volatile unsigned long *)0x4A000008) /* Interrupt mask control */
-#define PRIORITY (*(volatile unsigned long *)0x4A00000C) /* IRQ priority control */
-#define INTPND (*(volatile unsigned long *)0x4A000010) /* Interrupt request status */
-#define INTOFFSET (*(volatile unsigned long *)0x4A000014) /* Interrupt request source offset */
-#define SUBSRCPND (*(volatile unsigned long *)0x4A000018) /* Sub source pending */
-#define INTSUBMSK (*(volatile unsigned long *)0x4A00001C) /* Interrupt sub mask */
+#define SRCPND (*(volatile uint32_t *)0x4A000000) /* Interrupt request status */
+#define INTMOD (*(volatile uint32_t *)0x4A000004) /* Interrupt mode control */
+#define INTMSK (*(volatile uint32_t *)0x4A000008) /* Interrupt mask control */
+#define PRIORITY (*(volatile uint32_t *)0x4A00000C) /* IRQ priority control */
+#define INTPND (*(volatile uint32_t *)0x4A000010) /* Interrupt request status */
+#define INTOFFSET (*(volatile uint32_t *)0x4A000014) /* Interrupt request source offset */
+#define SUBSRCPND (*(volatile uint32_t *)0x4A000018) /* Sub source pending */
+#define INTSUBMSK (*(volatile uint32_t *)0x4A00001C) /* Interrupt sub mask */
 
 /* Interrupt indexes - INTOFFSET - IRQ mode only */
 /* Arbiter 5 => Arbiter 6 Req 5 */
@@ -146,42 +145,42 @@
 
 /* DMA */
 
-#define DISRC0 (*(volatile unsigned long *)0x4B000000) /* DMA 0 initial source */
-#define DISRCC0 (*(volatile unsigned long *)0x4B000004) /* DMA 0 initial source control */
-#define DIDST0 (*(volatile unsigned long *)0x4B000008) /* DMA 0 initial destination */
-#define DIDSTC0 (*(volatile unsigned long *)0x4B00000C) /* DMA 0 initial destination control */
-#define DCON0 (*(volatile unsigned long *)0x4B000010) /* DMA 0 control */
-#define DSTAT0 (*(volatile unsigned long *)0x4B000014) /* DMA 0 count */
-#define DCSRC0 (*(volatile unsigned long *)0x4B000018) /* DMA 0 current source */
-#define DCDST0 (*(volatile unsigned long *)0x4B00001C) /* DMA 0 current destination */
-#define DMASKTRIG0 (*(volatile unsigned long *)0x4B000020) /* DMA 0 mask trigger */
-#define DISRC1 (*(volatile unsigned long *)0x4B000040) /* DMA 1 initial source */
-#define DISRCC1 (*(volatile unsigned long *)0x4B000044) /* DMA 1 initial source control */
-#define DIDST1 (*(volatile unsigned long *)0x4B000048) /* DMA 1 initial destination */
-#define DIDSTC1 (*(volatile unsigned long *)0x4B00004C) /* DMA 1 initial destination control */
-#define DCON1 (*(volatile unsigned long *)0x4B000050) /* DMA 1 control */
-#define DSTAT1 (*(volatile unsigned long *)0x4B000054) /* DMA 1 count */
-#define DCSRC1 (*(volatile unsigned long *)0x4B000058) /* DMA 1 current source */
-#define DCDST1 (*(volatile unsigned long *)0x4B00005C) /* DMA 1 current destination */
-#define DMASKTRIG1 (*(volatile unsigned long *)0x4B000060) /* DMA 1 mask trigger */
-#define DISRC2 (*(volatile unsigned long *)0x4B000080) /* DMA 2 initial source */
-#define DISRCC2 (*(volatile unsigned long *)0x4B000084) /* DMA 2 initial source control */
-#define DIDST2 (*(volatile unsigned long *)0x4B000088) /* DMA 2 initial destination */
-#define DIDSTC2 (*(volatile unsigned long *)0x4B00008C) /* DMA 2 initial destination control */
-#define DCON2 (*(volatile unsigned long *)0x4B000090) /* DMA 2 control */
-#define DSTAT2 (*(volatile unsigned long *)0x4B000094) /* DMA 2 count */
-#define DCSRC2 (*(volatile unsigned long *)0x4B000098) /* DMA 2 current source */
-#define DCDST2 (*(volatile unsigned long *)0x4B00009C) /* DMA 2 current destination */
-#define DMASKTRIG2 (*(volatile unsigned long *)0x4B0000A0) /* DMA 2 mask trigger */
-#define DISRC3 (*(volatile unsigned long *)0x4B0000C0) /* DMA 3 initial source */
-#define DISRCC3 (*(volatile unsigned long *)0x4B0000C4) /* DMA 3 initial source control */
-#define DIDST3 (*(volatile unsigned long *)0x4B0000C8) /* DMA 3 initial destination */
-#define DIDSTC3 (*(volatile unsigned long *)0x4B0000CC) /* DMA 3 initial destination control */
-#define DCON3 (*(volatile unsigned long *)0x4B0000D0) /* DMA 3 control */
-#define DSTAT3 (*(volatile unsigned long *)0x4B0000D4) /* DMA 3 count */
-#define DCSRC3 (*(volatile unsigned long *)0x4B0000D8) /* DMA 3 current source */
-#define DCDST3 (*(volatile unsigned long *)0x4B0000DC) /* DMA 3 current destination */
-#define DMASKTRIG3 (*(volatile unsigned long *)0x4B0000E0) /* DMA 3 mask trigger */
+#define DISRC0 (*(volatile uint32_t *)0x4B000000) /* DMA 0 initial source */
+#define DISRCC0 (*(volatile uint32_t *)0x4B000004) /* DMA 0 initial source control */
+#define DIDST0 (*(volatile uint32_t *)0x4B000008) /* DMA 0 initial destination */
+#define DIDSTC0 (*(volatile uint32_t *)0x4B00000C) /* DMA 0 initial destination control */
+#define DCON0 (*(volatile uint32_t *)0x4B000010) /* DMA 0 control */
+#define DSTAT0 (*(volatile uint32_t *)0x4B000014) /* DMA 0 count */
+#define DCSRC0 (*(volatile uint32_t *)0x4B000018) /* DMA 0 current source */
+#define DCDST0 (*(volatile uint32_t *)0x4B00001C) /* DMA 0 current destination */
+#define DMASKTRIG0 (*(volatile uint32_t *)0x4B000020) /* DMA 0 mask trigger */
+#define DISRC1 (*(volatile uint32_t *)0x4B000040) /* DMA 1 initial source */
+#define DISRCC1 (*(volatile uint32_t *)0x4B000044) /* DMA 1 initial source control */
+#define DIDST1 (*(volatile uint32_t *)0x4B000048) /* DMA 1 initial destination */
+#define DIDSTC1 (*(volatile uint32_t *)0x4B00004C) /* DMA 1 initial destination control */
+#define DCON1 (*(volatile uint32_t *)0x4B000050) /* DMA 1 control */
+#define DSTAT1 (*(volatile uint32_t *)0x4B000054) /* DMA 1 count */
+#define DCSRC1 (*(volatile uint32_t *)0x4B000058) /* DMA 1 current source */
+#define DCDST1 (*(volatile uint32_t *)0x4B00005C) /* DMA 1 current destination */
+#define DMASKTRIG1 (*(volatile uint32_t *)0x4B000060) /* DMA 1 mask trigger */
+#define DISRC2 (*(volatile uint32_t *)0x4B000080) /* DMA 2 initial source */
+#define DISRCC2 (*(volatile uint32_t *)0x4B000084) /* DMA 2 initial source control */
+#define DIDST2 (*(volatile uint32_t *)0x4B000088) /* DMA 2 initial destination */
+#define DIDSTC2 (*(volatile uint32_t *)0x4B00008C) /* DMA 2 initial destination control */
+#define DCON2 (*(volatile uint32_t *)0x4B000090) /* DMA 2 control */
+#define DSTAT2 (*(volatile uint32_t *)0x4B000094) /* DMA 2 count */
+#define DCSRC2 (*(volatile uint32_t *)0x4B000098) /* DMA 2 current source */
+#define DCDST2 (*(volatile uint32_t *)0x4B00009C) /* DMA 2 current destination */
+#define DMASKTRIG2 (*(volatile uint32_t *)0x4B0000A0) /* DMA 2 mask trigger */
+#define DISRC3 (*(volatile uint32_t *)0x4B0000C0) /* DMA 3 initial source */
+#define DISRCC3 (*(volatile uint32_t *)0x4B0000C4) /* DMA 3 initial source control */
+#define DIDST3 (*(volatile uint32_t *)0x4B0000C8) /* DMA 3 initial destination */
+#define DIDSTC3 (*(volatile uint32_t *)0x4B0000CC) /* DMA 3 initial destination control */
+#define DCON3 (*(volatile uint32_t *)0x4B0000D0) /* DMA 3 control */
+#define DSTAT3 (*(volatile uint32_t *)0x4B0000D4) /* DMA 3 count */
+#define DCSRC3 (*(volatile uint32_t *)0x4B0000D8) /* DMA 3 current source */
+#define DCDST3 (*(volatile uint32_t *)0x4B0000DC) /* DMA 3 current destination */
+#define DMASKTRIG3 (*(volatile uint32_t *)0x4B0000E0) /* DMA 3 mask trigger */
 
 #define DISRCC_LOC_AHB              (0 << 1)
 #define DISRCC_LOC_APB              (1 << 1)
@@ -255,146 +254,146 @@
 
 /* Clock & Power Management */
 
-#define LOCKTIME (*(volatile unsigned long *)0x4C000000) /* PLL lock time counter */
-#define MPLLCON (*(volatile unsigned long *)0x4C000004) /* MPLL control */
-#define UPLLCON (*(volatile unsigned long *)0x4C000008) /* UPLL control */
-#define CLKCON (*(volatile unsigned long *)0x4C00000C) /* Clock generator control */
-#define CLKSLOW (*(volatile unsigned long *)0x4C000010) /* Slow clock control */
-#define CLKDIVN (*(volatile unsigned long *)0x4C000014) /* Clock divider control */
-#define CAMDIVN (*(volatile unsigned long *)0x4C000018) /* Camera clock divider control */
+#define LOCKTIME (*(volatile uint32_t *)0x4C000000) /* PLL lock time counter */
+#define MPLLCON (*(volatile uint32_t *)0x4C000004) /* MPLL control */
+#define UPLLCON (*(volatile uint32_t *)0x4C000008) /* UPLL control */
+#define CLKCON (*(volatile uint32_t *)0x4C00000C) /* Clock generator control */
+#define CLKSLOW (*(volatile uint32_t *)0x4C000010) /* Slow clock control */
+#define CLKDIVN (*(volatile uint32_t *)0x4C000014) /* Clock divider control */
+#define CAMDIVN (*(volatile uint32_t *)0x4C000018) /* Camera clock divider control */
 
 /* LCD Controller */
 
-#define LCDCON1 (*(volatile unsigned long *)0x4D000000) /* LCD control 1 */
-#define LCDCON2 (*(volatile unsigned long *)0x4D000004) /* LCD control 2 */
-#define LCDCON3 (*(volatile unsigned long *)0x4D000008) /* LCD control 3 */
-#define LCDCON4 (*(volatile unsigned long *)0x4D00000C) /* LCD control 4 */
-#define LCDCON5 (*(volatile unsigned long *)0x4D000010) /* LCD control 5 */
-#define LCDSADDR1 (*(volatile unsigned long *)0x4D000014) /* STN/TFT: frame buffer start address 1 */
-#define LCDSADDR2 (*(volatile unsigned long *)0x4D000018) /* STN/TFT: frame buffer start address 2 */
-#define LCDSADDR3 (*(volatile unsigned long *)0x4D00001C) /* STN/TFT: virtual screen address set */
-#define REDLUT (*(volatile unsigned long *)0x4D000020) /* STN: red lookup table */
-#define GREENLUT (*(volatile unsigned long *)0x4D000024) /* STN: green lookup table */
-#define BLUELUT (*(volatile unsigned long *)0x4D000028) /* STN: blue lookup table */
-#define DITHMODE (*(volatile unsigned long *)0x4D00004C) /* STN: dithering mode */
-#define TPAL (*(volatile unsigned long *)0x4D000050) /* TFT: temporary palette */
-#define LCDINTPND (*(volatile unsigned long *)0x4D000054) /* LCD interrupt pending */
-#define LCDSRCPND (*(volatile unsigned long *)0x4D000058) /* LCD interrupt source */
-#define LCDINTMSK (*(volatile unsigned long *)0x4D00005C) /* LCD interrupt mask */
-#define TCONSEL (*(volatile unsigned long *)0x4D000060) /* TCON(LPC3600/LCC3600) control */
+#define LCDCON1 (*(volatile uint32_t *)0x4D000000) /* LCD control 1 */
+#define LCDCON2 (*(volatile uint32_t *)0x4D000004) /* LCD control 2 */
+#define LCDCON3 (*(volatile uint32_t *)0x4D000008) /* LCD control 3 */
+#define LCDCON4 (*(volatile uint32_t *)0x4D00000C) /* LCD control 4 */
+#define LCDCON5 (*(volatile uint32_t *)0x4D000010) /* LCD control 5 */
+#define LCDSADDR1 (*(volatile uint32_t *)0x4D000014) /* STN/TFT: frame buffer start address 1 */
+#define LCDSADDR2 (*(volatile uint32_t *)0x4D000018) /* STN/TFT: frame buffer start address 2 */
+#define LCDSADDR3 (*(volatile uint32_t *)0x4D00001C) /* STN/TFT: virtual screen address set */
+#define REDLUT (*(volatile uint32_t *)0x4D000020) /* STN: red lookup table */
+#define GREENLUT (*(volatile uint32_t *)0x4D000024) /* STN: green lookup table */
+#define BLUELUT (*(volatile uint32_t *)0x4D000028) /* STN: blue lookup table */
+#define DITHMODE (*(volatile uint32_t *)0x4D00004C) /* STN: dithering mode */
+#define TPAL (*(volatile uint32_t *)0x4D000050) /* TFT: temporary palette */
+#define LCDINTPND (*(volatile uint32_t *)0x4D000054) /* LCD interrupt pending */
+#define LCDSRCPND (*(volatile uint32_t *)0x4D000058) /* LCD interrupt source */
+#define LCDINTMSK (*(volatile uint32_t *)0x4D00005C) /* LCD interrupt mask */
+#define TCONSEL (*(volatile uint32_t *)0x4D000060) /* TCON(LPC3600/LCC3600) control */
 
 /* NAND Flash */
 
-#define NFCONF (*(volatile unsigned long *)0x4E000000) /* NAND flash configuration */
-#define NFCONT (*(volatile unsigned long *)0x4E000004) /* NAND flash control */
-#define NFCMD (*(volatile unsigned long *)0x4E000008) /* NAND flash command */
-#define NFADDR (*(volatile unsigned long *)0x4E00000C) /* NAND flash address */
-#define NFDATA (*(volatile unsigned long *)0x4E000010) /* NAND flash data */
-#define NFMECC0 (*(volatile unsigned long *)0x4E000014) /* NAND flash main area ECC0/1 */
-#define NFMECC1 (*(volatile unsigned long *)0x4E000018) /* NAND flash main area ECC2/3 */
-#define NFSECC (*(volatile unsigned long *)0x4E00001C) /* NAND flash spare area ECC */
-#define NFSTAT (*(volatile unsigned long *)0x4E000020) /* NAND flash operation status */
-#define NFESTAT0 (*(volatile unsigned long *)0x4E000024) /* NAND flash ECC status for I/O[7:0] */
-#define NFESTAT1 (*(volatile unsigned long *)0x4E000028) /* NAND flash ECC status for I/O[15:8] */
-#define NFMECCSTAT0 (*(volatile unsigned long *)0x4E00002C) /* NAND flash main area ECC0 status */
-#define NFMECCSTAT1 (*(volatile unsigned long *)0x4E000030) /* NAND flash main area ECC1 status */
-#define NFSECCSTAT (*(volatile unsigned long *)0x4E000034) /* NAND flash spare area ECC status */
-#define NFSBLK (*(volatile unsigned long *)0x4E000038) /* NAND flash start block address */
-#define NFEBLK (*(volatile unsigned long *)0x4E00003C) /* NAND flash end block address */
+#define NFCONF (*(volatile uint32_t *)0x4E000000) /* NAND flash configuration */
+#define NFCONT (*(volatile uint32_t *)0x4E000004) /* NAND flash control */
+#define NFCMD (*(volatile uint32_t *)0x4E000008) /* NAND flash command */
+#define NFADDR (*(volatile uint32_t *)0x4E00000C) /* NAND flash address */
+#define NFDATA (*(volatile uint32_t *)0x4E000010) /* NAND flash data */
+#define NFMECC0 (*(volatile uint32_t *)0x4E000014) /* NAND flash main area ECC0/1 */
+#define NFMECC1 (*(volatile uint32_t *)0x4E000018) /* NAND flash main area ECC2/3 */
+#define NFSECC (*(volatile uint32_t *)0x4E00001C) /* NAND flash spare area ECC */
+#define NFSTAT (*(volatile uint32_t *)0x4E000020) /* NAND flash operation status */
+#define NFESTAT0 (*(volatile uint32_t *)0x4E000024) /* NAND flash ECC status for I/O[7:0] */
+#define NFESTAT1 (*(volatile uint32_t *)0x4E000028) /* NAND flash ECC status for I/O[15:8] */
+#define NFMECCSTAT0 (*(volatile uint32_t *)0x4E00002C) /* NAND flash main area ECC0 status */
+#define NFMECCSTAT1 (*(volatile uint32_t *)0x4E000030) /* NAND flash main area ECC1 status */
+#define NFSECCSTAT (*(volatile uint32_t *)0x4E000034) /* NAND flash spare area ECC status */
+#define NFSBLK (*(volatile uint32_t *)0x4E000038) /* NAND flash start block address */
+#define NFEBLK (*(volatile uint32_t *)0x4E00003C) /* NAND flash end block address */
 
 /* Camera Interface */
 
-#define CISRCFMT (*(volatile unsigned long *)0x4F000000) /* Input source format */
-#define CIWDOFST (*(volatile unsigned long *)0x4F000004) /* Window offset register */
-#define CIGCTRL (*(volatile unsigned long *)0x4F000008) /* Global control register */
-#define CICOYSA1 (*(volatile unsigned long *)0x4F000018) /* Y 1st frame start address for codec DMA */
-#define CICOYSA2 (*(volatile unsigned long *)0x4F00001C) /* Y 2nd frame start address for codec DMA */
-#define CICOYSA3 (*(volatile unsigned long *)0x4F000020) /* Y 3nd frame start address for codec DMA */
-#define CICOYSA4 (*(volatile unsigned long *)0x4F000024) /* Y 4th frame start address for codec DMA */
-#define CICOCBSA1 (*(volatile unsigned long *)0x4F000028) /* Cb 1st frame start address for codec DMA */
-#define CICOCBSA2 (*(volatile unsigned long *)0x4F00002C) /* Cb 2nd frame start address for codec DMA */
-#define CICOCBSA3 (*(volatile unsigned long *)0x4F000030) /* Cb 3nd frame start address for codec DMA */
-#define CICOCBSA4 (*(volatile unsigned long *)0x4F000034) /* Cb 4th frame start address for codec DMA */
-#define CICOCRSA1 (*(volatile unsigned long *)0x4F000038) /* Cr 1st frame start address for codec DMA */
-#define CICOCRSA2 (*(volatile unsigned long *)0x4F00003C) /* Cr 2nd frame start address for codec DMA */
-#define CICOCRSA3 (*(volatile unsigned long *)0x4F000040) /* Cr 3nd frame start address for codec DMA */
-#define CICOCRSA4 (*(volatile unsigned long *)0x4F000044) /* Cr 4th frame start address for codec DMA */
-#define CICOTRGFMT (*(volatile unsigned long *)0x4F000048) /* Target image format of codec DMA */
-#define CICOCTRL (*(volatile unsigned long *)0x4F00004C)
+#define CISRCFMT (*(volatile uint32_t *)0x4F000000) /* Input source format */
+#define CIWDOFST (*(volatile uint32_t *)0x4F000004) /* Window offset register */
+#define CIGCTRL (*(volatile uint32_t *)0x4F000008) /* Global control register */
+#define CICOYSA1 (*(volatile uint32_t *)0x4F000018) /* Y 1st frame start address for codec DMA */
+#define CICOYSA2 (*(volatile uint32_t *)0x4F00001C) /* Y 2nd frame start address for codec DMA */
+#define CICOYSA3 (*(volatile uint32_t *)0x4F000020) /* Y 3nd frame start address for codec DMA */
+#define CICOYSA4 (*(volatile uint32_t *)0x4F000024) /* Y 4th frame start address for codec DMA */
+#define CICOCBSA1 (*(volatile uint32_t *)0x4F000028) /* Cb 1st frame start address for codec DMA */
+#define CICOCBSA2 (*(volatile uint32_t *)0x4F00002C) /* Cb 2nd frame start address for codec DMA */
+#define CICOCBSA3 (*(volatile uint32_t *)0x4F000030) /* Cb 3nd frame start address for codec DMA */
+#define CICOCBSA4 (*(volatile uint32_t *)0x4F000034) /* Cb 4th frame start address for codec DMA */
+#define CICOCRSA1 (*(volatile uint32_t *)0x4F000038) /* Cr 1st frame start address for codec DMA */
+#define CICOCRSA2 (*(volatile uint32_t *)0x4F00003C) /* Cr 2nd frame start address for codec DMA */
+#define CICOCRSA3 (*(volatile uint32_t *)0x4F000040) /* Cr 3nd frame start address for codec DMA */
+#define CICOCRSA4 (*(volatile uint32_t *)0x4F000044) /* Cr 4th frame start address for codec DMA */
+#define CICOTRGFMT (*(volatile uint32_t *)0x4F000048) /* Target image format of codec DMA */
+#define CICOCTRL (*(volatile uint32_t *)0x4F00004C)
 
 /* Codec DMA control related */
 
-#define CICOSCPRERATIO (*(volatile unsigned long *)0x4F000050) /* Codec pre-scaler ratio control */
-#define CICOSCPREDST (*(volatile unsigned long *)0x4F000054) /* Codec pre-scaler destination format */
-#define CICOSCCTRL (*(volatile unsigned long *)0x4F000058) /* Codec main-scaler control */
-#define CICOTAREA (*(volatile unsigned long *)0x4F00005C) /* Codec scaler target area */
-#define CICOSTATUS (*(volatile unsigned long *)0x4F000064) /* Codec path status */
-#define CIPRCLRSA1 (*(volatile unsigned long *)0x4F00006C) /* RGB 1st frame start address for preview DMA */
-#define CIPRCLRSA2 (*(volatile unsigned long *)0x4F000070) /* RGB 2nd frame start address for preview DMA */
-#define CIPRCLRSA3 (*(volatile unsigned long *)0x4F000074) /* RGB 3nd frame start address for preview DMA */
-#define CIPRCLRSA4 (*(volatile unsigned long *)0x4F000078) /* RGB 4th frame start address for preview DMA */
-#define CIPRTRGFMT (*(volatile unsigned long *)0x4F00007C) /* Target image format of preview DMA */
-#define CIPRCTRL (*(volatile unsigned long *)0x4F000080) /* Preview DMA control related */
-#define CIPRSCPRERATIO (*(volatile unsigned long *)0x4F000084) /* Preview pre-scaler ratio control */
-#define CIPRSCPREDST (*(volatile unsigned long *)0x4F000088) /* Preview pre-scaler destination format */
-#define CIPRSCCTRL (*(volatile unsigned long *)0x4F00008C) /* Preview main-scaler control */
-#define CIPRTAREA (*(volatile unsigned long *)0x4F000090) /* Preview scaler target area */
-#define CIPRSTATUS (*(volatile unsigned long *)0x4F000098) /* Preview path status */
-#define CIIMGCPT (*(volatile unsigned long *)0x4F0000A0) /* Image capture enable command */
+#define CICOSCPRERATIO (*(volatile uint32_t *)0x4F000050) /* Codec pre-scaler ratio control */
+#define CICOSCPREDST (*(volatile uint32_t *)0x4F000054) /* Codec pre-scaler destination format */
+#define CICOSCCTRL (*(volatile uint32_t *)0x4F000058) /* Codec main-scaler control */
+#define CICOTAREA (*(volatile uint32_t *)0x4F00005C) /* Codec scaler target area */
+#define CICOSTATUS (*(volatile uint32_t *)0x4F000064) /* Codec path status */
+#define CIPRCLRSA1 (*(volatile uint32_t *)0x4F00006C) /* RGB 1st frame start address for preview DMA */
+#define CIPRCLRSA2 (*(volatile uint32_t *)0x4F000070) /* RGB 2nd frame start address for preview DMA */
+#define CIPRCLRSA3 (*(volatile uint32_t *)0x4F000074) /* RGB 3nd frame start address for preview DMA */
+#define CIPRCLRSA4 (*(volatile uint32_t *)0x4F000078) /* RGB 4th frame start address for preview DMA */
+#define CIPRTRGFMT (*(volatile uint32_t *)0x4F00007C) /* Target image format of preview DMA */
+#define CIPRCTRL (*(volatile uint32_t *)0x4F000080) /* Preview DMA control related */
+#define CIPRSCPRERATIO (*(volatile uint32_t *)0x4F000084) /* Preview pre-scaler ratio control */
+#define CIPRSCPREDST (*(volatile uint32_t *)0x4F000088) /* Preview pre-scaler destination format */
+#define CIPRSCCTRL (*(volatile uint32_t *)0x4F00008C) /* Preview main-scaler control */
+#define CIPRTAREA (*(volatile uint32_t *)0x4F000090) /* Preview scaler target area */
+#define CIPRSTATUS (*(volatile uint32_t *)0x4F000098) /* Preview path status */
+#define CIIMGCPT (*(volatile uint32_t *)0x4F0000A0) /* Image capture enable command */
 
 /* UART */
 
-#define ULCON0 (*(volatile unsigned long *)0x50000000) /* UART 0 line control */
-#define UCON0 (*(volatile unsigned long *)0x50000004) /* UART 0 control */
-#define UFCON0 (*(volatile unsigned long *)0x50000008) /* UART 0 FIFO control */
-#define UMCON0 (*(volatile unsigned long *)0x5000000C) /* UART 0 modem control */
-#define UTRSTAT0 (*(volatile unsigned long *)0x50000010) /* UART 0 Tx/Rx status */
-#define UERSTAT0 (*(volatile unsigned long *)0x50000014) /* UART 0 Rx error status */
-#define UFSTAT0 (*(volatile unsigned long *)0x50000018) /* UART 0 FIFO status */
-#define UMSTAT0 (*(volatile unsigned long *)0x5000001C) /* UART 0 modem status */
+#define ULCON0 (*(volatile uint32_t *)0x50000000) /* UART 0 line control */
+#define UCON0 (*(volatile uint32_t *)0x50000004) /* UART 0 control */
+#define UFCON0 (*(volatile uint32_t *)0x50000008) /* UART 0 FIFO control */
+#define UMCON0 (*(volatile uint32_t *)0x5000000C) /* UART 0 modem control */
+#define UTRSTAT0 (*(volatile uint32_t *)0x50000010) /* UART 0 Tx/Rx status */
+#define UERSTAT0 (*(volatile uint32_t *)0x50000014) /* UART 0 Rx error status */
+#define UFSTAT0 (*(volatile uint32_t *)0x50000018) /* UART 0 FIFO status */
+#define UMSTAT0 (*(volatile uint32_t *)0x5000001C) /* UART 0 modem status */
 #define UTXH0 (*(volatile unsigned char *)0x50000020) /* UART 0 transmission hold */
 #define URXH0 (*(volatile unsigned char *)0x50000024) /* UART 0 receive buffer */
-#define UBRDIV0 (*(volatile unsigned long *)0x50000028) /* UART 0 baud rate divisor */
-#define ULCON1 (*(volatile unsigned long *)0x50004000) /* UART 1 line control */
-#define UCON1 (*(volatile unsigned long *)0x50004004) /* UART 1 control */
-#define UFCON1 (*(volatile unsigned long *)0x50004008) /* UART 1 FIFO control */
-#define UMCON1 (*(volatile unsigned long *)0x5000400C) /* UART 1 modem control */
-#define UTRSTAT1 (*(volatile unsigned long *)0x50004010) /* UART 1 Tx/Rx status */
-#define UERSTAT1 (*(volatile unsigned long *)0x50004014) /* UART 1 Rx error status */
-#define UFSTAT1 (*(volatile unsigned long *)0x50004018) /* UART 1 FIFO status */
-#define UMSTAT1 (*(volatile unsigned long *)0x5000401C) /* UART 1 modem status */
+#define UBRDIV0 (*(volatile uint32_t *)0x50000028) /* UART 0 baud rate divisor */
+#define ULCON1 (*(volatile uint32_t *)0x50004000) /* UART 1 line control */
+#define UCON1 (*(volatile uint32_t *)0x50004004) /* UART 1 control */
+#define UFCON1 (*(volatile uint32_t *)0x50004008) /* UART 1 FIFO control */
+#define UMCON1 (*(volatile uint32_t *)0x5000400C) /* UART 1 modem control */
+#define UTRSTAT1 (*(volatile uint32_t *)0x50004010) /* UART 1 Tx/Rx status */
+#define UERSTAT1 (*(volatile uint32_t *)0x50004014) /* UART 1 Rx error status */
+#define UFSTAT1 (*(volatile uint32_t *)0x50004018) /* UART 1 FIFO status */
+#define UMSTAT1 (*(volatile uint32_t *)0x5000401C) /* UART 1 modem status */
 #define UTXH1 (*(volatile unsigned char*)0x50004020) /* UART 1 transmission hold */
 #define URXH1 (*(volatile unsigned char*)0x50004024) /* UART 1 receive buffer */
-#define UBRDIV1 (*(volatile unsigned long *)0x50004028) /* UART 1 baud rate divisor */
-#define ULCON2 (*(volatile unsigned long *)0x50008000) /* UART 2 line control */
-#define UCON2 (*(volatile unsigned long *)0x50008004) /* UART 2 control */
-#define UFCON2 (*(volatile unsigned long *)0x50008008) /* UART 2 FIFO control */
-#define UTRSTAT2 (*(volatile unsigned long *)0x50008010) /* UART 2 Tx/Rx status */
-#define UERSTAT2 (*(volatile unsigned long *)0x50008014) /* UART 2 Rx error status */
-#define UFSTAT2 (*(volatile unsigned long *)0x50008018) /* UART 2 FIFO status */
+#define UBRDIV1 (*(volatile uint32_t *)0x50004028) /* UART 1 baud rate divisor */
+#define ULCON2 (*(volatile uint32_t *)0x50008000) /* UART 2 line control */
+#define UCON2 (*(volatile uint32_t *)0x50008004) /* UART 2 control */
+#define UFCON2 (*(volatile uint32_t *)0x50008008) /* UART 2 FIFO control */
+#define UTRSTAT2 (*(volatile uint32_t *)0x50008010) /* UART 2 Tx/Rx status */
+#define UERSTAT2 (*(volatile uint32_t *)0x50008014) /* UART 2 Rx error status */
+#define UFSTAT2 (*(volatile uint32_t *)0x50008018) /* UART 2 FIFO status */
 #define UTXH2 (*(volatile unsigned char*)0x50008020) /* UART 2 transmission hold */
 #define URXH2 (*(volatile unsigned char*)0x50008024) /* UART 2 receive buffer */
-#define UBRDIV2 (*(volatile unsigned long *)0x50008028) /* UART 2 baud rate divisor */
+#define UBRDIV2 (*(volatile uint32_t *)0x50008028) /* UART 2 baud rate divisor */
 
 /* PWM Timer */
 
-#define TCFG0 (*(volatile unsigned long *)0x51000000) /* Timer configuration */
-#define TCFG1 (*(volatile unsigned long *)0x51000004) /* Timer configuration */
-#define TCON (*(volatile unsigned long *)0x51000008) /* Timer control */
-#define TCNTB0 (*(volatile unsigned long *)0x5100000C) /* Timer count buffer 0 */
-#define TCMPB0 (*(volatile unsigned long *)0x51000010) /* Timer compare buffer 0 */
-#define TCNTO0 (*(volatile unsigned long *)0x51000014) /* Timer count observation 0 */
-#define TCNTB1 (*(volatile unsigned long *)0x51000018) /* Timer count buffer 1 */
-#define TCMPB1 (*(volatile unsigned long *)0x5100001C) /* Timer compare buffer 1 */
-#define TCNTO1 (*(volatile unsigned long *)0x51000020) /* Timer count observation 1 */
-#define TCNTB2 (*(volatile unsigned long *)0x51000024) /* Timer count buffer 2 */
-#define TCMPB2 (*(volatile unsigned long *)0x51000028) /* Timer compare buffer 2 */
-#define TCNTO2 (*(volatile unsigned long *)0x5100002C) /* Timer count observation 2 */
-#define TCNTB3 (*(volatile unsigned long *)0x51000030) /* Timer count buffer 3 */
-#define TCMPB3 (*(volatile unsigned long *)0x51000034) /* Timer compare buffer 3 */
-#define TCNTO3 (*(volatile unsigned long *)0x51000038) /* Timer count observation 3 */
-#define TCNTB4 (*(volatile unsigned long *)0x5100003C) /* Timer count buffer 4 */
-#define TCNTO4 (*(volatile unsigned long *)0x51000040) /* Timer count observation 4 */
+#define TCFG0 (*(volatile uint32_t *)0x51000000) /* Timer configuration */
+#define TCFG1 (*(volatile uint32_t *)0x51000004) /* Timer configuration */
+#define TCON (*(volatile uint32_t *)0x51000008) /* Timer control */
+#define TCNTB0 (*(volatile uint32_t *)0x5100000C) /* Timer count buffer 0 */
+#define TCMPB0 (*(volatile uint32_t *)0x51000010) /* Timer compare buffer 0 */
+#define TCNTO0 (*(volatile uint32_t *)0x51000014) /* Timer count observation 0 */
+#define TCNTB1 (*(volatile uint32_t *)0x51000018) /* Timer count buffer 1 */
+#define TCMPB1 (*(volatile uint32_t *)0x5100001C) /* Timer compare buffer 1 */
+#define TCNTO1 (*(volatile uint32_t *)0x51000020) /* Timer count observation 1 */
+#define TCNTB2 (*(volatile uint32_t *)0x51000024) /* Timer count buffer 2 */
+#define TCMPB2 (*(volatile uint32_t *)0x51000028) /* Timer compare buffer 2 */
+#define TCNTO2 (*(volatile uint32_t *)0x5100002C) /* Timer count observation 2 */
+#define TCNTB3 (*(volatile uint32_t *)0x51000030) /* Timer count buffer 3 */
+#define TCMPB3 (*(volatile uint32_t *)0x51000034) /* Timer compare buffer 3 */
+#define TCNTO3 (*(volatile uint32_t *)0x51000038) /* Timer count observation 3 */
+#define TCNTB4 (*(volatile uint32_t *)0x5100003C) /* Timer count buffer 4 */
+#define TCNTO4 (*(volatile uint32_t *)0x51000040) /* Timer count observation 4 */
 
 /* USB Device */
 
@@ -447,24 +446,24 @@
 
 /* Watchdog Timer */
 
-#define WTCON (*(volatile unsigned long *)0x53000000) /* Watchdog timer mode */
-#define WTDAT (*(volatile unsigned long *)0x53000004) /* Watchdog timer data */
-#define WTCNT (*(volatile unsigned long *)0x53000008) /* Watchdog timer count */
+#define WTCON (*(volatile uint32_t *)0x53000000) /* Watchdog timer mode */
+#define WTDAT (*(volatile uint32_t *)0x53000004) /* Watchdog timer data */
+#define WTCNT (*(volatile uint32_t *)0x53000008) /* Watchdog timer count */
 
 /* IIC */
 
-#define IICCON (*(volatile unsigned long *)0x54000000) /* IIC control  */
-#define IICSTAT (*(volatile unsigned long *)0x54000004) /* IIC status */
-#define IICADD (*(volatile unsigned long *)0x54000008) /* IIC address */
-#define IICDS (*(volatile unsigned long *)0x5400000C) /* IIC data shift */
-#define IICLC (*(volatile unsigned long *)0x54000010) /* IIC multi-master line control */
+#define IICCON (*(volatile uint32_t *)0x54000000) /* IIC control  */
+#define IICSTAT (*(volatile uint32_t *)0x54000004) /* IIC status */
+#define IICADD (*(volatile uint32_t *)0x54000008) /* IIC address */
+#define IICDS (*(volatile uint32_t *)0x5400000C) /* IIC data shift */
+#define IICLC (*(volatile uint32_t *)0x54000010) /* IIC multi-master line control */
 
 /* IIS */
 
-#define IISCON (*(volatile unsigned long *)0x55000000) /* IIS control */
-#define IISMOD (*(volatile unsigned long *)0x55000004) /* IIS mode */
-#define IISPSR (*(volatile unsigned long *)0x55000008) /* IIS prescaler */
-#define IISFCON (*(volatile unsigned long *)0x5500000C) /* IIS FIFO control */
+#define IISCON (*(volatile uint32_t *)0x55000000) /* IIS control */
+#define IISMOD (*(volatile uint32_t *)0x55000004) /* IIS mode */
+#define IISPSR (*(volatile uint32_t *)0x55000008) /* IIS prescaler */
+#define IISFCON (*(volatile uint32_t *)0x5500000C) /* IIS FIFO control */
 #define IISFIFO (*(volatile unsigned short *)0x55000010) /* IIS FIFO entry */
 
 #define IISCON_RIGHT_CHANNEL            (1 << 8)
@@ -502,49 +501,49 @@
 
 /* I/O port */
 
-#define GPACON (*(volatile unsigned long *)0x56000000) /* Port A control */
-#define GPADAT (*(volatile unsigned long *)0x56000004) /* Port A data */
-#define GPBCON (*(volatile unsigned long *)0x56000010) /* Port B control */
-#define GPBDAT (*(volatile unsigned long *)0x56000014) /* Port B data */
-#define GPBUP (*(volatile unsigned long *)0x56000018) /* Pull-up control B */
-#define GPCCON (*(volatile unsigned long *)0x56000020) /* Port C control */
-#define GPCDAT (*(volatile unsigned long *)0x56000024) /* Port C data */
-#define GPCUP (*(volatile unsigned long *)0x56000028) /* Pull-up control C */
-#define GPDCON (*(volatile unsigned long *)0x56000030) /* Port D control */
-#define GPDDAT (*(volatile unsigned long *)0x56000034) /* Port D data */
-#define GPDUP (*(volatile unsigned long *)0x56000038) /* Pull-up control D */
-#define GPECON (*(volatile unsigned long *)0x56000040) /* Port E control */
-#define GPEDAT (*(volatile unsigned long *)0x56000044) /* Port E data */
-#define GPEUP (*(volatile unsigned long *)0x56000048) /* Pull-up control E */
-#define GPFCON (*(volatile unsigned long *)0x56000050) /* Port F control */
-#define GPFDAT (*(volatile unsigned long *)0x56000054) /* Port F data */
-#define GPFUP (*(volatile unsigned long *)0x56000058) /* Pull-up control F */
-#define GPGCON (*(volatile unsigned long *)0x56000060) /* Port G control */
-#define GPGDAT (*(volatile unsigned long *)0x56000064) /* Port G data */
-#define GPGUP (*(volatile unsigned long *)0x56000068) /* Pull-up control G */
-#define GPHCON (*(volatile unsigned long *)0x56000070) /* Port H control */
-#define GPHDAT (*(volatile unsigned long *)0x56000074) /* Port H data */
-#define GPHUP (*(volatile unsigned long *)0x56000078) /* Pull-up control H */
-#define MISCCR (*(volatile unsigned long *)0x56000080) /* Miscellaneous control */
-#define DCLKCON (*(volatile unsigned long *)0x56000084) /* DCLK0/1 control */
-#define EXTINT0 (*(volatile unsigned long *)0x56000088) /* External interrupt control register 0 */
-#define EXTINT1 (*(volatile unsigned long *)0x5600008C) /* External interrupt control register 1 */
-#define EXTINT2 (*(volatile unsigned long *)0x56000090) /* External interrupt control register 2 */
-#define EINTFLT0 (*(volatile unsigned long *)0x56000094) /* Reserved */
-#define EINTFLT1 (*(volatile unsigned long *)0x56000098) /* Reserved */
-#define EINTFLT2 (*(volatile unsigned long *)0x5600009C) /* External interrupt filter control register 2 */
-#define EINTFLT3 (*(volatile unsigned long *)0x560000A0) /* External interrupt filter control register 3 */
-#define EINTMASK (*(volatile unsigned long *)0x560000A4) /* External interrupt mask */
-#define EINTPEND (*(volatile unsigned long *)0x560000A8) /* External interrupt pending */
-#define GSTATUS0 (*(volatile unsigned long *)0x560000AC) /* External pin status */
-#define GSTATUS1 (*(volatile unsigned long *)0x560000B0) /* Chip ID */
-#define GSTATUS2 (*(volatile unsigned long *)0x560000B4) /* Reset status */
-#define GSTATUS3 (*(volatile unsigned long *)0x560000B8) /* Inform register */
-#define GSTATUS4 (*(volatile unsigned long *)0x560000BC) /* Inform register */
-#define MSLCON (*(volatile unsigned long *)0x560000CC) /* Memory sleep control register */
-#define GPJCON (*(volatile unsigned long *)0x560000D0) /* Port J control */
-#define GPJDAT (*(volatile unsigned long *)0x560000D4) /* Port J data */
-#define GPJUP (*(volatile unsigned long *)0x560000D8) /* Pull-up control J */
+#define GPACON (*(volatile uint32_t *)0x56000000) /* Port A control */
+#define GPADAT (*(volatile uint32_t *)0x56000004) /* Port A data */
+#define GPBCON (*(volatile uint32_t *)0x56000010) /* Port B control */
+#define GPBDAT (*(volatile uint32_t *)0x56000014) /* Port B data */
+#define GPBUP (*(volatile uint32_t *)0x56000018) /* Pull-up control B */
+#define GPCCON (*(volatile uint32_t *)0x56000020) /* Port C control */
+#define GPCDAT (*(volatile uint32_t *)0x56000024) /* Port C data */
+#define GPCUP (*(volatile uint32_t *)0x56000028) /* Pull-up control C */
+#define GPDCON (*(volatile uint32_t *)0x56000030) /* Port D control */
+#define GPDDAT (*(volatile uint32_t *)0x56000034) /* Port D data */
+#define GPDUP (*(volatile uint32_t *)0x56000038) /* Pull-up control D */
+#define GPECON (*(volatile uint32_t *)0x56000040) /* Port E control */
+#define GPEDAT (*(volatile uint32_t *)0x56000044) /* Port E data */
+#define GPEUP (*(volatile uint32_t *)0x56000048) /* Pull-up control E */
+#define GPFCON (*(volatile uint32_t *)0x56000050) /* Port F control */
+#define GPFDAT (*(volatile uint32_t *)0x56000054) /* Port F data */
+#define GPFUP (*(volatile uint32_t *)0x56000058) /* Pull-up control F */
+#define GPGCON (*(volatile uint32_t *)0x56000060) /* Port G control */
+#define GPGDAT (*(volatile uint32_t *)0x56000064) /* Port G data */
+#define GPGUP (*(volatile uint32_t *)0x56000068) /* Pull-up control G */
+#define GPHCON (*(volatile uint32_t *)0x56000070) /* Port H control */
+#define GPHDAT (*(volatile uint32_t *)0x56000074) /* Port H data */
+#define GPHUP (*(volatile uint32_t *)0x56000078) /* Pull-up control H */
+#define MISCCR (*(volatile uint32_t *)0x56000080) /* Miscellaneous control */
+#define DCLKCON (*(volatile uint32_t *)0x56000084) /* DCLK0/1 control */
+#define EXTINT0 (*(volatile uint32_t *)0x56000088) /* External interrupt control register 0 */
+#define EXTINT1 (*(volatile uint32_t *)0x5600008C) /* External interrupt control register 1 */
+#define EXTINT2 (*(volatile uint32_t *)0x56000090) /* External interrupt control register 2 */
+#define EINTFLT0 (*(volatile uint32_t *)0x56000094) /* Reserved */
+#define EINTFLT1 (*(volatile uint32_t *)0x56000098) /* Reserved */
+#define EINTFLT2 (*(volatile uint32_t *)0x5600009C) /* External interrupt filter control register 2 */
+#define EINTFLT3 (*(volatile uint32_t *)0x560000A0) /* External interrupt filter control register 3 */
+#define EINTMASK (*(volatile uint32_t *)0x560000A4) /* External interrupt mask */
+#define EINTPEND (*(volatile uint32_t *)0x560000A8) /* External interrupt pending */
+#define GSTATUS0 (*(volatile uint32_t *)0x560000AC) /* External pin status */
+#define GSTATUS1 (*(volatile uint32_t *)0x560000B0) /* Chip ID */
+#define GSTATUS2 (*(volatile uint32_t *)0x560000B4) /* Reset status */
+#define GSTATUS3 (*(volatile uint32_t *)0x560000B8) /* Inform register */
+#define GSTATUS4 (*(volatile uint32_t *)0x560000BC) /* Inform register */
+#define MSLCON (*(volatile uint32_t *)0x560000CC) /* Memory sleep control register */
+#define GPJCON (*(volatile uint32_t *)0x560000D0) /* Port J control */
+#define GPJDAT (*(volatile uint32_t *)0x560000D4) /* Port J data */
+#define GPJUP (*(volatile uint32_t *)0x560000D8) /* Pull-up control J */
 
 /* RTC */
 
@@ -567,52 +566,52 @@
 
 /* A/D Converter */
 
-#define ADCCON (*(volatile unsigned long *)0x58000000) /* ADC control */
-#define ADCTSC (*(volatile unsigned long *)0x58000004) /* ADC touch screen control */
-#define ADCDLY (*(volatile unsigned long *)0x58000008) /* ADC start or interval delay */
-#define ADCDAT0 (*(volatile unsigned long *)0x5800000C) /* ADC conversion data */
-#define ADCDAT1 (*(volatile unsigned long *)0x58000010) /* ADC conversion data */
-#define ADCUPDN (*(volatile unsigned long *)0x58000014) /* Stylus up or down interrupt status */
+#define ADCCON (*(volatile uint32_t *)0x58000000) /* ADC control */
+#define ADCTSC (*(volatile uint32_t *)0x58000004) /* ADC touch screen control */
+#define ADCDLY (*(volatile uint32_t *)0x58000008) /* ADC start or interval delay */
+#define ADCDAT0 (*(volatile uint32_t *)0x5800000C) /* ADC conversion data */
+#define ADCDAT1 (*(volatile uint32_t *)0x58000010) /* ADC conversion data */
+#define ADCUPDN (*(volatile uint32_t *)0x58000014) /* Stylus up or down interrupt status */
 
 /* SPI */
 
-#define SPCON0 (*(volatile unsigned long *)0x59000000) /* SPI control */
-#define SPSTA0 (*(volatile unsigned long *)0x59000004) /* SPI status */
-#define SPPIN0 (*(volatile unsigned long *)0x59000008) /* SPI pin control */
-#define SPPRE0 (*(volatile unsigned long *)0x5900000C) /* SPI baud rate prescaler */
-#define SPTDAT0 (*(volatile unsigned long *)0x59000010) /* SPI Tx data */
-#define SPRDAT0 (*(volatile unsigned long *)0x59000014) /* SPI Rx data */
-#define SPCON1 (*(volatile unsigned long *)0x59000020) /* SPI control */
-#define SPSTA1 (*(volatile unsigned long *)0x59000024) /* SPI status */
-#define SPPIN1 (*(volatile unsigned long *)0x59000028) /* SPI pin control */
-#define SPPRE1 (*(volatile unsigned long *)0x5900002C) /* SPI baud rate prescaler */
-#define SPTDAT1 (*(volatile unsigned long *)0x59000030) /* SPI Tx data */
-#define SPRDAT1 (*(volatile unsigned long *)0x59000034) /* SPI Rx data */
+#define SPCON0 (*(volatile uint32_t *)0x59000000) /* SPI control */
+#define SPSTA0 (*(volatile uint32_t *)0x59000004) /* SPI status */
+#define SPPIN0 (*(volatile uint32_t *)0x59000008) /* SPI pin control */
+#define SPPRE0 (*(volatile uint32_t *)0x5900000C) /* SPI baud rate prescaler */
+#define SPTDAT0 (*(volatile uint32_t *)0x59000010) /* SPI Tx data */
+#define SPRDAT0 (*(volatile uint32_t *)0x59000014) /* SPI Rx data */
+#define SPCON1 (*(volatile uint32_t *)0x59000020) /* SPI control */
+#define SPSTA1 (*(volatile uint32_t *)0x59000024) /* SPI status */
+#define SPPIN1 (*(volatile uint32_t *)0x59000028) /* SPI pin control */
+#define SPPRE1 (*(volatile uint32_t *)0x5900002C) /* SPI baud rate prescaler */
+#define SPTDAT1 (*(volatile uint32_t *)0x59000030) /* SPI Tx data */
+#define SPRDAT1 (*(volatile uint32_t *)0x59000034) /* SPI Rx data */
 
 /* SD Interface */
 
-#define SDICON (*(volatile unsigned long *)0x5A000000) /* SDI control */
-#define SDIPRE (*(volatile unsigned long *)0x5A000004) /* SDI baud rate prescaler */
-#define SDICARG (*(volatile unsigned long *)0x5A000008) /* SDI command argument */
-#define SDICCON (*(volatile unsigned long *)0x5A00000C) /* SDI command control */
-#define SDICSTA (*(volatile unsigned long *)0x5A000010) /* SDI command status */
-#define SDIRSP0 (*(volatile unsigned long *)0x5A000014) /* SDI response */
-#define SDIRSP1 (*(volatile unsigned long *)0x5A000018) /* SDI response */
-#define SDIRSP2 (*(volatile unsigned long *)0x5A00001C) /* SDI response */
-#define SDIRSP3 (*(volatile unsigned long *)0x5A000020) /* SDI response */
-#define SDIDTIMER (*(volatile unsigned long *)0x5A000024) /* SDI data / busy timer */
-#define SDIBSIZE (*(volatile unsigned long *)0x5A000028) /* SDI block size */
-#define SDIDCON (*(volatile unsigned long *)0x5A00002C) /* SDI data control */
-#define SDIDCNT (*(volatile unsigned long *)0x5A000030) /* SDI data remain counter */
-#define SDIDSTA (*(volatile unsigned long *)0x5A000034) /* SDI data status */
-#define SDIFSTA (*(volatile unsigned long *)0x5A000038) /* SDI FIFO status */
-#define SDIIMSK (*(volatile unsigned long *)0x5A00003C) /* SDI interrupt mask */
+#define SDICON (*(volatile uint32_t *)0x5A000000) /* SDI control */
+#define SDIPRE (*(volatile uint32_t *)0x5A000004) /* SDI baud rate prescaler */
+#define SDICARG (*(volatile uint32_t *)0x5A000008) /* SDI command argument */
+#define SDICCON (*(volatile uint32_t *)0x5A00000C) /* SDI command control */
+#define SDICSTA (*(volatile uint32_t *)0x5A000010) /* SDI command status */
+#define SDIRSP0 (*(volatile uint32_t *)0x5A000014) /* SDI response */
+#define SDIRSP1 (*(volatile uint32_t *)0x5A000018) /* SDI response */
+#define SDIRSP2 (*(volatile uint32_t *)0x5A00001C) /* SDI response */
+#define SDIRSP3 (*(volatile uint32_t *)0x5A000020) /* SDI response */
+#define SDIDTIMER (*(volatile uint32_t *)0x5A000024) /* SDI data / busy timer */
+#define SDIBSIZE (*(volatile uint32_t *)0x5A000028) /* SDI block size */
+#define SDIDCON (*(volatile uint32_t *)0x5A00002C) /* SDI data control */
+#define SDIDCNT (*(volatile uint32_t *)0x5A000030) /* SDI data remain counter */
+#define SDIDSTA (*(volatile uint32_t *)0x5A000034) /* SDI data status */
+#define SDIFSTA (*(volatile uint32_t *)0x5A000038) /* SDI FIFO status */
+#define SDIIMSK (*(volatile uint32_t *)0x5A00003C) /* SDI interrupt mask */
 
 /* SDI data - LE = Little Endian, BE = Big Endian */
-#define SDIDAT_LLE (*(volatile unsigned long *)0x5A000040)  /* 32 bit */  
+#define SDIDAT_LLE (*(volatile uint32_t *)0x5A000040)  /* 32 bit */
 #define SDIDAT_HLE (*(volatile unsigned short *)0x5A000044) /* 16 */
 #define SDIDAT_BLE (*(volatile unsigned char *)0x5A000048)  /* 8 */
-#define SDIDAT_LBE (*(volatile unsigned long *)0x5A00004C)  /* 32 */
+#define SDIDAT_LBE (*(volatile uint32_t *)0x5A00004C)  /* 32 */
 #define SDIDAT_HBE (*(volatile unsigned short *)0x5A000041) /* 16 */
 #define SDIDAT_BBE (*(volatile unsigned char *)0x5A000043)  /* 8 */
 
@@ -714,14 +713,14 @@
 
 /* AC97 Audio-CODEC Interface */
 
-#define AC_GLBCTRL (*(volatile unsigned long *)0x5B000000) /* AC97 global control register */
-#define AC_GLBSTAT (*(volatile unsigned long *)0x5B000004) /* AC97 global status register */
-#define AC_CODEC_CMD (*(volatile unsigned long *)0x5B000008) /* AC97 codec command register */
-#define AC_CODEC_STAT (*(volatile unsigned long *)0x5B00000C) /* AC97 codec status register */
-#define AC_PCMADDR (*(volatile unsigned long *)0x5B000010) /* AC97 PCM out/in channel FIFO address register */
-#define AC_MICADDR (*(volatile unsigned long *)0x5B000014) /* AC97 mic in channel FIFO address register */
-#define AC_PCMDATA (*(volatile unsigned long *)0x5B000018) /* AC97 PCM out/in channel FIFO data register */
-#define AC_MICDATA (*(volatile unsigned long *)0x5B00001C) /* AC97 MIC in channel FIFO data register */
+#define AC_GLBCTRL (*(volatile uint32_t *)0x5B000000) /* AC97 global control register */
+#define AC_GLBSTAT (*(volatile uint32_t *)0x5B000004) /* AC97 global status register */
+#define AC_CODEC_CMD (*(volatile uint32_t *)0x5B000008) /* AC97 codec command register */
+#define AC_CODEC_STAT (*(volatile uint32_t *)0x5B00000C) /* AC97 codec status register */
+#define AC_PCMADDR (*(volatile uint32_t *)0x5B000010) /* AC97 PCM out/in channel FIFO address register */
+#define AC_MICADDR (*(volatile uint32_t *)0x5B000014) /* AC97 mic in channel FIFO address register */
+#define AC_PCMDATA (*(volatile uint32_t *)0x5B000018) /* AC97 PCM out/in channel FIFO data register */
+#define AC_MICDATA (*(volatile uint32_t *)0x5B00001C) /* AC97 MIC in channel FIFO data register */
 
 /* Memory banks */
 
diff --git a/firmware/export/s5l87xx.h b/firmware/export/s5l87xx.h
index 60317e60d0..3b13fd72e2 100644
--- a/firmware/export/s5l87xx.h
+++ b/firmware/export/s5l87xx.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Marcoen Hirschberg, Bart van Adrichem
  *
diff --git a/firmware/export/screendump.h b/firmware/export/screendump.h
index b8fc27047d..0011bee570 100644
--- a/firmware/export/screendump.h
+++ b/firmware/export/screendump.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
  *                     \/            \/     \/    \/            \/ 
- * $Id$
  *
  * Copyright (C) 2009 by Jens Arnold
  *
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h
index ed8f93b476..8033647916 100644
--- a/firmware/export/scroll_engine.h
+++ b/firmware/export/scroll_engine.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Michael Sevakis
  *
diff --git a/firmware/export/sd.h b/firmware/export/sd.h
index 3895fdc0c9..61cc513c74 100644
--- a/firmware/export/sd.h
+++ b/firmware/export/sd.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  * Copyright (C) 2008 by Frank Gevaerts
diff --git a/firmware/export/sdl_codec.h b/firmware/export/sdl_codec.h
index 2adcd8bc5d..1c68bb35ad 100644
--- a/firmware/export/sdl_codec.h
+++ b/firmware/export/sdl_codec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/export/sdmmc.h b/firmware/export/sdmmc.h
index 01158a0061..8dbded62b9 100644
--- a/firmware/export/sdmmc.h
+++ b/firmware/export/sdmmc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Jens Arnold
  *
diff --git a/firmware/export/sdmmc_host.h b/firmware/export/sdmmc_host.h
index 3d6c7fbb0f..30419faa0a 100644
--- a/firmware/export/sdmmc_host.h
+++ b/firmware/export/sdmmc_host.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/export/serial.h b/firmware/export/serial.h
index 3ca0ce08a8..acbcbb4630 100644
--- a/firmware/export/serial.h
+++ b/firmware/export/serial.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/export/si4700.h b/firmware/export/si4700.h
index cf9e0f077b..96ee9d8e0a 100644
--- a/firmware/export/si4700.h
+++ b/firmware/export/si4700.h
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  *
- * $Id$
  *
  * Tuner header for the Silicon Labs SI4700
  *
diff --git a/firmware/export/sound.h b/firmware/export/sound.h
index 59677912db..75a1202d57 100644
--- a/firmware/export/sound.h
+++ b/firmware/export/sound.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/spdif.h b/firmware/export/spdif.h
index f54564ab03..ceb439edad 100644
--- a/firmware/export/spdif.h
+++ b/firmware/export/spdif.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michal Sevakis
  * Based on the work of Thom Johansen
diff --git a/firmware/export/spi.h b/firmware/export/spi.h
index 93b531b7f3..37ccb5a4da 100644
--- a/firmware/export/spi.h
+++ b/firmware/export/spi.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Catalin Patulea
  *
diff --git a/firmware/export/stfm1000.h b/firmware/export/stfm1000.h
index 6c01d6308e..ca45eefb70 100644
--- a/firmware/export/stfm1000.h
+++ b/firmware/export/stfm1000.h
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  *
- * $Id$
  *
  * Tuner header for the STFM1000
  *
diff --git a/firmware/export/stm32h743.h b/firmware/export/stm32h743.h
index 89643e3132..7de82df35f 100644
--- a/firmware/export/stm32h743.h
+++ b/firmware/export/stm32h743.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/export/storage.h b/firmware/export/storage.h
index b0a791fe7f..85c1ed9434 100644
--- a/firmware/export/storage.h
+++ b/firmware/export/storage.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  * Copyright (C) 2008 by Frank Gevaerts
@@ -318,9 +317,6 @@ void storage_get_info(int drive, struct storage_info *info);
 #ifdef HAVE_HOTSWAP
 bool storage_removable(int drive);
 bool storage_present(int drive);
-#else
-#define storage_removable(x) 0
-#define storage_present(x) 1
 #endif
 int storage_driver_type(int drive);
 
@@ -328,4 +324,10 @@ int storage_driver_type(int drive);
 
 int storage_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf);
 int storage_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf);
+
+#ifndef HAVE_HOTSWAP
+# define storage_removable(x) 0
+# define storage_present(x) 1
 #endif
+
+#endif /* __STORAGE_H__ */
diff --git a/firmware/export/sw_i2c.h b/firmware/export/sw_i2c.h
index ed92f19be5..242e7fffeb 100644
--- a/firmware/export/sw_i2c.h
+++ b/firmware/export/sw_i2c.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Robert Kukla
  *
diff --git a/firmware/export/synaptics-mep.h b/firmware/export/synaptics-mep.h
index c3894d3e7c..4d91aea687 100644
--- a/firmware/export/synaptics-mep.h
+++ b/firmware/export/synaptics-mep.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/export/synaptics-rmi.h b/firmware/export/synaptics-rmi.h
index e7fe14d7d5..e719b0a8d2 100644
--- a/firmware/export/synaptics-rmi.h
+++ b/firmware/export/synaptics-rmi.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/export/system.h b/firmware/export/system.h
index fce3c85b39..498c0b048d 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/export/tcc780x.h b/firmware/export/tcc780x.h
index 22ec03aa09..46d69f53bb 100644
--- a/firmware/export/tcc780x.h
+++ b/firmware/export/tcc780x.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Rob Purchase
  *
diff --git a/firmware/export/tea5760.h b/firmware/export/tea5760.h
index a5af67aac1..1ee39fffc8 100644
--- a/firmware/export/tea5760.h
+++ b/firmware/export/tea5760.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Tuner header for the Philips TEA5760
  *
  * Copyright (C) 2009 Bertrik Sikken
diff --git a/firmware/export/tea5767.h b/firmware/export/tea5767.h
index 6def18576f..ec1d55d9cd 100644
--- a/firmware/export/tea5767.h
+++ b/firmware/export/tea5767.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Tuner header for the Philips TEA5767
  *
  * Copyright (C) 2007 Michael Sevakis
diff --git a/firmware/export/timer.h b/firmware/export/timer.h
index 92b26db216..f249675693 100644
--- a/firmware/export/timer.h
+++ b/firmware/export/timer.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2005 Jens Arnold
 *
diff --git a/firmware/export/tlv320.h b/firmware/export/tlv320.h
index 6c722bb437..303412d8c5 100644
--- a/firmware/export/tlv320.h
+++ b/firmware/export/tlv320.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Christian Gmeiner
  *
diff --git a/firmware/export/touchpad.h b/firmware/export/touchpad.h
index ad08469459..f013dee4d3 100644
--- a/firmware/export/touchpad.h
+++ b/firmware/export/touchpad.h
@@ -5,7 +5,6 @@
  * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
  * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
  * \/ \/ \/ \/ \/
- * $Id$
  *
  * Copyright (C) 2013 by Jean-Louis Biasini
  *
diff --git a/firmware/export/touchscreen.h b/firmware/export/touchscreen.h
index 5e107e8ef2..f3c5c788ee 100644
--- a/firmware/export/touchscreen.h
+++ b/firmware/export/touchscreen.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/export/tsc200x.h b/firmware/export/tsc200x.h
index a2705a0553..d2f0caee6e 100644
--- a/firmware/export/tsc200x.h
+++ b/firmware/export/tsc200x.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Rob Purchase
  *
diff --git a/firmware/export/tsc2100.h b/firmware/export/tsc2100.h
index 11baf3ffcb..ab04d1c23a 100644
--- a/firmware/export/tsc2100.h
+++ b/firmware/export/tsc2100.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jonathan Gordon
  *
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h
index a3cc985137..ad443b5e90 100644
--- a/firmware/export/tuner.h
+++ b/firmware/export/tuner.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Tuner abstraction layer
  *
  * Copyright (C) 2004 Jörg Hohensohn
diff --git a/firmware/export/uc87xx.h b/firmware/export/uc87xx.h
index 99303ef9e6..04a27a04b2 100644
--- a/firmware/export/uc87xx.h
+++ b/firmware/export/uc87xx.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/export/uda1341.h b/firmware/export/uda1341.h
index f07b4c62bf..721d52f742 100644
--- a/firmware/export/uda1341.h
+++ b/firmware/export/uda1341.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bob Cousins
  *
diff --git a/firmware/export/uda1380.h b/firmware/export/uda1380.h
index e0019d2bcb..fa289e23a8 100644
--- a/firmware/export/uda1380.h
+++ b/firmware/export/uda1380.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/export/udacodec.h b/firmware/export/udacodec.h
index beca43329e..dccac3c813 100644
--- a/firmware/export/udacodec.h
+++ b/firmware/export/udacodec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/export/usb-designware.h b/firmware/export/usb-designware.h
index 993ebcfbc1..865394b57a 100644
--- a/firmware/export/usb-designware.h
+++ b/firmware/export/usb-designware.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Michael Sparmann
  * Copyright (C) 2014 by Marcin Bukat
diff --git a/firmware/export/usb-s3c6400x.h b/firmware/export/usb-s3c6400x.h
index 55d9b8c93c..2c4ad7b948 100644
--- a/firmware/export/usb-s3c6400x.h
+++ b/firmware/export/usb-s3c6400x.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Michael Sparmann
  *
diff --git a/firmware/export/usb-tcc.h b/firmware/export/usb-tcc.h
index c3932c7164..6e1cb41c37 100644
--- a/firmware/export/usb-tcc.h
+++ b/firmware/export/usb-tcc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Vitja Makarov
  *
diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index ed76ade521..a324b1174c 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
@@ -179,14 +178,7 @@ enum {
     USB_NUM_DRIVERS
 };
 
-struct usb_transfer_completion_event_data
-{
-    unsigned char endpoint;
-    int dir;
-    int status;
-    int length;
-    void* data[2];
-};
+struct usb_transfer_completion_event_data;
 #endif /* HAVE_USBSTACK */
 
 /* initialise the usb code and thread */
diff --git a/firmware/export/usb_ch9.h b/firmware/export/usb_ch9.h
index 1fe281b77c..74ce733cc1 100644
--- a/firmware/export/usb_ch9.h
+++ b/firmware/export/usb_ch9.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) by Linux Kernel Developers
  *
diff --git a/firmware/export/usb_core.h b/firmware/export/usb_core.h
index 5aa6e4f33a..e995448fdd 100644
--- a/firmware/export/usb_core.h
+++ b/firmware/export/usb_core.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Björn Stenberg
  *
@@ -39,6 +38,11 @@
 
 extern int usb_max_pkt_size;
 
+enum usb_control_response {
+    USB_CONTROL_ACK,
+    USB_CONTROL_STALL,
+};
+
 enum {
     USB_STRING_INDEX_LANGUAGE,
     USB_STRING_INDEX_MANUFACTURER,
@@ -51,9 +55,8 @@ struct usb_class_driver;
 
 void usb_core_init(void);
 void usb_core_exit(void);
-void usb_core_control_request(struct usb_ctrlrequest* req, void* data);
-void usb_core_control_complete(int status);
-void usb_core_legacy_control_request(struct usb_ctrlrequest* req);
+void usb_core_setup_received(struct usb_ctrlrequest* req);
+void usb_core_control_response(enum usb_control_response response, const void* data, size_t size);
 void usb_core_transfer_complete(int endpoint,int dir,int status,int length);
 void usb_core_bus_reset(void);
 void usb_core_enable_driver(int driver,bool enabled);
diff --git a/firmware/export/usb_drv.h b/firmware/export/usb_drv.h
index 405ea1d9dd..4d197715e1 100644
--- a/firmware/export/usb_drv.h
+++ b/firmware/export/usb_drv.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Björn Stenberg
  *
@@ -56,12 +55,6 @@
  *          -> usb_drv_int_enable(false)  [ditto]
  *    -> soc specific controller/clock deinit */
 
-enum usb_control_response {
-    USB_CONTROL_ACK,
-    USB_CONTROL_STALL,
-    USB_CONTROL_RECEIVE,
-};
-
 /* endpoint allocation:
  * there are two ways to implement endpoint allocation.
  * 1. define usb_drv_ep_specs and usb_drv_ep_specs_flags in the driver.
@@ -112,8 +105,6 @@ int usb_drv_send(int endpoint, void* ptr, int length);
 int usb_drv_send_nonblocking(int endpoint, void* ptr, int length);
 int usb_drv_recv_blocking(int endpoint, void* ptr, int length);
 int usb_drv_recv_nonblocking(int endpoint, void* ptr, int length);
-void usb_drv_control_response(enum usb_control_response resp,
-                              void* data, int length);
 void usb_drv_set_address(int address);
 void usb_drv_reset_endpoint(int endpoint, bool send);
 bool usb_drv_powered(void);
diff --git a/firmware/export/wifi.h b/firmware/export/wifi.h
index a70e062cb0..def2c98f46 100644
--- a/firmware/export/wifi.h
+++ b/firmware/export/wifi.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 by Tomasz Moń
  *
diff --git a/firmware/export/wm8731.h b/firmware/export/wm8731.h
index a725a87484..97d4c4cd0a 100644
--- a/firmware/export/wm8731.h
+++ b/firmware/export/wm8731.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  *
diff --git a/firmware/export/wm8740.h b/firmware/export/wm8740.h
index ff27a7e41e..ee69827cf9 100644
--- a/firmware/export/wm8740.h
+++ b/firmware/export/wm8740.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/export/wm8751.h b/firmware/export/wm8751.h
index 9b66981129..bae37a7a92 100644
--- a/firmware/export/wm8751.h
+++ b/firmware/export/wm8751.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  *
diff --git a/firmware/export/wm8758.h b/firmware/export/wm8758.h
index d4194b90ee..842c1e820e 100644
--- a/firmware/export/wm8758.h
+++ b/firmware/export/wm8758.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  *
diff --git a/firmware/export/wm8975.h b/firmware/export/wm8975.h
index b8ef17910c..8e5e109398 100644
--- a/firmware/export/wm8975.h
+++ b/firmware/export/wm8975.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  *
diff --git a/firmware/export/wm8978.h b/firmware/export/wm8978.h
index 00f46a02d5..5bed80f846 100644
--- a/firmware/export/wm8978.h
+++ b/firmware/export/wm8978.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Michael Sevakis
  *
diff --git a/firmware/export/wm8985.h b/firmware/export/wm8985.h
index f733133917..bcacc39fd8 100644
--- a/firmware/export/wm8985.h
+++ b/firmware/export/wm8985.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  *
diff --git a/firmware/export/wmcodec.h b/firmware/export/wmcodec.h
index 8c67fc480e..f57933eb51 100644
--- a/firmware/export/wmcodec.h
+++ b/firmware/export/wmcodec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Marcoen Hirschberg
  *
diff --git a/firmware/export/x1000-codec.h b/firmware/export/x1000-codec.h
index cfc71dbd60..0916573fe5 100644
--- a/firmware/export/x1000-codec.h
+++ b/firmware/export/x1000-codec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021-2022 Aidan MacDonald
  *
diff --git a/firmware/export/x1000.h b/firmware/export/x1000.h
index 22e655eeaf..5e38df03fa 100644
--- a/firmware/export/x1000.h
+++ b/firmware/export/x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021-2022 Aidan MacDonald
  *
diff --git a/firmware/firmware.make b/firmware/firmware.make
index 5215d7226a..28cc810da7 100644
--- a/firmware/firmware.make
+++ b/firmware/firmware.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 INCLUDES += -I$(FIRMDIR) -I$(FIRMDIR)/export -I$(FIRMDIR)/drivers \
diff --git a/firmware/font.c b/firmware/font.c
index 689445692b..9ea194038a 100644
--- a/firmware/font.c
+++ b/firmware/font.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2002 by Greg Haerr <greg@censoft.com>
  *
@@ -109,6 +108,7 @@ struct buflib_alloc_data {
     unsigned char buffer[];
 };
 static int buflib_allocations[MAXFONTS];
+static int ui_font = FONT_LASTUSERFONT;
 
 static int cache_fd;
 static struct font* cache_pf;
@@ -710,9 +710,10 @@ void font_enable_all(void)
  */
 struct font* font_get(int font)
 {
+    bool is_ui_font = (font == FONT_UI);
     struct font* pf;
-    if (font == FONT_UI)
-        font = MAXFONTS-1;
+    if (is_ui_font)
+        font = ui_font;
     if (font <= FONT_SYSFIXED || font >= MAXFONTS)
         return &sysfont;
 
@@ -725,10 +726,30 @@ struct font* font_get(int font)
                 return pf;
         }
         if (--font < 0)
-            return &sysfont;
+        {
+            if (is_ui_font && ui_font != FONT_LASTUSERFONT)
+            {
+                /* The users preferred UI font couldn't be loaded */
+                ui_font = FONT_LASTUSERFONT;
+                font = ui_font; /* try from the top to find something loaded */
+            }
+            else
+                return &sysfont; /* Nothing else is available */
+        }
     }
 }
 
+/* When FONT_UI is supplied to font_get this font will be tried first if it is
+ * not loaded then fall back to default of any loaded font wins */
+void set_ui_font(int font)
+{
+    /* Note: we don't allow setting FONT_SYSFIXED here */
+    if (font > FONT_SYSFIXED && font < MAXFONTS)
+        ui_font = font;
+    else /* default (same as supplying FONT_UI) */
+        ui_font = FONT_LASTUSERFONT;
+}
+
 /*
  * Reads an entry into cache entry
  */
@@ -884,13 +905,14 @@ const unsigned char* font_get_bits(struct font* pf, ucschar_t char_code)
     return bits;
 }
 
-static void font_path_to_glyph_path( const char *font_path, char *glyph_path)
+extern int open_pathfmt(char *buf, size_t size, int oflag, const char *pathfmt, ...); /*misc.c*/
+static NO_INLINE int font_path_open_glyphcache(const char *font_path, int oflags)
 {
-    /* take full file name, cut extension, and add .glyphcache */
-    strmemccpy(glyph_path, font_path, MAX_PATH);
-    int dotidx = strlen(glyph_path) - sizeof(FONT_EXT);
-    strmemccpy(glyph_path + dotidx, "." GLYPH_CACHE_EXT, MAX_PATH - dotidx);
-    logf("%s %s", __func__, glyph_path);
+    char glyph_path[MAX_PATH];
+    int dotidx = strlen(font_path) - sizeof(FONT_EXT);
+    logf("%s %.*s.%s", __func__, dotidx, font_path, GLYPH_CACHE_EXT);
+    return open_pathfmt(glyph_path, sizeof(glyph_path), oflags, 
+                        "%.*s.%s", dotidx, font_path, GLYPH_CACHE_EXT);
 }
 
 /* call with NULL to flush */
@@ -945,9 +967,7 @@ static void glyph_cache_save(int font_id)
 
     if(pf && pf->fd >= 0)
     {
-        char filename[MAX_PATH];
-        font_path_to_glyph_path(pdata->path, filename);
-        fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0666);
+        fd = font_path_open_glyphcache(pdata->path, O_WRONLY|O_CREAT|O_TRUNC);
         if (fd >= 0)
         {
             uint32_t header = FC_HEADER_VAL;
@@ -988,10 +1008,7 @@ static NO_INLINE void glyph_cache_load(const char *font_path, struct font *pf)
         if ( sort_size > MAX_SORT )
              sort_size = MAX_SORT;
 
-        char filename[MAX_PATH];
-        font_path_to_glyph_path(font_path, filename);
-
-        fd = open(filename, O_RDONLY|O_BINARY);
+        fd = font_path_open_glyphcache(font_path, O_RDONLY|O_BINARY);
 #ifdef TRY_DEFAULT_GLYPHCACHE
         /* if font specific file fails, try default */
         if (fd < 0)
@@ -1104,6 +1121,52 @@ const unsigned char* font_get_bits(struct font* pf, ucschar_t char_code)
 
 #endif /* BOOTLOADER */
 
+/*
+ * Returns the length (in bytes) of a given NULL terminated string
+ *  stops after maxwidth, maxbytes or NULL (\0) whichever occurs first.
+ * maxbytes = -1 ignores maxbytes and relies on NULL terminator (\0)
+ *  to terminate the string
+ * maxwidth = -1 ignores maxwidth
+ * stringsize pixel width and height will be returned in *w and *h
+ */
+int font_measurestring(const unsigned char *str, size_t maxbytes, size_t maxwidth, int *w, int *h, int fontnum)
+{
+    const unsigned char *start = str;
+    size_t bytes;
+    struct font* pf = font_get(fontnum);
+    font_lock( fontnum, true );
+    ucschar_t ch;
+    size_t width = 0;
+
+    while (true)
+    {
+        bytes = str - start;
+        str = utf8decode(str, &ch);
+        if (ch == 0 || bytes >= maxbytes)
+        {
+            break;
+        }
+        if (IS_DIACRITIC(ch))
+            continue;
+        int fw = font_get_width(pf,ch);
+        width += fw;
+        if (width > maxwidth)
+        {
+            width -= fw;
+            break;
+        }
+    }
+
+    if ( h )
+        *h = pf->height;
+    if ( w )
+        *w = width;
+
+    font_lock( fontnum, false );
+
+    return bytes;
+}
+
 /*
  * Returns the stringsize of a given NULL terminated string
  *  stops after maxbytes or NULL (\0) whichever occurs first.
@@ -1112,26 +1175,11 @@ const unsigned char* font_get_bits(struct font* pf, ucschar_t char_code)
  */
 int font_getstringnsize(const unsigned char *str, size_t maxbytes, int *w, int *h, int fontnum)
 {
-    struct font* pf = font_get(fontnum);
-    font_lock( fontnum, true );
-    ucschar_t ch;
     int width = 0;
-    size_t b = maxbytes - 1;
-
-    for (str = utf8decode(str, &ch); ch != 0 && b < maxbytes; str = utf8decode(str, &ch), b--)
-    {
-        if (IS_DIACRITIC(ch))
-            continue;
-
-        /* get proportional width and glyph bits*/
-        width += font_get_width(pf,ch);
-    }
-    if ( w )
-        *w = width;
-    if ( h )
-        *h = pf->height;
-    font_lock( fontnum, false );
-    return width;
+    if (!w)
+        w = &width;
+    font_measurestring(str, maxbytes, -1, w, h, fontnum);
+    return *w;
 }
 
 /*
diff --git a/firmware/general.c b/firmware/general.c
index d421d722a8..5d74c07ea5 100644
--- a/firmware/general.c
+++ b/firmware/general.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michael Sevakis
  *
diff --git a/firmware/include/adler32.h b/firmware/include/adler32.h
index cd5302e869..293399cdd7 100644
--- a/firmware/include/adler32.h
+++ b/firmware/include/adler32.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 James Buren (adaptations from tinf/zlib)
  *
diff --git a/firmware/include/ap_int.h b/firmware/include/ap_int.h
index 68cbb2fb71..1b4cb1ef65 100644
--- a/firmware/include/ap_int.h
+++ b/firmware/include/ap_int.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2018 by Michael A. Sevakis
  *
diff --git a/firmware/include/assert.h b/firmware/include/assert.h
index 536c4a8fc7..27986adc94 100644
--- a/firmware/include/assert.h
+++ b/firmware/include/assert.h
@@ -2,21 +2,13 @@
         assert.h
 */
 
-#include "_ansi.h"
+#include <panic.h>
 
 #undef assert
 
 #ifdef NDEBUG           /* required by ANSI standard */
 #define assert(p)       ((void)0)
 #else
-
-#ifdef __STDC__
-#define assert(e)       ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
-#else   /* PCC */
-#define assert(e)       ((e) ? (void)0 : __assert(__FILE__, __LINE__, "e"))
-#endif
-
+#define assert(e)       ((e) ? (void)0 : panicf("Assertion failed: %s (%s: %s: %d)", #e, __FILE__, __func__, __LINE__))
 #endif /* NDEBUG */
 
-void _EXFUN(__assert,(const char *, int, const char *));
-
diff --git a/firmware/include/bitarray.h b/firmware/include/bitarray.h
index a1e7a3fd58..19d7c37456 100644
--- a/firmware/include/bitarray.h
+++ b/firmware/include/bitarray.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/include/buflib.h b/firmware/include/buflib.h
index 3fe8ac1430..d32dbc9bfd 100644
--- a/firmware/include/buflib.h
+++ b/firmware/include/buflib.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Andrew Mahone
  * Copyright (C) 2011 Thomas Martitz
diff --git a/firmware/include/buflib_malloc.h b/firmware/include/buflib_malloc.h
index a17c75c29a..5c782d5cc2 100644
--- a/firmware/include/buflib_malloc.h
+++ b/firmware/include/buflib_malloc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2023 Aidan MacDonald
  *
diff --git a/firmware/include/buflib_mempool.h b/firmware/include/buflib_mempool.h
index 448e40963a..71ab2e50e0 100644
--- a/firmware/include/buflib_mempool.h
+++ b/firmware/include/buflib_mempool.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * This is a memory allocator designed to provide reasonable management of free
 * space and fast access to allocated data. More than one allocator can be used
diff --git a/firmware/include/checksum.h b/firmware/include/checksum.h
index 6e66368bcf..a51262a36b 100644
--- a/firmware/include/checksum.h
+++ b/firmware/include/checksum.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2020 James Buren
  *
diff --git a/firmware/include/chunk_alloc.h b/firmware/include/chunk_alloc.h
index ea9f6a64cb..7a99fca1e2 100644
--- a/firmware/include/chunk_alloc.h
+++ b/firmware/include/chunk_alloc.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2023 William Wilgus
 *
diff --git a/firmware/include/core_alloc.h b/firmware/include/core_alloc.h
index 4cc9aa8cab..c963fd425b 100644
--- a/firmware/include/core_alloc.h
+++ b/firmware/include/core_alloc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Thomas Martitz
  *
diff --git a/firmware/include/crc32.h b/firmware/include/crc32.h
index adf7e2bc6e..d7ef92ea98 100644
--- a/firmware/include/crc32.h
+++ b/firmware/include/crc32.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Jörg Hohensohn [IDC]Dragon
  *
diff --git a/firmware/include/diacritic.h b/firmware/include/diacritic.h
index e7a51eb095..0ef4e3c2c4 100644
--- a/firmware/include/diacritic.h
+++ b/firmware/include/diacritic.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Tomer Shalev
  *
diff --git a/firmware/include/dir.h b/firmware/include/dir.h
index 516b407bf1..9cc32f522c 100644
--- a/firmware/include/dir.h
+++ b/firmware/include/dir.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Kévin Ferrare
  *
diff --git a/firmware/include/dircache.h b/firmware/include/dircache.h
index d610c63245..ebb5ed83ec 100644
--- a/firmware/include/dircache.h
+++ b/firmware/include/dircache.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Miika Pekkarinen
  * Copyright (C) 2014 by Michael Sevakis
diff --git a/firmware/include/dircache_redirect.h b/firmware/include/dircache_redirect.h
index d7314cf3b1..d7af8d78d9 100644
--- a/firmware/include/dircache_redirect.h
+++ b/firmware/include/dircache_redirect.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/include/disk_cache.h b/firmware/include/disk_cache.h
index 9787c64aec..9ca75aaa09 100644
--- a/firmware/include/disk_cache.h
+++ b/firmware/include/disk_cache.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/include/elf-target.h b/firmware/include/elf-target.h
index e718cf666b..68b1a22f38 100644
--- a/firmware/include/elf-target.h
+++ b/firmware/include/elf-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Aidan MacDonald
  *
diff --git a/firmware/include/elf.h b/firmware/include/elf.h
index bfdd4f2281..3c5d33d008 100644
--- a/firmware/include/elf.h
+++ b/firmware/include/elf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Aidan MacDonald
  *
diff --git a/firmware/include/elf_loader.h b/firmware/include/elf_loader.h
index 9b7550bc62..4232545035 100644
--- a/firmware/include/elf_loader.h
+++ b/firmware/include/elf_loader.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Aidan MacDonald
  *
diff --git a/firmware/include/file.h b/firmware/include/file.h
index 324a657848..72d8cbcafc 100644
--- a/firmware/include/file.h
+++ b/firmware/include/file.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/include/file_internal.h b/firmware/include/file_internal.h
index e1af0d5449..74c3699065 100644
--- a/firmware/include/file_internal.h
+++ b/firmware/include/file_internal.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/include/fileobj_mgr.h b/firmware/include/fileobj_mgr.h
index 0db3520d34..0e9e0c6f1a 100644
--- a/firmware/include/fileobj_mgr.h
+++ b/firmware/include/fileobj_mgr.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/include/filesystem-native.h b/firmware/include/filesystem-native.h
index 5bd61eea76..0edce81ae3 100644
--- a/firmware/include/filesystem-native.h
+++ b/firmware/include/filesystem-native.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/include/fs_attr.h b/firmware/include/fs_attr.h
index 299ebca82d..523bb096a2 100644
--- a/firmware/include/fs_attr.h
+++ b/firmware/include/fs_attr.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Kévin Ferrare
  *
diff --git a/firmware/include/fs_defines.h b/firmware/include/fs_defines.h
index 70e083ae2e..5062b678c8 100644
--- a/firmware/include/fs_defines.h
+++ b/firmware/include/fs_defines.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 by Michael Sevakis
  *
diff --git a/firmware/include/inflate.h b/firmware/include/inflate.h
index 1fce186f34..5dc1e335ce 100644
--- a/firmware/include/inflate.h
+++ b/firmware/include/inflate.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 by James Buren (libflate adaptations for RockBox)
  *
diff --git a/firmware/include/linked_list.h b/firmware/include/linked_list.h
index 1e077be22a..ea6f75acbf 100644
--- a/firmware/include/linked_list.h
+++ b/firmware/include/linked_list.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/include/memset16.h b/firmware/include/memset16.h
index 1569644db5..3c3ff611bc 100644
--- a/firmware/include/memset16.h
+++ b/firmware/include/memset16.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Jens Arnold
  *
diff --git a/firmware/include/rb_namespace.h b/firmware/include/rb_namespace.h
index 5cd8c2dd29..ab02a3231c 100644
--- a/firmware/include/rb_namespace.h
+++ b/firmware/include/rb_namespace.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 by Michael Sevakis
  *
diff --git a/firmware/include/rbendian.h b/firmware/include/rbendian.h
index 690c9a115a..039d3f9521 100644
--- a/firmware/include/rbendian.h
+++ b/firmware/include/rbendian.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/include/rbunicode.h b/firmware/include/rbunicode.h
index d243c08596..b8697bd1b7 100644
--- a/firmware/include/rbunicode.h
+++ b/firmware/include/rbunicode.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2004,2005 by Marcoen Hirschberg
  *
diff --git a/firmware/include/strcasecmp.h b/firmware/include/strcasecmp.h
index 630f3c9fd8..e9871ea028 100644
--- a/firmware/include/strcasecmp.h
+++ b/firmware/include/strcasecmp.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/firmware/include/strcasestr.h b/firmware/include/strcasestr.h
index f61096906e..17d145547f 100644
--- a/firmware/include/strcasestr.h
+++ b/firmware/include/strcasestr.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/firmware/include/string-extra.h b/firmware/include/string-extra.h
index 3ebe1af246..83e8b1dde1 100644
--- a/firmware/include/string-extra.h
+++ b/firmware/include/string-extra.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/firmware/include/strlcat.h b/firmware/include/strlcat.h
index dbde60c21b..3279a06ffd 100644
--- a/firmware/include/strlcat.h
+++ b/firmware/include/strlcat.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/firmware/include/strlcpy.h b/firmware/include/strlcpy.h
index f94ed52ba8..95989598e5 100644
--- a/firmware/include/strlcpy.h
+++ b/firmware/include/strlcpy.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/firmware/include/strmemccpy.h b/firmware/include/strmemccpy.h
index c7004610dd..f1af98edcc 100644
--- a/firmware/include/strmemccpy.h
+++ b/firmware/include/strmemccpy.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 William Wilgus
  *
diff --git a/firmware/include/strptokspn_r.h b/firmware/include/strptokspn_r.h
index d565118190..09f216588d 100644
--- a/firmware/include/strptokspn_r.h
+++ b/firmware/include/strptokspn_r.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 William Wilgus
  *
diff --git a/firmware/include/strtok_r.h b/firmware/include/strtok_r.h
index f4727630fa..47cecf212e 100644
--- a/firmware/include/strtok_r.h
+++ b/firmware/include/strtok_r.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/firmware/include/timefuncs.h b/firmware/include/timefuncs.h
index 25e041b576..369b42e303 100644
--- a/firmware/include/timefuncs.h
+++ b/firmware/include/timefuncs.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/include/version.h b/firmware/include/version.h
index e9e291a8c4..812d50e44c 100644
--- a/firmware/include/version.h
+++ b/firmware/include/version.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Frank Gevaerts
  *
diff --git a/firmware/include/vuprintf.h b/firmware/include/vuprintf.h
index 3876482fb2..1334a17710 100644
--- a/firmware/include/vuprintf.h
+++ b/firmware/include/vuprintf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Felix Arends
  *
diff --git a/firmware/include/zip.h b/firmware/include/zip.h
index 70d225cfd7..8714da6b5e 100644
--- a/firmware/include/zip.h
+++ b/firmware/include/zip.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 by James Buren
  *
diff --git a/firmware/kernel/corelock.c b/firmware/kernel/corelock.c
index 53d08a9069..170bd218dc 100644
--- a/firmware/kernel/corelock.c
+++ b/firmware/kernel/corelock.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Daniel Ankers
  *
diff --git a/firmware/kernel/include/corelock.h b/firmware/kernel/include/corelock.h
index 402ae07d19..3377d79298 100644
--- a/firmware/kernel/include/corelock.h
+++ b/firmware/kernel/include/corelock.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Ulf Ralberg
  *
diff --git a/firmware/kernel/include/kernel.h b/firmware/kernel/include/kernel.h
index fc6dfca8c3..74c3b3c87c 100644
--- a/firmware/kernel/include/kernel.h
+++ b/firmware/kernel/include/kernel.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/kernel/include/mrsw_lock.h b/firmware/kernel/include/mrsw_lock.h
index 7511f87e93..b0aa44eee5 100644
--- a/firmware/kernel/include/mrsw_lock.h
+++ b/firmware/kernel/include/mrsw_lock.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/kernel/include/mutex.h b/firmware/kernel/include/mutex.h
index 816d8040cb..8bc4532229 100644
--- a/firmware/kernel/include/mutex.h
+++ b/firmware/kernel/include/mutex.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/kernel/include/queue.h b/firmware/kernel/include/queue.h
index 71980a293f..a85c1e1481 100644
--- a/firmware/kernel/include/queue.h
+++ b/firmware/kernel/include/queue.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/kernel/include/semaphore.h b/firmware/kernel/include/semaphore.h
index 1d604a4e76..bb08464881 100644
--- a/firmware/kernel/include/semaphore.h
+++ b/firmware/kernel/include/semaphore.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/kernel/include/thread.h b/firmware/kernel/include/thread.h
index a80080b979..f23c4d9572 100644
--- a/firmware/kernel/include/thread.h
+++ b/firmware/kernel/include/thread.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Ulf Ralberg
  *
diff --git a/firmware/kernel/include/tick.h b/firmware/kernel/include/tick.h
index d1933dbe9b..66c32e704d 100644
--- a/firmware/kernel/include/tick.h
+++ b/firmware/kernel/include/tick.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/kernel/include/timeout.h b/firmware/kernel/include/timeout.h
index 0b7c52ba4c..1775000c52 100644
--- a/firmware/kernel/include/timeout.h
+++ b/firmware/kernel/include/timeout.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/kernel/kernel-internal.h b/firmware/kernel/kernel-internal.h
index 8f7e3e28cb..8fd841e348 100644
--- a/firmware/kernel/kernel-internal.h
+++ b/firmware/kernel/kernel-internal.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Ulf Ralberg
  *
diff --git a/firmware/kernel/mrsw_lock.c b/firmware/kernel/mrsw_lock.c
index 6120666d05..2d1aead394 100644
--- a/firmware/kernel/mrsw_lock.c
+++ b/firmware/kernel/mrsw_lock.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/kernel/mutex.c b/firmware/kernel/mutex.c
index eb09b9d68c..92e8594efe 100644
--- a/firmware/kernel/mutex.c
+++ b/firmware/kernel/mutex.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/kernel/queue.c b/firmware/kernel/queue.c
index 29611e34c7..9cd42bce36 100644
--- a/firmware/kernel/queue.c
+++ b/firmware/kernel/queue.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/kernel/semaphore.c b/firmware/kernel/semaphore.c
index 6b58fa3d8a..67dd6fddc8 100644
--- a/firmware/kernel/semaphore.c
+++ b/firmware/kernel/semaphore.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/kernel/thread-common.c b/firmware/kernel/thread-common.c
index 326b8ea1cd..0170b66237 100644
--- a/firmware/kernel/thread-common.c
+++ b/firmware/kernel/thread-common.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Ulf Ralberg
  *
diff --git a/firmware/kernel/thread-internal.h b/firmware/kernel/thread-internal.h
index f7e3d82117..427e6dd033 100644
--- a/firmware/kernel/thread-internal.h
+++ b/firmware/kernel/thread-internal.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Ulf Ralberg
  *
diff --git a/firmware/kernel/thread.c b/firmware/kernel/thread.c
index dde1a71011..550169e385 100644
--- a/firmware/kernel/thread.c
+++ b/firmware/kernel/thread.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Ulf Ralberg
  *
diff --git a/firmware/kernel/tick.c b/firmware/kernel/tick.c
index 6fe2bf4305..5c0fa06c24 100644
--- a/firmware/kernel/tick.c
+++ b/firmware/kernel/tick.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/lc-rock.c b/firmware/lc-rock.c
index 6670a30c96..73d743dfbd 100644
--- a/firmware/lc-rock.c
+++ b/firmware/lc-rock.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/libc/atoi.c b/firmware/libc/atoi.c
index 00617c3d13..c9de6da739 100644
--- a/firmware/libc/atoi.c
+++ b/firmware/libc/atoi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Gary Czvitkovicz
  *
diff --git a/firmware/libc/gmtime.c b/firmware/libc/gmtime.c
index b01050904d..06358f5605 100644
--- a/firmware/libc/gmtime.c
+++ b/firmware/libc/gmtime.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 by Michael Sevakis
  *
diff --git a/firmware/libc/include/endian.h b/firmware/libc/include/endian.h
index de1c508da7..586c9c55fb 100644
--- a/firmware/libc/include/endian.h
+++ b/firmware/libc/include/endian.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/libc/include/fcntl.h b/firmware/libc/include/fcntl.h
index ec53d728cf..20ff25c99f 100644
--- a/firmware/libc/include/fcntl.h
+++ b/firmware/libc/include/fcntl.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/libc/include/inttypes.h b/firmware/libc/include/inttypes.h
index ed6fd6d47c..5344e634c3 100644
--- a/firmware/libc/include/inttypes.h
+++ b/firmware/libc/include/inttypes.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  *
diff --git a/firmware/libc/include/string.h b/firmware/libc/include/string.h
index 6217fff15c..0c5180ce44 100644
--- a/firmware/libc/include/string.h
+++ b/firmware/libc/include/string.h
@@ -34,6 +34,7 @@ char    *_EXFUN(strerror,(int));
 size_t   _EXFUN(strlen,(const char *));
 char    *_EXFUN(strncat,(char *, const char *, size_t));
 int      _EXFUN(strncmp,(const char *, const char *, size_t));
+char    *_EXFUN(strncpy, (char *, const char *, size_t));
 char    *_EXFUN(strpbrk,(const char *, const char *));
 char    *_EXFUN(strrchr,(const char *, int));
 size_t   _EXFUN(strspn,(const char *, const char *));
diff --git a/firmware/libc/include/sys/types.h b/firmware/libc/include/sys/types.h
index ecc25fd749..de90aa8d19 100644
--- a/firmware/libc/include/sys/types.h
+++ b/firmware/libc/include/sys/types.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/firmware/libc/mktime.c b/firmware/libc/mktime.c
index 822f12e6e8..a9df03968c 100644
--- a/firmware/libc/mktime.c
+++ b/firmware/libc/mktime.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/libc/sprintf.c b/firmware/libc/sprintf.c
index a78b5ed665..dd9fbf0b72 100644
--- a/firmware/libc/sprintf.c
+++ b/firmware/libc/sprintf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Gary Czvitkovicz
  *
diff --git a/apps/plugins/lib/strncpy.c b/firmware/libc/strncpy.c
similarity index 99%
rename from apps/plugins/lib/strncpy.c
rename to firmware/libc/strncpy.c
index 9ad3594287..fd43b24602 100644
--- a/apps/plugins/lib/strncpy.c
+++ b/firmware/libc/strncpy.c
@@ -39,7 +39,6 @@ QUICKREF
 
 #include <string.h>
 #include <limits.h>
-#include "plugin.h"
 #include "_ansi.h"
 #include <stdint.h>
 
diff --git a/firmware/linuxboot.c b/firmware/linuxboot.c
index 6803bb466b..32e252315c 100644
--- a/firmware/linuxboot.c
+++ b/firmware/linuxboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/firmware/logf.c b/firmware/logf.c
index 971c2d3a35..157371a7d9 100644
--- a/firmware/logf.c
+++ b/firmware/logf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Daniel Stenberg
  *
diff --git a/firmware/panic.c b/firmware/panic.c
index 7b2045347a..bf7550e7e7 100644
--- a/firmware/panic.c
+++ b/firmware/panic.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by wavey@wavey.org
  *
diff --git a/firmware/pcm.c b/firmware/pcm.c
index be5b47673a..5fa368911f 100644
--- a/firmware/pcm.c
+++ b/firmware/pcm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
@@ -77,6 +76,9 @@
  *
  */
 
+/* 'true' when all stages of pcm initialization have completed */
+static volatile bool pcm_is_ready[PCM_SINK_NUM] SHAREDBSS_ATTR = { false };
+
 #ifdef USB_ENABLE_IAP
 extern struct pcm_sink iap_pcm_sink;
 #endif
@@ -87,7 +89,7 @@ static struct pcm_sink* sinks[PCM_SINK_NUM] = {
     [PCM_SINK_IAP] = &iap_pcm_sink,
 #endif
 };
-static enum pcm_sink_ids cur_sink = PCM_SINK_BUILTIN;
+static enum pcm_sink_ids cur_sink SHAREDBSS_ATTR = PCM_SINK_BUILTIN;
 
 /* The registered callback function to ask for more mp3 data */
 volatile pcm_play_callback_type
@@ -147,7 +149,7 @@ void pcm_play_stop_int(void)
 
 static void pcm_wait_for_init(void)
 {
-    while (!sinks[cur_sink]->pcm_is_ready)
+    while (!pcm_is_ready[cur_sink])
         sleep(0);
 }
 
@@ -257,9 +259,9 @@ void pcm_init(void)
 
     for(size_t i = 0; i < PCM_SINK_NUM; i += 1) {
         struct pcm_sink* sink = sinks[i];
+        pcm_is_ready[i] = false;
         sink->pending_freq = sink->caps.default_freq;
         sink->configured_freq = -1U;
-        sink->pcm_is_ready = false;
         sink->ops.init();
     }
 }
@@ -272,7 +274,7 @@ void pcm_postinit(void)
     for(size_t i = 0; i < PCM_SINK_NUM; i += 1) {
         struct pcm_sink* sink = sinks[i];
         sink->ops.postinit();
-        sink->pcm_is_ready = true;
+        pcm_is_ready[i] = true;
     }
 
     /* Ensure mixer is in a sane state */
@@ -281,7 +283,7 @@ void pcm_postinit(void)
 
 bool pcm_is_initialized(void)
 {
-    return sinks[cur_sink]->pcm_is_ready;
+    return pcm_is_ready[cur_sink];
 }
 
 enum pcm_sink_ids pcm_current_sink(void)
diff --git a/firmware/pcm_mixer.c b/firmware/pcm_mixer.c
index 607db70839..5de15ac793 100644
--- a/firmware/pcm_mixer.c
+++ b/firmware/pcm_mixer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Michael Sevakis
  *
@@ -523,6 +522,9 @@ void mixer_set_frequency(unsigned int samplerate)
     if(pcm_get_frequency() == samplerate)
         return;
 
+    pcm_play_stop();
+    idle_counter = 0;
+
     pcm_set_frequency(samplerate);
     mixer_handle_sampr_change(SAMPR_NUM(pcm_get_frequency()));
     if (pcm_is_initialized())
diff --git a/firmware/pcm_sampr.c b/firmware/pcm_sampr.c
index 7fe9d5bd11..8fc27d489c 100644
--- a/firmware/pcm_sampr.c
+++ b/firmware/pcm_sampr.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Michael Sevakis
  *
diff --git a/firmware/pcm_sw_volume.c b/firmware/pcm_sw_volume.c
index ae07bbd3ec..99e5d62cb4 100644
--- a/firmware/pcm_sw_volume.c
+++ b/firmware/pcm_sw_volume.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Michael Sevakis
  *
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 82f9308483..e89c0ce034 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/profile.c b/firmware/profile.c
index 21feb13d26..6ecacb5e9a 100644
--- a/firmware/profile.c
+++ b/firmware/profile.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Profiling routines counts ticks and calls to each profiled function.
  * 
diff --git a/firmware/reggen/reggen.make b/firmware/reggen/reggen.make
index 5f1c075fb0..8f7e8bbd79 100644
--- a/firmware/reggen/reggen.make
+++ b/firmware/reggen/reggen.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 REGGEN_SRC := $(call preprocess, $(FIRMDIR)/reggen/SOURCES)
diff --git a/firmware/rolo.c b/firmware/rolo.c
index 3cc358331b..d832496270 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Randy D. Wood
  *
diff --git a/firmware/screendump.c b/firmware/screendump.c
index 7d09b0cd5e..f1a080efae 100644
--- a/firmware/screendump.c
+++ b/firmware/screendump.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Jens Arnold
  *
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c
index 79609e5b63..305d67a8b6 100644
--- a/firmware/scroll_engine.c
+++ b/firmware/scroll_engine.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/sdmmc.c b/firmware/sdmmc.c
index 3f9e2d4e3c..a9852cf682 100644
--- a/firmware/sdmmc.c
+++ b/firmware/sdmmc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Jens Arnold
  *
diff --git a/firmware/sound.c b/firmware/sound.c
index 06f6906b55..40975abfc6 100644
--- a/firmware/sound.c
+++ b/firmware/sound.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  * Copyright (C) 2007 by Christian Gmeiner
diff --git a/firmware/storage.c b/firmware/storage.c
index f6a168dabb..3120a5a7d4 100644
--- a/firmware/storage.c
+++ b/firmware/storage.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Frank Gevaerts
  *
diff --git a/firmware/system.c b/firmware/system.c
index e2fdff0e59..20c927efeb 100644
--- a/firmware/system.c
+++ b/firmware/system.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/target/arm/as3525/app.lds b/firmware/target/arm/as3525/app.lds
index 4807855198..a4f9c06d49 100644
--- a/firmware/target/arm/as3525/app.lds
+++ b/firmware/target/arm/as3525/app.lds
@@ -1,3 +1,4 @@
+#define __ASSEMBLER__
 #include "config.h"
 #include "cpu.h"
 
diff --git a/firmware/target/arm/as3525/ascodec-as3525.c b/firmware/target/arm/as3525/ascodec-as3525.c
index 6076505acb..1290aa4b3e 100644
--- a/firmware/target/arm/as3525/ascodec-as3525.c
+++ b/firmware/target/arm/as3525/ascodec-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Bertrik Sikken
  *
@@ -127,7 +126,7 @@ static void ascodec_int_audio_cb(struct ascodec_request *req);
 void INT_I2C_AUDIO(void);
 static struct ascodec_request as_audio_req;
 static struct semaphore adc_done_sem;
-static unsigned long ascodec_enrd0_shadow = 0;
+static uint32_t ascodec_enrd0_shadow = 0;
 
 static void ascodec_wait_cb(struct ascodec_request *req);
 
diff --git a/firmware/target/arm/as3525/audio-as3525.c b/firmware/target/arm/as3525/audio-as3525.c
index 691ccaa028..23bd58a294 100644
--- a/firmware/target/arm/as3525/audio-as3525.c
+++ b/firmware/target/arm/as3525/audio-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/as3525/backlight-e200v2-fuze.c b/firmware/target/arm/as3525/backlight-e200v2-fuze.c
index 26602fcee6..c9624be366 100644
--- a/firmware/target/arm/as3525/backlight-e200v2-fuze.c
+++ b/firmware/target/arm/as3525/backlight-e200v2-fuze.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/as3525/boot.lds b/firmware/target/arm/as3525/boot.lds
index 9861ef2125..41737f5112 100644
--- a/firmware/target/arm/as3525/boot.lds
+++ b/firmware/target/arm/as3525/boot.lds
@@ -1,3 +1,4 @@
+#define __ASSEMBLER__
 #include "config.h"
 #include "cpu.h"
 
diff --git a/firmware/target/arm/as3525/button-clip.c b/firmware/target/arm/as3525/button-clip.c
index c83590a06e..4f54ed5e3c 100644
--- a/firmware/target/arm/as3525/button-clip.c
+++ b/firmware/target/arm/as3525/button-clip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Bertrik Sikken
  * Copyright (C) 2008 François Dinel
diff --git a/firmware/target/arm/as3525/button-e200v2-fuze.c b/firmware/target/arm/as3525/button-e200v2-fuze.c
index 7c29c74861..d3b152fad6 100644
--- a/firmware/target/arm/as3525/button-e200v2-fuze.c
+++ b/firmware/target/arm/as3525/button-e200v2-fuze.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Thomas Martitz
  * Copyright (C) 2008 by Dominik Wenger
diff --git a/firmware/target/arm/as3525/clock-target.h b/firmware/target/arm/as3525/clock-target.h
index 2f2f90b24f..ebd181c093 100644
--- a/firmware/target/arm/as3525/clock-target.h
+++ b/firmware/target/arm/as3525/clock-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/dbop-as3525.c b/firmware/target/arm/as3525/dbop-as3525.c
index 1816b5205b..5ba2c0d6ce 100644
--- a/firmware/target/arm/as3525/dbop-as3525.c
+++ b/firmware/target/arm/as3525/dbop-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/as3525/dbop-as3525.h b/firmware/target/arm/as3525/dbop-as3525.h
index 3db62bd3e1..a5499390ec 100644
--- a/firmware/target/arm/as3525/dbop-as3525.h
+++ b/firmware/target/arm/as3525/dbop-as3525.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/as3525/debug-as3525.c b/firmware/target/arm/as3525/debug-as3525.c
index 4848f0e5c5..3822bae597 100644
--- a/firmware/target/arm/as3525/debug-as3525.c
+++ b/firmware/target/arm/as3525/debug-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
@@ -331,6 +330,10 @@ bool dbg_hw_info(void)
       defined(SANSA_CLIPZIP)
         lcd_putsf(x, line++, "AMSv2 variant %d", amsv2_variant);
 #endif
+#if defined(SANSA_CLIPZIP)
+        lcd_putsf(x, line++, "Display type %d", GPIOB_PIN(3) ? 1 : 0);
+#endif
+
         }
         while(dbg_btn(&done, &x))
         {
diff --git a/firmware/target/arm/as3525/dma-pl081.c b/firmware/target/arm/as3525/dma-pl081.c
index bd895a6d83..870833fea6 100644
--- a/firmware/target/arm/as3525/dma-pl081.c
+++ b/firmware/target/arm/as3525/dma-pl081.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/dma-target.h b/firmware/target/arm/as3525/dma-target.h
index 2ed6e36bd7..ef47341aac 100644
--- a/firmware/target/arm/as3525/dma-target.h
+++ b/firmware/target/arm/as3525/dma-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/fmradio-i2c-as3525.c b/firmware/target/arm/as3525/fmradio-i2c-as3525.c
index 7f6cb8366b..6feb663e23 100644
--- a/firmware/target/arm/as3525/fmradio-i2c-as3525.c
+++ b/firmware/target/arm/as3525/fmradio-i2c-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/as3525/kernel-as3525.c b/firmware/target/arm/as3525/kernel-as3525.c
index f4f006aa16..b1e8e431f9 100644
--- a/firmware/target/arm/as3525/kernel-as3525.c
+++ b/firmware/target/arm/as3525/kernel-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S b/firmware/target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S
index feffe6fb96..5925ec550c 100644
--- a/firmware/target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S
+++ b/firmware/target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jens Arnold
  * Heavily based on lcd-as-memframe.c by Michael Sevakis
diff --git a/firmware/target/arm/as3525/lcd-clip.h b/firmware/target/arm/as3525/lcd-clip.h
index 3bde92430c..3c3037e90c 100644
--- a/firmware/target/arm/as3525/lcd-clip.h
+++ b/firmware/target/arm/as3525/lcd-clip.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008-2009 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/lcd-fuze.c b/firmware/target/arm/as3525/lcd-fuze.c
index a1ccea348d..97a330b7b0 100644
--- a/firmware/target/arm/as3525/lcd-fuze.c
+++ b/firmware/target/arm/as3525/lcd-fuze.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Linus Nielsen Feltzing
  * Copyright (C) 2008 by Dave Chapman
diff --git a/firmware/target/arm/as3525/lcd-ssd1303.c b/firmware/target/arm/as3525/lcd-ssd1303.c
index 186fdcacbe..25d7a813af 100644
--- a/firmware/target/arm/as3525/lcd-ssd1303.c
+++ b/firmware/target/arm/as3525/lcd-ssd1303.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  * Copyright (C) 2008 François Dinel
diff --git a/firmware/target/arm/as3525/memory-init.S b/firmware/target/arm/as3525/memory-init.S
index 49b05463e7..d0afc3aa04 100644
--- a/firmware/target/arm/as3525/memory-init.S
+++ b/firmware/target/arm/as3525/memory-init.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2010 by Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/pcm-as3525.c b/firmware/target/arm/as3525/pcm-as3525.c
index b72070b312..029c075e52 100644
--- a/firmware/target/arm/as3525/pcm-as3525.c
+++ b/firmware/target/arm/as3525/pcm-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008-2009 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/power-as3525.c b/firmware/target/arm/as3525/power-as3525.c
index e6f1cfd24d..6e745e844e 100644
--- a/firmware/target/arm/as3525/power-as3525.c
+++ b/firmware/target/arm/as3525/power-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/powermgmt-target.h b/firmware/target/arm/as3525/powermgmt-target.h
index e0aa0ec4c3..52127c2866 100644
--- a/firmware/target/arm/as3525/powermgmt-target.h
+++ b/firmware/target/arm/as3525/powermgmt-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sevakis
  * Copyright (C) 2008 by Bertrik Sikken
diff --git a/firmware/target/arm/as3525/rtc-target.h b/firmware/target/arm/as3525/rtc-target.h
index 900aa357d0..f56db2872c 100644
--- a/firmware/target/arm/as3525/rtc-target.h
+++ b/firmware/target/arm/as3525/rtc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 by Michael Sevakis
  *
diff --git a/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
index 6344eff593..ff87310cd1 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
+++ b/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h b/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h
index a6b07de6bf..e8e5e1b7a5 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Barry Wardell
  *
diff --git a/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c
index 36ef43d32b..7716aedfe3 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c
+++ b/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell, (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/as3525/sansa-c200v2/button-target.h b/firmware/target/arm/as3525/sansa-c200v2/button-target.h
index d5b22583c4..7f0b757317 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/button-target.h
+++ b/firmware/target/arm/as3525/sansa-c200v2/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Mark Arigo
  *
diff --git a/firmware/target/arm/as3525/sansa-c200v2/powermgmt-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/powermgmt-c200v2.c
index ff4d1b7eaa..a52facc459 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/powermgmt-c200v2.c
+++ b/firmware/target/arm/as3525/sansa-c200v2/powermgmt-c200v2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/as3525/sansa-clip/backlight-target.h b/firmware/target/arm/as3525/sansa-clip/backlight-target.h
index 669f0f5939..8f9bbacc97 100644
--- a/firmware/target/arm/as3525/sansa-clip/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-clip/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/sansa-clip/button-target.h b/firmware/target/arm/as3525/sansa-clip/button-target.h
index 85d5a477e1..cafbdf56be 100644
--- a/firmware/target/arm/as3525/sansa-clip/button-target.h
+++ b/firmware/target/arm/as3525/sansa-clip/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 François Dinel
  *
diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S b/firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S
index 431dc62da0..22fd5b990a 100644
--- a/firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S
+++ b/firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-clip.c b/firmware/target/arm/as3525/sansa-clip/lcd-clip.c
index 8331b9e895..2b2d62fef2 100644
--- a/firmware/target/arm/as3525/sansa-clip/lcd-clip.c
+++ b/firmware/target/arm/as3525/sansa-clip/lcd-clip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 François Dinel
  * Copyright (C) 2008-2009 Rafaël Carré
diff --git a/firmware/target/arm/as3525/sansa-clip/powermgmt-clip.c b/firmware/target/arm/as3525/sansa-clip/powermgmt-clip.c
index 70413ec380..c9ce99b17c 100644
--- a/firmware/target/arm/as3525/sansa-clip/powermgmt-clip.c
+++ b/firmware/target/arm/as3525/sansa-clip/powermgmt-clip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c b/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
index 76df12c948..bb18082402 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
+++ b/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/sansa-clipplus/backlight-target.h b/firmware/target/arm/as3525/sansa-clipplus/backlight-target.h
index 9e8ff1ce8c..fc5daa3e8b 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-clipplus/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/sansa-clipplus/button-clip.c b/firmware/target/arm/as3525/sansa-clipplus/button-clip.c
index 09d62562ee..cb82f86b89 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/button-clip.c
+++ b/firmware/target/arm/as3525/sansa-clipplus/button-clip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 François Dinel
  * Copyright ©   2008-2009 Rafaël Carré
diff --git a/firmware/target/arm/as3525/sansa-clipplus/button-target.h b/firmware/target/arm/as3525/sansa-clipplus/button-target.h
index 8176382ba2..6547687520 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/button-target.h
+++ b/firmware/target/arm/as3525/sansa-clipplus/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 François Dinel
  *
diff --git a/firmware/target/arm/as3525/sansa-clipplus/lcd-as-clip-plus.S b/firmware/target/arm/as3525/sansa-clipplus/lcd-as-clip-plus.S
index 7dcdc9f0da..92d73afcd3 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/lcd-as-clip-plus.S
+++ b/firmware/target/arm/as3525/sansa-clipplus/lcd-as-clip-plus.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c b/firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c
index 42cd43a880..ade0e6b19c 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c
+++ b/firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 François Dinel
  * Copyright (C) 2008-2009 Rafaël Carré
diff --git a/firmware/target/arm/as3525/sansa-clipplus/powermgmt-clipplus.c b/firmware/target/arm/as3525/sansa-clipplus/powermgmt-clipplus.c
index f9b1052ab9..03b41e2911 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/powermgmt-clipplus.c
+++ b/firmware/target/arm/as3525/sansa-clipplus/powermgmt-clipplus.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
index 65f69e8bcd..e4ab515fa2 100644
--- a/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
+++ b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/sansa-clipv2/backlight-target.h b/firmware/target/arm/as3525/sansa-clipv2/backlight-target.h
index 800b26d7fa..d39276c5b6 100644
--- a/firmware/target/arm/as3525/sansa-clipv2/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-clipv2/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/sansa-clipv2/button-target.h b/firmware/target/arm/as3525/sansa-clipv2/button-target.h
index 85d5a477e1..cafbdf56be 100644
--- a/firmware/target/arm/as3525/sansa-clipv2/button-target.h
+++ b/firmware/target/arm/as3525/sansa-clipv2/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 François Dinel
  *
diff --git a/firmware/target/arm/as3525/sansa-clipv2/lcd-as-clipv2.S b/firmware/target/arm/as3525/sansa-clipv2/lcd-as-clipv2.S
index 23f1db3109..765e990da6 100644
--- a/firmware/target/arm/as3525/sansa-clipv2/lcd-as-clipv2.S
+++ b/firmware/target/arm/as3525/sansa-clipv2/lcd-as-clipv2.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c b/firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c
index 0b3317255a..02f593e111 100644
--- a/firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c
+++ b/firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 François Dinel
  * Copyright (C) 2008-2009 Rafaël Carré
diff --git a/firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c b/firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c
index 016ebef1af..ee513e650b 100644
--- a/firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c
+++ b/firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c
index 925db3a34d..b5077440f9 100644
--- a/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c
+++ b/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2011 Bertrik Sikken
  *
diff --git a/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h b/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h
index 00b925c22b..6cf9093037 100644
--- a/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2011 Bertrik Sikken
  *
diff --git a/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c
index 4fdb87fc1d..ce9e30179e 100644
--- a/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c
+++ b/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 François Dinel
  * Copyright ©   2008-2009 Rafaël Carré
diff --git a/firmware/target/arm/as3525/sansa-clipzip/button-target.h b/firmware/target/arm/as3525/sansa-clipzip/button-target.h
index 8176382ba2..6547687520 100644
--- a/firmware/target/arm/as3525/sansa-clipzip/button-target.h
+++ b/firmware/target/arm/as3525/sansa-clipzip/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 François Dinel
  *
diff --git a/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c
index 1760e505e8..fefced1765 100644
--- a/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c
+++ b/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Bertrik Sikken
  *
@@ -30,6 +29,10 @@
 /* the detected lcd type (0 or 1) */
 static int lcd_type;
 
+/* set by lcd_set_flip(): when true the panel is rotated 180 degrees via the
+   controller's GRAM write direction (see lcd_set_flip and lcd_setup_rect) */
+static bool lcd_flipped = false;
+
 #ifdef HAVE_LCD_ENABLE
 /* whether the lcd is currently enabled or not */
 static bool lcd_enabled;
@@ -133,7 +136,7 @@ static void lcd_write(uint8_t cmd, uint8_t data)
 /*  Initialises lcd type 0
  *  This appears to be a WiseChip OLED display controlled by a SEPS114A.
  */
-static void lcd_init_type0(void)
+static void lcd_init_type0(void) /* INIT_ATTR */
 {
     lcd_write(0x01, 0x00);  /* SOFT_RESET */
     lcd_write(0x14, 0x01);  /* STANDBY_ON_OFF */
@@ -146,12 +149,14 @@ static void lcd_init_type0(void)
     lcd_write(0xEA, 0x0A);  /* ? */
     lcd_write(0xEB, 0x42);  /* ? */
     lcd_write(0x18, 0x08);  /* DISCHARGE_TIME */
-    lcd_write(0x1A, 0x0B);  /* OSC_ADJUST */
+    lcd_write(0x1A, 0x03);  /* OSC_ADJUST 3 = 95Hz*/
     lcd_write(0x48, 0x03);  /* ROW_OVERLAP */
     lcd_write(0x30, 0x00);  /* DISPLAY_X1 */
     lcd_write(0x31, 0x5F);  /* DISPLAY_X2 */
     lcd_write(0x32, 0x00);  /* DISPLAY_Y1 */
     lcd_write(0x33, 0x5F);  /* DISPLAY_Y2 */
+    lcd_write(0x38, 0x00);  /* DISPLAYSTART_X */
+    lcd_write(0x39, 0x00);  /* DISPLAYSTART_Y */
     lcd_write(0xE0, 0x10);  /* RGB_IF */
     lcd_write(0xE1, 0x00);  /* RGB_POL */
     lcd_write(0xE5, 0x80);  /* DISPLAY_MODE_CONTROL */
@@ -178,9 +183,9 @@ static void lcd_write_nibbles(uint8_t val)
 }
 
 /* Initialises lcd type 1
- * This appears to be a Visionox OLED display, with an unknown controller
+ * This appears to be a Visionox OLED display, with a LDT LD7134 controller
  */
-static void lcd_init_type1(void)
+static void lcd_init_type1(void) /* INIT_ATTR */
 {
     static const uint8_t curve[128] = {
         /* 5-bit curve */
@@ -197,65 +202,67 @@ static void lcd_init_type1(void)
     };
     int i;
 
-    lcd_write(0x02, 0x00);
+    lcd_write(0x02, 0x00); /* DDISP OFF */
 
-    lcd_write_cmd(0x01);
+    lcd_write_cmd(0x01);  /* SOFTRESET */
 
-    lcd_write(0x03, 0x00);
+    lcd_write(0x03, 0x00); /* DSTBY ON */
 
-    lcd_write(0x04, 0x03);
+    lcd_write(0x04, 0x02); /* Set OSC Control 2 = 90Hz*/
 
-    lcd_write(0x05, 0x00);    /* 0x08 results in BGR colour */
+    lcd_write(0x05, 0x00); /* Write Direction 0x08 results in BGR colour */
 
-    lcd_write(0x06, 0x00);
+    lcd_write(0x06, 0x00); /* Set Row Scan Direction */
 
-    lcd_write(0x07, 0x00);
+    lcd_write(0x07, 0x00); /* Set Display Size */
     lcd_write_dat_word(0x00, 0x04);
     lcd_write_dat_word(0x1F, 0x00);
     lcd_write_dat_word(0x00, 0x05);
     lcd_write_dat(0x0F);
 
-    lcd_write(0x08, 0x01);
+    lcd_write(0x08, 0x01); /* Set Interface Bus Type 1 = 8-bit*/
 
-    lcd_write(0x09, 0x07);
+    lcd_write(0x09, 0x07); /* Set Masking Data */
 
-    lcd_write_cmd(0x0A);
+    lcd_write_cmd(0x0A); /* Set Read/Write Box Data */
     lcd_write_nibbles(0);
     lcd_write_nibbles(LCD_WIDTH - 1);
     lcd_write_nibbles(0);
     lcd_write_nibbles(LCD_HEIGHT - 1);
 
-    lcd_write(0x0B, 0x00);
+    lcd_write(0x0B, 0x00); /* Set Display Start Address */
     lcd_write_dat_word(0x00, 0x00);
     lcd_write_dat(0x00);
 
-    lcd_write_cmd(0x0E);
+    lcd_write_cmd(0x0E); /* Set Dot Matrix Current Level */
     lcd_write_nibbles(0x42);
     lcd_write_nibbles(0x25);
     lcd_write_nibbles(0x3F);
 
-    lcd_write(0x0F, 0x0A);
+    lcd_write(0x0F, 0x0A); /* Set Dot Matrix Peak Current Level */
     lcd_write_dat_word(0x0A, 0x0A);
 
-    lcd_write(0x1C, 0x08);
+    lcd_write(0x1C, 0x08); /* Set Pre-Charge Width */
 
-    lcd_write(0x1D, 0x00);
+    lcd_write(0x1D, 0x00); /* Set Peak Pulse Width */
     lcd_write_dat_word(0x00, 0x00);
 
-    lcd_write(0x1E, 0x05);
+    lcd_write(0x1E, 0x05); /* Set Peak Pulse Delay */
 
-    lcd_write(0x1F, 0x00);
+    lcd_write(0x1F, 0x00); /* Set Row Scan Operation 0=Mode 1 : Default scan mode */
 
-    lcd_write(0x30, 0x10);
+    lcd_write(0x30, 0x10); /* Set Internal Regulator for Row Scan*/
 
-    lcd_write_cmd(0x3A);
+    lcd_write_cmd(0x3A); /* Set Gamma Correction Table */
     for (i = 0; i < 128; i++) {
         lcd_write_nibbles(curve[i]);
     }
 
-    lcd_write(0x3C, 0x00);
+    lcd_write_cmd(0x3B); /* Set Gamma Correction Table Initialize */
 
-    lcd_write(0x3D, 0x00);
+    lcd_write(0x3C, 0x00); /* Set VDD Selection */
+
+    lcd_write(0x3D, 0x00); /* DMODE 0= 65K Color */
 }
 
 #ifdef HAVE_LCD_ENABLE
@@ -268,18 +275,16 @@ void lcd_enable(bool on)
 
     if (lcd_type == 0) {
         if (on) {
-            lcd_write(0x14, 0x00);  /* STANDBY_ON_OFF */
-            lcd_write(0x02, 0x01);  /* DISP_ON_OFF */
-            lcd_write(0xD2, 0x04);  /* SCREEN_SAVER_MODE */
-            lcd_write(0xD0, 0x80);  /* SCREEN_SAVER_CONTROL */
-            sleep(HZ * 100/1000);
-
-            lcd_write(0xD0, 0x00);  /* SCREEN_SAVER_CONTROL */
+            lcd_write(0x14, 0x00);  /* STANDBY OFF */
+            lcd_write(0x02, 0x01);  /* DISP_ON */
+            /* apply 180 degree flip via memory write direction (1Dh):
+               MDIR1|MDIR0 = decrement both; normal is horizontal-decrement */
+            lcd_write(0x1D, lcd_flipped ? 0x02 : 0x01);
         }
         else {
-            lcd_write(0xD2, 0x05);
-            lcd_write(0xD0, 0x80);
-            sleep(HZ * 100/1000);
+            lcd_write(0xD2, 0x05); /* SCREEN_SAVER_MODE 5=FADE_OUT*/
+            lcd_write(0xD0, 0x80); /* SCREEN_SAVER_CONTROL */
+            sleep(HZ/10);
 
             lcd_write(0x02, 0x00);
             lcd_write(0xD0, 0x00);
@@ -287,18 +292,25 @@ void lcd_enable(bool on)
         }
     }
     else {
+        /* Type 1 */
         if (on) {
-            lcd_write(0x03, 0x00);
+            lcd_write(0x03, 0x00); /* DSTBY OFF */
 
-            lcd_write(0x02, 0x01);
+            lcd_write(0x02, 0x01); /* DDISP ON */
+
+            /* apply 180 degree flip via graphic RAM writing direction (05h):
+               D[2:0] = 011 starts from XE,YE (both axes reversed) */
+            lcd_write(0x05, lcd_flipped ? 0x03 : 0x00);
         }
         else {
             lcd_write(0x02, 0x00);
 
             lcd_write(0x03, 0x01);
+
+            lcd_write(0x14, 0x01); /* DSTBY ON */
         }
     }
-    
+
     lcd_enabled = on;
 }
 
@@ -310,7 +322,7 @@ bool lcd_active(void)
 #endif /* HAVE_LCD_ENABLE */
 
 /* initialises the lcd */
-void lcd_init_device(void)
+void lcd_init_device(void) /* INIT_ATTR */
 {
     lcd_type = lcd_hw_init();
     if (lcd_type == 0) {
@@ -325,22 +337,53 @@ void lcd_init_device(void)
 /* sets up the lcd to receive frame buffer data */
 static void lcd_setup_rect(int x, int x_end, int y, int y_end)
 {
+    int fx, fx_end, fy;
+
     if (lcd_type == 0) {
-        lcd_write(0x34, x);     /* MEM_X1 */
-        lcd_write(0x35, x_end); /* MEM_X2 */
+        if (lcd_flipped) /* Type 0 LCD requires the flipped fx and fx_end ??*/
+        {
+        /* Mirror the window to the opposite corner; the reversed write
+           direction set in lcd_enable() fills it back-to-front, drawing the
+           framebuffer rotated 180 degrees with no per-pixel work. */
+            fx = x;
+            fx_end = x_end;
+            fy = LCD_HEIGHT - 1 - y_end;
+            y_end  = LCD_HEIGHT - 1 - y;
+            y = fy;
+        }
+        else
+        {
+            fx = LCD_WIDTH - 1 - x_end;
+            fx_end = LCD_WIDTH - 1 - x;
+        }
+        lcd_write(0x34, fx);    /* MEM_X1 */
+        lcd_write(0x35, fx_end);/* MEM_X2 */
         lcd_write(0x36, y);     /* MEM_Y1 */
         lcd_write(0x37, y_end); /* MEM_Y2 */
-        
-        lcd_write_cmd(0x08);    /* DDRAM_DATA_ACCESS_PORT */
+
+        lcd_write_cmd(0x08);   /* DDRAM_DATA_ACCESS_PORT */
     }
     else {
-        lcd_write_cmd(0x0A);
+        /* Type 1*/
+        if (lcd_flipped) {
+        /* Mirror the window to the opposite corner; the reversed write
+           direction set in lcd_enable() fills it back-to-front, drawing the
+           framebuffer rotated 180 degrees with no per-pixel work. */
+            fx = LCD_WIDTH  - 1 - x_end;
+            x_end  = LCD_WIDTH  - 1 - x;
+            x = fx;
+            fy = LCD_HEIGHT - 1 - y_end;
+            y_end  = LCD_HEIGHT - 1 - y;
+            y = fy;
+        }
+
+        lcd_write_cmd(0x0A); /* Set Read/Write Box Data */
         lcd_write_nibbles(x);
         lcd_write_nibbles(x_end);
         lcd_write_nibbles(y);
         lcd_write_nibbles(y_end);
-        
-        lcd_write_cmd(0x0C);
+
+        lcd_write_cmd(0x0C); /* Read/Write Display Data */
     }
 }
 
@@ -363,7 +406,7 @@ void oled_brightness(int brightness)
         g = 1 + 6*brightness;
         b = 3 + 10*brightness;
     
-        lcd_write_cmd(0x0E);
+        lcd_write_cmd(0x0E); /* Set Dot Matrix Current Level */
         lcd_write_nibbles(r);
         lcd_write_nibbles(g);
         lcd_write_nibbles(b);
@@ -381,6 +424,23 @@ void lcd_write_data(const fb_data *data, int count)
     }
 }
 
+/* Rotate the display 180 degrees (the flip_display setting). Both panel
+   controllers do this in hardware by reversing the GRAM write direction (set in
+   lcd_enable) so the address counter walks the framebuffer backwards;
+   lcd_setup_rect mirrors the write window to match. Cycle the panel off/on here
+   so a change (e.g. toggled from the menu) takes effect immediately. */
+void lcd_set_flip(bool yesno)
+{
+    if (yesno == lcd_flipped)
+        return;
+    lcd_flipped = yesno;
+
+    if (lcd_enabled) {
+        lcd_enable(false);
+        lcd_enable(true);
+    }
+}
+
 /* Updates a fraction of the display. */
 void lcd_update_rect(int x, int y, int width, int height)
 {
@@ -393,13 +453,15 @@ void lcd_update_rect(int x, int y, int width, int height)
         /* rectangle is outside visible display, do nothing */
         return;
     }
-    
+
+#if 0 /* no longer needed unless it turns out that some devices are wired backwards */
     /* update entire horizontal strip for display type 0 (wisechip) */
     if (lcd_type == 0) {
         x = 0;
         x_end = 96;
     }
-    
+#endif
+
     /* correct rectangle (if necessary) */
     if (x < 0) {
         x = 0;
diff --git a/firmware/target/arm/as3525/sansa-clipzip/lcd-target.h b/firmware/target/arm/as3525/sansa-clipzip/lcd-target.h
index 814e048edd..768f662895 100644
--- a/firmware/target/arm/as3525/sansa-clipzip/lcd-target.h
+++ b/firmware/target/arm/as3525/sansa-clipzip/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Bertrik Sikken
  *
diff --git a/firmware/target/arm/as3525/sansa-clipzip/powermgmt-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/powermgmt-clipzip.c
index 70413ec380..c9ce99b17c 100644
--- a/firmware/target/arm/as3525/sansa-clipzip/powermgmt-clipzip.c
+++ b/firmware/target/arm/as3525/sansa-clipzip/powermgmt-clipzip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h b/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h
index 0baaf2441a..117b76b4cd 100644
--- a/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Barry Wardell
  *
diff --git a/firmware/target/arm/as3525/sansa-e200v2/button-target.h b/firmware/target/arm/as3525/sansa-e200v2/button-target.h
index 4c41a4b6df..806e57740e 100644
--- a/firmware/target/arm/as3525/sansa-e200v2/button-target.h
+++ b/firmware/target/arm/as3525/sansa-e200v2/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
index 1344ea6fa8..7a3194d374 100644
--- a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
+++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/as3525/sansa-e200v2/powermgmt-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/powermgmt-e200v2.c
index 4bf104ab46..0cff078e7e 100644
--- a/firmware/target/arm/as3525/sansa-e200v2/powermgmt-e200v2.c
+++ b/firmware/target/arm/as3525/sansa-e200v2/powermgmt-e200v2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/as3525/sansa-fuze/backlight-target.h b/firmware/target/arm/as3525/sansa-fuze/backlight-target.h
index c4e95e9c4a..2e659bc42e 100644
--- a/firmware/target/arm/as3525/sansa-fuze/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-fuze/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Barry Wardell
  *
diff --git a/firmware/target/arm/as3525/sansa-fuze/button-target.h b/firmware/target/arm/as3525/sansa-fuze/button-target.h
index 1bcc739413..354a31cc6f 100644
--- a/firmware/target/arm/as3525/sansa-fuze/button-target.h
+++ b/firmware/target/arm/as3525/sansa-fuze/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/as3525/sansa-fuze/lcd-fuzev1.c b/firmware/target/arm/as3525/sansa-fuze/lcd-fuzev1.c
index 0c56ee3070..833d306357 100644
--- a/firmware/target/arm/as3525/sansa-fuze/lcd-fuzev1.c
+++ b/firmware/target/arm/as3525/sansa-fuze/lcd-fuzev1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Dave Chapman
  *
diff --git a/firmware/target/arm/as3525/sansa-fuze/powermgmt-fuze.c b/firmware/target/arm/as3525/sansa-fuze/powermgmt-fuze.c
index edc7929c60..bc17eee560 100644
--- a/firmware/target/arm/as3525/sansa-fuze/powermgmt-fuze.c
+++ b/firmware/target/arm/as3525/sansa-fuze/powermgmt-fuze.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c
index 71f0c1a3f2..71d2674ebb 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c
+++ b/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h b/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h
index 4138ef7868..58b1deee64 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Barry Wardell
  *
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
index 5023e72cc3..5f347435ed 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
+++ b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/button-target.h b/firmware/target/arm/as3525/sansa-fuzev2/button-target.h
index 6ea1a9616e..14d01f878e 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/button-target.h
+++ b/firmware/target/arm/as3525/sansa-fuzev2/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c
index e87425f762..f16d22e69f 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c
+++ b/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Dave Chapman
  * Copyright (C) 2010 by Thomas Martitz
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c
index ff84b6b304..9577edb592 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c
+++ b/firmware/target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/sansa-m200v4/backlight-target.h b/firmware/target/arm/as3525/sansa-m200v4/backlight-target.h
index f3ef1095e6..4a36fe0d0d 100644
--- a/firmware/target/arm/as3525/sansa-m200v4/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-m200v4/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 ??
  *
diff --git a/firmware/target/arm/as3525/sansa-m200v4/button-m200v4.c b/firmware/target/arm/as3525/sansa-m200v4/button-m200v4.c
index af57f97051..fdd33fcb18 100644
--- a/firmware/target/arm/as3525/sansa-m200v4/button-m200v4.c
+++ b/firmware/target/arm/as3525/sansa-m200v4/button-m200v4.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by ??
  *
diff --git a/firmware/target/arm/as3525/sansa-m200v4/button-target.h b/firmware/target/arm/as3525/sansa-m200v4/button-target.h
index 00876c4a3d..19fa15b9e7 100644
--- a/firmware/target/arm/as3525/sansa-m200v4/button-target.h
+++ b/firmware/target/arm/as3525/sansa-m200v4/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Dave Chapman
  *
diff --git a/firmware/target/arm/as3525/sansa-m200v4/powermgmt-m200v4.c b/firmware/target/arm/as3525/sansa-m200v4/powermgmt-m200v4.c
index 1326e86a65..eea24f2193 100644
--- a/firmware/target/arm/as3525/sansa-m200v4/powermgmt-m200v4.c
+++ b/firmware/target/arm/as3525/sansa-m200v4/powermgmt-m200v4.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/scrollwheel-as3525.c b/firmware/target/arm/as3525/scrollwheel-as3525.c
index 357e7c55bf..7a085f4c23 100644
--- a/firmware/target/arm/as3525/scrollwheel-as3525.c
+++ b/firmware/target/arm/as3525/scrollwheel-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009-2010 by Thomas Martitz
  *
diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c
index df39cba495..6fd0d049f6 100644
--- a/firmware/target/arm/as3525/sd-as3525.c
+++ b/firmware/target/arm/as3525/sd-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Daniel Ankers
  * Copyright © 2008-2009 Rafaël Carré
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index f9ef7d9c97..782a360afb 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Daniel Ankers
  * Copyright © 2008-2009 Rafaël Carré
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c
index 26a228cddf..aced3e2b80 100644
--- a/firmware/target/arm/as3525/system-as3525.c
+++ b/firmware/target/arm/as3525/system-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Rob Purchase
  * Copyright © 2008 Rafaël Carré
@@ -33,6 +32,10 @@
 #include "backlight-target.h"
 #include "lcd.h"
 
+#if defined(SANSA_CLIPPLUS) && CONFIG_TUNER
+#include "fmradio.h"
+#endif
+
 struct mutex cpufreq_mtx;
 
 /*  Charge Pump and Power management Settings  */
@@ -522,6 +525,12 @@ void set_cpu_frequency(long frequency)
 #if defined(SANSA_CLIPZIP)
         ascodec_write_pmu(0x17, 1, 0x80 | 20);
 #elif defined(SANSA_CLIPPLUS)
+#if CONFIG_TUNER
+
+        if (get_radio_status()== FMRADIO_PLAYING) /* FS#13947 Noise in FM radio when unboosted */
+            ascodec_write_pmu(0x17, 1, 0x80 | 35);
+        else
+#endif
         if (amsv2_variant)
             ascodec_write_pmu(0x17, 1, 0x80 | 22);
         else
diff --git a/firmware/target/arm/as3525/system-target.h b/firmware/target/arm/as3525/system-target.h
index dcea03085a..0ee32cc3f8 100644
--- a/firmware/target/arm/as3525/system-target.h
+++ b/firmware/target/arm/as3525/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/timer-as3525.c b/firmware/target/arm/as3525/timer-as3525.c
index 420eb489fb..7817f65dd9 100644
--- a/firmware/target/arm/as3525/timer-as3525.c
+++ b/firmware/target/arm/as3525/timer-as3525.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2008 Rafaël Carré
 *
diff --git a/firmware/target/arm/as3525/tuner-as3525v2.c b/firmware/target/arm/as3525/tuner-as3525v2.c
index a490217254..32e66479a7 100644
--- a/firmware/target/arm/as3525/tuner-as3525v2.c
+++ b/firmware/target/arm/as3525/tuner-as3525v2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Multi-tuner detection module to select between the Si4700 and the RDA5802
  *
diff --git a/firmware/target/arm/as3525/usb-as3525.c b/firmware/target/arm/as3525/usb-as3525.c
index 3f636256a8..2fcddbaf25 100644
--- a/firmware/target/arm/as3525/usb-as3525.c
+++ b/firmware/target/arm/as3525/usb-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/as3525/usb-drv-as3525.c b/firmware/target/arm/as3525/usb-drv-as3525.c
index 56216bec5e..ba0b485f1b 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525.c
+++ b/firmware/target/arm/as3525/usb-drv-as3525.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2010 Tobias Diedrich
  *
@@ -629,7 +628,7 @@ static void handle_out_ep(int ep)
              req->wIndex,
              req->wLength);
 
-        usb_core_legacy_control_request(&req_copy);
+        usb_core_setup_received(&req_copy);
         setup_desc_init(setup_desc);
 
         ep_sts &= ~USB_EP_STAT_SETUP_RCVD;
@@ -734,7 +733,7 @@ void INT_USB_FUNC(void)
             got_set_configuration = 1;
 
             set_config.wValue = USB_DEV_STS & USB_DEV_STS_MASK_CFG;
-            usb_core_legacy_control_request(&set_config);
+            usb_core_setup_received(&set_config);
             intr &= ~USB_DEV_INTR_SET_CONFIG;
         }
         if (intr & USB_DEV_INTR_EARLY_SUSPEND) {/* idle >3ms detected */
diff --git a/firmware/target/arm/as3525/usb-drv-as3525.h b/firmware/target/arm/as3525/usb-drv-as3525.h
index 0f8b3c0668..6105c00240 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525.h
+++ b/firmware/target/arm/as3525/usb-drv-as3525.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2010 Tobias Diedrich
  *
diff --git a/firmware/target/arm/ata-as-arm.S b/firmware/target/arm/ata-as-arm.S
index 4b4701f7fa..096832f814 100644
--- a/firmware/target/arm/ata-as-arm.S
+++ b/firmware/target/arm/ata-as-arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jens Arnold
  *
diff --git a/firmware/target/arm/ata-nand-telechips.c b/firmware/target/arm/ata-nand-telechips.c
index 49fbedff76..c7954e3188 100644
--- a/firmware/target/arm/ata-nand-telechips.c
+++ b/firmware/target/arm/ata-nand-telechips.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Rob Purchase
  *
diff --git a/firmware/target/arm/bits-armv4.S b/firmware/target/arm/bits-armv4.S
index 33a1508c2c..b220329e17 100644
--- a/firmware/target/arm/bits-armv4.S
+++ b/firmware/target/arm/bits-armv4.S
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2010 by Michael Sevakis
 *
diff --git a/firmware/target/arm/bits-armv6.S b/firmware/target/arm/bits-armv6.S
index d0e48477ed..a361244384 100644
--- a/firmware/target/arm/bits-armv6.S
+++ b/firmware/target/arm/bits-armv6.S
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2010 by Michael Sevakis
 *
diff --git a/firmware/target/arm/cpucache-arm.h b/firmware/target/arm/cpucache-arm.h
index 40bfe7e2f1..7e94c41b7f 100644
--- a/firmware/target/arm/cpucache-arm.h
+++ b/firmware/target/arm/cpucache-arm.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006,2007 by Greg White
  *
diff --git a/firmware/target/arm/cpucache-armv7m.c b/firmware/target/arm/cpucache-armv7m.c
index 43f7ef8fe8..114ab8d9e4 100644
--- a/firmware/target/arm/cpucache-armv7m.c
+++ b/firmware/target/arm/cpucache-armv7m.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/cpucache-armv7m.h b/firmware/target/arm/cpucache-armv7m.h
index 1fcca7e8f6..9ebc132ce5 100644
--- a/firmware/target/arm/cpucache-armv7m.h
+++ b/firmware/target/arm/cpucache-armv7m.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/crt0.S b/firmware/target/arm/crt0.S
index 07d860ed4f..00f77cef10 100644
--- a/firmware/target/arm/crt0.S
+++ b/firmware/target/arm/crt0.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Marcoen Hirschberg
  *
diff --git a/firmware/target/arm/i2c-telechips.c b/firmware/target/arm/i2c-telechips.c
index 3ce2c05568..81dcde6da5 100644
--- a/firmware/target/arm/i2c-telechips.c
+++ b/firmware/target/arm/i2c-telechips.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Rob Purchase
  *
diff --git a/firmware/target/arm/imx233/adc-imx233.c b/firmware/target/arm/imx233/adc-imx233.c
index 00bd1ca9f9..3da0104442 100644
--- a/firmware/target/arm/imx233/adc-imx233.c
+++ b/firmware/target/arm/imx233/adc-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/adc-target.h b/firmware/target/arm/imx233/adc-target.h
index 1694b4c5f6..dec5b1eaa6 100644
--- a/firmware/target/arm/imx233/adc-target.h
+++ b/firmware/target/arm/imx233/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/ata-imx233.c b/firmware/target/arm/imx233/ata-imx233.c
index b8f3268bdd..c2a2df905d 100644
--- a/firmware/target/arm/imx233/ata-imx233.c
+++ b/firmware/target/arm/imx233/ata-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/ata-target.h b/firmware/target/arm/imx233/ata-target.h
index 2c553ebbff..01bb46678f 100644
--- a/firmware/target/arm/imx233/ata-target.h
+++ b/firmware/target/arm/imx233/ata-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/audio-imx233.c b/firmware/target/arm/imx233/audio-imx233.c
index 40218f4aa0..42e2264622 100644
--- a/firmware/target/arm/imx233/audio-imx233.c
+++ b/firmware/target/arm/imx233/audio-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/audio-imx233.h b/firmware/target/arm/imx233/audio-imx233.h
index 860a9c710f..259f10d9db 100644
--- a/firmware/target/arm/imx233/audio-imx233.h
+++ b/firmware/target/arm/imx233/audio-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/audioin-imx233.c b/firmware/target/arm/imx233/audioin-imx233.c
index b1bd8ec655..6884099d18 100644
--- a/firmware/target/arm/imx233/audioin-imx233.c
+++ b/firmware/target/arm/imx233/audioin-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/audioin-imx233.h b/firmware/target/arm/imx233/audioin-imx233.h
index 4aef88ac0c..900b7f1f83 100644
--- a/firmware/target/arm/imx233/audioin-imx233.h
+++ b/firmware/target/arm/imx233/audioin-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/audioout-imx233.c b/firmware/target/arm/imx233/audioout-imx233.c
index 79ee0ce757..ddedde6e13 100644
--- a/firmware/target/arm/imx233/audioout-imx233.c
+++ b/firmware/target/arm/imx233/audioout-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/audioout-imx233.h b/firmware/target/arm/imx233/audioout-imx233.h
index 4c27ae2375..ba93c14f0b 100644
--- a/firmware/target/arm/imx233/audioout-imx233.h
+++ b/firmware/target/arm/imx233/audioout-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/boot.lds b/firmware/target/arm/imx233/boot.lds
index 6022c9ed86..826bed392e 100644
--- a/firmware/target/arm/imx233/boot.lds
+++ b/firmware/target/arm/imx233/boot.lds
@@ -7,7 +7,7 @@ OUTPUT_ARCH(arm)
 STARTUP(target/arm/imx233/crt0.o)
 
 /* Leave a hole at the beginning of the RAM to load the firmware */
-#define RAM_HOLE    1024 * 1024
+#define RAM_HOLE    1536 * 1024
 
 /* Make a difference between virtual and physical address so that we can use
  * the resulting elf file with the elftosb tools which loads at the *physical*
diff --git a/firmware/target/arm/imx233/button-imx233.c b/firmware/target/arm/imx233/button-imx233.c
index 9300eec161..2ddb79c015 100644
--- a/firmware/target/arm/imx233/button-imx233.c
+++ b/firmware/target/arm/imx233/button-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/button-imx233.h b/firmware/target/arm/imx233/button-imx233.h
index 33e15a2a97..f4646867bc 100644
--- a/firmware/target/arm/imx233/button-imx233.h
+++ b/firmware/target/arm/imx233/button-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/button-lradc-imx233.c b/firmware/target/arm/imx233/button-lradc-imx233.c
index 141281041b..ac77187d5d 100644
--- a/firmware/target/arm/imx233/button-lradc-imx233.c
+++ b/firmware/target/arm/imx233/button-lradc-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/button-lradc-imx233.h b/firmware/target/arm/imx233/button-lradc-imx233.h
index d96823fcdc..a1aa794c7a 100644
--- a/firmware/target/arm/imx233/button-lradc-imx233.h
+++ b/firmware/target/arm/imx233/button-lradc-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/clkctrl-imx233.c b/firmware/target/arm/imx233/clkctrl-imx233.c
index d0feabb0a5..166f0ce726 100644
--- a/firmware/target/arm/imx233/clkctrl-imx233.c
+++ b/firmware/target/arm/imx233/clkctrl-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/clkctrl-imx233.h b/firmware/target/arm/imx233/clkctrl-imx233.h
index d150912cfe..d5d649788f 100644
--- a/firmware/target/arm/imx233/clkctrl-imx233.h
+++ b/firmware/target/arm/imx233/clkctrl-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/clock-target.h b/firmware/target/arm/imx233/clock-target.h
index 59f684f16c..532a0bc32d 100644
--- a/firmware/target/arm/imx233/clock-target.h
+++ b/firmware/target/arm/imx233/clock-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/audio-target.h b/firmware/target/arm/imx233/creative-zen/audio-target.h
index 807a7b4966..8393579939 100644
--- a/firmware/target/arm/imx233/creative-zen/audio-target.h
+++ b/firmware/target/arm/imx233/creative-zen/audio-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/backlight-target.h b/firmware/target/arm/imx233/creative-zen/backlight-target.h
index 60a2fbe746..d708cb2e36 100644
--- a/firmware/target/arm/imx233/creative-zen/backlight-target.h
+++ b/firmware/target/arm/imx233/creative-zen/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/backlight-zen.c b/firmware/target/arm/imx233/creative-zen/backlight-zen.c
index 7d99092e2f..2bc84f079b 100644
--- a/firmware/target/arm/imx233/creative-zen/backlight-zen.c
+++ b/firmware/target/arm/imx233/creative-zen/backlight-zen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/button-target.h b/firmware/target/arm/imx233/creative-zen/button-target.h
index eb4f45ccf7..2da96e58e0 100644
--- a/firmware/target/arm/imx233/creative-zen/button-target.h
+++ b/firmware/target/arm/imx233/creative-zen/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/button-zen.c b/firmware/target/arm/imx233/creative-zen/button-zen.c
index 7cc524fe1c..3c48ba174a 100644
--- a/firmware/target/arm/imx233/creative-zen/button-zen.c
+++ b/firmware/target/arm/imx233/creative-zen/button-zen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/debug-zen.c b/firmware/target/arm/imx233/creative-zen/debug-zen.c
index a350d0ae62..dc7820e7b4 100644
--- a/firmware/target/arm/imx233/creative-zen/debug-zen.c
+++ b/firmware/target/arm/imx233/creative-zen/debug-zen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/fmradio-target.h b/firmware/target/arm/imx233/creative-zen/fmradio-target.h
index c2b75b3ed4..33a4983833 100644
--- a/firmware/target/arm/imx233/creative-zen/fmradio-target.h
+++ b/firmware/target/arm/imx233/creative-zen/fmradio-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/lcd-target.h b/firmware/target/arm/imx233/creative-zen/lcd-target.h
index 299ffa3dfb..cb955d08cd 100644
--- a/firmware/target/arm/imx233/creative-zen/lcd-target.h
+++ b/firmware/target/arm/imx233/creative-zen/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/lcd-zen.c b/firmware/target/arm/imx233/creative-zen/lcd-zen.c
index e8c1ef74de..119404753d 100644
--- a/firmware/target/arm/imx233/creative-zen/lcd-zen.c
+++ b/firmware/target/arm/imx233/creative-zen/lcd-zen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/lcd-zenmozaic.c b/firmware/target/arm/imx233/creative-zen/lcd-zenmozaic.c
index ab4466300b..66c0c4b5b2 100644
--- a/firmware/target/arm/imx233/creative-zen/lcd-zenmozaic.c
+++ b/firmware/target/arm/imx233/creative-zen/lcd-zenmozaic.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/lcd-zenv.c b/firmware/target/arm/imx233/creative-zen/lcd-zenv.c
index 75d2775814..a8200d92a4 100644
--- a/firmware/target/arm/imx233/creative-zen/lcd-zenv.c
+++ b/firmware/target/arm/imx233/creative-zen/lcd-zenv.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/lcd-zenxfistyle.c b/firmware/target/arm/imx233/creative-zen/lcd-zenxfistyle.c
index 825b0072a3..2019f5bba4 100644
--- a/firmware/target/arm/imx233/creative-zen/lcd-zenxfistyle.c
+++ b/firmware/target/arm/imx233/creative-zen/lcd-zenxfistyle.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/power-zen.c b/firmware/target/arm/imx233/creative-zen/power-zen.c
index 15da6ab201..3615390892 100644
--- a/firmware/target/arm/imx233/creative-zen/power-zen.c
+++ b/firmware/target/arm/imx233/creative-zen/power-zen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/powermgmt-target.h b/firmware/target/arm/imx233/creative-zen/powermgmt-target.h
index 716ee4dac3..580f9b961a 100644
--- a/firmware/target/arm/imx233/creative-zen/powermgmt-target.h
+++ b/firmware/target/arm/imx233/creative-zen/powermgmt-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zen/powermgmt-zen.c b/firmware/target/arm/imx233/creative-zen/powermgmt-zen.c
index dd8009f20b..ef3a1a7512 100644
--- a/firmware/target/arm/imx233/creative-zen/powermgmt-zen.c
+++ b/firmware/target/arm/imx233/creative-zen/powermgmt-zen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/audio-target.h b/firmware/target/arm/imx233/creative-zenxfi2/audio-target.h
index 4179fe910e..ff537249bc 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/audio-target.h
+++ b/firmware/target/arm/imx233/creative-zenxfi2/audio-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/backlight-target.h b/firmware/target/arm/imx233/creative-zenxfi2/backlight-target.h
index 483272f804..961266ab71 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/backlight-target.h
+++ b/firmware/target/arm/imx233/creative-zenxfi2/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/backlight-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/backlight-zenxfi2.c
index 02e7a0f77e..02e645c0a1 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/backlight-zenxfi2.c
+++ b/firmware/target/arm/imx233/creative-zenxfi2/backlight-zenxfi2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/button-target.h b/firmware/target/arm/imx233/creative-zenxfi2/button-target.h
index d4dd3eb362..4f6e502378 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/button-target.h
+++ b/firmware/target/arm/imx233/creative-zenxfi2/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c
index 1021884d54..d0fb5866f1 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c
+++ b/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/debug-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/debug-zenxfi2.c
index a18704243e..f7e4b3debb 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/debug-zenxfi2.c
+++ b/firmware/target/arm/imx233/creative-zenxfi2/debug-zenxfi2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/fmradio-target.h b/firmware/target/arm/imx233/creative-zenxfi2/fmradio-target.h
index e6869dc2a5..55741e974b 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/fmradio-target.h
+++ b/firmware/target/arm/imx233/creative-zenxfi2/fmradio-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/lcd-target.h b/firmware/target/arm/imx233/creative-zenxfi2/lcd-target.h
index 5c1ecdd406..1387286ddd 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/lcd-target.h
+++ b/firmware/target/arm/imx233/creative-zenxfi2/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c
index d0084900e7..84d693df69 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c
+++ b/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/powermgmt-target.h b/firmware/target/arm/imx233/creative-zenxfi2/powermgmt-target.h
index 6790772704..3c732e1668 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/powermgmt-target.h
+++ b/firmware/target/arm/imx233/creative-zenxfi2/powermgmt-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/powermgmt-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/powermgmt-zenxfi2.c
index 826add7d0e..b75f682908 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/powermgmt-zenxfi2.c
+++ b/firmware/target/arm/imx233/creative-zenxfi2/powermgmt-zenxfi2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/audio-target.h b/firmware/target/arm/imx233/creative-zenxfi3/audio-target.h
index 7286900331..b680cbd5fc 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/audio-target.h
+++ b/firmware/target/arm/imx233/creative-zenxfi3/audio-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/backlight-target.h b/firmware/target/arm/imx233/creative-zenxfi3/backlight-target.h
index edc67ba816..0d11954d12 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/backlight-target.h
+++ b/firmware/target/arm/imx233/creative-zenxfi3/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/backlight-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/backlight-zenxfi3.c
index e3baddea1e..83de688bad 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/backlight-zenxfi3.c
+++ b/firmware/target/arm/imx233/creative-zenxfi3/backlight-zenxfi3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/button-target.h b/firmware/target/arm/imx233/creative-zenxfi3/button-target.h
index 929ba18eaf..40f864e61c 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/button-target.h
+++ b/firmware/target/arm/imx233/creative-zenxfi3/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c
index ed8e769e2d..09d592781a 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c
+++ b/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/debug-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/debug-zenxfi3.c
index 0f003bcd1e..d0978f31a9 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/debug-zenxfi3.c
+++ b/firmware/target/arm/imx233/creative-zenxfi3/debug-zenxfi3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/fmradio-target.h b/firmware/target/arm/imx233/creative-zenxfi3/fmradio-target.h
index e6869dc2a5..55741e974b 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/fmradio-target.h
+++ b/firmware/target/arm/imx233/creative-zenxfi3/fmradio-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/lcd-target.h b/firmware/target/arm/imx233/creative-zenxfi3/lcd-target.h
index 931fcb32a0..c7b81478f8 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/lcd-target.h
+++ b/firmware/target/arm/imx233/creative-zenxfi3/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c
index d5f25a523c..d3da69bf1b 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c
+++ b/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/mpr121-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/mpr121-zenxfi3.c
index 23fcc7f0e4..18cee38b11 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/mpr121-zenxfi3.c
+++ b/firmware/target/arm/imx233/creative-zenxfi3/mpr121-zenxfi3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/mpr121-zenxfi3.h b/firmware/target/arm/imx233/creative-zenxfi3/mpr121-zenxfi3.h
index eb8b00eeee..7016c23e5c 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/mpr121-zenxfi3.h
+++ b/firmware/target/arm/imx233/creative-zenxfi3/mpr121-zenxfi3.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/powermgmt-target.h b/firmware/target/arm/imx233/creative-zenxfi3/powermgmt-target.h
index 6c010a72d3..559c5585cd 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/powermgmt-target.h
+++ b/firmware/target/arm/imx233/creative-zenxfi3/powermgmt-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/powermgmt-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/powermgmt-zenxfi3.c
index 57705d3a6a..a248cd1844 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/powermgmt-zenxfi3.c
+++ b/firmware/target/arm/imx233/creative-zenxfi3/powermgmt-zenxfi3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/crt0.S b/firmware/target/arm/imx233/crt0.S
index 8db8400dbf..7600d1d64b 100644
--- a/firmware/target/arm/imx233/crt0.S
+++ b/firmware/target/arm/imx233/crt0.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/dcp-imx233.c b/firmware/target/arm/imx233/dcp-imx233.c
index c800d890d3..9dddaf2d38 100644
--- a/firmware/target/arm/imx233/dcp-imx233.c
+++ b/firmware/target/arm/imx233/dcp-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  * 
diff --git a/firmware/target/arm/imx233/dcp-imx233.h b/firmware/target/arm/imx233/dcp-imx233.h
index 48428e18b8..b00508941f 100644
--- a/firmware/target/arm/imx233/dcp-imx233.h
+++ b/firmware/target/arm/imx233/dcp-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  * 
diff --git a/firmware/target/arm/imx233/debug-imx233.c b/firmware/target/arm/imx233/debug-imx233.c
index e73194c027..186c3a4673 100644
--- a/firmware/target/arm/imx233/debug-imx233.c
+++ b/firmware/target/arm/imx233/debug-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
@@ -1265,14 +1264,14 @@ bool dbg_hw_info_sdmmc(void)
             else
                 continue;
             lcd_putsf(0, line++, "%s", info.slot_name);
-#ifdef HAVE_HOTSWAP
+
             bool removable = storage_removable(info.drive);
             bool present = storage_present(info.drive);
             if(removable)
                 lcd_putsf(0, line++, "  removable %spresent", present ? "" : "not ");
             if(!present)
                 continue;
-#endif
+
             lcd_putsf(0, line++, "  bus: %d  sbc: %d", info.bus_width, info.has_sbc);
             lcd_putsf(0, line++, "  hs: %s", info.hs_enabled ? "enabled" :
                 info.hs_capable ? "disabled" : "not capable");
diff --git a/firmware/target/arm/imx233/dma-imx233.c b/firmware/target/arm/imx233/dma-imx233.c
index fa8ee074bb..5b2325059f 100644
--- a/firmware/target/arm/imx233/dma-imx233.c
+++ b/firmware/target/arm/imx233/dma-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  * 
diff --git a/firmware/target/arm/imx233/dma-imx233.h b/firmware/target/arm/imx233/dma-imx233.h
index f48fbbccf3..80aaac9043 100644
--- a/firmware/target/arm/imx233/dma-imx233.h
+++ b/firmware/target/arm/imx233/dma-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  * 
diff --git a/firmware/target/arm/imx233/dualboot-imx233.c b/firmware/target/arm/imx233/dualboot-imx233.c
index 53222310db..c22ae43856 100644
--- a/firmware/target/arm/imx233/dualboot-imx233.c
+++ b/firmware/target/arm/imx233/dualboot-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/dualboot-imx233.h b/firmware/target/arm/imx233/dualboot-imx233.h
index 59b6b2f93c..2a2309049c 100644
--- a/firmware/target/arm/imx233/dualboot-imx233.h
+++ b/firmware/target/arm/imx233/dualboot-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/emi-imx233.c b/firmware/target/arm/imx233/emi-imx233.c
index 74fb05de57..03939b5595 100644
--- a/firmware/target/arm/imx233/emi-imx233.c
+++ b/firmware/target/arm/imx233/emi-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/emi-imx233.h b/firmware/target/arm/imx233/emi-imx233.h
index 5983a0308e..dcf3ef17fb 100644
--- a/firmware/target/arm/imx233/emi-imx233.h
+++ b/firmware/target/arm/imx233/emi-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/fmradio-imx233.c b/firmware/target/arm/imx233/fmradio-imx233.c
index 85bad41653..dd88b0d5ff 100644
--- a/firmware/target/arm/imx233/fmradio-imx233.c
+++ b/firmware/target/arm/imx233/fmradio-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/fmradio-imx233.h b/firmware/target/arm/imx233/fmradio-imx233.h
index d53336dd40..ed1d49fa69 100644
--- a/firmware/target/arm/imx233/fmradio-imx233.h
+++ b/firmware/target/arm/imx233/fmradio-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/gpmi-imx233.c b/firmware/target/arm/imx233/gpmi-imx233.c
index 48f37fe397..66b9c81c12 100644
--- a/firmware/target/arm/imx233/gpmi-imx233.c
+++ b/firmware/target/arm/imx233/gpmi-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/gpmi-imx233.h b/firmware/target/arm/imx233/gpmi-imx233.h
index a04ad51e1e..e8b037f2f7 100644
--- a/firmware/target/arm/imx233/gpmi-imx233.h
+++ b/firmware/target/arm/imx233/gpmi-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/i2c-imx233.c b/firmware/target/arm/imx233/i2c-imx233.c
index d6f0830ede..ef80a109a3 100644
--- a/firmware/target/arm/imx233/i2c-imx233.c
+++ b/firmware/target/arm/imx233/i2c-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  * 
diff --git a/firmware/target/arm/imx233/i2c-imx233.h b/firmware/target/arm/imx233/i2c-imx233.h
index 33e38e38da..4bf9140442 100644
--- a/firmware/target/arm/imx233/i2c-imx233.h
+++ b/firmware/target/arm/imx233/i2c-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  * 
diff --git a/firmware/target/arm/imx233/icoll-imx233.c b/firmware/target/arm/imx233/icoll-imx233.c
index f20ce97ea9..672927817b 100644
--- a/firmware/target/arm/imx233/icoll-imx233.c
+++ b/firmware/target/arm/imx233/icoll-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/icoll-imx233.h b/firmware/target/arm/imx233/icoll-imx233.h
index 1815c70384..c332b930f5 100644
--- a/firmware/target/arm/imx233/icoll-imx233.h
+++ b/firmware/target/arm/imx233/icoll-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/kernel-imx233.c b/firmware/target/arm/imx233/kernel-imx233.c
index 0652d6e640..ea501a3a84 100644
--- a/firmware/target/arm/imx233/kernel-imx233.c
+++ b/firmware/target/arm/imx233/kernel-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/kernel-imx233.h b/firmware/target/arm/imx233/kernel-imx233.h
index 74a6f248f2..a25ff2d149 100644
--- a/firmware/target/arm/imx233/kernel-imx233.h
+++ b/firmware/target/arm/imx233/kernel-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/lcdif-imx233.c b/firmware/target/arm/imx233/lcdif-imx233.c
index 0470079747..34c5477b6a 100644
--- a/firmware/target/arm/imx233/lcdif-imx233.c
+++ b/firmware/target/arm/imx233/lcdif-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/lcdif-imx233.h b/firmware/target/arm/imx233/lcdif-imx233.h
index 74e83bacde..39b12d31c3 100644
--- a/firmware/target/arm/imx233/lcdif-imx233.h
+++ b/firmware/target/arm/imx233/lcdif-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/led-imx233.c b/firmware/target/arm/imx233/led-imx233.c
index 88c2b7e054..6d0e110b69 100644
--- a/firmware/target/arm/imx233/led-imx233.c
+++ b/firmware/target/arm/imx233/led-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2017 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/led-imx233.h b/firmware/target/arm/imx233/led-imx233.h
index 658135c94a..dbc5b1e7d3 100644
--- a/firmware/target/arm/imx233/led-imx233.h
+++ b/firmware/target/arm/imx233/led-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2017 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/lradc-imx233.c b/firmware/target/arm/imx233/lradc-imx233.c
index 268a6ce46b..562a791728 100644
--- a/firmware/target/arm/imx233/lradc-imx233.c
+++ b/firmware/target/arm/imx233/lradc-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/lradc-imx233.h b/firmware/target/arm/imx233/lradc-imx233.h
index fad0eb9121..2f397ea7d9 100644
--- a/firmware/target/arm/imx233/lradc-imx233.h
+++ b/firmware/target/arm/imx233/lradc-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/nand-imx233.c b/firmware/target/arm/imx233/nand-imx233.c
index 22da408e05..d61f99af02 100644
--- a/firmware/target/arm/imx233/nand-imx233.c
+++ b/firmware/target/arm/imx233/nand-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/ocotp-imx233.h b/firmware/target/arm/imx233/ocotp-imx233.h
index ddd7fec228..6d8b756162 100644
--- a/firmware/target/arm/imx233/ocotp-imx233.h
+++ b/firmware/target/arm/imx233/ocotp-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/partitions-imx233.c b/firmware/target/arm/imx233/partitions-imx233.c
index 69d0ba4199..1af9b9eb39 100644
--- a/firmware/target/arm/imx233/partitions-imx233.c
+++ b/firmware/target/arm/imx233/partitions-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/partitions-imx233.h b/firmware/target/arm/imx233/partitions-imx233.h
index edc6c1b2f4..355fa27afb 100644
--- a/firmware/target/arm/imx233/partitions-imx233.h
+++ b/firmware/target/arm/imx233/partitions-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/pcm-imx233.c b/firmware/target/arm/imx233/pcm-imx233.c
index 05103f6a98..0c5b4624f4 100644
--- a/firmware/target/arm/imx233/pcm-imx233.c
+++ b/firmware/target/arm/imx233/pcm-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/pinctrl-imx233.c b/firmware/target/arm/imx233/pinctrl-imx233.c
index 96edf8db84..9866a3756c 100644
--- a/firmware/target/arm/imx233/pinctrl-imx233.c
+++ b/firmware/target/arm/imx233/pinctrl-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/pinctrl-imx233.h b/firmware/target/arm/imx233/pinctrl-imx233.h
index 5ef812b97f..de4d37afa4 100644
--- a/firmware/target/arm/imx233/pinctrl-imx233.h
+++ b/firmware/target/arm/imx233/pinctrl-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/pins/pins-imx233.h b/firmware/target/arm/imx233/pins/pins-imx233.h
index 7a97ea7f11..e7eb9bd8b2 100644
--- a/firmware/target/arm/imx233/pins/pins-imx233.h
+++ b/firmware/target/arm/imx233/pins/pins-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/pins/pins-stmp3600.h b/firmware/target/arm/imx233/pins/pins-stmp3600.h
index 9db0ad9a76..a9329d0d0b 100644
--- a/firmware/target/arm/imx233/pins/pins-stmp3600.h
+++ b/firmware/target/arm/imx233/pins/pins-stmp3600.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/pins/pins-stmp3700.h b/firmware/target/arm/imx233/pins/pins-stmp3700.h
index 23e77bfedb..9d897a4943 100644
--- a/firmware/target/arm/imx233/pins/pins-stmp3700.h
+++ b/firmware/target/arm/imx233/pins/pins-stmp3700.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/power-imx233.c b/firmware/target/arm/imx233/power-imx233.c
index 7f819b5e89..3e40ed6b3e 100644
--- a/firmware/target/arm/imx233/power-imx233.c
+++ b/firmware/target/arm/imx233/power-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/power-imx233.h b/firmware/target/arm/imx233/power-imx233.h
index c3c75b0ab6..64ef85559e 100644
--- a/firmware/target/arm/imx233/power-imx233.h
+++ b/firmware/target/arm/imx233/power-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/powermgmt-imx233.c b/firmware/target/arm/imx233/powermgmt-imx233.c
index 3aee5934b9..6291562400 100644
--- a/firmware/target/arm/imx233/powermgmt-imx233.c
+++ b/firmware/target/arm/imx233/powermgmt-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/powermgmt-imx233.h b/firmware/target/arm/imx233/powermgmt-imx233.h
index 640a8e3740..a69b38fb89 100644
--- a/firmware/target/arm/imx233/powermgmt-imx233.h
+++ b/firmware/target/arm/imx233/powermgmt-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/pwm-imx233.c b/firmware/target/arm/imx233/pwm-imx233.c
index 3704b60ff2..681f1a1010 100644
--- a/firmware/target/arm/imx233/pwm-imx233.c
+++ b/firmware/target/arm/imx233/pwm-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/pwm-imx233.h b/firmware/target/arm/imx233/pwm-imx233.h
index 008cc0f84d..7e6680497d 100644
--- a/firmware/target/arm/imx233/pwm-imx233.h
+++ b/firmware/target/arm/imx233/pwm-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/rtc-imx233.c b/firmware/target/arm/imx233/rtc-imx233.c
index 3672b43a7c..955160db30 100644
--- a/firmware/target/arm/imx233/rtc-imx233.c
+++ b/firmware/target/arm/imx233/rtc-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/rtc-imx233.h b/firmware/target/arm/imx233/rtc-imx233.h
index f681c4b0a9..df9034489c 100644
--- a/firmware/target/arm/imx233/rtc-imx233.h
+++ b/firmware/target/arm/imx233/rtc-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/audio-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/audio-target.h
index 46ae86ae94..1198ac265c 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/audio-target.h
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/audio-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c
index f87dbddfc0..5827e7f6db 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/backlight-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/backlight-target.h
index 483272f804..961266ab71 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/backlight-target.h
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
index 2ded86a967..a31aaaf0a9 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h
index 7a4396e0f2..7d4ac4b095 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c
index 745488c9d0..6f9c3415f5 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c
index fb565dbdcf..f16d9b073a 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-target.h
index 4c3aa0b4e5..a0f5a1f7b5 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-target.h
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
index ceb7b4e090..4e9ef0d4f3 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-target.h
index dbdbf9ae5c..db186a401e 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-target.h
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-fuzeplus.c
index 0515b740b3..5b4aa6b76e 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-fuzeplus.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h
index 4a11afc379..81f79639ab 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sdmmc-imx233.c b/firmware/target/arm/imx233/sdmmc-imx233.c
index 02f59a50f4..6b62f3bab7 100644
--- a/firmware/target/arm/imx233/sdmmc-imx233.c
+++ b/firmware/target/arm/imx233/sdmmc-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
@@ -356,7 +355,7 @@ static bool send_cmd(int drive, uint8_t cmd, uint32_t arg, uint32_t flags, uint3
 
 static int wait_for_state(int drive, unsigned state)
 {
-    unsigned long response;
+    uint32_t response;
     unsigned int timeout = current_tick + 5*HZ;
     int cmd_retry = 10;
     int next_yield = current_tick + MIN_YIELD_PERIOD;
@@ -424,21 +423,21 @@ static int init_sd_card(int drive)
 
         /* ACMD41 For v2 cards set HCS bit[30] & send host voltage range to all */
         if(!send_cmd(drive, SD_APP_OP_COND, (0x00FF8000 | (sd_v2 ? 1<<30 : 0)),
-                MCI_ACMD|MCI_NOCRC|MCI_RESP, &SDMMC_INFO(drive).ocr))
+                MCI_ACMD|MCI_NOCRC|MCI_RESP, (uint32_t*)&SDMMC_INFO(drive).ocr))
             return -100;
     } while(!(SDMMC_INFO(drive).ocr & (1<<31)));
 
     /* CMD2 send CID */
-    if(!send_cmd(drive, SD_ALL_SEND_CID, 0, MCI_RESP|MCI_LONG_RESP, SDMMC_INFO(drive).cid))
+    if(!send_cmd(drive, SD_ALL_SEND_CID, 0, MCI_RESP|MCI_LONG_RESP, (uint32_t*)SDMMC_INFO(drive).cid))
         return -3;
 
     /* CMD3 send RCA */
-    if(!send_cmd(drive, SD_SEND_RELATIVE_ADDR, 0, MCI_RESP, &SDMMC_INFO(drive).rca))
+    if(!send_cmd(drive, SD_SEND_RELATIVE_ADDR, 0, MCI_RESP, (uint32_t*)&SDMMC_INFO(drive).rca))
         return -4;
 
     /* CMD9 send CSD */
     if(!send_cmd(drive, SD_SEND_CSD, SDMMC_RCA(drive), MCI_RESP|MCI_LONG_RESP,
-            SDMMC_INFO(drive).csd))
+            (uint32_t*)SDMMC_INFO(drive).csd))
         return -9;
 
     sd_parse_csd(&SDMMC_INFO(drive));
diff --git a/firmware/target/arm/imx233/sdmmc-imx233.h b/firmware/target/arm/imx233/sdmmc-imx233.h
index d5c2bccd84..d978ecaa6c 100644
--- a/firmware/target/arm/imx233/sdmmc-imx233.h
+++ b/firmware/target/arm/imx233/sdmmc-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  * 
diff --git a/firmware/target/arm/imx233/sony-nwz/audio-target.h b/firmware/target/arm/imx233/sony-nwz/audio-target.h
index 59e8fd6f01..a4d6e62da9 100644
--- a/firmware/target/arm/imx233/sony-nwz/audio-target.h
+++ b/firmware/target/arm/imx233/sony-nwz/audio-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sony-nwz/backlight-nwz.c b/firmware/target/arm/imx233/sony-nwz/backlight-nwz.c
index 2e7cc49ad1..8ea51814ae 100644
--- a/firmware/target/arm/imx233/sony-nwz/backlight-nwz.c
+++ b/firmware/target/arm/imx233/sony-nwz/backlight-nwz.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sony-nwz/backlight-target.h b/firmware/target/arm/imx233/sony-nwz/backlight-target.h
index 60a2fbe746..d708cb2e36 100644
--- a/firmware/target/arm/imx233/sony-nwz/backlight-target.h
+++ b/firmware/target/arm/imx233/sony-nwz/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sony-nwz/button-nwz.c b/firmware/target/arm/imx233/sony-nwz/button-nwz.c
index a1110af6b8..3844dee1ec 100644
--- a/firmware/target/arm/imx233/sony-nwz/button-nwz.c
+++ b/firmware/target/arm/imx233/sony-nwz/button-nwz.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sony-nwz/button-target.h b/firmware/target/arm/imx233/sony-nwz/button-target.h
index cbe04a051b..32f8450033 100644
--- a/firmware/target/arm/imx233/sony-nwz/button-target.h
+++ b/firmware/target/arm/imx233/sony-nwz/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sony-nwz/debug-nwz.c b/firmware/target/arm/imx233/sony-nwz/debug-nwz.c
index acb1cfca37..aaedef6e39 100644
--- a/firmware/target/arm/imx233/sony-nwz/debug-nwz.c
+++ b/firmware/target/arm/imx233/sony-nwz/debug-nwz.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sony-nwz/fmradio-target.h b/firmware/target/arm/imx233/sony-nwz/fmradio-target.h
index e6869dc2a5..55741e974b 100644
--- a/firmware/target/arm/imx233/sony-nwz/fmradio-target.h
+++ b/firmware/target/arm/imx233/sony-nwz/fmradio-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sony-nwz/lcd-nwze360.c b/firmware/target/arm/imx233/sony-nwz/lcd-nwze360.c
index 8f49bfa3eb..40e721af40 100644
--- a/firmware/target/arm/imx233/sony-nwz/lcd-nwze360.c
+++ b/firmware/target/arm/imx233/sony-nwz/lcd-nwze360.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sony-nwz/lcd-nwze370.c b/firmware/target/arm/imx233/sony-nwz/lcd-nwze370.c
index e7f7e1e8a0..516b6dbc0d 100644
--- a/firmware/target/arm/imx233/sony-nwz/lcd-nwze370.c
+++ b/firmware/target/arm/imx233/sony-nwz/lcd-nwze370.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sony-nwz/lcd-target.h b/firmware/target/arm/imx233/sony-nwz/lcd-target.h
index 931fcb32a0..c7b81478f8 100644
--- a/firmware/target/arm/imx233/sony-nwz/lcd-target.h
+++ b/firmware/target/arm/imx233/sony-nwz/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sony-nwz/powermgmt-nwze360.c b/firmware/target/arm/imx233/sony-nwz/powermgmt-nwze360.c
index 3b6857eb9c..9ca738b695 100644
--- a/firmware/target/arm/imx233/sony-nwz/powermgmt-nwze360.c
+++ b/firmware/target/arm/imx233/sony-nwz/powermgmt-nwze360.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sony-nwz/powermgmt-nwze370.c b/firmware/target/arm/imx233/sony-nwz/powermgmt-nwze370.c
index 073f759f51..391aa273a0 100644
--- a/firmware/target/arm/imx233/sony-nwz/powermgmt-nwze370.c
+++ b/firmware/target/arm/imx233/sony-nwz/powermgmt-nwze370.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/sony-nwz/powermgmt-target.h b/firmware/target/arm/imx233/sony-nwz/powermgmt-target.h
index 268423b433..91f304c53e 100644
--- a/firmware/target/arm/imx233/sony-nwz/powermgmt-target.h
+++ b/firmware/target/arm/imx233/sony-nwz/powermgmt-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/ssp-imx233.c b/firmware/target/arm/imx233/ssp-imx233.c
index e2efab5e9f..96aa7d0e8a 100644
--- a/firmware/target/arm/imx233/ssp-imx233.c
+++ b/firmware/target/arm/imx233/ssp-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/ssp-imx233.h b/firmware/target/arm/imx233/ssp-imx233.h
index 5686dcd477..b52bccfb5e 100644
--- a/firmware/target/arm/imx233/ssp-imx233.h
+++ b/firmware/target/arm/imx233/ssp-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  * 
diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c
index a8a6a748ce..0bb62639d0 100644
--- a/firmware/target/arm/imx233/system-imx233.c
+++ b/firmware/target/arm/imx233/system-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/system-target.h b/firmware/target/arm/imx233/system-target.h
index 3c7bbc6f37..44e2bfd862 100644
--- a/firmware/target/arm/imx233/system-target.h
+++ b/firmware/target/arm/imx233/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/timer-imx233.c b/firmware/target/arm/imx233/timer-imx233.c
index 57d38c01a6..34d99dd847 100644
--- a/firmware/target/arm/imx233/timer-imx233.c
+++ b/firmware/target/arm/imx233/timer-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/timrot-imx233.c b/firmware/target/arm/imx233/timrot-imx233.c
index 91f24924d6..b1309c5a4f 100644
--- a/firmware/target/arm/imx233/timrot-imx233.c
+++ b/firmware/target/arm/imx233/timrot-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/timrot-imx233.h b/firmware/target/arm/imx233/timrot-imx233.h
index 0add64e9ce..44288a34cb 100644
--- a/firmware/target/arm/imx233/timrot-imx233.h
+++ b/firmware/target/arm/imx233/timrot-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/touchscreen-imx233.c b/firmware/target/arm/imx233/touchscreen-imx233.c
index 561b2c750a..dd3575ff37 100644
--- a/firmware/target/arm/imx233/touchscreen-imx233.c
+++ b/firmware/target/arm/imx233/touchscreen-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/touchscreen-imx233.h b/firmware/target/arm/imx233/touchscreen-imx233.h
index faf957db30..aea91ae02a 100644
--- a/firmware/target/arm/imx233/touchscreen-imx233.h
+++ b/firmware/target/arm/imx233/touchscreen-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx233/uartdbg-imx233.c b/firmware/target/arm/imx233/uartdbg-imx233.c
index e1cf533d3e..d6b6df52bc 100644
--- a/firmware/target/arm/imx233/uartdbg-imx233.c
+++ b/firmware/target/arm/imx233/uartdbg-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Lorenzo Miori
  *
diff --git a/firmware/target/arm/imx233/uartdbg-imx233.h b/firmware/target/arm/imx233/uartdbg-imx233.h
index 91993b2bf3..dac2b17514 100644
--- a/firmware/target/arm/imx233/uartdbg-imx233.h
+++ b/firmware/target/arm/imx233/uartdbg-imx233.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Lorenzo Miori
  *
diff --git a/firmware/target/arm/imx233/usb-imx233.c b/firmware/target/arm/imx233/usb-imx233.c
index 05e412c77a..da218b6870 100644
--- a/firmware/target/arm/imx233/usb-imx233.c
+++ b/firmware/target/arm/imx233/usb-imx233.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/firmware/target/arm/imx31/app.lds b/firmware/target/arm/imx31/app.lds
index 56d0f435d1..00124b576f 100644
--- a/firmware/target/arm/imx31/app.lds
+++ b/firmware/target/arm/imx31/app.lds
@@ -1,3 +1,4 @@
+#define __ASSEMBLER__
 #include "config.h"
 
 ENTRY(start)
diff --git a/firmware/target/arm/imx31/ata-imx31.c b/firmware/target/arm/imx31/ata-imx31.c
index ac29cf5770..f08d112218 100644
--- a/firmware/target/arm/imx31/ata-imx31.c
+++ b/firmware/target/arm/imx31/ata-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Will Robertson
  *
diff --git a/firmware/target/arm/imx31/ata-target.h b/firmware/target/arm/imx31/ata-target.h
index 9363a8579c..ca199f07d4 100644
--- a/firmware/target/arm/imx31/ata-target.h
+++ b/firmware/target/arm/imx31/ata-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/imx31/avic-imx31.c b/firmware/target/arm/imx31/avic-imx31.c
index 5b0aad434c..9ef0255619 100644
--- a/firmware/target/arm/imx31/avic-imx31.c
+++ b/firmware/target/arm/imx31/avic-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by James Espinoza
  *
diff --git a/firmware/target/arm/imx31/avic-imx31.h b/firmware/target/arm/imx31/avic-imx31.h
index 50b04635ee..5c001c186f 100644
--- a/firmware/target/arm/imx31/avic-imx31.h
+++ b/firmware/target/arm/imx31/avic-imx31.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by James Espinoza
  *
diff --git a/firmware/target/arm/imx31/boot.lds b/firmware/target/arm/imx31/boot.lds
index f6e3abc029..0e831765ec 100644
--- a/firmware/target/arm/imx31/boot.lds
+++ b/firmware/target/arm/imx31/boot.lds
@@ -1,3 +1,4 @@
+#define __ASSEMBLER__
 #include "config.h"
 #include "imx31l.h"
 
diff --git a/firmware/target/arm/imx31/ccm-imx31.c b/firmware/target/arm/imx31/ccm-imx31.c
index 00a7d859b1..dd79c98dfb 100644
--- a/firmware/target/arm/imx31/ccm-imx31.c
+++ b/firmware/target/arm/imx31/ccm-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2008 Michael Sevakis
  *
@@ -32,7 +31,7 @@ enum IMX31_PLLS ccm_get_src_pll(void)
 
 void ccm_module_clock_gating(enum IMX31_CG_LIST cg, enum IMX31_CG_MODES mode)
 {
-    volatile unsigned long *reg;
+    volatile uint32_t *reg;
     unsigned long mask;
     int shift;
 
@@ -112,7 +111,7 @@ unsigned int ccm_get_ata_clk(void)
 void ccm_set_mcupll_and_pdr(unsigned long pllctl, unsigned long pdr)
 {
     unsigned int pll = ccm_get_src_pll();
-    volatile unsigned long *pllreg = &(&CCM_MPCTL)[pll];
+    volatile uint32_t *pllreg = &(&CCM_MPCTL)[pll];
     unsigned long fref = ccm_get_pll_ref_clk_rate();
     unsigned long curfreq = ccm_calc_pll_rate(fref, *pllreg);
     unsigned long newfreq = ccm_calc_pll_rate(fref, pllctl);
diff --git a/firmware/target/arm/imx31/ccm-imx31.h b/firmware/target/arm/imx31/ccm-imx31.h
index 400f6cad5d..2a8dfe61be 100644
--- a/firmware/target/arm/imx31/ccm-imx31.h
+++ b/firmware/target/arm/imx31/ccm-imx31.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2008 Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/crt0.S b/firmware/target/arm/imx31/crt0.S
index 4e489800d4..3d63b149dd 100644
--- a/firmware/target/arm/imx31/crt0.S
+++ b/firmware/target/arm/imx31/crt0.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/imx31/debug-imx31.c b/firmware/target/arm/imx31/debug-imx31.c
index cffa3fa483..f9b7323ae1 100644
--- a/firmware/target/arm/imx31/debug-imx31.c
+++ b/firmware/target/arm/imx31/debug-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/dvfs_dptc-imx31.c b/firmware/target/arm/imx31/dvfs_dptc-imx31.c
index 3f9e9a3dd8..20431143e0 100644
--- a/firmware/target/arm/imx31/dvfs_dptc-imx31.c
+++ b/firmware/target/arm/imx31/dvfs_dptc-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Michael Sevakis
  *
@@ -620,7 +619,7 @@ void dvfs_int_mask(bool mask)
 /* Set a signal load tracking weight */
 void dvfs_set_lt_weight(enum DVFS_LT_SIGS index, unsigned long value)
 {
-    volatile unsigned long *reg_p = &CCM_LTR2;
+    volatile uint32_t *reg_p = &CCM_LTR2;
     unsigned int shift = 3 * index;
 
     if (index < 9)
@@ -639,7 +638,7 @@ void dvfs_set_lt_weight(enum DVFS_LT_SIGS index, unsigned long value)
 /* Return a signal load tracking weight */
 unsigned long dvfs_get_lt_weight(enum DVFS_LT_SIGS index)
 {
-    volatile unsigned long *reg_p = &CCM_LTR2;
+    volatile uint32_t *reg_p = &CCM_LTR2;
     unsigned int shift = 3 * index;
 
     if (index < 9)
diff --git a/firmware/target/arm/imx31/dvfs_dptc-imx31.h b/firmware/target/arm/imx31/dvfs_dptc-imx31.h
index 8c599fe402..f5276f2262 100644
--- a/firmware/target/arm/imx31/dvfs_dptc-imx31.h
+++ b/firmware/target/arm/imx31/dvfs_dptc-imx31.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c
index 2a89a82e46..8325b54e88 100644
--- a/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/adc-target.h b/firmware/target/arm/imx31/gigabeat-s/adc-target.h
index dbca920b26..92d4eca7cf 100644
--- a/firmware/target/arm/imx31/gigabeat-s/adc-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/audio-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/audio-gigabeat-s.c
index 9587b5683c..02885eb79d 100644
--- a/firmware/target/arm/imx31/gigabeat-s/audio-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/audio-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Nils Wallménius
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c
index 29d8980d86..46d7d539b2 100644
--- a/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/backlight-target.h b/firmware/target/arm/imx31/gigabeat-s/backlight-target.h
index 124fa87b17..4d598b1e12 100644
--- a/firmware/target/arm/imx31/gigabeat-s/backlight-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c
index cdd6da041b..ac3374b1cf 100644
--- a/firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
@@ -35,7 +34,7 @@
 static bool initialized     = false;
 #endif
 
-static unsigned long ext_btn = BUTTON_NONE; /* Buttons not on KPP */
+static uint32_t ext_btn = BUTTON_NONE; /* Buttons not on KPP */
 static bool hold_button     = false;
 #ifndef BOOTLOADER
 static bool hold_button_old = false;
diff --git a/firmware/target/arm/imx31/gigabeat-s/button-target.h b/firmware/target/arm/imx31/gigabeat-s/button-target.h
index fba02d5dd2..af129e5f44 100644
--- a/firmware/target/arm/imx31/gigabeat-s/button-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/dvfs_dptc_tables-target.h b/firmware/target/arm/imx31/gigabeat-s/dvfs_dptc_tables-target.h
index f81ef83ac7..62625c724d 100644
--- a/firmware/target/arm/imx31/gigabeat-s/dvfs_dptc_tables-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/dvfs_dptc_tables-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c
index c84f1cf41c..b2d6c1b83b 100644
--- a/firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Physical interface of the SI4700 in the Gigabeat S
  *
  * Copyright (C) 2008 by Nils Wallménius
diff --git a/firmware/target/arm/imx31/gigabeat-s/gpio-target.h b/firmware/target/arm/imx31/gigabeat-s/gpio-target.h
index 9204e6cd9d..042aa8fdd4 100644
--- a/firmware/target/arm/imx31/gigabeat-s/gpio-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/gpio-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/headphone-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/headphone-gigabeat-s.c
index 712e7eac8d..530fa7f663 100644
--- a/firmware/target/arm/imx31/gigabeat-s/headphone-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/headphone-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2009 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/i2s-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/i2s-gigabeat-s.c
index 723999c15e..d8bfacdfdd 100644
--- a/firmware/target/arm/imx31/gigabeat-s/i2s-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/i2s-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c
index 491bd52a66..f3a3b988fe 100644
--- a/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
index a9d981c7e1..d3d12a9e75 100644
--- a/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Will Robertson
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-target.h b/firmware/target/arm/imx31/gigabeat-s/lcd-target.h
index 9cf7fa38e2..b5a42bb8e8 100644
--- a/firmware/target/arm/imx31/gigabeat-s/lcd-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Greg White
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/mc13783-target.h b/firmware/target/arm/imx31/gigabeat-s/mc13783-target.h
index e656e4e08f..8bedf1b409 100644
--- a/firmware/target/arm/imx31/gigabeat-s/mc13783-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/mc13783-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
index e9eae4d67c..25d149f74d 100644
--- a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c
index 81f150acd7..1cb41b5ae8 100644
--- a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
@@ -33,7 +32,7 @@
 #include "fmradio_i2c.h"
 #endif
 
-static unsigned long power_status = POWER_INPUT_NONE;
+static uint32_t power_status = POWER_INPUT_NONE;
 
 /* Detect which power sources are present. */
 unsigned int power_input_status(void)
diff --git a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.h b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.h
index 2cd509267c..a5a54fefd2 100644
--- a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.h
+++ b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Nils Wallménius
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c
index 20b33fe2f7..1199cc55ed 100644
--- a/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h b/firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h
index a45d1b712f..eb79c92a05 100644
--- a/firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
index f6f57775a7..4ae9439134 100644
--- a/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by James Espinoza
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-target.h b/firmware/target/arm/imx31/gigabeat-s/system-target.h
index db3bcc8858..0c620da158 100644
--- a/firmware/target/arm/imx31/gigabeat-s/system-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Greg White
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/timer-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/timer-gigabeat-s.c
index f3f78a1ee1..f95dc48d4a 100644
--- a/firmware/target/arm/imx31/gigabeat-s/timer-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/timer-gigabeat-s.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 by Michael Sevakis
 *
diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
index 737ee36e00..0710b64d14 100644
--- a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/imx31/gigabeat-s/wmcodec-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/wmcodec-gigabeat-s.c
index ca23aa4e56..a9da41f063 100644
--- a/firmware/target/arm/imx31/gigabeat-s/wmcodec-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/wmcodec-gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Gigabeat S specific code for the WM8978 codec
  *
diff --git a/firmware/target/arm/imx31/gpio-imx31.c b/firmware/target/arm/imx31/gpio-imx31.c
index 7a7363be88..867afa3b91 100644
--- a/firmware/target/arm/imx31/gpio-imx31.c
+++ b/firmware/target/arm/imx31/gpio-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2008 by Michael Sevakis
  *
@@ -44,7 +43,7 @@ static __attribute__((interrupt("IRQ"))) void GPIO3_HANDLER(void);
 
 static struct gpio_module_desc
 {
-    volatile unsigned long * const base;    /* Module base address */
+    volatile uint32_t * const base;    /* Module base address */
     void (* const handler)(void);           /* Interrupt function */
     const struct gpio_event *events;        /* Event handler list */
     unsigned long enabled;                  /* Enabled event mask */
@@ -55,7 +54,7 @@ static struct gpio_module_desc
 {
 #if (GPIO_EVENT_MASK & USE_GPIO1_EVENTS)
     [GPIO1_NUM] = &(struct gpio_module_desc) {
-        .base         = (unsigned long *)GPIO1_BASE_ADDR,
+        .base         = (uint32_t *)GPIO1_BASE_ADDR,
         .ints         = INT_GPIO1,
         .handler      = GPIO1_HANDLER,
         .int_priority = GPIO1_INT_PRIO
@@ -63,7 +62,7 @@ static struct gpio_module_desc
 #endif
 #if (GPIO_EVENT_MASK & USE_GPIO2_EVENTS)
     [GPIO2_NUM] = &(struct gpio_module_desc) {
-        .base         = (unsigned long *)GPIO2_BASE_ADDR,
+        .base         = (uint32_t *)GPIO2_BASE_ADDR,
         .ints         = INT_GPIO2,
         .handler      = GPIO2_HANDLER,
         .int_priority = GPIO2_INT_PRIO
@@ -71,7 +70,7 @@ static struct gpio_module_desc
 #endif
 #if (GPIO_EVENT_MASK & USE_GPIO3_EVENTS)
     [GPIO3_NUM] = &(struct gpio_module_desc) {
-        .base         = (unsigned long *)GPIO3_BASE_ADDR,
+        .base         = (uint32_t *)GPIO3_BASE_ADDR,
         .ints         = INT_GPIO3,
         .handler      = GPIO3_HANDLER,
         .int_priority = GPIO3_INT_PRIO,
@@ -97,7 +96,7 @@ static const struct gpio_event * event_from_id(
 static void gpio_call_events(enum gpio_module_number gpio)
 {
     const struct gpio_module_desc * const desc = gpio_descs[gpio];
-    volatile unsigned long * const base = desc->base;
+    volatile uint32_t * const base = desc->base;
 
     /* Send only events that are not masked */
     unsigned long pnd = base[GPIO_ISR] & base[GPIO_IMR];
@@ -180,7 +179,7 @@ bool gpio_enable_event(enum gpio_id id, bool enable)
     if (!event)
         return false;
 
-    volatile unsigned long * const base = desc->base;
+    volatile uint32_t * const base = desc->base;
     unsigned long num = id % 32;
     unsigned long mask = 1ul << num;
 
@@ -205,7 +204,7 @@ bool gpio_enable_event(enum gpio_id id, bool enable)
         }
         else
         {
-            volatile unsigned long *icrp = &base[GPIO_ICR + num / 16];
+            volatile uint32_t *icrp = &base[GPIO_ICR + num / 16];
             unsigned int shift = 2*(num % 16);
             bitmod32(icrp, event->sense << shift, 0x3 << shift);
             base[GPIO_EDGE_SEL] &= ~mask;
diff --git a/firmware/target/arm/imx31/gpio-imx31.h b/firmware/target/arm/imx31/gpio-imx31.h
index e02896f4c3..b282e81fe7 100644
--- a/firmware/target/arm/imx31/gpio-imx31.h
+++ b/firmware/target/arm/imx31/gpio-imx31.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2008 by Michael Sevakis
  *
@@ -191,10 +190,10 @@ struct gpio_event
 #endif /* DEFINE_GPIO_VECTOR_TABLE */
 
 #define GPIO_BASE_ADDR \
-    (volatile unsigned long * const [GPIO_NUM_GPIO]) { \
-        (volatile unsigned long *)GPIO1_BASE_ADDR,     \
-        (volatile unsigned long *)GPIO2_BASE_ADDR,     \
-        (volatile unsigned long *)GPIO3_BASE_ADDR }
+    (volatile uint32_t * const [GPIO_NUM_GPIO]) { \
+        (volatile uint32_t *)GPIO1_BASE_ADDR,     \
+        (volatile uint32_t *)GPIO2_BASE_ADDR,     \
+        (volatile uint32_t *)GPIO3_BASE_ADDR }
 
 #define GPIO_DR       (0x00 / sizeof (unsigned long)) /* 00h        */
 #define GPIO_GDIR     (0x04 / sizeof (unsigned long)) /* 04h        */
diff --git a/firmware/target/arm/imx31/i2c-imx31.c b/firmware/target/arm/imx31/i2c-imx31.c
index ce5e4cc8f8..6900aad1d7 100644
--- a/firmware/target/arm/imx31/i2c-imx31.c
+++ b/firmware/target/arm/imx31/i2c-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/i2c-imx31.h b/firmware/target/arm/imx31/i2c-imx31.h
index dad5a3da00..4094d66076 100644
--- a/firmware/target/arm/imx31/i2c-imx31.h
+++ b/firmware/target/arm/imx31/i2c-imx31.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/iomuxc-imx31.c b/firmware/target/arm/imx31/iomuxc-imx31.c
index 412693e221..58d8a2b504 100644
--- a/firmware/target/arm/imx31/iomuxc-imx31.c
+++ b/firmware/target/arm/imx31/iomuxc-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2010 Michael Sevakis
  *
@@ -32,7 +31,7 @@ void iomuxc_set_pin_mux(enum IMX31_IOMUXC_PINS pin,
     unsigned long index = pin / 4;
     unsigned int shift = 8*(pin % 4);
 
-    bitmod32((unsigned long *)(IOMUXC_BASE_ADDR + 0xc) + index,
+    bitmod32((uint32_t *)(IOMUXC_BASE_ADDR + 0xc) + index,
               mux << shift, IOMUXC_MUX_MASK << shift);
 }
 
@@ -45,6 +44,6 @@ void iomuxc_set_pad_config(enum IMX31_IOMUXC_PINS pin,
     unsigned long index = padoffs / 3;
     unsigned int shift = 10*(padoffs % 3);
 
-    bitmod32((unsigned long *)(IOMUXC_BASE_ADDR + 0x154) + index,
+    bitmod32((uint32_t *)(IOMUXC_BASE_ADDR + 0x154) + index,
              config << shift, IOMUXC_PAD_MASK << shift);
 }
diff --git a/firmware/target/arm/imx31/iomuxc-imx31.h b/firmware/target/arm/imx31/iomuxc-imx31.h
index 198b55d774..3c396a0593 100644
--- a/firmware/target/arm/imx31/iomuxc-imx31.h
+++ b/firmware/target/arm/imx31/iomuxc-imx31.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2010 Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/mc13783-imx31.c b/firmware/target/arm/imx31/mc13783-imx31.c
index 6bf0b878f4..4f45996097 100644
--- a/firmware/target/arm/imx31/mc13783-imx31.c
+++ b/firmware/target/arm/imx31/mc13783-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/mmu-imx31.c b/firmware/target/arm/imx31/mmu-imx31.c
index 920a8c9fd3..c7d462bee6 100644
--- a/firmware/target/arm/imx31/mmu-imx31.c
+++ b/firmware/target/arm/imx31/mmu-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Will Robertson
  *
diff --git a/firmware/target/arm/imx31/mmu-imx31.h b/firmware/target/arm/imx31/mmu-imx31.h
index c66a3d941d..3b87691662 100644
--- a/firmware/target/arm/imx31/mmu-imx31.h
+++ b/firmware/target/arm/imx31/mmu-imx31.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006,2007 by Greg White
  *
diff --git a/firmware/target/arm/imx31/rolo_restart_firmware.S b/firmware/target/arm/imx31/rolo_restart_firmware.S
index 79d335ac46..15a899380b 100644
--- a/firmware/target/arm/imx31/rolo_restart_firmware.S
+++ b/firmware/target/arm/imx31/rolo_restart_firmware.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/rtc-target.h b/firmware/target/arm/imx31/rtc-target.h
index b6dc46204d..c737eca4f8 100644
--- a/firmware/target/arm/imx31/rtc-target.h
+++ b/firmware/target/arm/imx31/rtc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/sdma-imx31.c b/firmware/target/arm/imx31/sdma-imx31.c
index d3e6233a4b..fe10bbe8a3 100644
--- a/firmware/target/arm/imx31/sdma-imx31.c
+++ b/firmware/target/arm/imx31/sdma-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sevakis
  *
@@ -36,7 +35,7 @@
 /* Cut down to bare bones essentials */
 
 /* Mask of channels with callback enabled */
-static unsigned long sdma_enabled_ints = 0;
+static uint32_t sdma_enabled_ints = 0;
 /* One channel control block per channel in physically mapped device RAM */
 static struct channel_control_block ccb_array[CH_NUM] NOCACHEBSS_ATTR;
 /* Channel 0 (command channel) data */
diff --git a/firmware/target/arm/imx31/sdma-imx31.h b/firmware/target/arm/imx31/sdma-imx31.h
index 17c1b9e4f8..6b4654530f 100644
--- a/firmware/target/arm/imx31/sdma-imx31.h
+++ b/firmware/target/arm/imx31/sdma-imx31.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/sdma_script_code.h b/firmware/target/arm/imx31/sdma_script_code.h
index ee61b2d116..0bab8d96d8 100644
--- a/firmware/target/arm/imx31/sdma_script_code.h
+++ b/firmware/target/arm/imx31/sdma_script_code.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/sdma_struct.h b/firmware/target/arm/imx31/sdma_struct.h
index f157072392..2fccb921f0 100644
--- a/firmware/target/arm/imx31/sdma_struct.h
+++ b/firmware/target/arm/imx31/sdma_struct.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sevakis
  *
diff --git a/firmware/target/arm/imx31/serial-imx31.h b/firmware/target/arm/imx31/serial-imx31.h
index cbb7be2ec3..c776e883f8 100644
--- a/firmware/target/arm/imx31/serial-imx31.h
+++ b/firmware/target/arm/imx31/serial-imx31.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by James Espinoza
  *
diff --git a/firmware/target/arm/imx31/spi-imx31.c b/firmware/target/arm/imx31/spi-imx31.c
index bc2e4d31e0..55921f9de4 100644
--- a/firmware/target/arm/imx31/spi-imx31.c
+++ b/firmware/target/arm/imx31/spi-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2007 Will Robertson
  *
diff --git a/firmware/target/arm/imx31/spi-imx31.h b/firmware/target/arm/imx31/spi-imx31.h
index 6d07165d3d..a4f139c356 100644
--- a/firmware/target/arm/imx31/spi-imx31.h
+++ b/firmware/target/arm/imx31/spi-imx31.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2007 Will Robertson
  *
diff --git a/firmware/target/arm/imx31/uart-imx31.c b/firmware/target/arm/imx31/uart-imx31.c
index c54ac0c0ce..c1abb50c07 100644
--- a/firmware/target/arm/imx31/uart-imx31.c
+++ b/firmware/target/arm/imx31/uart-imx31.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
diff --git a/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c b/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c
index 4a9fe2e568..7f6f4cb0b2 100644
--- a/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c
+++ b/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jens Arnold
  *
diff --git a/firmware/target/arm/ipod/1g2g/adc-target.h b/firmware/target/arm/ipod/1g2g/adc-target.h
index 5b0ce4b4ae..b4dd97622a 100644
--- a/firmware/target/arm/ipod/1g2g/adc-target.h
+++ b/firmware/target/arm/ipod/1g2g/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jens Arnold
  *
diff --git a/firmware/target/arm/ipod/1g2g/backlight-1g2g.c b/firmware/target/arm/ipod/1g2g/backlight-1g2g.c
index 7f1fa7ba42..5a8bdf5dff 100644
--- a/firmware/target/arm/ipod/1g2g/backlight-1g2g.c
+++ b/firmware/target/arm/ipod/1g2g/backlight-1g2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/ipod/1g2g/backlight-target.h b/firmware/target/arm/ipod/1g2g/backlight-target.h
index e888aa7c3f..4658152612 100644
--- a/firmware/target/arm/ipod/1g2g/backlight-target.h
+++ b/firmware/target/arm/ipod/1g2g/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c b/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c
index 79714c22e9..27dc1db4ae 100644
--- a/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c
+++ b/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/ipod/3g/backlight-3g.c b/firmware/target/arm/ipod/3g/backlight-3g.c
index fcc162310f..3fb9f9f5a9 100644
--- a/firmware/target/arm/ipod/3g/backlight-3g.c
+++ b/firmware/target/arm/ipod/3g/backlight-3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/ipod/adc-ipod-pcf.c b/firmware/target/arm/ipod/adc-ipod-pcf.c
index 5040e21fd8..114e532b24 100644
--- a/firmware/target/arm/ipod/adc-ipod-pcf.c
+++ b/firmware/target/arm/ipod/adc-ipod-pcf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/ipod/adc-target.h b/firmware/target/arm/ipod/adc-target.h
index 6fa887708e..73850589d4 100644
--- a/firmware/target/arm/ipod/adc-target.h
+++ b/firmware/target/arm/ipod/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/ipod/backlight-4g_color.c b/firmware/target/arm/ipod/backlight-4g_color.c
index 96ed387625..712ed1ce41 100644
--- a/firmware/target/arm/ipod/backlight-4g_color.c
+++ b/firmware/target/arm/ipod/backlight-4g_color.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/ipod/backlight-mini1g_mini2g.c b/firmware/target/arm/ipod/backlight-mini1g_mini2g.c
index 143be32e91..9f49ec680c 100644
--- a/firmware/target/arm/ipod/backlight-mini1g_mini2g.c
+++ b/firmware/target/arm/ipod/backlight-mini1g_mini2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/ipod/backlight-nano_video.c b/firmware/target/arm/ipod/backlight-nano_video.c
index e2e9bf0341..7baec1ef54 100644
--- a/firmware/target/arm/ipod/backlight-nano_video.c
+++ b/firmware/target/arm/ipod/backlight-nano_video.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/ipod/backlight-target.h b/firmware/target/arm/ipod/backlight-target.h
index 133663d279..73b4259b3c 100644
--- a/firmware/target/arm/ipod/backlight-target.h
+++ b/firmware/target/arm/ipod/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/ipod/button-1g-3g.c b/firmware/target/arm/ipod/button-1g-3g.c
index 34d63ec495..1cc33fdd3b 100644
--- a/firmware/target/arm/ipod/button-1g-3g.c
+++ b/firmware/target/arm/ipod/button-1g-3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c
index 3014405bbd..4c54e556cd 100644
--- a/firmware/target/arm/ipod/button-clickwheel.c
+++ b/firmware/target/arm/ipod/button-clickwheel.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
diff --git a/firmware/target/arm/ipod/button-mini1g.c b/firmware/target/arm/ipod/button-mini1g.c
index d4fc1327a9..5614e53dd0 100644
--- a/firmware/target/arm/ipod/button-mini1g.c
+++ b/firmware/target/arm/ipod/button-mini1g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
diff --git a/firmware/target/arm/ipod/button-target.h b/firmware/target/arm/ipod/button-target.h
index 75bc191608..4066663498 100644
--- a/firmware/target/arm/ipod/button-target.h
+++ b/firmware/target/arm/ipod/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/ipod/lcd-as-color-nano.S b/firmware/target/arm/ipod/lcd-as-color-nano.S
index f6f9cc5be3..9e4a5f253b 100644
--- a/firmware/target/arm/ipod/lcd-as-color-nano.S
+++ b/firmware/target/arm/ipod/lcd-as-color-nano.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2010-2011 by Andree Buschmann
  *
diff --git a/firmware/target/arm/ipod/lcd-as-gray.S b/firmware/target/arm/ipod/lcd-as-gray.S
index cfd179a714..87019dfe3d 100644
--- a/firmware/target/arm/ipod/lcd-as-gray.S
+++ b/firmware/target/arm/ipod/lcd-as-gray.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/arm/ipod/lcd-color_nano.c b/firmware/target/arm/ipod/lcd-color_nano.c
index 67d26aa862..7ef9d6571c 100644
--- a/firmware/target/arm/ipod/lcd-color_nano.c
+++ b/firmware/target/arm/ipod/lcd-color_nano.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Rockbox driver for iPod LCDs
  *
diff --git a/firmware/target/arm/ipod/lcd-gray.c b/firmware/target/arm/ipod/lcd-gray.c
index 883897b997..a5122fc0d0 100644
--- a/firmware/target/arm/ipod/lcd-gray.c
+++ b/firmware/target/arm/ipod/lcd-gray.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Rockbox driver for iPod LCDs
  *
diff --git a/firmware/target/arm/ipod/piezo.c b/firmware/target/arm/ipod/piezo.c
index 40a685c489..01e74fa46e 100644
--- a/firmware/target/arm/ipod/piezo.c
+++ b/firmware/target/arm/ipod/piezo.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Robert Keevil
  *
diff --git a/firmware/target/arm/ipod/piezo.h b/firmware/target/arm/ipod/piezo.h
index 9dceac13cb..2a5502ae1e 100644
--- a/firmware/target/arm/ipod/piezo.h
+++ b/firmware/target/arm/ipod/piezo.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Robert Keevil
  *
diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c
index 34adf3315a..c27bc56e89 100644
--- a/firmware/target/arm/ipod/power-ipod.c
+++ b/firmware/target/arm/ipod/power-ipod.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/ipod/powermgmt-ipod-pcf.c b/firmware/target/arm/ipod/powermgmt-ipod-pcf.c
index 32f0539a97..2d82df6cf9 100644
--- a/firmware/target/arm/ipod/powermgmt-ipod-pcf.c
+++ b/firmware/target/arm/ipod/powermgmt-ipod-pcf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/ipod/video/battery-video.c b/firmware/target/arm/ipod/video/battery-video.c
index b4c460284b..4441882161 100644
--- a/firmware/target/arm/ipod/video/battery-video.c
+++ b/firmware/target/arm/ipod/video/battery-video.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id $
  *
  * Default battery capacity for ipod video
  *
diff --git a/firmware/target/arm/ipod/video/lcd-as-video.S b/firmware/target/arm/ipod/video/lcd-as-video.S
index dcef7c0a95..5e630f4bcd 100644
--- a/firmware/target/arm/ipod/video/lcd-as-video.S
+++ b/firmware/target/arm/ipod/video/lcd-as-video.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Andree Buschmann
  *
diff --git a/firmware/target/arm/ipod/video/lcd-video.c b/firmware/target/arm/ipod/video/lcd-video.c
index 27d889aafa..5ab9498e42 100644
--- a/firmware/target/arm/ipod/video/lcd-video.c
+++ b/firmware/target/arm/ipod/video/lcd-video.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * LCD driver for iPod Video
  *
diff --git a/firmware/target/arm/iriver/backlight-target.h b/firmware/target/arm/iriver/backlight-target.h
index 3882964207..83587be1b4 100644
--- a/firmware/target/arm/iriver/backlight-target.h
+++ b/firmware/target/arm/iriver/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/iriver/h10/adc-target.h b/firmware/target/arm/iriver/h10/adc-target.h
index ba3e98de47..4de3082252 100644
--- a/firmware/target/arm/iriver/h10/adc-target.h
+++ b/firmware/target/arm/iriver/h10/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/iriver/h10/backlight-h10.c b/firmware/target/arm/iriver/h10/backlight-h10.c
index 80dfdd88c1..1b5f42b426 100644
--- a/firmware/target/arm/iriver/h10/backlight-h10.c
+++ b/firmware/target/arm/iriver/h10/backlight-h10.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/iriver/h10/button-h10.c b/firmware/target/arm/iriver/h10/button-h10.c
index 4fd7d3df38..bdcdcbaeaf 100644
--- a/firmware/target/arm/iriver/h10/button-h10.c
+++ b/firmware/target/arm/iriver/h10/button-h10.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/iriver/h10/button-target.h b/firmware/target/arm/iriver/h10/button-target.h
index 2cd4a1454c..50dd58ceda 100644
--- a/firmware/target/arm/iriver/h10/button-target.h
+++ b/firmware/target/arm/iriver/h10/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/iriver/h10/fmradio_i2c-h10.c b/firmware/target/arm/iriver/h10/fmradio_i2c-h10.c
index bee1c6ebfb..a278de9216 100644
--- a/firmware/target/arm/iriver/h10/fmradio_i2c-h10.c
+++ b/firmware/target/arm/iriver/h10/fmradio_i2c-h10.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Physical interface of the Philips TEA5767 in iriver H10 series
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
diff --git a/firmware/target/arm/iriver/h10/lcd-as-h10.S b/firmware/target/arm/iriver/h10/lcd-as-h10.S
index 8ac8b4289f..54e2f1e1fb 100644
--- a/firmware/target/arm/iriver/h10/lcd-as-h10.S
+++ b/firmware/target/arm/iriver/h10/lcd-as-h10.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
index da5113db53..7860be805f 100644
--- a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
+++ b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/iriver/h10/lcd-h10_5gb.c b/firmware/target/arm/iriver/h10/lcd-h10_5gb.c
index 5e1ad9ce23..42e2f9d0ba 100644
--- a/firmware/target/arm/iriver/h10/lcd-h10_5gb.c
+++ b/firmware/target/arm/iriver/h10/lcd-h10_5gb.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/iriver/h10/power-h10.c b/firmware/target/arm/iriver/h10/power-h10.c
index 26b8975cd8..63a4371b3e 100644
--- a/firmware/target/arm/iriver/h10/power-h10.c
+++ b/firmware/target/arm/iriver/h10/power-h10.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/iriver/h10/powermgmt-h10.c b/firmware/target/arm/iriver/h10/powermgmt-h10.c
index 07d345787a..bca9ec20ed 100644
--- a/firmware/target/arm/iriver/h10/powermgmt-h10.c
+++ b/firmware/target/arm/iriver/h10/powermgmt-h10.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/lcd-c200_c200v2.c b/firmware/target/arm/lcd-c200_c200v2.c
index 38877ccac9..b4a92d5474 100644
--- a/firmware/target/arm/lcd-c200_c200v2.c
+++ b/firmware/target/arm/lcd-c200_c200v2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Mark Arigo
  *
diff --git a/firmware/target/arm/lcd-ssd1815.c b/firmware/target/arm/lcd-ssd1815.c
index 0af20cd34f..396165c65f 100644
--- a/firmware/target/arm/lcd-ssd1815.c
+++ b/firmware/target/arm/lcd-ssd1815.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/target/arm/mmu-arm.S b/firmware/target/arm/mmu-arm.S
index 85903ec798..c6298d55eb 100644
--- a/firmware/target/arm/mmu-arm.S
+++ b/firmware/target/arm/mmu-arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006,2007 by Greg White
  *
@@ -336,7 +335,7 @@ discard_dcache_range:
 
 commit_dcache:
 #ifdef HAVE_TEST_AND_CLEAN_CACHE
-    mrc     p15, 0, r15, c7, c10, 3 @ test and clean dcache
+    mrc     p15, 0, APSR_nzcv, c7, c10, 3 @ test and clean dcache
     bne     commit_dcache
     mov     r1, #0
 #else
@@ -367,7 +366,7 @@ commit_dcache:
 
 commit_discard_dcache:
 #ifdef HAVE_TEST_AND_CLEAN_CACHE
-    mrc     p15, 0, r15, c7, c14, 3 @ test, clean and invalidate dcache
+    mrc     p15, 0, APSR_nzcv, c7, c14, 3 @ test, clean and invalidate dcache
     bne     commit_discard_dcache
     mov     r1, #0
 #else
diff --git a/firmware/target/arm/mmu-arm.h b/firmware/target/arm/mmu-arm.h
index 348d52acaa..68960a3fca 100644
--- a/firmware/target/arm/mmu-arm.h
+++ b/firmware/target/arm/mmu-arm.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006,2007 by Greg White
  *
diff --git a/firmware/target/arm/mmu-armv6.S b/firmware/target/arm/mmu-armv6.S
index d084b4a907..d06fc22f2a 100644
--- a/firmware/target/arm/mmu-armv6.S
+++ b/firmware/target/arm/mmu-armv6.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006,2007 by Greg White
  *
diff --git a/firmware/target/arm/nvic-arm.h b/firmware/target/arm/nvic-arm.h
index f695279e8c..4f87d29e2e 100644
--- a/firmware/target/arm/nvic-arm.h
+++ b/firmware/target/arm/nvic-arm.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/olympus/mrobe-100/adc-target.h b/firmware/target/arm/olympus/mrobe-100/adc-target.h
index ee9e294c6b..1910806fce 100644
--- a/firmware/target/arm/olympus/mrobe-100/adc-target.h
+++ b/firmware/target/arm/olympus/mrobe-100/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/olympus/mrobe-100/backlight-mr100.c b/firmware/target/arm/olympus/mrobe-100/backlight-mr100.c
index b39010ff0e..e7d130115b 100644
--- a/firmware/target/arm/olympus/mrobe-100/backlight-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/backlight-mr100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/olympus/mrobe-100/backlight-target.h b/firmware/target/arm/olympus/mrobe-100/backlight-target.h
index 17776698c3..159a58e8f8 100644
--- a/firmware/target/arm/olympus/mrobe-100/backlight-target.h
+++ b/firmware/target/arm/olympus/mrobe-100/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/olympus/mrobe-100/button-mr100.c b/firmware/target/arm/olympus/mrobe-100/button-mr100.c
index 88a47ad644..9c7eb2b5d7 100644
--- a/firmware/target/arm/olympus/mrobe-100/button-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/button-mr100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/olympus/mrobe-100/button-target.h b/firmware/target/arm/olympus/mrobe-100/button-target.h
index 050fc8de1a..57cb21e1ca 100644
--- a/firmware/target/arm/olympus/mrobe-100/button-target.h
+++ b/firmware/target/arm/olympus/mrobe-100/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-as-mr100.S b/firmware/target/arm/olympus/mrobe-100/lcd-as-mr100.S
index 09778014c1..d8bac87177 100644
--- a/firmware/target/arm/olympus/mrobe-100/lcd-as-mr100.S
+++ b/firmware/target/arm/olympus/mrobe-100/lcd-as-mr100.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c b/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c
index c10b4ca8f6..b13e089855 100644
--- a/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c b/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c
index 22bc4fb0d8..8d220ebcd3 100644
--- a/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mark Arigo
  *
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h b/firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h
index ac576c104e..04742dd729 100644
--- a/firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h
+++ b/firmware/target/arm/olympus/mrobe-100/lcd-remote-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: lcd-remote-target.h 11967 2007-01-09 23:29:07Z linus $
  *
  * Copyright (C) 2007 by Jens Arnold
  *
diff --git a/firmware/target/arm/olympus/mrobe-100/power-mr100.c b/firmware/target/arm/olympus/mrobe-100/power-mr100.c
index 4b0adb4031..b4d7d0c706 100644
--- a/firmware/target/arm/olympus/mrobe-100/power-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/power-mr100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/olympus/mrobe-100/powermgmt-mr100.c b/firmware/target/arm/olympus/mrobe-100/powermgmt-mr100.c
index 71f3588343..b2b752dd9f 100644
--- a/firmware/target/arm/olympus/mrobe-100/powermgmt-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/powermgmt-mr100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/pbell/vibe500/adc-target.h b/firmware/target/arm/pbell/vibe500/adc-target.h
index 79a3f2d8ab..c2730c198b 100644
--- a/firmware/target/arm/pbell/vibe500/adc-target.h
+++ b/firmware/target/arm/pbell/vibe500/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2009 by Szymon Dziok
  *
diff --git a/firmware/target/arm/pbell/vibe500/backlight-target.h b/firmware/target/arm/pbell/vibe500/backlight-target.h
index 7168ed62fa..009c18f4f1 100644
--- a/firmware/target/arm/pbell/vibe500/backlight-target.h
+++ b/firmware/target/arm/pbell/vibe500/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2009 by Szymon Dziok
  *
diff --git a/firmware/target/arm/pbell/vibe500/backlight-vibe500.c b/firmware/target/arm/pbell/vibe500/backlight-vibe500.c
index 1d03ddddf0..08cd239140 100644
--- a/firmware/target/arm/pbell/vibe500/backlight-vibe500.c
+++ b/firmware/target/arm/pbell/vibe500/backlight-vibe500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2009 by Szymon Dziok
  * Based on the Iriver H10 and the Philips HD1630 code.
diff --git a/firmware/target/arm/pbell/vibe500/button-target.h b/firmware/target/arm/pbell/vibe500/button-target.h
index 93c8da42bd..35d7ceeff9 100644
--- a/firmware/target/arm/pbell/vibe500/button-target.h
+++ b/firmware/target/arm/pbell/vibe500/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2009 by Szymon Dziok
  *
diff --git a/firmware/target/arm/pbell/vibe500/button-vibe500.c b/firmware/target/arm/pbell/vibe500/button-vibe500.c
index 71c3558403..7e0774c47e 100644
--- a/firmware/target/arm/pbell/vibe500/button-vibe500.c
+++ b/firmware/target/arm/pbell/vibe500/button-vibe500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2009 Szymon Dziok
  * Based on the Iriver H10 and the Philips HD1630 code
diff --git a/firmware/target/arm/pbell/vibe500/lcd-as-vibe500.S b/firmware/target/arm/pbell/vibe500/lcd-as-vibe500.S
index e03011c168..f98aca1251 100644
--- a/firmware/target/arm/pbell/vibe500/lcd-as-vibe500.S
+++ b/firmware/target/arm/pbell/vibe500/lcd-as-vibe500.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2007-2008 by Michael Sevakis
  * Adapted for the Packard Bell Vibe 500 by Szymon Dziok
diff --git a/firmware/target/arm/pbell/vibe500/lcd-vibe500.c b/firmware/target/arm/pbell/vibe500/lcd-vibe500.c
index 9c469138e7..85addb3507 100644
--- a/firmware/target/arm/pbell/vibe500/lcd-vibe500.c
+++ b/firmware/target/arm/pbell/vibe500/lcd-vibe500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2009 by Szymon Dziok
  * Based on the Iriver H10 code by Barry Wardell
diff --git a/firmware/target/arm/pbell/vibe500/power-vibe500.c b/firmware/target/arm/pbell/vibe500/power-vibe500.c
index 6237f7eb8b..0c5ec519f2 100644
--- a/firmware/target/arm/pbell/vibe500/power-vibe500.c
+++ b/firmware/target/arm/pbell/vibe500/power-vibe500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2009 by Szymon Dziok
  *
diff --git a/firmware/target/arm/pbell/vibe500/powermgmt-vibe500.c b/firmware/target/arm/pbell/vibe500/powermgmt-vibe500.c
index e67aadd074..74bef7f5d5 100644
--- a/firmware/target/arm/pbell/vibe500/powermgmt-vibe500.c
+++ b/firmware/target/arm/pbell/vibe500/powermgmt-vibe500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/pcm-telechips.c b/firmware/target/arm/pcm-telechips.c
index 3fa55eafe9..3c9ca6b9b5 100644
--- a/firmware/target/arm/pcm-telechips.c
+++ b/firmware/target/arm/pcm-telechips.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michael Sevakis
  * Copyright (C) 2008 by Rob Purchase
diff --git a/firmware/target/arm/philips/fmradio_i2c-hdd.c b/firmware/target/arm/philips/fmradio_i2c-hdd.c
index 98fe5f64ab..222c788766 100644
--- a/firmware/target/arm/philips/fmradio_i2c-hdd.c
+++ b/firmware/target/arm/philips/fmradio_i2c-hdd.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/hdd1630/adc-target.h b/firmware/target/arm/philips/hdd1630/adc-target.h
index bf97081e35..ededd697e8 100644
--- a/firmware/target/arm/philips/hdd1630/adc-target.h
+++ b/firmware/target/arm/philips/hdd1630/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/philips/hdd1630/backlight-hdd1630.c b/firmware/target/arm/philips/hdd1630/backlight-hdd1630.c
index efa85723a1..027091562a 100644
--- a/firmware/target/arm/philips/hdd1630/backlight-hdd1630.c
+++ b/firmware/target/arm/philips/hdd1630/backlight-hdd1630.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: backlight-hdd.c 28307 2010-10-18 19:54:18Z b0hoon $
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/hdd1630/backlight-target.h b/firmware/target/arm/philips/hdd1630/backlight-target.h
index d79f09a8a6..e969e9021c 100644
--- a/firmware/target/arm/philips/hdd1630/backlight-target.h
+++ b/firmware/target/arm/philips/hdd1630/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: backlight-target.h 24112 2009-12-25 04:05:01Z lowlight $
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/hdd1630/button-hdd1630.c b/firmware/target/arm/philips/hdd1630/button-hdd1630.c
index faed6abb72..10cbac8917 100644
--- a/firmware/target/arm/philips/hdd1630/button-hdd1630.c
+++ b/firmware/target/arm/philips/hdd1630/button-hdd1630.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/hdd1630/button-target.h b/firmware/target/arm/philips/hdd1630/button-target.h
index 28364c6b53..b9f9d234ba 100644
--- a/firmware/target/arm/philips/hdd1630/button-target.h
+++ b/firmware/target/arm/philips/hdd1630/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/hdd1630/lcd-as-hdd1630.S b/firmware/target/arm/philips/hdd1630/lcd-as-hdd1630.S
index 3bb3530917..4f451ed430 100644
--- a/firmware/target/arm/philips/hdd1630/lcd-as-hdd1630.S
+++ b/firmware/target/arm/philips/hdd1630/lcd-as-hdd1630.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c b/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c
index c26c0bc963..f30b24134a 100644
--- a/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c
+++ b/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/hdd1630/powermgmt-hdd1630.c b/firmware/target/arm/philips/hdd1630/powermgmt-hdd1630.c
index fb88bc4fc8..e59f68b2db 100644
--- a/firmware/target/arm/philips/hdd1630/powermgmt-hdd1630.c
+++ b/firmware/target/arm/philips/hdd1630/powermgmt-hdd1630.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/philips/hdd6330/adc-target.h b/firmware/target/arm/philips/hdd6330/adc-target.h
index bf97081e35..ededd697e8 100644
--- a/firmware/target/arm/philips/hdd6330/adc-target.h
+++ b/firmware/target/arm/philips/hdd6330/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/philips/hdd6330/backlight-hdd6330.c b/firmware/target/arm/philips/hdd6330/backlight-hdd6330.c
index b6422a5aa9..56628582e3 100644
--- a/firmware/target/arm/philips/hdd6330/backlight-hdd6330.c
+++ b/firmware/target/arm/philips/hdd6330/backlight-hdd6330.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: backlight-hdd.c 28307 2010-10-18 19:54:18Z b0hoon $
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/hdd6330/backlight-target.h b/firmware/target/arm/philips/hdd6330/backlight-target.h
index d79f09a8a6..e969e9021c 100644
--- a/firmware/target/arm/philips/hdd6330/backlight-target.h
+++ b/firmware/target/arm/philips/hdd6330/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: backlight-target.h 24112 2009-12-25 04:05:01Z lowlight $
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/hdd6330/button-hdd6330.c b/firmware/target/arm/philips/hdd6330/button-hdd6330.c
index 8466c56625..9a450a8dca 100644
--- a/firmware/target/arm/philips/hdd6330/button-hdd6330.c
+++ b/firmware/target/arm/philips/hdd6330/button-hdd6330.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/hdd6330/button-target.h b/firmware/target/arm/philips/hdd6330/button-target.h
index f8eaa82b22..f8213ddfbf 100644
--- a/firmware/target/arm/philips/hdd6330/button-target.h
+++ b/firmware/target/arm/philips/hdd6330/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/hdd6330/lcd-as-hdd6330.S b/firmware/target/arm/philips/hdd6330/lcd-as-hdd6330.S
index c3a7992a2e..53a8e993fe 100644
--- a/firmware/target/arm/philips/hdd6330/lcd-as-hdd6330.S
+++ b/firmware/target/arm/philips/hdd6330/lcd-as-hdd6330.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2010 by Szymon Dziok
  *
diff --git a/firmware/target/arm/philips/hdd6330/lcd-hdd6330.c b/firmware/target/arm/philips/hdd6330/lcd-hdd6330.c
index cdd3064bba..baee20cbaf 100644
--- a/firmware/target/arm/philips/hdd6330/lcd-hdd6330.c
+++ b/firmware/target/arm/philips/hdd6330/lcd-hdd6330.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/hdd6330/powermgmt-hdd6330.c b/firmware/target/arm/philips/hdd6330/powermgmt-hdd6330.c
index fb88bc4fc8..e59f68b2db 100644
--- a/firmware/target/arm/philips/hdd6330/powermgmt-hdd6330.c
+++ b/firmware/target/arm/philips/hdd6330/powermgmt-hdd6330.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/philips/piezo.c b/firmware/target/arm/philips/piezo.c
index 52c3fed2d0..37428e6b5d 100644
--- a/firmware/target/arm/philips/piezo.c
+++ b/firmware/target/arm/philips/piezo.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Szymon Dziok
  *
diff --git a/firmware/target/arm/philips/piezo.h b/firmware/target/arm/philips/piezo.h
index 730042c4f3..af406bbdcc 100644
--- a/firmware/target/arm/philips/piezo.h
+++ b/firmware/target/arm/philips/piezo.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Szymon Dziok
  *
diff --git a/firmware/target/arm/philips/power-hdd.c b/firmware/target/arm/philips/power-hdd.c
index c33073fb5a..2bb39c265e 100644
--- a/firmware/target/arm/philips/power-hdd.c
+++ b/firmware/target/arm/philips/power-hdd.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/sa9200/backlight-sa9200.c b/firmware/target/arm/philips/sa9200/backlight-sa9200.c
index 7046d09910..8ecd7df295 100644
--- a/firmware/target/arm/philips/sa9200/backlight-sa9200.c
+++ b/firmware/target/arm/philips/sa9200/backlight-sa9200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/philips/sa9200/backlight-target.h b/firmware/target/arm/philips/sa9200/backlight-target.h
index 349f2e2b57..4b823a33e1 100644
--- a/firmware/target/arm/philips/sa9200/backlight-target.h
+++ b/firmware/target/arm/philips/sa9200/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/philips/sa9200/button-sa9200.c b/firmware/target/arm/philips/sa9200/button-sa9200.c
index bef5be7522..41a27be6b2 100644
--- a/firmware/target/arm/philips/sa9200/button-sa9200.c
+++ b/firmware/target/arm/philips/sa9200/button-sa9200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/sa9200/button-target.h b/firmware/target/arm/philips/sa9200/button-target.h
index 1c86a75ce2..e32a0e647b 100644
--- a/firmware/target/arm/philips/sa9200/button-target.h
+++ b/firmware/target/arm/philips/sa9200/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2007 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/sa9200/lcd-as-sa9200.S b/firmware/target/arm/philips/sa9200/lcd-as-sa9200.S
index d99222b9df..542181404f 100644
--- a/firmware/target/arm/philips/sa9200/lcd-as-sa9200.S
+++ b/firmware/target/arm/philips/sa9200/lcd-as-sa9200.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2011 by Michael Sevakis
  *
diff --git a/firmware/target/arm/philips/sa9200/lcd-sa9200.c b/firmware/target/arm/philips/sa9200/lcd-sa9200.c
index 7c5abdf71b..e4c5cfa1c4 100644
--- a/firmware/target/arm/philips/sa9200/lcd-sa9200.c
+++ b/firmware/target/arm/philips/sa9200/lcd-sa9200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Mark Arigo
  *
diff --git a/firmware/target/arm/philips/sa9200/power-sa9200.c b/firmware/target/arm/philips/sa9200/power-sa9200.c
index b6a3929e8b..450a269145 100644
--- a/firmware/target/arm/philips/sa9200/power-sa9200.c
+++ b/firmware/target/arm/philips/sa9200/power-sa9200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Daniel Ankers
  *
diff --git a/firmware/target/arm/philips/sa9200/powermgmt-sa9200.c b/firmware/target/arm/philips/sa9200/powermgmt-sa9200.c
index e4381b863b..7e5fd42b66 100644
--- a/firmware/target/arm/philips/sa9200/powermgmt-sa9200.c
+++ b/firmware/target/arm/philips/sa9200/powermgmt-sa9200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/philips/sa9200/powermgmt-target.h b/firmware/target/arm/philips/sa9200/powermgmt-target.h
index 37ea310efe..40e5272596 100644
--- a/firmware/target/arm/philips/sa9200/powermgmt-target.h
+++ b/firmware/target/arm/philips/sa9200/powermgmt-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sevakis
  * Copyright (C) 2008 by Bertrik Sikken
diff --git a/firmware/target/arm/powermgmt-ascodec.c b/firmware/target/arm/powermgmt-ascodec.c
index e31ccc8afb..96b1aad2b8 100644
--- a/firmware/target/arm/powermgmt-ascodec.c
+++ b/firmware/target/arm/powermgmt-ascodec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sevakis
  * Copyright (C) 2008 by Bertrik Sikken
diff --git a/firmware/target/arm/pp/adc-pp5020.c b/firmware/target/arm/pp/adc-pp5020.c
index e3c4551727..0d1abc7ff4 100644
--- a/firmware/target/arm/pp/adc-pp5020.c
+++ b/firmware/target/arm/pp/adc-pp5020.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/pp/ascodec-pp.c b/firmware/target/arm/pp/ascodec-pp.c
index 35eeef57d3..b2845f9648 100644
--- a/firmware/target/arm/pp/ascodec-pp.c
+++ b/firmware/target/arm/pp/ascodec-pp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Driver for AS3514 audio codec
  *
diff --git a/firmware/target/arm/pp/ata-pp5002.c b/firmware/target/arm/pp/ata-pp5002.c
index 5ab0e9ddc7..fdfca48e4a 100644
--- a/firmware/target/arm/pp/ata-pp5002.c
+++ b/firmware/target/arm/pp/ata-pp5002.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/pp/ata-pp5020.c b/firmware/target/arm/pp/ata-pp5020.c
index 3850f34fb1..0f77f9ca2f 100644
--- a/firmware/target/arm/pp/ata-pp5020.c
+++ b/firmware/target/arm/pp/ata-pp5020.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
@@ -154,6 +153,7 @@ static ICODE_ATTR int ata_wait_intrq(void)
         if (IDE0_CFG & IDE_CFG_INTRQ)
             return 1;
         ata_keep_active();
+        yield();
     } while (TIME_BEFORE(current_tick, timeout));
 
     return 0; /* timeout */
diff --git a/firmware/target/arm/pp/ata-sd-pp.c b/firmware/target/arm/pp/ata-sd-pp.c
index b998afd21e..2d28014bf3 100644
--- a/firmware/target/arm/pp/ata-sd-pp.c
+++ b/firmware/target/arm/pp/ata-sd-pp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Daniel Ankers
  *
diff --git a/firmware/target/arm/pp/ata-target.h b/firmware/target/arm/pp/ata-target.h
index ddf4056db9..fb92900616 100644
--- a/firmware/target/arm/pp/ata-target.h
+++ b/firmware/target/arm/pp/ata-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/pp/audio-pp.c b/firmware/target/arm/pp/audio-pp.c
index 4e4d4b917a..70468b34bd 100644
--- a/firmware/target/arm/pp/audio-pp.c
+++ b/firmware/target/arm/pp/audio-pp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michael Sevakis
  *
diff --git a/firmware/target/arm/pp/crt0-pp-bl.S b/firmware/target/arm/pp/crt0-pp-bl.S
index 01681288f9..cf04311415 100644
--- a/firmware/target/arm/pp/crt0-pp-bl.S
+++ b/firmware/target/arm/pp/crt0-pp-bl.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/pp/crt0-pp.S b/firmware/target/arm/pp/crt0-pp.S
index 3b78f57eea..ec4b2be87f 100644
--- a/firmware/target/arm/pp/crt0-pp.S
+++ b/firmware/target/arm/pp/crt0-pp.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/pp/crt0-pp502x-bl-usb.S b/firmware/target/arm/pp/crt0-pp502x-bl-usb.S
index 93b1fbaeb5..b1b771ff60 100644
--- a/firmware/target/arm/pp/crt0-pp502x-bl-usb.S
+++ b/firmware/target/arm/pp/crt0-pp502x-bl-usb.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  * Copyright (C) 2010 by Michael Sevakis
diff --git a/firmware/target/arm/pp/debug-pp.c b/firmware/target/arm/pp/debug-pp.c
index 52f6bf36b3..16d77ed7c2 100644
--- a/firmware/target/arm/pp/debug-pp.c
+++ b/firmware/target/arm/pp/debug-pp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dave Chapman
  *
diff --git a/firmware/target/arm/pp/i2c-pp.c b/firmware/target/arm/pp/i2c-pp.c
index 192af0e304..f449bf3a97 100644
--- a/firmware/target/arm/pp/i2c-pp.c
+++ b/firmware/target/arm/pp/i2c-pp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * PP502X and PP5002 I2C driver
  *
diff --git a/firmware/target/arm/pp/i2s-pp.c b/firmware/target/arm/pp/i2s-pp.c
index 83f39515c4..7833e7a1d3 100644
--- a/firmware/target/arm/pp/i2s-pp.c
+++ b/firmware/target/arm/pp/i2s-pp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Portalplayer specific code for I2S
  *
diff --git a/firmware/target/arm/pp/kernel-pp.c b/firmware/target/arm/pp/kernel-pp.c
index 2a00254173..56126a6b17 100644
--- a/firmware/target/arm/pp/kernel-pp.c
+++ b/firmware/target/arm/pp/kernel-pp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/target/arm/pp/pcm-pp.c b/firmware/target/arm/pp/pcm-pp.c
index 7909464878..2a1ddd7668 100644
--- a/firmware/target/arm/pp/pcm-pp.c
+++ b/firmware/target/arm/pp/pcm-pp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michael Sevakis
  *
diff --git a/firmware/target/arm/pp/sd-pp-target.h b/firmware/target/arm/pp/sd-pp-target.h
index 342543552a..f87a7bc25d 100644
--- a/firmware/target/arm/pp/sd-pp-target.h
+++ b/firmware/target/arm/pp/sd-pp-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Antonius Hellmann
  *
diff --git a/firmware/target/arm/pp/system-pp5002.c b/firmware/target/arm/pp/system-pp5002.c
index 388f962fce..75f99674d7 100644
--- a/firmware/target/arm/pp/system-pp5002.c
+++ b/firmware/target/arm/pp/system-pp5002.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/target/arm/pp/system-pp502x.c b/firmware/target/arm/pp/system-pp502x.c
index 8b9c2b15a1..e8834061e1 100644
--- a/firmware/target/arm/pp/system-pp502x.c
+++ b/firmware/target/arm/pp/system-pp502x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/target/arm/pp/system-target.h b/firmware/target/arm/pp/system-target.h
index c26e9e1d06..3556be6921 100644
--- a/firmware/target/arm/pp/system-target.h
+++ b/firmware/target/arm/pp/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  * Copyright (C) 2007 by Michael Sevakis
diff --git a/firmware/target/arm/pp/thread-pp.c b/firmware/target/arm/pp/thread-pp.c
index 292ba9baa4..2ac52c54d0 100644
--- a/firmware/target/arm/pp/thread-pp.c
+++ b/firmware/target/arm/pp/thread-pp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Daniel Ankers
  *
diff --git a/firmware/target/arm/pp/timer-pp.c b/firmware/target/arm/pp/timer-pp.c
index db859f6b88..5e81ea706f 100644
--- a/firmware/target/arm/pp/timer-pp.c
+++ b/firmware/target/arm/pp/timer-pp.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2006 Thom Johansen
 *
diff --git a/firmware/target/arm/pp/uart-pp.c b/firmware/target/arm/pp/uart-pp.c
index b41e901569..5a6e0172a7 100644
--- a/firmware/target/arm/pp/uart-pp.c
+++ b/firmware/target/arm/pp/uart-pp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
diff --git a/firmware/target/arm/pp/usb-fw-pp5002.c b/firmware/target/arm/pp/usb-fw-pp5002.c
index 452d1e0061..2d4cc64c4d 100644
--- a/firmware/target/arm/pp/usb-fw-pp5002.c
+++ b/firmware/target/arm/pp/usb-fw-pp5002.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jens Arnold
  *
diff --git a/firmware/target/arm/pp/usb-fw-pp502x.c b/firmware/target/arm/pp/usb-fw-pp502x.c
index fb04566cf5..68812c8751 100644
--- a/firmware/target/arm/pp/usb-fw-pp502x.c
+++ b/firmware/target/arm/pp/usb-fw-pp502x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/pp/wmcodec-pp.c b/firmware/target/arm/pp/wmcodec-pp.c
index 839fd90676..4e291a9c6e 100644
--- a/firmware/target/arm/pp/wmcodec-pp.c
+++ b/firmware/target/arm/pp/wmcodec-pp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Portalplayer specific code for Wolfson audio codecs
  *
diff --git a/firmware/target/arm/rk27xx/adc-rk27xx.c b/firmware/target/arm/rk27xx/adc-rk27xx.c
index ff4ddcd797..97eef23bb8 100644
--- a/firmware/target/arm/rk27xx/adc-rk27xx.c
+++ b/firmware/target/arm/rk27xx/adc-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Marcin Bukat
  *
diff --git a/firmware/target/arm/rk27xx/adc-target.h b/firmware/target/arm/rk27xx/adc-target.h
index d408b7415b..a65db6472d 100644
--- a/firmware/target/arm/rk27xx/adc-target.h
+++ b/firmware/target/arm/rk27xx/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Marcin Bukat
  *
diff --git a/firmware/target/arm/rk27xx/ata-nand-rk27xx.c b/firmware/target/arm/rk27xx/ata-nand-rk27xx.c
index 5cbc67f837..ea493cd661 100644
--- a/firmware/target/arm/rk27xx/ata-nand-rk27xx.c
+++ b/firmware/target/arm/rk27xx/ata-nand-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/firmware/target/arm/rk27xx/backlight-rk27xx.c b/firmware/target/arm/rk27xx/backlight-rk27xx.c
index 61e887af46..6b7459a69e 100644
--- a/firmware/target/arm/rk27xx/backlight-rk27xx.c
+++ b/firmware/target/arm/rk27xx/backlight-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Marcin Bukat
  *
diff --git a/firmware/target/arm/rk27xx/backlight-target.h b/firmware/target/arm/rk27xx/backlight-target.h
index a436186791..88e6cfac6a 100644
--- a/firmware/target/arm/rk27xx/backlight-target.h
+++ b/firmware/target/arm/rk27xx/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Marcoen Hirschberg
  *
diff --git a/firmware/target/arm/rk27xx/debug-rk27xx.c b/firmware/target/arm/rk27xx/debug-rk27xx.c
index ea0190049f..28fd96da78 100644
--- a/firmware/target/arm/rk27xx/debug-rk27xx.c
+++ b/firmware/target/arm/rk27xx/debug-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/rk27xx/ftl-rk27xx.c b/firmware/target/arm/rk27xx/ftl-rk27xx.c
index 40248ab6f3..82a26b7865 100644
--- a/firmware/target/arm/rk27xx/ftl-rk27xx.c
+++ b/firmware/target/arm/rk27xx/ftl-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/rk27xx/ftl-target.h b/firmware/target/arm/rk27xx/ftl-target.h
index 96dc4d06fa..e432ad1b40 100644
--- a/firmware/target/arm/rk27xx/ftl-target.h
+++ b/firmware/target/arm/rk27xx/ftl-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sparmann
  *
diff --git a/firmware/target/arm/rk27xx/hm60x/button-hm60x.c b/firmware/target/arm/rk27xx/hm60x/button-hm60x.c
index fd5b6d6d20..5fdc0f50d0 100644
--- a/firmware/target/arm/rk27xx/hm60x/button-hm60x.c
+++ b/firmware/target/arm/rk27xx/hm60x/button-hm60x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/hm60x/button-target.h b/firmware/target/arm/rk27xx/hm60x/button-target.h
index b6950b52de..bd371731eb 100644
--- a/firmware/target/arm/rk27xx/hm60x/button-target.h
+++ b/firmware/target/arm/rk27xx/hm60x/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/hm60x/lcd-target.h b/firmware/target/arm/rk27xx/hm60x/lcd-target.h
index 801db891b4..3cae07c167 100644
--- a/firmware/target/arm/rk27xx/hm60x/lcd-target.h
+++ b/firmware/target/arm/rk27xx/hm60x/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C)  2012 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/hm60x/power-hm60x.c b/firmware/target/arm/rk27xx/hm60x/power-hm60x.c
index 538d00f5ec..d588f2701e 100644
--- a/firmware/target/arm/rk27xx/hm60x/power-hm60x.c
+++ b/firmware/target/arm/rk27xx/hm60x/power-hm60x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/rk27xx/hm60x/powermgmt-hm60x.c b/firmware/target/arm/rk27xx/hm60x/powermgmt-hm60x.c
index b0f22bc4cf..6c7cc0749d 100644
--- a/firmware/target/arm/rk27xx/hm60x/powermgmt-hm60x.c
+++ b/firmware/target/arm/rk27xx/hm60x/powermgmt-hm60x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/rk27xx/hm801/button-hm801.c b/firmware/target/arm/rk27xx/hm801/button-hm801.c
index 5f01a7bd14..4d880124c2 100644
--- a/firmware/target/arm/rk27xx/hm801/button-hm801.c
+++ b/firmware/target/arm/rk27xx/hm801/button-hm801.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/hm801/button-target.h b/firmware/target/arm/rk27xx/hm801/button-target.h
index 29c31d0df6..1b6befee0d 100644
--- a/firmware/target/arm/rk27xx/hm801/button-target.h
+++ b/firmware/target/arm/rk27xx/hm801/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/hm801/lcd-target.h b/firmware/target/arm/rk27xx/hm801/lcd-target.h
index 7c2f194e4c..9763823ba0 100644
--- a/firmware/target/arm/rk27xx/hm801/lcd-target.h
+++ b/firmware/target/arm/rk27xx/hm801/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C)  2012 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/hm801/power-hm801.c b/firmware/target/arm/rk27xx/hm801/power-hm801.c
index 18a0566a78..6a7d1c3982 100644
--- a/firmware/target/arm/rk27xx/hm801/power-hm801.c
+++ b/firmware/target/arm/rk27xx/hm801/power-hm801.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/rk27xx/hm801/powermgmt-hm801.c b/firmware/target/arm/rk27xx/hm801/powermgmt-hm801.c
index 42dd9242e5..7f4a95dd67 100644
--- a/firmware/target/arm/rk27xx/hm801/powermgmt-hm801.c
+++ b/firmware/target/arm/rk27xx/hm801/powermgmt-hm801.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2011 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/i2c-rk27xx.c b/firmware/target/arm/rk27xx/i2c-rk27xx.c
index cc2319ab45..3a28b7300b 100644
--- a/firmware/target/arm/rk27xx/i2c-rk27xx.c
+++ b/firmware/target/arm/rk27xx/i2c-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Marcin Bukat
  *
diff --git a/firmware/target/arm/rk27xx/ihifi/button-ihifi.c b/firmware/target/arm/rk27xx/ihifi/button-ihifi.c
index 6477400255..929f4787c2 100644
--- a/firmware/target/arm/rk27xx/ihifi/button-ihifi.c
+++ b/firmware/target/arm/rk27xx/ihifi/button-ihifi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ihifi/button-target.h b/firmware/target/arm/rk27xx/ihifi/button-target.h
index f78727b0f5..a98f7bc79e 100644
--- a/firmware/target/arm/rk27xx/ihifi/button-target.h
+++ b/firmware/target/arm/rk27xx/ihifi/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ihifi/lcd-ihifi.c b/firmware/target/arm/rk27xx/ihifi/lcd-ihifi.c
index d5906b9dd5..80a8a3a48d 100644
--- a/firmware/target/arm/rk27xx/ihifi/lcd-ihifi.c
+++ b/firmware/target/arm/rk27xx/ihifi/lcd-ihifi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C)  2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ihifi/lcd-target.h b/firmware/target/arm/rk27xx/ihifi/lcd-target.h
index 0d245c888b..6d66eec73e 100644
--- a/firmware/target/arm/rk27xx/ihifi/lcd-target.h
+++ b/firmware/target/arm/rk27xx/ihifi/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C)  2012 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ihifi/power-ihifi.c b/firmware/target/arm/rk27xx/ihifi/power-ihifi.c
index 780d476112..e519b48adb 100644
--- a/firmware/target/arm/rk27xx/ihifi/power-ihifi.c
+++ b/firmware/target/arm/rk27xx/ihifi/power-ihifi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ihifi/powermgmt-ihifi760.c b/firmware/target/arm/rk27xx/ihifi/powermgmt-ihifi760.c
index b613d90941..230cf41bbf 100644
--- a/firmware/target/arm/rk27xx/ihifi/powermgmt-ihifi760.c
+++ b/firmware/target/arm/rk27xx/ihifi/powermgmt-ihifi760.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ihifi/powermgmt-ihifi960.c b/firmware/target/arm/rk27xx/ihifi/powermgmt-ihifi960.c
index 9a781ca775..c6c8747a72 100644
--- a/firmware/target/arm/rk27xx/ihifi/powermgmt-ihifi960.c
+++ b/firmware/target/arm/rk27xx/ihifi/powermgmt-ihifi960.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ihifi2/audio-ihifi770.c b/firmware/target/arm/rk27xx/ihifi2/audio-ihifi770.c
index a21ea9cfef..392ca26fb6 100644
--- a/firmware/target/arm/rk27xx/ihifi2/audio-ihifi770.c
+++ b/firmware/target/arm/rk27xx/ihifi2/audio-ihifi770.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/arm/rk27xx/ihifi2/audio-ihifi800.c b/firmware/target/arm/rk27xx/ihifi2/audio-ihifi800.c
index 14b126c72a..cab02a3ceb 100644
--- a/firmware/target/arm/rk27xx/ihifi2/audio-ihifi800.c
+++ b/firmware/target/arm/rk27xx/ihifi2/audio-ihifi800.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/arm/rk27xx/ihifi2/button-ihifi.c b/firmware/target/arm/rk27xx/ihifi2/button-ihifi.c
index 172853a83a..2fa5062195 100644
--- a/firmware/target/arm/rk27xx/ihifi2/button-ihifi.c
+++ b/firmware/target/arm/rk27xx/ihifi2/button-ihifi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/arm/rk27xx/ihifi2/button-target.h b/firmware/target/arm/rk27xx/ihifi2/button-target.h
index d317e30972..c228d250e4 100644
--- a/firmware/target/arm/rk27xx/ihifi2/button-target.h
+++ b/firmware/target/arm/rk27xx/ihifi2/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770.c b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770.c
index 23505d9fa0..98d760682e 100644
--- a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770.c
+++ b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770c.c b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770c.c
index 311b8057cb..4f935d7e60 100644
--- a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770c.c
+++ b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770c.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi800.c b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi800.c
index 821b52dcb6..402d6ab9d4 100644
--- a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi800.c
+++ b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi800.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/arm/rk27xx/ihifi2/lcd-target.h b/firmware/target/arm/rk27xx/ihifi2/lcd-target.h
index 6b2aa5d8a5..c3a78b901e 100644
--- a/firmware/target/arm/rk27xx/ihifi2/lcd-target.h
+++ b/firmware/target/arm/rk27xx/ihifi2/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/arm/rk27xx/ihifi2/power-ihifi.c b/firmware/target/arm/rk27xx/ihifi2/power-ihifi.c
index cc489eacfe..e75f5df79b 100644
--- a/firmware/target/arm/rk27xx/ihifi2/power-ihifi.c
+++ b/firmware/target/arm/rk27xx/ihifi2/power-ihifi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770.c b/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770.c
index 799e288e19..1658874202 100644
--- a/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770.c
+++ b/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770c.c b/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770c.c
index b0290cb886..a234037af6 100644
--- a/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770c.c
+++ b/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770c.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi800.c b/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi800.c
index 1eee8ccec2..05e209540a 100644
--- a/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi800.c
+++ b/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi800.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/arm/rk27xx/kernel-rk27xx.c b/firmware/target/arm/rk27xx/kernel-rk27xx.c
index 012cc9acc7..c6a053ca7d 100644
--- a/firmware/target/arm/rk27xx/kernel-rk27xx.c
+++ b/firmware/target/arm/rk27xx/kernel-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Marcin Bukat
  *
diff --git a/firmware/target/arm/rk27xx/lcd-hifiman.c b/firmware/target/arm/rk27xx/lcd-hifiman.c
index bde1d3546f..cc989911a9 100644
--- a/firmware/target/arm/rk27xx/lcd-hifiman.c
+++ b/firmware/target/arm/rk27xx/lcd-hifiman.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C)  2011 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ma/audio-ma.c b/firmware/target/arm/rk27xx/ma/audio-ma.c
index 6a4da1a4f3..aa791ab194 100644
--- a/firmware/target/arm/rk27xx/ma/audio-ma.c
+++ b/firmware/target/arm/rk27xx/ma/audio-ma.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ma/button-ma.c b/firmware/target/arm/rk27xx/ma/button-ma.c
index f8da786e4f..dabb492ded 100644
--- a/firmware/target/arm/rk27xx/ma/button-ma.c
+++ b/firmware/target/arm/rk27xx/ma/button-ma.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ma/button-target.h b/firmware/target/arm/rk27xx/ma/button-target.h
index 56e8e903b0..025286f9c5 100644
--- a/firmware/target/arm/rk27xx/ma/button-target.h
+++ b/firmware/target/arm/rk27xx/ma/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ma/lcd-ma.c b/firmware/target/arm/rk27xx/ma/lcd-ma.c
index fa3ccc5aa0..e46d41cc1a 100644
--- a/firmware/target/arm/rk27xx/ma/lcd-ma.c
+++ b/firmware/target/arm/rk27xx/ma/lcd-ma.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C)  2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ma/lcd-target.h b/firmware/target/arm/rk27xx/ma/lcd-target.h
index f411a53de2..4068e1db00 100644
--- a/firmware/target/arm/rk27xx/ma/lcd-target.h
+++ b/firmware/target/arm/rk27xx/ma/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C)  2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ma/pca9555-ma.c b/firmware/target/arm/rk27xx/ma/pca9555-ma.c
index 34f068e594..3409489665 100644
--- a/firmware/target/arm/rk27xx/ma/pca9555-ma.c
+++ b/firmware/target/arm/rk27xx/ma/pca9555-ma.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ma/pca9555-target.h b/firmware/target/arm/rk27xx/ma/pca9555-target.h
index 25cb1dac84..923d0f0df9 100644
--- a/firmware/target/arm/rk27xx/ma/pca9555-target.h
+++ b/firmware/target/arm/rk27xx/ma/pca9555-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ma/power-ma.c b/firmware/target/arm/rk27xx/ma/power-ma.c
index fb7c23251a..9bfa831502 100644
--- a/firmware/target/arm/rk27xx/ma/power-ma.c
+++ b/firmware/target/arm/rk27xx/ma/power-ma.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/ma/powermgmt-ma.c b/firmware/target/arm/rk27xx/ma/powermgmt-ma.c
index e430ad00d2..3008f49924 100644
--- a/firmware/target/arm/rk27xx/ma/powermgmt-ma.c
+++ b/firmware/target/arm/rk27xx/ma/powermgmt-ma.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2013 Andrew Ryabinin
  *
diff --git a/firmware/target/arm/rk27xx/nand-rk27xx.c b/firmware/target/arm/rk27xx/nand-rk27xx.c
index a4c28b9fb7..2cf605e72b 100644
--- a/firmware/target/arm/rk27xx/nand-rk27xx.c
+++ b/firmware/target/arm/rk27xx/nand-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/rk27xx/nand-target.h b/firmware/target/arm/rk27xx/nand-target.h
index dee690e5e6..6bad1a560d 100644
--- a/firmware/target/arm/rk27xx/nand-target.h
+++ b/firmware/target/arm/rk27xx/nand-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sparmann
  *
diff --git a/firmware/target/arm/rk27xx/pcm-rk27xx.c b/firmware/target/arm/rk27xx/pcm-rk27xx.c
index af81f1e7e4..3d7532d787 100644
--- a/firmware/target/arm/rk27xx/pcm-rk27xx.c
+++ b/firmware/target/arm/rk27xx/pcm-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Marcin Bukat
  * Copyright (C) 2011 Andrew Ryabinin
diff --git a/firmware/target/arm/rk27xx/rk27generic/button-rk27generic.c b/firmware/target/arm/rk27xx/rk27generic/button-rk27generic.c
index cd60482b0f..0e01a4b0da 100644
--- a/firmware/target/arm/rk27xx/rk27generic/button-rk27generic.c
+++ b/firmware/target/arm/rk27xx/rk27generic/button-rk27generic.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Marcin Bukat
  *
diff --git a/firmware/target/arm/rk27xx/rk27generic/button-target.h b/firmware/target/arm/rk27xx/rk27generic/button-target.h
index 55169b06f6..cc5add6aec 100644
--- a/firmware/target/arm/rk27xx/rk27generic/button-target.h
+++ b/firmware/target/arm/rk27xx/rk27generic/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Marcin Bukat
  *
diff --git a/firmware/target/arm/rk27xx/rk27generic/fmradio-i2c-rk27generic.c b/firmware/target/arm/rk27xx/rk27generic/fmradio-i2c-rk27generic.c
index 4ab171cd5a..b816182679 100644
--- a/firmware/target/arm/rk27xx/rk27generic/fmradio-i2c-rk27generic.c
+++ b/firmware/target/arm/rk27xx/rk27generic/fmradio-i2c-rk27generic.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/firmware/target/arm/rk27xx/rk27generic/power-rk27generic.c b/firmware/target/arm/rk27xx/rk27generic/power-rk27generic.c
index d3feb41597..784acd9876 100644
--- a/firmware/target/arm/rk27xx/rk27generic/power-rk27generic.c
+++ b/firmware/target/arm/rk27xx/rk27generic/power-rk27generic.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/rk27xx/rk27generic/powermgmt-rk27generic.c b/firmware/target/arm/rk27xx/rk27generic/powermgmt-rk27generic.c
index 32426f53f6..f38cdf02d2 100644
--- a/firmware/target/arm/rk27xx/rk27generic/powermgmt-rk27generic.c
+++ b/firmware/target/arm/rk27xx/rk27generic/powermgmt-rk27generic.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/rk27xx/sd-rk27xx.c b/firmware/target/arm/rk27xx/sd-rk27xx.c
index b5969f5c9e..4f9118a58d 100644
--- a/firmware/target/arm/rk27xx/sd-rk27xx.c
+++ b/firmware/target/arm/rk27xx/sd-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Daniel Ankers
  * Copyright © 2008-2009 Rafaël Carré
diff --git a/firmware/target/arm/rk27xx/spfd5420a.h b/firmware/target/arm/rk27xx/spfd5420a.h
index fcb998dfd1..6c38bb0a9d 100644
--- a/firmware/target/arm/rk27xx/spfd5420a.h
+++ b/firmware/target/arm/rk27xx/spfd5420a.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Marcin Bukat
  *
diff --git a/firmware/target/arm/rk27xx/system-rk27xx.c b/firmware/target/arm/rk27xx/system-rk27xx.c
index 9ab87ef0dd..0d71915a00 100644
--- a/firmware/target/arm/rk27xx/system-rk27xx.c
+++ b/firmware/target/arm/rk27xx/system-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Marcin Bukat
  *
diff --git a/firmware/target/arm/rk27xx/system-target.h b/firmware/target/arm/rk27xx/system-target.h
index eca675a2af..c332cf2513 100644
--- a/firmware/target/arm/rk27xx/system-target.h
+++ b/firmware/target/arm/rk27xx/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Rafaël Carré
  * Copyright (C) 2011 Marcin Bukat
diff --git a/firmware/target/arm/rk27xx/timer-rk27xx.c b/firmware/target/arm/rk27xx/timer-rk27xx.c
index 116f169e2d..d9904a40e6 100644
--- a/firmware/target/arm/rk27xx/timer-rk27xx.c
+++ b/firmware/target/arm/rk27xx/timer-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Marcin Bukat
  *
diff --git a/firmware/target/arm/rk27xx/usb-drv-rk27xx.c b/firmware/target/arm/rk27xx/usb-drv-rk27xx.c
index 1451c6265e..ee46c514fb 100644
--- a/firmware/target/arm/rk27xx/usb-drv-rk27xx.c
+++ b/firmware/target/arm/rk27xx/usb-drv-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Marcin Bukat
  *
@@ -119,7 +118,7 @@ static void setup_received(void)
     setup_data[1] = SETUP2;
 
     /* pass setup data to the upper layer */
-    usb_core_legacy_control_request((struct usb_ctrlrequest*)setup_data);
+    usb_core_setup_received((struct usb_ctrlrequest*)setup_data);
 }
 
 static int max_pkt_size(struct endpoint_t *endp)
diff --git a/firmware/target/arm/rk27xx/usb-rk27xx.c b/firmware/target/arm/rk27xx/usb-rk27xx.c
index 4c1e62a875..4ac4f81c32 100644
--- a/firmware/target/arm/rk27xx/usb-rk27xx.c
+++ b/firmware/target/arm/rk27xx/usb-rk27xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Marcin Bukat
  *
diff --git a/firmware/target/arm/s3c2440/adc-s3c2440.c b/firmware/target/arm/s3c2440/adc-s3c2440.c
index f7faf54786..e54f12d779 100644
--- a/firmware/target/arm/s3c2440/adc-s3c2440.c
+++ b/firmware/target/arm/s3c2440/adc-s3c2440.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Wade Brown
  *
diff --git a/firmware/target/arm/s3c2440/crt0.S b/firmware/target/arm/s3c2440/crt0.S
index 7f4cd2aa00..6fe425655b 100644
--- a/firmware/target/arm/s3c2440/crt0.S
+++ b/firmware/target/arm/s3c2440/crt0.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/s3c2440/debug-s3c2440.c b/firmware/target/arm/s3c2440/debug-s3c2440.c
index 92d78767eb..58a1867bab 100644
--- a/firmware/target/arm/s3c2440/debug-s3c2440.c
+++ b/firmware/target/arm/s3c2440/debug-s3c2440.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/s3c2440/dma-s3c2440.c b/firmware/target/arm/s3c2440/dma-s3c2440.c
index 312a9bff68..9839969159 100644
--- a/firmware/target/arm/s3c2440/dma-s3c2440.c
+++ b/firmware/target/arm/s3c2440/dma-s3c2440.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright  2009 by Bob Cousins
  *
diff --git a/firmware/target/arm/s3c2440/dma-target.h b/firmware/target/arm/s3c2440/dma-target.h
index 8be19640f5..522bf4cac4 100644
--- a/firmware/target/arm/s3c2440/dma-target.h
+++ b/firmware/target/arm/s3c2440/dma-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 by Bob Cousins
  *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/adc-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/adc-target.h
index 663e739210..e1d1b60a02 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/adc-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
index aae4c4b1d8..4d8caaeb52 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006,2007 by Marcoen Hirschberg
  *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h
index 5403b2418a..077bb4691f 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
index c30eb8d812..12b92334b5 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h
index ef30babc2f..ce8cfac186 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
index 0185186008..3dea361861 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h
index 6852e733ef..8b712a9372 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-target.h
index d5656f6d45..6450abe86c 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Greg White
  *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
index 7567627213..432862d39d 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michael Sevakis
  *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
index e31a633aca..eb53acb040 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/powermgmt-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/powermgmt-meg-fx.c
index a327ee871d..fabf2575ef 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/powermgmt-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/powermgmt-meg-fx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c
index 07e679b9f5..a50fa62e1a 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2007 by Greg White
 *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.h b/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.h
index a5a75ed553..2e35c1bd7d 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2007 by Greg White
 *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c
index 4565f79751..774daf123d 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2007 by Michael Sevakis
 *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c
index fd75529c92..139052639b 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
index f04a82f643..76b32d35e7 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Gigabeat specific code for the Wolfson codec
  *
diff --git a/firmware/target/arm/s3c2440/i2c-s3c2440.c b/firmware/target/arm/s3c2440/i2c-s3c2440.c
index b8fbb19003..89bbf9d49f 100644
--- a/firmware/target/arm/s3c2440/i2c-s3c2440.c
+++ b/firmware/target/arm/s3c2440/i2c-s3c2440.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/target/arm/s3c2440/i2c-s3c2440.h b/firmware/target/arm/s3c2440/i2c-s3c2440.h
index 8b739358af..64b77e9dd4 100644
--- a/firmware/target/arm/s3c2440/i2c-s3c2440.h
+++ b/firmware/target/arm/s3c2440/i2c-s3c2440.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/target/arm/s3c2440/kernel-s3c2440.c b/firmware/target/arm/s3c2440/kernel-s3c2440.c
index 892758e147..fcd4813541 100644
--- a/firmware/target/arm/s3c2440/kernel-s3c2440.c
+++ b/firmware/target/arm/s3c2440/kernel-s3c2440.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2007 by Michael Sevakis
 *
diff --git a/firmware/target/arm/s3c2440/lcd-s3c2440.c b/firmware/target/arm/s3c2440/lcd-s3c2440.c
index 3b0ad48c6e..f323c746c6 100644
--- a/firmware/target/arm/s3c2440/lcd-s3c2440.c
+++ b/firmware/target/arm/s3c2440/lcd-s3c2440.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2007 by Greg White
 * Copyright (C) 2009 by Bob Cousins
diff --git a/firmware/target/arm/s3c2440/sd-s3c2440.c b/firmware/target/arm/s3c2440/sd-s3c2440.c
index 5737366a88..d55c17353a 100644
--- a/firmware/target/arm/s3c2440/sd-s3c2440.c
+++ b/firmware/target/arm/s3c2440/sd-s3c2440.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bob Cousins
  *
diff --git a/firmware/target/arm/s3c2440/system-s3c2440.c b/firmware/target/arm/s3c2440/system-s3c2440.c
index b9c6dd5879..938ee0276a 100644
--- a/firmware/target/arm/s3c2440/system-s3c2440.c
+++ b/firmware/target/arm/s3c2440/system-s3c2440.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2007 by Michael Sevakis
 *
diff --git a/firmware/target/arm/s3c2440/system-target.h b/firmware/target/arm/s3c2440/system-target.h
index e69998f4b9..f8e3a6d4fb 100644
--- a/firmware/target/arm/s3c2440/system-target.h
+++ b/firmware/target/arm/s3c2440/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Greg White
  *
diff --git a/firmware/target/arm/s3c2440/uart-s3c2440.c b/firmware/target/arm/s3c2440/uart-s3c2440.c
index 47f11a92b6..43ec5dc37c 100644
--- a/firmware/target/arm/s3c2440/uart-s3c2440.c
+++ b/firmware/target/arm/s3c2440/uart-s3c2440.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bob Cousins
  *
diff --git a/firmware/target/arm/s5l8700/adc-s5l8700.c b/firmware/target/arm/s5l8700/adc-s5l8700.c
index 1c3598225b..3d853c88c9 100644
--- a/firmware/target/arm/s5l8700/adc-s5l8700.c
+++ b/firmware/target/arm/s5l8700/adc-s5l8700.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8700/adc-target.h b/firmware/target/arm/s5l8700/adc-target.h
index 0fb8bf52de..b908cdcbf4 100644
--- a/firmware/target/arm/s5l8700/adc-target.h
+++ b/firmware/target/arm/s5l8700/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
index 5ca467f7f8..4a682b21b4 100644
--- a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
+++ b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8700/backlight-target.h b/firmware/target/arm/s5l8700/backlight-target.h
index a436186791..88e6cfac6a 100644
--- a/firmware/target/arm/s5l8700/backlight-target.h
+++ b/firmware/target/arm/s5l8700/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Marcoen Hirschberg
  *
diff --git a/firmware/target/arm/s5l8700/crt0.S b/firmware/target/arm/s5l8700/crt0.S
index 49fa9797dc..d6107c9241 100644
--- a/firmware/target/arm/s5l8700/crt0.S
+++ b/firmware/target/arm/s5l8700/crt0.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: crt0.S 18776 2008-10-11 18:32:17Z gevaerts $
  *
  * Copyright (C) 2008 by Marcoen Hirschberg
  * Copyright (C) 2008 by Denes Balatoni
@@ -49,9 +48,9 @@ newstart2:
 
 #ifdef ROCKBOX_BIG_ENDIAN
     mov r1, #0x80
-    mrc 15, 0, r0, c1, c0, 0
+    mrc p15, 0, r0, c1, c0, 0
     orr r0, r0, r1
-    mcr 15, 0, r0, c1, c0, 0 // set bigendian
+    mcr p15, 0, r0, c1, c0, 0 // set bigendian
 #endif
 
     ldr r1, =0x3c800000 // disable watchdog
@@ -144,11 +143,11 @@ start_loc:
     str r0, [r1,#0x10]  // CLKCON3
 
     ldr r2, =0xc0000078
-    mrc 15, 0, r0, c1, c0, 0
+    mrc p15, 0, r0, c1, c0, 0
     mvn r1, #0xc0000000
     and r0, r0, r1
     orr r0, r0, r2
-    mcr 15, 0, r0, c1, c0, 0 // asynchronous clocking mode
+    mcr p15, 0, r0, c1, c0, 0 // asynchronous clocking mode
     nop
     nop                         
     nop
@@ -179,17 +178,17 @@ start_loc:
     ldr r0, =0xffffef7e
     str r0, [r1,#0x40]  // PWRCONEXT
 
-    mrc 15, 0, r0, c1, c0, 0
+    mrc p15, 0, r0, c1, c0, 0
     bic r0, r0, #0x1000
     bic r0, r0, #0x5
-    mcr 15, 0, r0, c1, c0, 0 // disable caches and protection unit
+    mcr p15, 0, r0, c1, c0, 0 // disable caches and protection unit
 
     mov r1, #0
 1:
     mov r0, #0
 2:
     orr r2, r1, r0
-    mcr 15, 0, r2, c7, c14, 2 // clean and flush dcache single entry
+    mcr p15, 0, r2, c7, c14, 2 // clean and flush dcache single entry
     add r0, r0, #0x10
     cmp r0, #0x40
     bne 2b
@@ -199,48 +198,48 @@ start_loc:
     nop
     nop
     mov r0, #0
-    mcr 15, 0, r0, c7, c10, 4 // clean and flush whole dcache
-    mcr 15, 0, r0, c7, c5, 0 // flush icache
-    mcr 15, 0, r0, c7, c6, 0 // flush dcache
+    mcr p15, 0, r0, c7, c10, 4 // clean and flush whole dcache
+    mcr p15, 0, r0, c7, c5, 0 // flush icache
+    mcr p15, 0, r0, c7, c6, 0 // flush dcache
 
     mov r0, #0x3f
-    mcr 15, 0, r0, c6, c0, 1 // CS0: 4GB at offset 0 - everything
-    mcr 15, 0, r0, c6, c0, 0 // DS0: 4GB at offset 0 - everything
+    mcr p15, 0, r0, c6, c0, 1 // CS0: 4GB at offset 0 - everything
+    mcr p15, 0, r0, c6, c0, 0 // DS0: 4GB at offset 0 - everything
 #ifdef IPOD_NANO2G
     mov r0, #0x31 // FIXME: calculate that from MEMORYSIZE
 #else
     mov r0, #0x2f // FIXME: calculate that from MEMORYSIZE
 #endif
-    mcr 15, 0, r0, c6, c1, 1 // CS1: SRAM/SDRAM mirror
-    mcr 15, 0, r0, c6, c1, 0 // DS1: SRAM/SDRAM mirror
+    mcr p15, 0, r0, c6, c1, 1 // CS1: SRAM/SDRAM mirror
+    mcr p15, 0, r0, c6, c1, 0 // DS1: SRAM/SDRAM mirror
     add r0, r0, #0x08000000
-    mcr 15, 0, r0, c6, c2, 1 // CS2: SDRAM
-    mcr 15, 0, r0, c6, c2, 0 // DS2: SDRAM
+    mcr p15, 0, r0, c6, c2, 1 // CS2: SDRAM
+    mcr p15, 0, r0, c6, c2, 0 // DS2: SDRAM
     ldr r0, =0x22000023
-    mcr 15, 0, r0, c6, c3, 1 // CS3: SRAM
-    mcr 15, 0, r0, c6, c3, 0 // DS3: SRAM
+    mcr p15, 0, r0, c6, c3, 1 // CS3: SRAM
+    mcr p15, 0, r0, c6, c3, 0 // DS3: SRAM
     ldr r0, =0x24000027
-    mcr 15, 0, r0, c6, c4, 1 // CS4: NOR flash
-    mcr 15, 0, r0, c6, c4, 0 // DS4: NOR flash
+    mcr p15, 0, r0, c6, c4, 1 // CS4: NOR flash
+    mcr p15, 0, r0, c6, c4, 0 // DS4: NOR flash
     mov r0, #0
-    mcr 15, 0, r0, c6, c5, 1 // CS5: unused
-    mcr 15, 0, r0, c6, c5, 0 // DS5: unused
-    mcr 15, 0, r0, c6, c6, 1 // CS6: unused
-    mcr 15, 0, r0, c6, c6, 0 // DS6: unused
-    mcr 15, 0, r0, c6, c7, 1 // CS7: unused
-    mcr 15, 0, r0, c6, c7, 0 // DS7: unused
+    mcr p15, 0, r0, c6, c5, 1 // CS5: unused
+    mcr p15, 0, r0, c6, c5, 0 // DS5: unused
+    mcr p15, 0, r0, c6, c6, 1 // CS6: unused
+    mcr p15, 0, r0, c6, c6, 0 // DS6: unused
+    mcr p15, 0, r0, c6, c7, 1 // CS7: unused
+    mcr p15, 0, r0, c6, c7, 0 // DS7: unused
     mov r0, #0x1e
-    mcr 15, 0, r0, c2, c0, 1 // CS1-4: cacheable
-    mcr 15, 0, r0, c2, c0, 0 // DS1-4: cacheable
-    mcr 15, 0, r0, c3, c0, 0 // DS1-4: write cacheable
+    mcr p15, 0, r0, c2, c0, 1 // CS1-4: cacheable
+    mcr p15, 0, r0, c2, c0, 0 // DS1-4: cacheable
+    mcr p15, 0, r0, c3, c0, 0 // DS1-4: write cacheable
     ldr r0, =0x000003ff
-    mcr 15, 0, r0, c5, c0, 1 // CS0-4: full access
-    mcr 15, 0, r0, c5, c0, 0 // DS0-4: full access
+    mcr p15, 0, r0, c5, c0, 1 // CS0-4: full access
+    mcr p15, 0, r0, c5, c0, 0 // DS0-4: full access
 
-    mrc 15, 0, r0, c1, c0, 0
+    mrc p15, 0, r0, c1, c0, 0
     orr r0, r0, #0x5
     orr r0, r0, #0x1000
-    mcr 15, 0, r0, c1, c0, 0 // re-enable protection unit and caches
+    mcr p15, 0, r0, c1, c0, 0 // re-enable protection unit and caches
 
     ldr r1, =0x38200000
     ldr r0, =0x006A49A5 // default: settings from Apple FW (96 MHz HCLK)
@@ -255,26 +254,26 @@ start_loc:
     str r0, [r1, #44] // do not enter any power saving mode
 
     mov r1, #0x1
-    mrc 15, 0, r0, c1, c0, 0
+    mrc p15, 0, r0, c1, c0, 0
     bic r0, r0, r1
-    mcr 15, 0, r0, c1, c0, 0 // disable protection unit
+    mcr p15, 0, r0, c1, c0, 0 // disable protection unit
 
     mov r1, #0x4
-    mrc 15, 0, r0, c1, c0, 0
+    mrc p15, 0, r0, c1, c0, 0
     bic r0, r0, r1
-    mcr 15, 0, r0, c1, c0, 0 // dcache disable
+    mcr p15, 0, r0, c1, c0, 0 // dcache disable
 
     mov r1, #0x1000
-    mrc 15, 0, r0, c1, c0, 0
+    mrc p15, 0, r0, c1, c0, 0
     bic r0, r0, r1
-    mcr 15, 0, r0, c1, c0, 0 // icache disable
+    mcr p15, 0, r0, c1, c0, 0 // icache disable
 
     mov r1, #0
 1:
     mov r0, #0
 2:
     orr r2, r1, r0
-    mcr 15, 0, r2, c7, c14, 2 // clean and flush dcache single entry
+    mcr p15, 0, r2, c7, c14, 2 // clean and flush dcache single entry
     add r0, r0, #0x10
     cmp r0, #0x40
     bne 2b
@@ -284,59 +283,59 @@ start_loc:
     nop
     nop
     mov r0, #0
-    mcr 15, 0, r0, c7, c10, 4 // clean and flush whole dcache
+    mcr p15, 0, r0, c7, c10, 4 // clean and flush whole dcache
 
     mov r0, #0
-    mcr 15, 0, r0, c7, c5, 0 // flush icache
+    mcr p15, 0, r0, c7, c5, 0 // flush icache
     
     mov r0, #0
-    mcr 15, 0, r0, c7, c6, 0 // flush dcache
+    mcr p15, 0, r0, c7, c6, 0 // flush dcache
 
     mov r0, #0x3f
-    mcr 15, 0, r0, c6, c0, 1
+    mcr p15, 0, r0, c6, c0, 1
     mov r0, #0x2f
-    mcr 15, 0, r0, c6, c1, 1
+    mcr p15, 0, r0, c6, c1, 1
     ldr r0, =0x08000031
-    mcr 15, 0, r0, c6, c2, 1
+    mcr p15, 0, r0, c6, c2, 1
     ldr r0, =0x22000023
-    mcr 15, 0, r0, c6, c3, 1
+    mcr p15, 0, r0, c6, c3, 1
     ldr r0, =0x24000027
-    mcr 15, 0, r0, c6, c4, 1
+    mcr p15, 0, r0, c6, c4, 1
     mov r0, #0x3f
-    mcr 15, 0, r0, c6, c0, 0
+    mcr p15, 0, r0, c6, c0, 0
     mov r0, #0x2f
-    mcr 15, 0, r0, c6, c1, 0
+    mcr p15, 0, r0, c6, c1, 0
     ldr r0, =0x08000031
-    mcr 15, 0, r0, c6, c2, 0
+    mcr p15, 0, r0, c6, c2, 0
     ldr r0, =0x22000023
-    mcr 15, 0, r0, c6, c3, 0
+    mcr p15, 0, r0, c6, c3, 0
     ldr r0, =0x24000029
-    mcr 15, 0, r0, c6, c4, 0
+    mcr p15, 0, r0, c6, c4, 0
     mov r0, #0x1e
-    mcr 15, 0, r0, c2, c0, 1
+    mcr p15, 0, r0, c2, c0, 1
     mov r0, #0x1e
-    mcr 15, 0, r0, c2, c0, 0
+    mcr p15, 0, r0, c2, c0, 0
     mov r0, #0x1e
-    mcr 15, 0, r0, c3, c0, 0
+    mcr p15, 0, r0, c3, c0, 0
     ldr r0, =0x0000ffff
-    mcr 15, 0, r0, c5, c0, 1
+    mcr p15, 0, r0, c5, c0, 1
     ldr r0, =0x0000ffff
-    mcr 15, 0, r0, c5, c0, 0 // set up protection and caching
+    mcr p15, 0, r0, c5, c0, 0 // set up protection and caching
 
     mov r1, #0x4
-    mrc 15, 0, r0, c1, c0, 0
+    mrc p15, 0, r0, c1, c0, 0
     orr r0, r0, r1
-    mcr 15, 0, r0, c1, c0, 0 // dcache enable
+    mcr p15, 0, r0, c1, c0, 0 // dcache enable
 
     mov r1, #0x1000
-    mrc 15, 0, r0, c1, c0, 0
+    mrc p15, 0, r0, c1, c0, 0
     orr r0, r0, r1
-    mcr 15, 0, r0, c1, c0, 0 // icache enable
+    mcr p15, 0, r0, c1, c0, 0 // icache enable
 
     mov r1, #0x1
-    mrc 15, 0, r0, c1, c0, 0
+    mrc p15, 0, r0, c1, c0, 0
     orr r0, r0, r1
-    mcr 15, 0, r0, c1, c0, 0 // enable protection unit
+    mcr p15, 0, r0, c1, c0, 0 // enable protection unit
 #endif
 
 #if CONFIG_CPU==S5L8700 || !defined(BOOTLOADER)
diff --git a/firmware/target/arm/s5l8700/debug-s5l8700.c b/firmware/target/arm/s5l8700/debug-s5l8700.c
index f174fd5728..e4c1ee6c15 100644
--- a/firmware/target/arm/s5l8700/debug-s5l8700.c
+++ b/firmware/target/arm/s5l8700/debug-s5l8700.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/s5l8700/dma-s5l8700.c b/firmware/target/arm/s5l8700/dma-s5l8700.c
index 8e6a6ebffe..db2553c726 100644
--- a/firmware/target/arm/s5l8700/dma-s5l8700.c
+++ b/firmware/target/arm/s5l8700/dma-s5l8700.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8700/dma-target.h b/firmware/target/arm/s5l8700/dma-target.h
index 6bb3a92bbd..f432793839 100644
--- a/firmware/target/arm/s5l8700/dma-target.h
+++ b/firmware/target/arm/s5l8700/dma-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8700/i2c-s5l8700.c b/firmware/target/arm/s5l8700/i2c-s5l8700.c
index 49dd0b98c0..3deed6a8bd 100644
--- a/firmware/target/arm/s5l8700/i2c-s5l8700.c
+++ b/firmware/target/arm/s5l8700/i2c-s5l8700.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/adc-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/adc-nano2g.c
index c2a0b85f08..9d9173e346 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/adc-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/adc-nano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: adc-s5l8700.c 21775 2009-07-11 14:12:02Z bertrik $
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/audio-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/audio-nano2g.c
index 876e046e11..f42fb0eaa1 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/audio-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/audio-nano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michael Sevakis
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/backlight-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/backlight-nano2g.c
index b38e0f17f5..b1008ce70e 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/backlight-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/backlight-nano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/button-target.h b/firmware/target/arm/s5l8700/ipodnano2g/button-target.h
index 75bc191608..4066663498 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/button-target.h
+++ b/firmware/target/arm/s5l8700/ipodnano2g/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
index 7071d411b5..e0e227514d 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/ftl-target.h b/firmware/target/arm/s5l8700/ipodnano2g/ftl-target.h
index 96dc4d06fa..e432ad1b40 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/ftl-target.h
+++ b/firmware/target/arm/s5l8700/ipodnano2g/ftl-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S b/firmware/target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S
index af338eef16..4c59cc1c73 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S
+++ b/firmware/target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: lcd-as-video.S 26756 2010-06-11 04:41:36Z funman $
  *
  * Copyright (C) 2010 by Andree Buschmann
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c
index 13e5c5c1d4..c8486001b2 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
index 49e0c4d3b5..4ef1c39e8e 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/nand-target.h b/firmware/target/arm/s5l8700/ipodnano2g/nand-target.h
index e1f0a612d2..05feecbc17 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/nand-target.h
+++ b/firmware/target/arm/s5l8700/ipodnano2g/nand-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c
index 78e7f00347..d1d5fb0a14 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Robert Keevil
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/piezo.h b/firmware/target/arm/s5l8700/ipodnano2g/piezo.h
index 987d4ffdda..e03aff8116 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/piezo.h
+++ b/firmware/target/arm/s5l8700/ipodnano2g/piezo.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Robert Keevil
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/pmu-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/pmu-nano2g.c
index 37cc1dcced..e0bcd25de7 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/pmu-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/pmu-nano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/pmu-target.h b/firmware/target/arm/s5l8700/ipodnano2g/pmu-target.h
index 40618c4447..348e401d64 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/pmu-target.h
+++ b/firmware/target/arm/s5l8700/ipodnano2g/pmu-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c
index 841058034a..f17990b70d 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c
index 482186f753..83508d10c4 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/rtc-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/rtc-nano2g.c
index a14bffb81c..fcc13ab9d2 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/rtc-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/rtc-nano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing, Uwe Freese, Laurent Baum
  *
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/serial-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/serial-nano2g.c
index ac30836853..c71b8b31c8 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/serial-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/serial-nano2g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/s5l8700/kernel-s5l8700.c b/firmware/target/arm/s5l8700/kernel-s5l8700.c
index 34949956d9..c6346f5d5c 100644
--- a/firmware/target/arm/s5l8700/kernel-s5l8700.c
+++ b/firmware/target/arm/s5l8700/kernel-s5l8700.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8700/pcm-s5l8700.c b/firmware/target/arm/s5l8700/pcm-s5l8700.c
index 0cc2691719..5bd2d4046d 100644
--- a/firmware/target/arm/s5l8700/pcm-s5l8700.c
+++ b/firmware/target/arm/s5l8700/pcm-s5l8700.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Bertrik Sikken
  *
@@ -254,9 +253,9 @@ static void sink_dma_init(void)
 }
 
 /* set the configured PCM frequency */
-static void sink_set_freq(uint16_t freq)
+static void sink_set_freq(uint16_t freq_idx)
 {
-    pcm_dma_set_freq(hw_freq_sampr[freq]);
+    pcm_dma_set_freq(freq_idx);
 }
 
 #ifdef HAVE_PCM_DMA_ADDRESS
diff --git a/firmware/target/arm/s5l8700/system-s5l8700.c b/firmware/target/arm/s5l8700/system-s5l8700.c
index c442b74971..eb9dd09881 100644
--- a/firmware/target/arm/s5l8700/system-s5l8700.c
+++ b/firmware/target/arm/s5l8700/system-s5l8700.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Rob Purchase
  *
diff --git a/firmware/target/arm/s5l8700/system-target.h b/firmware/target/arm/s5l8700/system-target.h
index 67c8647042..77f138336d 100644
--- a/firmware/target/arm/s5l8700/system-target.h
+++ b/firmware/target/arm/s5l8700/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8700/timer-s5l8700.c b/firmware/target/arm/s5l8700/timer-s5l8700.c
index 1196efad6f..4cb9f202df 100644
--- a/firmware/target/arm/s5l8700/timer-s5l8700.c
+++ b/firmware/target/arm/s5l8700/timer-s5l8700.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2009 Bertrik Sikken
 *
diff --git a/firmware/target/arm/s5l8700/uart-s5l8700.c b/firmware/target/arm/s5l8700/uart-s5l8700.c
index da22066f5c..b144542596 100644
--- a/firmware/target/arm/s5l8700/uart-s5l8700.c
+++ b/firmware/target/arm/s5l8700/uart-s5l8700.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/s5l8700/uart-s5l8701.c b/firmware/target/arm/s5l8700/uart-s5l8701.c
index f1079344ff..ab1f3048d8 100644
--- a/firmware/target/arm/s5l8700/uart-s5l8701.c
+++ b/firmware/target/arm/s5l8700/uart-s5l8701.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/s5l8700/uart-target.h b/firmware/target/arm/s5l8700/uart-target.h
index 76446f7fad..56ae71a748 100644
--- a/firmware/target/arm/s5l8700/uart-target.h
+++ b/firmware/target/arm/s5l8700/uart-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/s5l8700/usb-s5l8700.c b/firmware/target/arm/s5l8700/usb-s5l8700.c
index d73e983068..7f05914bbf 100644
--- a/firmware/target/arm/s5l8700/usb-s5l8700.c
+++ b/firmware/target/arm/s5l8700/usb-s5l8700.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8700/usb-s5l8701.c b/firmware/target/arm/s5l8700/usb-s5l8701.c
index 7668b214c2..131dedcf5d 100644
--- a/firmware/target/arm/s5l8700/usb-s5l8701.c
+++ b/firmware/target/arm/s5l8700/usb-s5l8701.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2014 Michael Sparmann
 *
diff --git a/firmware/target/arm/s5l8700/wmcodec-s5l8700.c b/firmware/target/arm/s5l8700/wmcodec-s5l8700.c
index 3c7c24994d..4da5527ccd 100644
--- a/firmware/target/arm/s5l8700/wmcodec-s5l8700.c
+++ b/firmware/target/arm/s5l8700/wmcodec-s5l8700.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * TCC specific code for Wolfson audio codecs
  *
diff --git a/firmware/target/arm/s5l8702/crt0.S b/firmware/target/arm/s5l8702/crt0.S
index 4fbff28b58..b3f81427b0 100644
--- a/firmware/target/arm/s5l8702/crt0.S
+++ b/firmware/target/arm/s5l8702/crt0.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: crt0.S 18776 2008-10-11 18:32:17Z gevaerts $
  *
  * Copyright (C) 2008 by Marcoen Hirschberg
  * Copyright (C) 2008 by Denes Balatoni
@@ -93,7 +92,7 @@ start_loc:
     mcr     p15, 0, r0, c1, c0, 0   /* disable caches and protection unit */
 
 .cleancache:
-    mrc     p15, 0, r15, c7, c10, 3 /* test and clean dcache */
+    mrc     p15, 0, APSR_nzcv, c7, c10, 3 /* test and clean dcache */
     bne     .cleancache
     mov     r0, #0
     mcr     p15, 0, r0, c7, c10, 4  /* drain write buffer */
diff --git a/firmware/target/arm/s5l8702/crypto-s5l8702.c b/firmware/target/arm/s5l8702/crypto-s5l8702.c
index bac6c7caec..8e712c670e 100644
--- a/firmware/target/arm/s5l8702/crypto-s5l8702.c
+++ b/firmware/target/arm/s5l8702/crypto-s5l8702.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2009 Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8702/debug-s5l8702.c b/firmware/target/arm/s5l8702/debug-s5l8702.c
index a8fa985553..9b58c46dfa 100644
--- a/firmware/target/arm/s5l8702/debug-s5l8702.c
+++ b/firmware/target/arm/s5l8702/debug-s5l8702.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: debug-s5l8700.c 28719 2010-12-01 18:35:01Z Buschel $
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/s5l8702/dma-s5l8702.c b/firmware/target/arm/s5l8702/dma-s5l8702.c
index c32a22bdab..16076a1644 100644
--- a/firmware/target/arm/s5l8702/dma-s5l8702.c
+++ b/firmware/target/arm/s5l8702/dma-s5l8702.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/s5l8702/dma-s5l8702.h b/firmware/target/arm/s5l8702/dma-s5l8702.h
index 79f15a9b07..251aafe0e3 100644
--- a/firmware/target/arm/s5l8702/dma-s5l8702.h
+++ b/firmware/target/arm/s5l8702/dma-s5l8702.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/s5l8702/gpio-s5l8702.c b/firmware/target/arm/s5l8702/gpio-s5l8702.c
index a4561c3ab5..17294fe705 100644
--- a/firmware/target/arm/s5l8702/gpio-s5l8702.c
+++ b/firmware/target/arm/s5l8702/gpio-s5l8702.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Cástor Muñoz
  * Code based on openiBoot project
diff --git a/firmware/target/arm/s5l8702/gpio-s5l8702.h b/firmware/target/arm/s5l8702/gpio-s5l8702.h
index 2acf52c7b8..c02d4359ab 100644
--- a/firmware/target/arm/s5l8702/gpio-s5l8702.h
+++ b/firmware/target/arm/s5l8702/gpio-s5l8702.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Cástor Muñoz
  * Code based on openiBoot project
diff --git a/firmware/target/arm/s5l8702/i2c-s5l8702.c b/firmware/target/arm/s5l8702/i2c-s5l8702.c
index 469cb1f436..df4dcab7f0 100644
--- a/firmware/target/arm/s5l8702/i2c-s5l8702.c
+++ b/firmware/target/arm/s5l8702/i2c-s5l8702.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: i2c-s5l8700.c 28589 2010-11-14 15:19:30Z theseven $
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/adc-6g.c b/firmware/target/arm/s5l8702/ipod6g/adc-6g.c
index 43b6ee2511..9af90f2ba3 100644
--- a/firmware/target/arm/s5l8702/ipod6g/adc-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/adc-6g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: adc-s5l8700.c 21775 2009-07-11 14:12:02Z bertrik $
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/adc-target.h b/firmware/target/arm/s5l8702/ipod6g/adc-target.h
index bedc0a8447..fdb931953d 100644
--- a/firmware/target/arm/s5l8702/ipod6g/adc-target.h
+++ b/firmware/target/arm/s5l8702/ipod6g/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: adc-target.h 21734 2009-07-09 20:17:47Z bertrik $
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/audio-6g.c b/firmware/target/arm/s5l8702/ipod6g/audio-6g.c
index a4bf3ea832..9775325cdc 100644
--- a/firmware/target/arm/s5l8702/ipod6g/audio-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/audio-6g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: audio-nano2g.c 23095 2009-10-11 09:17:12Z dave $
  *
  * Copyright (C) 2006 by Michael Sevakis
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/backlight-6g.c b/firmware/target/arm/s5l8702/ipod6g/backlight-6g.c
index 84b70bd7ab..881b22fb93 100644
--- a/firmware/target/arm/s5l8702/ipod6g/backlight-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/backlight-6g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: backlight-nano2g.c 28601 2010-11-14 20:39:18Z theseven $
  *
  * Copyright (C) 2009 by Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/backlight-target.h b/firmware/target/arm/s5l8702/ipod6g/backlight-target.h
index 89ed552b2e..a6e65a0ee3 100644
--- a/firmware/target/arm/s5l8702/ipod6g/backlight-target.h
+++ b/firmware/target/arm/s5l8702/ipod6g/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: backlight-target.h 21478 2009-06-23 18:11:03Z bertrik $
  *
  * Copyright (C) 2008 by Marcoen Hirschberg
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/button-target.h b/firmware/target/arm/s5l8702/ipod6g/button-target.h
index a5c4771b7c..4066663498 100644
--- a/firmware/target/arm/s5l8702/ipod6g/button-target.h
+++ b/firmware/target/arm/s5l8702/ipod6g/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: button-target.h 21828 2009-07-12 22:16:51Z dave $
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/cscodec-6g.c b/firmware/target/arm/s5l8702/ipod6g/cscodec-6g.c
index a81409911a..9918f38242 100644
--- a/firmware/target/arm/s5l8702/ipod6g/cscodec-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/cscodec-6g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: wmcodec-s5l8700.c 22025 2009-07-25 00:49:13Z dave $
  *
  * S5L8702-specific code for Cirrus codecs
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/lcd-6g.c b/firmware/target/arm/s5l8702/ipod6g/lcd-6g.c
index 49d6945a07..b314349bf0 100644
--- a/firmware/target/arm/s5l8702/ipod6g/lcd-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/lcd-6g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: lcd-nano2g.c 28868 2010-12-21 06:59:17Z Buschel $
  *
  * Copyright (C) 2009 by Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/lcd-target.h b/firmware/target/arm/s5l8702/ipod6g/lcd-target.h
index 0f663757a9..64feba4cab 100644
--- a/firmware/target/arm/s5l8702/ipod6g/lcd-target.h
+++ b/firmware/target/arm/s5l8702/ipod6g/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: lcd-nano2g.c 28868 2010-12-21 06:59:17Z Buschel $
  *
  * Copyright (C) 2009 by Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/piezo-6g.c b/firmware/target/arm/s5l8702/ipod6g/piezo-6g.c
index 06735673be..57ee0a9cd0 100644
--- a/firmware/target/arm/s5l8702/ipod6g/piezo-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/piezo-6g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Robert Keevil
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/piezo.h b/firmware/target/arm/s5l8702/ipod6g/piezo.h
index 7abe05ac65..a4489dd8ff 100644
--- a/firmware/target/arm/s5l8702/ipod6g/piezo.h
+++ b/firmware/target/arm/s5l8702/ipod6g/piezo.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Robert Keevil
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/pmu-6g.c b/firmware/target/arm/s5l8702/ipod6g/pmu-6g.c
index 17cb9c5701..91d0da0c1a 100644
--- a/firmware/target/arm/s5l8702/ipod6g/pmu-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/pmu-6g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: pmu-nano2g.c 27752 2010-08-08 10:49:32Z bertrik $
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/pmu-target.h b/firmware/target/arm/s5l8702/ipod6g/pmu-target.h
index 9c7fb952eb..84d4b42324 100644
--- a/firmware/target/arm/s5l8702/ipod6g/pmu-target.h
+++ b/firmware/target/arm/s5l8702/ipod6g/pmu-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: pmu-target.h 24721 2010-02-17 15:54:48Z theseven $
  *
  * Copyright © 2009 Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/power-6g.c b/firmware/target/arm/s5l8702/ipod6g/power-6g.c
index 8a5331dc6e..c1ff86092f 100644
--- a/firmware/target/arm/s5l8702/ipod6g/power-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/power-6g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: power-nano2g.c 28190 2010-10-01 18:09:10Z Buschel $
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/powermgmt-6g.c b/firmware/target/arm/s5l8702/ipod6g/powermgmt-6g.c
index 83363524a4..4af1d29889 100644
--- a/firmware/target/arm/s5l8702/ipod6g/powermgmt-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/powermgmt-6g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: powermgmt-nano2g.c 28159 2010-09-24 22:42:06Z Buschel $
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/rtc-6g.c b/firmware/target/arm/s5l8702/ipod6g/rtc-6g.c
index bf1b18035a..fcc13ab9d2 100644
--- a/firmware/target/arm/s5l8702/ipod6g/rtc-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/rtc-6g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: rtc-nano2g.c 23114 2009-10-11 18:20:56Z theseven $
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing, Uwe Freese, Laurent Baum
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/serial-6g.c b/firmware/target/arm/s5l8702/ipod6g/serial-6g.c
index c08107c096..c9e8247144 100644
--- a/firmware/target/arm/s5l8702/ipod6g/serial-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/serial-6g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c b/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c
index e979c7fa02..4de60e2fea 100644
--- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/adc-nano3g.c b/firmware/target/arm/s5l8702/ipodnano3g/adc-nano3g.c
index 42c5518210..c1e63e76f0 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/adc-nano3g.c
+++ b/firmware/target/arm/s5l8702/ipodnano3g/adc-nano3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: adc-s5l8700.c 21775 2009-07-11 14:12:02Z bertrik $
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/adc-target.h b/firmware/target/arm/s5l8702/ipodnano3g/adc-target.h
index bedc0a8447..fdb931953d 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/adc-target.h
+++ b/firmware/target/arm/s5l8702/ipodnano3g/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: adc-target.h 21734 2009-07-09 20:17:47Z bertrik $
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/audio-nano3g.c b/firmware/target/arm/s5l8702/ipodnano3g/audio-nano3g.c
index fc49ec6316..451b558111 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/audio-nano3g.c
+++ b/firmware/target/arm/s5l8702/ipodnano3g/audio-nano3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: audio-nano2g.c 23095 2009-10-11 09:17:12Z dave $
  *
  * Copyright (C) 2006 by Michael Sevakis
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/backlight-nano3g.c b/firmware/target/arm/s5l8702/ipodnano3g/backlight-nano3g.c
index 39958d3506..34fc198471 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/backlight-nano3g.c
+++ b/firmware/target/arm/s5l8702/ipodnano3g/backlight-nano3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: backlight-nano2g.c 28601 2010-11-14 20:39:18Z theseven $
  *
  * Copyright (C) 2009 by Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/backlight-target.h b/firmware/target/arm/s5l8702/ipodnano3g/backlight-target.h
index 89ed552b2e..a6e65a0ee3 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/backlight-target.h
+++ b/firmware/target/arm/s5l8702/ipodnano3g/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: backlight-target.h 21478 2009-06-23 18:11:03Z bertrik $
  *
  * Copyright (C) 2008 by Marcoen Hirschberg
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/button-target.h b/firmware/target/arm/s5l8702/ipodnano3g/button-target.h
index a5c4771b7c..4066663498 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/button-target.h
+++ b/firmware/target/arm/s5l8702/ipodnano3g/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: button-target.h 21828 2009-07-12 22:16:51Z dave $
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/cscodec-nano3g.c b/firmware/target/arm/s5l8702/ipodnano3g/cscodec-nano3g.c
index 192f16ac6d..e3ebfc9525 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/cscodec-nano3g.c
+++ b/firmware/target/arm/s5l8702/ipodnano3g/cscodec-nano3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: wmcodec-s5l8700.c 22025 2009-07-25 00:49:13Z dave $
  *
  * S5L8702-specific code for Cirrus codecs
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/lcd-target.h b/firmware/target/arm/s5l8702/ipodnano3g/lcd-target.h
index d5ec89ceca..f9b7a11e4f 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/lcd-target.h
+++ b/firmware/target/arm/s5l8702/ipodnano3g/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: lcd-nano2g.c 28868 2010-12-21 06:59:17Z Buschel $
  *
  * Copyright (C) 2009 by Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/nand-nano3g.c b/firmware/target/arm/s5l8702/ipodnano3g/nand-nano3g.c
index 9eede7b074..3632955dc2 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/nand-nano3g.c
+++ b/firmware/target/arm/s5l8702/ipodnano3g/nand-nano3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/piezo-nano3g.c b/firmware/target/arm/s5l8702/ipodnano3g/piezo-nano3g.c
index 29792098b1..5ff28a802f 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/piezo-nano3g.c
+++ b/firmware/target/arm/s5l8702/ipodnano3g/piezo-nano3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Robert Keevil
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/piezo.h b/firmware/target/arm/s5l8702/ipodnano3g/piezo.h
index ff6d562e0b..87b5517351 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/piezo.h
+++ b/firmware/target/arm/s5l8702/ipodnano3g/piezo.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Robert Keevil
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/pmu-nano3g.c b/firmware/target/arm/s5l8702/ipodnano3g/pmu-nano3g.c
index 1de7a0918e..c7cfebf7fc 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/pmu-nano3g.c
+++ b/firmware/target/arm/s5l8702/ipodnano3g/pmu-nano3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: pmu-nano2g.c 27752 2010-08-08 10:49:32Z bertrik $
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/pmu-target.h b/firmware/target/arm/s5l8702/ipodnano3g/pmu-target.h
index 116d5e485b..5278102ffa 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/pmu-target.h
+++ b/firmware/target/arm/s5l8702/ipodnano3g/pmu-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: pmu-target.h 24721 2010-02-17 15:54:48Z theseven $
  *
  * Copyright © 2009 Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/power-nano3g.c b/firmware/target/arm/s5l8702/ipodnano3g/power-nano3g.c
index 4470905f3e..8a957aa89a 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/power-nano3g.c
+++ b/firmware/target/arm/s5l8702/ipodnano3g/power-nano3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: power-nano2g.c 28190 2010-10-01 18:09:10Z Buschel $
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/powermgmt-nano3g.c b/firmware/target/arm/s5l8702/ipodnano3g/powermgmt-nano3g.c
index e126fdabab..0ea1c7aed1 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/powermgmt-nano3g.c
+++ b/firmware/target/arm/s5l8702/ipodnano3g/powermgmt-nano3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: powermgmt-nano2g.c 28159 2010-09-24 22:42:06Z Buschel $
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/rtc-nano3g.c b/firmware/target/arm/s5l8702/ipodnano3g/rtc-nano3g.c
index 615ac34b8a..215689c725 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/rtc-nano3g.c
+++ b/firmware/target/arm/s5l8702/ipodnano3g/rtc-nano3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: rtc-nano2g.c 23114 2009-10-11 18:20:56Z theseven $
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing, Uwe Freese, Laurent Baum
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano3g/serial-nano3g.c b/firmware/target/arm/s5l8702/ipodnano3g/serial-nano3g.c
index c08107c096..c9e8247144 100644
--- a/firmware/target/arm/s5l8702/ipodnano3g/serial-nano3g.c
+++ b/firmware/target/arm/s5l8702/ipodnano3g/serial-nano3g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/adc-nano4g.c b/firmware/target/arm/s5l8702/ipodnano4g/adc-nano4g.c
index 42c5518210..c1e63e76f0 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/adc-nano4g.c
+++ b/firmware/target/arm/s5l8702/ipodnano4g/adc-nano4g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: adc-s5l8700.c 21775 2009-07-11 14:12:02Z bertrik $
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/adc-target.h b/firmware/target/arm/s5l8702/ipodnano4g/adc-target.h
index bedc0a8447..fdb931953d 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/adc-target.h
+++ b/firmware/target/arm/s5l8702/ipodnano4g/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: adc-target.h 21734 2009-07-09 20:17:47Z bertrik $
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/audio-nano4g.c b/firmware/target/arm/s5l8702/ipodnano4g/audio-nano4g.c
index fc49ec6316..451b558111 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/audio-nano4g.c
+++ b/firmware/target/arm/s5l8702/ipodnano4g/audio-nano4g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: audio-nano2g.c 23095 2009-10-11 09:17:12Z dave $
  *
  * Copyright (C) 2006 by Michael Sevakis
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/backlight-nano4g.c b/firmware/target/arm/s5l8702/ipodnano4g/backlight-nano4g.c
index b98fa29f75..f14955136f 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/backlight-nano4g.c
+++ b/firmware/target/arm/s5l8702/ipodnano4g/backlight-nano4g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: backlight-nano2g.c 28601 2010-11-14 20:39:18Z theseven $
  *
  * Copyright (C) 2009 by Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/backlight-target.h b/firmware/target/arm/s5l8702/ipodnano4g/backlight-target.h
index 89ed552b2e..a6e65a0ee3 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/backlight-target.h
+++ b/firmware/target/arm/s5l8702/ipodnano4g/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: backlight-target.h 21478 2009-06-23 18:11:03Z bertrik $
  *
  * Copyright (C) 2008 by Marcoen Hirschberg
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/button-target.h b/firmware/target/arm/s5l8702/ipodnano4g/button-target.h
index a5c4771b7c..4066663498 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/button-target.h
+++ b/firmware/target/arm/s5l8702/ipodnano4g/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: button-target.h 21828 2009-07-12 22:16:51Z dave $
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/cscodec-nano4g.c b/firmware/target/arm/s5l8702/ipodnano4g/cscodec-nano4g.c
index ea80cd177e..f4afac554d 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/cscodec-nano4g.c
+++ b/firmware/target/arm/s5l8702/ipodnano4g/cscodec-nano4g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: wmcodec-s5l8700.c 22025 2009-07-25 00:49:13Z dave $
  *
  * S5L8702-specific code for Cirrus codecs
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/lcd-target.h b/firmware/target/arm/s5l8702/ipodnano4g/lcd-target.h
index d5ec89ceca..f9b7a11e4f 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/lcd-target.h
+++ b/firmware/target/arm/s5l8702/ipodnano4g/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: lcd-nano2g.c 28868 2010-12-21 06:59:17Z Buschel $
  *
  * Copyright (C) 2009 by Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/nand-nano4g.c b/firmware/target/arm/s5l8702/ipodnano4g/nand-nano4g.c
index 9eede7b074..3632955dc2 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/nand-nano4g.c
+++ b/firmware/target/arm/s5l8702/ipodnano4g/nand-nano4g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/piezo-nano4g.c b/firmware/target/arm/s5l8702/ipodnano4g/piezo-nano4g.c
index c299ea3eb6..d059caee46 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/piezo-nano4g.c
+++ b/firmware/target/arm/s5l8702/ipodnano4g/piezo-nano4g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Robert Keevil
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/piezo.h b/firmware/target/arm/s5l8702/ipodnano4g/piezo.h
index ff6d562e0b..87b5517351 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/piezo.h
+++ b/firmware/target/arm/s5l8702/ipodnano4g/piezo.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Robert Keevil
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/pmu-nano4g.c b/firmware/target/arm/s5l8702/ipodnano4g/pmu-nano4g.c
index 8b15bf6e86..2f19b11eeb 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/pmu-nano4g.c
+++ b/firmware/target/arm/s5l8702/ipodnano4g/pmu-nano4g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: pmu-nano2g.c 27752 2010-08-08 10:49:32Z bertrik $
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/pmu-target.h b/firmware/target/arm/s5l8702/ipodnano4g/pmu-target.h
index 578038ac52..f219977f50 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/pmu-target.h
+++ b/firmware/target/arm/s5l8702/ipodnano4g/pmu-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: pmu-target.h 24721 2010-02-17 15:54:48Z theseven $
  *
  * Copyright © 2009 Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/power-nano4g.c b/firmware/target/arm/s5l8702/ipodnano4g/power-nano4g.c
index ec42763a0b..11a049eca5 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/power-nano4g.c
+++ b/firmware/target/arm/s5l8702/ipodnano4g/power-nano4g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: power-nano2g.c 28190 2010-10-01 18:09:10Z Buschel $
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/powermgmt-nano4g.c b/firmware/target/arm/s5l8702/ipodnano4g/powermgmt-nano4g.c
index 652ccff1d8..f4e2f7b734 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/powermgmt-nano4g.c
+++ b/firmware/target/arm/s5l8702/ipodnano4g/powermgmt-nano4g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: powermgmt-nano2g.c 28159 2010-09-24 22:42:06Z Buschel $
  *
  * Copyright © 2008 Rafaël Carré
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/rtc-nano4g.c b/firmware/target/arm/s5l8702/ipodnano4g/rtc-nano4g.c
index 615ac34b8a..215689c725 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/rtc-nano4g.c
+++ b/firmware/target/arm/s5l8702/ipodnano4g/rtc-nano4g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: rtc-nano2g.c 23114 2009-10-11 18:20:56Z theseven $
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing, Uwe Freese, Laurent Baum
  *
diff --git a/firmware/target/arm/s5l8702/ipodnano4g/serial-nano4g.c b/firmware/target/arm/s5l8702/ipodnano4g/serial-nano4g.c
index c08107c096..c9e8247144 100644
--- a/firmware/target/arm/s5l8702/ipodnano4g/serial-nano4g.c
+++ b/firmware/target/arm/s5l8702/ipodnano4g/serial-nano4g.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/s5l8702/kernel-s5l8702.c b/firmware/target/arm/s5l8702/kernel-s5l8702.c
index 0a5413af73..05e2963fbb 100644
--- a/firmware/target/arm/s5l8702/kernel-s5l8702.c
+++ b/firmware/target/arm/s5l8702/kernel-s5l8702.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: kernel-s5l8700.c 28795 2010-12-11 17:52:52Z Buschel $
  *
  * Copyright © 2009 Bertrik Sikken
  *
diff --git a/firmware/target/arm/s5l8702/lcd-asm-s5l8702.S b/firmware/target/arm/s5l8702/lcd-asm-s5l8702.S
index 2bd591bcfb..e0c99163db 100644
--- a/firmware/target/arm/s5l8702/lcd-asm-s5l8702.S
+++ b/firmware/target/arm/s5l8702/lcd-asm-s5l8702.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: lcd-as-video.S 26756 2010-06-11 04:41:36Z funman $
  *
  * Copyright (C) 2010 by Andree Buschmann
  *
diff --git a/firmware/target/arm/s5l8702/lcd-s5l8702.c b/firmware/target/arm/s5l8702/lcd-s5l8702.c
index cc0fa37605..4e8e8af1e3 100644
--- a/firmware/target/arm/s5l8702/lcd-s5l8702.c
+++ b/firmware/target/arm/s5l8702/lcd-s5l8702.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: lcd-nano2g.c 28868 2010-12-21 06:59:17Z Buschel $
  *
  * Copyright (C) 2009 by Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8702/pcm-s5l8702.c b/firmware/target/arm/s5l8702/pcm-s5l8702.c
index a10479e95e..bd110f31c4 100644
--- a/firmware/target/arm/s5l8702/pcm-s5l8702.c
+++ b/firmware/target/arm/s5l8702/pcm-s5l8702.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: pcm-s5l8700.c 28600 2010-11-14 19:49:20Z Buschel $
  *
  * Copyright © 2011 Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8702/pcm-target.h b/firmware/target/arm/s5l8702/pcm-target.h
index b858581c4e..4c7f96d55e 100644
--- a/firmware/target/arm/s5l8702/pcm-target.h
+++ b/firmware/target/arm/s5l8702/pcm-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: system-target.h 28791 2010-12-11 09:39:33Z Buschel $
  *
  * Copyright (C) 2010 by Michael Sparmann
  *
diff --git a/firmware/target/arm/s5l8702/pl080.c b/firmware/target/arm/s5l8702/pl080.c
index d7b3a3173f..b6377f5db5 100644
--- a/firmware/target/arm/s5l8702/pl080.c
+++ b/firmware/target/arm/s5l8702/pl080.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/s5l8702/system-s5l8702.c b/firmware/target/arm/s5l8702/system-s5l8702.c
index 3fc25b996f..a706e81491 100644
--- a/firmware/target/arm/s5l8702/system-s5l8702.c
+++ b/firmware/target/arm/s5l8702/system-s5l8702.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: system-s5l8700.c 28935 2010-12-30 20:23:46Z Buschel $
  *
  * Copyright (C) 2007 by Rob Purchase
  *
diff --git a/firmware/target/arm/s5l8702/system-target.h b/firmware/target/arm/s5l8702/system-target.h
index c1835fc9bc..d618d431d3 100644
--- a/firmware/target/arm/s5l8702/system-target.h
+++ b/firmware/target/arm/s5l8702/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: system-target.h 28791 2010-12-11 09:39:33Z Buschel $
  *
  * Copyright (C) 2007 by Dave Chapman
  *
diff --git a/firmware/target/arm/s5l8702/timer-s5l8702.c b/firmware/target/arm/s5l8702/timer-s5l8702.c
index 27d42caa14..4c07f6a825 100644
--- a/firmware/target/arm/s5l8702/timer-s5l8702.c
+++ b/firmware/target/arm/s5l8702/timer-s5l8702.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id: timer-s5l8700.c 23103 2009-10-11 11:35:14Z theseven $
 *
 * Copyright (C) 2009 Bertrik Sikken
 *
diff --git a/firmware/target/arm/s5l8702/uart-s5l8702.c b/firmware/target/arm/s5l8702/uart-s5l8702.c
index 6b2866e729..00770851bc 100644
--- a/firmware/target/arm/s5l8702/uart-s5l8702.c
+++ b/firmware/target/arm/s5l8702/uart-s5l8702.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/s5l8702/uart-target.h b/firmware/target/arm/s5l8702/uart-target.h
index 76446f7fad..56ae71a748 100644
--- a/firmware/target/arm/s5l8702/uart-target.h
+++ b/firmware/target/arm/s5l8702/uart-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/s5l8702/usb-s5l8702.c b/firmware/target/arm/s5l8702/usb-s5l8702.c
index 2fa5033ef6..4572406d72 100644
--- a/firmware/target/arm/s5l8702/usb-s5l8702.c
+++ b/firmware/target/arm/s5l8702/usb-s5l8702.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2014 Michael Sparmann
 *
diff --git a/firmware/target/arm/samsung/adc-target.h b/firmware/target/arm/samsung/adc-target.h
index 9cca223804..9d66dc35a0 100644
--- a/firmware/target/arm/samsung/adc-target.h
+++ b/firmware/target/arm/samsung/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/samsung/akcodec-yh82x_yh92x.c b/firmware/target/arm/samsung/akcodec-yh82x_yh92x.c
index 55442e8837..149c449dd5 100644
--- a/firmware/target/arm/samsung/akcodec-yh82x_yh92x.c
+++ b/firmware/target/arm/samsung/akcodec-yh82x_yh92x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2009 Mark Arigo
  *
diff --git a/firmware/target/arm/samsung/backlight-target.h b/firmware/target/arm/samsung/backlight-target.h
index 3882964207..83587be1b4 100644
--- a/firmware/target/arm/samsung/backlight-target.h
+++ b/firmware/target/arm/samsung/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/samsung/button-target.h b/firmware/target/arm/samsung/button-target.h
index 8e1c970c62..784b266431 100644
--- a/firmware/target/arm/samsung/button-target.h
+++ b/firmware/target/arm/samsung/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Mark Arigo
  *
diff --git a/firmware/target/arm/samsung/button-yh82x_yh92x.c b/firmware/target/arm/samsung/button-yh82x_yh92x.c
index ed3c3abf81..2fef2541c9 100644
--- a/firmware/target/arm/samsung/button-yh82x_yh92x.c
+++ b/firmware/target/arm/samsung/button-yh82x_yh92x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Mark Arigo
  *
diff --git a/firmware/target/arm/samsung/fmradio-yh92x.c b/firmware/target/arm/samsung/fmradio-yh92x.c
index 4637aca287..504f9d3d04 100644
--- a/firmware/target/arm/samsung/fmradio-yh92x.c
+++ b/firmware/target/arm/samsung/fmradio-yh92x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Physical interface of the Philips TEA5767 in Samsung YH-92x
  *
  * Copyright (C) 2014 by Szymon Dziok
diff --git a/firmware/target/arm/samsung/power-yh82x_yh92x.c b/firmware/target/arm/samsung/power-yh82x_yh92x.c
index aed8817f2a..6d75378797 100644
--- a/firmware/target/arm/samsung/power-yh82x_yh92x.c
+++ b/firmware/target/arm/samsung/power-yh82x_yh92x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Mark Arigo
  *
diff --git a/firmware/target/arm/samsung/yh820/backlight-yh820.c b/firmware/target/arm/samsung/yh820/backlight-yh820.c
index c9309eebbe..9d5f014ee7 100644
--- a/firmware/target/arm/samsung/yh820/backlight-yh820.c
+++ b/firmware/target/arm/samsung/yh820/backlight-yh820.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/samsung/yh820/lcd-as-yh820.S b/firmware/target/arm/samsung/yh820/lcd-as-yh820.S
index 542ceeeb36..db0b626e42 100644
--- a/firmware/target/arm/samsung/yh820/lcd-as-yh820.S
+++ b/firmware/target/arm/samsung/yh820/lcd-as-yh820.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jens Arnold
  * Heavily based on lcd-as-memframe.c by Michael Sevakis
diff --git a/firmware/target/arm/samsung/yh820/lcd-yh820.c b/firmware/target/arm/samsung/yh820/lcd-yh820.c
index f4b55ab917..2b800b8ef7 100644
--- a/firmware/target/arm/samsung/yh820/lcd-yh820.c
+++ b/firmware/target/arm/samsung/yh820/lcd-yh820.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Mark Arigo
  *
diff --git a/firmware/target/arm/samsung/yh820/powermgmt-yh820.c b/firmware/target/arm/samsung/yh820/powermgmt-yh820.c
index 389feb915d..e6aea6fad7 100644
--- a/firmware/target/arm/samsung/yh820/powermgmt-yh820.c
+++ b/firmware/target/arm/samsung/yh820/powermgmt-yh820.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/samsung/yh920/backlight-yh920.c b/firmware/target/arm/samsung/yh920/backlight-yh920.c
index b24f8128c4..ce7574df59 100644
--- a/firmware/target/arm/samsung/yh920/backlight-yh920.c
+++ b/firmware/target/arm/samsung/yh920/backlight-yh920.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/samsung/yh920/lcd-as-yh920.S b/firmware/target/arm/samsung/yh920/lcd-as-yh920.S
index 130addf460..47b764ebaa 100644
--- a/firmware/target/arm/samsung/yh920/lcd-as-yh920.S
+++ b/firmware/target/arm/samsung/yh920/lcd-as-yh920.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  * Modified from ipod/lcd-as-gray.S for YH920 by Rafaël Carré
diff --git a/firmware/target/arm/samsung/yh920/lcd-yh920.c b/firmware/target/arm/samsung/yh920/lcd-yh920.c
index 6a579f382a..dcb595ffa1 100644
--- a/firmware/target/arm/samsung/yh920/lcd-yh920.c
+++ b/firmware/target/arm/samsung/yh920/lcd-yh920.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/samsung/yh920/powermgmt-yh920.c b/firmware/target/arm/samsung/yh920/powermgmt-yh920.c
index 77def90715..ac695e639b 100644
--- a/firmware/target/arm/samsung/yh920/powermgmt-yh920.c
+++ b/firmware/target/arm/samsung/yh920/powermgmt-yh920.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/samsung/yh925/backlight-yh925.c b/firmware/target/arm/samsung/yh925/backlight-yh925.c
index 8eb287b61b..a77751f331 100644
--- a/firmware/target/arm/samsung/yh925/backlight-yh925.c
+++ b/firmware/target/arm/samsung/yh925/backlight-yh925.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/samsung/yh925/lcd-as-yh925.S b/firmware/target/arm/samsung/yh925/lcd-as-yh925.S
index 8ac8b4289f..54e2f1e1fb 100644
--- a/firmware/target/arm/samsung/yh925/lcd-as-yh925.S
+++ b/firmware/target/arm/samsung/yh925/lcd-as-yh925.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2008 by Michael Sevakis
  *
diff --git a/firmware/target/arm/samsung/yh925/lcd-yh925.c b/firmware/target/arm/samsung/yh925/lcd-yh925.c
index a75ce663c9..45cc22fa6a 100644
--- a/firmware/target/arm/samsung/yh925/lcd-yh925.c
+++ b/firmware/target/arm/samsung/yh925/lcd-yh925.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/samsung/yh925/powermgmt-yh925.c b/firmware/target/arm/samsung/yh925/powermgmt-yh925.c
index b4799eee02..8038290ff0 100644
--- a/firmware/target/arm/samsung/yh925/powermgmt-yh925.c
+++ b/firmware/target/arm/samsung/yh925/powermgmt-yh925.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/sandisk/audio-c200_e200.c b/firmware/target/arm/sandisk/audio-c200_e200.c
index 07ca2a5371..fb1fcab169 100644
--- a/firmware/target/arm/sandisk/audio-c200_e200.c
+++ b/firmware/target/arm/sandisk/audio-c200_e200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/target/arm/sandisk/backlight-c200_e200.c b/firmware/target/arm/sandisk/backlight-c200_e200.c
index ad1a6d9e46..648c41c1ba 100644
--- a/firmware/target/arm/sandisk/backlight-c200_e200.c
+++ b/firmware/target/arm/sandisk/backlight-c200_e200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/sandisk/backlight-target.h b/firmware/target/arm/sandisk/backlight-target.h
index cbe26f54da..4dc2dca544 100644
--- a/firmware/target/arm/sandisk/backlight-target.h
+++ b/firmware/target/arm/sandisk/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c
index 6637111ec8..708740c977 100644
--- a/firmware/target/arm/sandisk/power-c200_e200.c
+++ b/firmware/target/arm/sandisk/power-c200_e200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Daniel Ankers
  *
diff --git a/firmware/target/arm/sandisk/powermgmt-target.h b/firmware/target/arm/sandisk/powermgmt-target.h
index cb1ccf55c4..04b75e5755 100644
--- a/firmware/target/arm/sandisk/powermgmt-target.h
+++ b/firmware/target/arm/sandisk/powermgmt-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sevakis
  * Copyright (C) 2008 by Bertrik Sikken
diff --git a/firmware/target/arm/sandisk/sansa-c200/button-c200.c b/firmware/target/arm/sandisk/sansa-c200/button-c200.c
index e42577fab3..6e5ff51fae 100644
--- a/firmware/target/arm/sandisk/sansa-c200/button-c200.c
+++ b/firmware/target/arm/sandisk/sansa-c200/button-c200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2007 by Mark Arigo
  *
diff --git a/firmware/target/arm/sandisk/sansa-c200/button-target.h b/firmware/target/arm/sandisk/sansa-c200/button-target.h
index 1b352975e5..7f0b757317 100644
--- a/firmware/target/arm/sandisk/sansa-c200/button-target.h
+++ b/firmware/target/arm/sandisk/sansa-c200/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2007 by Mark Arigo
  *
diff --git a/firmware/target/arm/sandisk/sansa-c200/lcd-as-c200.S b/firmware/target/arm/sandisk/sansa-c200/lcd-as-c200.S
index 542ceeeb36..db0b626e42 100644
--- a/firmware/target/arm/sandisk/sansa-c200/lcd-as-c200.S
+++ b/firmware/target/arm/sandisk/sansa-c200/lcd-as-c200.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jens Arnold
  * Heavily based on lcd-as-memframe.c by Michael Sevakis
diff --git a/firmware/target/arm/sandisk/sansa-c200/powermgmt-c200.c b/firmware/target/arm/sandisk/sansa-c200/powermgmt-c200.c
index 51e918494c..d46e3c3386 100644
--- a/firmware/target/arm/sandisk/sansa-c200/powermgmt-c200.c
+++ b/firmware/target/arm/sandisk/sansa-c200/powermgmt-c200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: powermgmt-e200.c 14375 2007-08-17 06:45:18Z amiconn $
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-e200.c b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
index 1f108b9b90..384264faf1 100644
--- a/firmware/target/arm/sandisk/sansa-e200/button-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-target.h b/firmware/target/arm/sandisk/sansa-e200/button-target.h
index 162254746b..2330047e68 100644
--- a/firmware/target/arm/sandisk/sansa-e200/button-target.h
+++ b/firmware/target/arm/sandisk/sansa-e200/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
index 060031a534..bfe8405b70 100644
--- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Rockbox driver for Sansa e200 LCDs
  *
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-target.h b/firmware/target/arm/sandisk/sansa-e200/lcd-target.h
index e589dce78c..0353f344dc 100644
--- a/firmware/target/arm/sandisk/sansa-e200/lcd-target.h
+++ b/firmware/target/arm/sandisk/sansa-e200/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Michael Sevakis
  *
diff --git a/firmware/target/arm/sandisk/sansa-e200/powermgmt-e200.c b/firmware/target/arm/sandisk/sansa-e200/powermgmt-e200.c
index ee0d753d2c..aeb5446b0a 100644
--- a/firmware/target/arm/sandisk/sansa-e200/powermgmt-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/powermgmt-e200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/arm/stm32/clock-stm32h7.h b/firmware/target/arm/stm32/clock-stm32h7.h
index a84b09e519..06cc363ec5 100644
--- a/firmware/target/arm/stm32/clock-stm32h7.h
+++ b/firmware/target/arm/stm32/clock-stm32h7.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/crt0-stm32h7.S b/firmware/target/arm/stm32/crt0-stm32h7.S
index 0548350cc9..ddcae7d392 100644
--- a/firmware/target/arm/stm32/crt0-stm32h7.S
+++ b/firmware/target/arm/stm32/crt0-stm32h7.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/debug-stm32h7.c b/firmware/target/arm/stm32/debug-stm32h7.c
index 4002876e28..b37b140974 100644
--- a/firmware/target/arm/stm32/debug-stm32h7.c
+++ b/firmware/target/arm/stm32/debug-stm32h7.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/dmamux-stm32h743.h b/firmware/target/arm/stm32/dmamux-stm32h743.h
index 2fd965a79b..f28d7ea5ec 100644
--- a/firmware/target/arm/stm32/dmamux-stm32h743.h
+++ b/firmware/target/arm/stm32/dmamux-stm32h743.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/adc-echoplayer.c b/firmware/target/arm/stm32/echoplayer/adc-echoplayer.c
index 245f0375db..045c567ad1 100644
--- a/firmware/target/arm/stm32/echoplayer/adc-echoplayer.c
+++ b/firmware/target/arm/stm32/echoplayer/adc-echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/adc-target.h b/firmware/target/arm/stm32/echoplayer/adc-target.h
index 5edc098b37..64291dd03b 100644
--- a/firmware/target/arm/stm32/echoplayer/adc-target.h
+++ b/firmware/target/arm/stm32/echoplayer/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/audiohw-echoplayer.c b/firmware/target/arm/stm32/echoplayer/audiohw-echoplayer.c
index 2fb913481e..2a8cc6e4e2 100644
--- a/firmware/target/arm/stm32/echoplayer/audiohw-echoplayer.c
+++ b/firmware/target/arm/stm32/echoplayer/audiohw-echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/backlight-echoplayer.c b/firmware/target/arm/stm32/echoplayer/backlight-echoplayer.c
index ea278afb6a..864c332120 100644
--- a/firmware/target/arm/stm32/echoplayer/backlight-echoplayer.c
+++ b/firmware/target/arm/stm32/echoplayer/backlight-echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/backlight-target.h b/firmware/target/arm/stm32/echoplayer/backlight-target.h
index 2af6fdf6ff..a7e3c05d69 100644
--- a/firmware/target/arm/stm32/echoplayer/backlight-target.h
+++ b/firmware/target/arm/stm32/echoplayer/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/button-echoplayer.c b/firmware/target/arm/stm32/echoplayer/button-echoplayer.c
index 1c180717ab..b6c903923a 100644
--- a/firmware/target/arm/stm32/echoplayer/button-echoplayer.c
+++ b/firmware/target/arm/stm32/echoplayer/button-echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/button-target.h b/firmware/target/arm/stm32/echoplayer/button-target.h
index e8233c4a74..382934c393 100644
--- a/firmware/target/arm/stm32/echoplayer/button-target.h
+++ b/firmware/target/arm/stm32/echoplayer/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/clock-echoplayer.c b/firmware/target/arm/stm32/echoplayer/clock-echoplayer.c
index d9bd0d31c5..59cdc7a2cb 100644
--- a/firmware/target/arm/stm32/echoplayer/clock-echoplayer.c
+++ b/firmware/target/arm/stm32/echoplayer/clock-echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/clock-echoplayer.h b/firmware/target/arm/stm32/echoplayer/clock-echoplayer.h
index d75b294e93..fe296ef6bb 100644
--- a/firmware/target/arm/stm32/echoplayer/clock-echoplayer.h
+++ b/firmware/target/arm/stm32/echoplayer/clock-echoplayer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/gpio-target.h b/firmware/target/arm/stm32/echoplayer/gpio-target.h
index 36c5df281b..05507350a7 100644
--- a/firmware/target/arm/stm32/echoplayer/gpio-target.h
+++ b/firmware/target/arm/stm32/echoplayer/gpio-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/i2c-echoplayer.c b/firmware/target/arm/stm32/echoplayer/i2c-echoplayer.c
index 39cdea33ab..7718db3563 100644
--- a/firmware/target/arm/stm32/echoplayer/i2c-echoplayer.c
+++ b/firmware/target/arm/stm32/echoplayer/i2c-echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/i2c-echoplayer.h b/firmware/target/arm/stm32/echoplayer/i2c-echoplayer.h
index 7b0ef57eeb..b8bf48f17f 100644
--- a/firmware/target/arm/stm32/echoplayer/i2c-echoplayer.h
+++ b/firmware/target/arm/stm32/echoplayer/i2c-echoplayer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/lcd-echoplayer.c b/firmware/target/arm/stm32/echoplayer/lcd-echoplayer.c
index e68b0d9b0e..7c8245db13 100644
--- a/firmware/target/arm/stm32/echoplayer/lcd-echoplayer.c
+++ b/firmware/target/arm/stm32/echoplayer/lcd-echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/lcd-echoplayer.h b/firmware/target/arm/stm32/echoplayer/lcd-echoplayer.h
index 5d36972167..71638f2487 100644
--- a/firmware/target/arm/stm32/echoplayer/lcd-echoplayer.h
+++ b/firmware/target/arm/stm32/echoplayer/lcd-echoplayer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/pcm-echoplayer.c b/firmware/target/arm/stm32/echoplayer/pcm-echoplayer.c
index 1867b21de0..d4944ce241 100644
--- a/firmware/target/arm/stm32/echoplayer/pcm-echoplayer.c
+++ b/firmware/target/arm/stm32/echoplayer/pcm-echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/power-echoplayer.c b/firmware/target/arm/stm32/echoplayer/power-echoplayer.c
index bbe3c627e5..9b8ede2c72 100644
--- a/firmware/target/arm/stm32/echoplayer/power-echoplayer.c
+++ b/firmware/target/arm/stm32/echoplayer/power-echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/power-echoplayer.h b/firmware/target/arm/stm32/echoplayer/power-echoplayer.h
index 555b55c034..dfbfc5ea79 100644
--- a/firmware/target/arm/stm32/echoplayer/power-echoplayer.h
+++ b/firmware/target/arm/stm32/echoplayer/power-echoplayer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/sdmmc-echoplayer.c b/firmware/target/arm/stm32/echoplayer/sdmmc-echoplayer.c
index 803b7cae2b..61ab336841 100644
--- a/firmware/target/arm/stm32/echoplayer/sdmmc-echoplayer.c
+++ b/firmware/target/arm/stm32/echoplayer/sdmmc-echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/system-echoplayer.c b/firmware/target/arm/stm32/echoplayer/system-echoplayer.c
index 29d017eec9..79555f7256 100644
--- a/firmware/target/arm/stm32/echoplayer/system-echoplayer.c
+++ b/firmware/target/arm/stm32/echoplayer/system-echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/system-echoplayer.h b/firmware/target/arm/stm32/echoplayer/system-echoplayer.h
index abfd96c145..3d6c821913 100644
--- a/firmware/target/arm/stm32/echoplayer/system-echoplayer.h
+++ b/firmware/target/arm/stm32/echoplayer/system-echoplayer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/echoplayer/usb-echoplayer.c b/firmware/target/arm/stm32/echoplayer/usb-echoplayer.c
index f16cd8dc7c..e464e2f4b6 100644
--- a/firmware/target/arm/stm32/echoplayer/usb-echoplayer.c
+++ b/firmware/target/arm/stm32/echoplayer/usb-echoplayer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/gpio-stm32h7.c b/firmware/target/arm/stm32/gpio-stm32h7.c
index 020c3cb86f..b74a71274a 100644
--- a/firmware/target/arm/stm32/gpio-stm32h7.c
+++ b/firmware/target/arm/stm32/gpio-stm32h7.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/gpio-stm32h7.h b/firmware/target/arm/stm32/gpio-stm32h7.h
index 24b0c1fe61..1f90bb24cc 100644
--- a/firmware/target/arm/stm32/gpio-stm32h7.h
+++ b/firmware/target/arm/stm32/gpio-stm32h7.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/i2c-stm32h7.c b/firmware/target/arm/stm32/i2c-stm32h7.c
index 1d06290f03..7f4608a033 100644
--- a/firmware/target/arm/stm32/i2c-stm32h7.c
+++ b/firmware/target/arm/stm32/i2c-stm32h7.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/i2c-stm32h7.h b/firmware/target/arm/stm32/i2c-stm32h7.h
index b20dc0e89b..708d50d476 100644
--- a/firmware/target/arm/stm32/i2c-stm32h7.h
+++ b/firmware/target/arm/stm32/i2c-stm32h7.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2026 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/irqhandlers-stm32h743.c b/firmware/target/arm/stm32/irqhandlers-stm32h743.c
index 9af063d230..c9a2d65d90 100644
--- a/firmware/target/arm/stm32/irqhandlers-stm32h743.c
+++ b/firmware/target/arm/stm32/irqhandlers-stm32h743.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/nvic-stm32h743.h b/firmware/target/arm/stm32/nvic-stm32h743.h
index b23289aa45..e9052e0198 100644
--- a/firmware/target/arm/stm32/nvic-stm32h743.h
+++ b/firmware/target/arm/stm32/nvic-stm32h743.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/nvic-target.h b/firmware/target/arm/stm32/nvic-target.h
index a0a62f7e7b..def278c5b9 100644
--- a/firmware/target/arm/stm32/nvic-target.h
+++ b/firmware/target/arm/stm32/nvic-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/sdmmc-stm32h7.c b/firmware/target/arm/stm32/sdmmc-stm32h7.c
index 2fd9ff1cb4..cfd7fabbef 100644
--- a/firmware/target/arm/stm32/sdmmc-stm32h7.c
+++ b/firmware/target/arm/stm32/sdmmc-stm32h7.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/sdmmc-stm32h7.h b/firmware/target/arm/stm32/sdmmc-stm32h7.h
index 7aeed251e2..2dd69af3a8 100644
--- a/firmware/target/arm/stm32/sdmmc-stm32h7.h
+++ b/firmware/target/arm/stm32/sdmmc-stm32h7.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/spi-stm32h7.c b/firmware/target/arm/stm32/spi-stm32h7.c
index b7741e0182..15506b8638 100644
--- a/firmware/target/arm/stm32/spi-stm32h7.c
+++ b/firmware/target/arm/stm32/spi-stm32h7.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/spi-stm32h7.h b/firmware/target/arm/stm32/spi-stm32h7.h
index f7871a3969..77c9318c8e 100644
--- a/firmware/target/arm/stm32/spi-stm32h7.h
+++ b/firmware/target/arm/stm32/spi-stm32h7.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/system-stm32h7.c b/firmware/target/arm/stm32/system-stm32h7.c
index 06639664b3..c1c311c18e 100644
--- a/firmware/target/arm/stm32/system-stm32h7.c
+++ b/firmware/target/arm/stm32/system-stm32h7.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/system-target.h b/firmware/target/arm/stm32/system-target.h
index ac0fab226a..18605615cc 100644
--- a/firmware/target/arm/stm32/system-target.h
+++ b/firmware/target/arm/stm32/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/timer-stm32h7.c b/firmware/target/arm/stm32/timer-stm32h7.c
index 30a13fad10..5135d9a384 100644
--- a/firmware/target/arm/stm32/timer-stm32h7.c
+++ b/firmware/target/arm/stm32/timer-stm32h7.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/usb-stm32h7.c b/firmware/target/arm/stm32/usb-stm32h7.c
index 983389b54c..5a1da1225c 100644
--- a/firmware/target/arm/stm32/usb-stm32h7.c
+++ b/firmware/target/arm/stm32/usb-stm32h7.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Aidan MacDonald
  *
diff --git a/firmware/target/arm/stm32/vectors-stm32h7.S b/firmware/target/arm/stm32/vectors-stm32h7.S
index 16fced87a6..d283d808ad 100644
--- a/firmware/target/arm/stm32/vectors-stm32h7.S
+++ b/firmware/target/arm/stm32/vectors-stm32h7.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/system-arm-classic.c b/firmware/target/arm/system-arm-classic.c
index d956b5e64a..286cfddd47 100644
--- a/firmware/target/arm/system-arm-classic.c
+++ b/firmware/target/arm/system-arm-classic.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Thom Johansen
  *
diff --git a/firmware/target/arm/system-arm-classic.h b/firmware/target/arm/system-arm-classic.h
index a941a36a7e..a459901ee9 100644
--- a/firmware/target/arm/system-arm-classic.h
+++ b/firmware/target/arm/system-arm-classic.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/target/arm/system-arm-micro.c b/firmware/target/arm/system-arm-micro.c
index b9aa20733c..0a38b1bebe 100644
--- a/firmware/target/arm/system-arm-micro.c
+++ b/firmware/target/arm/system-arm-micro.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/system-arm-micro.h b/firmware/target/arm/system-arm-micro.h
index a364a882fe..7659685e9d 100644
--- a/firmware/target/arm/system-arm-micro.h
+++ b/firmware/target/arm/system-arm-micro.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/system-arm.h b/firmware/target/arm/system-arm.h
index 204772ea6c..f5aa366fd3 100644
--- a/firmware/target/arm/system-arm.h
+++ b/firmware/target/arm/system-arm.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/target/arm/tcc780x/adc-tcc780x.c b/firmware/target/arm/tcc780x/adc-tcc780x.c
index f87a1694f2..db5f4dfac5 100644
--- a/firmware/target/arm/tcc780x/adc-tcc780x.c
+++ b/firmware/target/arm/tcc780x/adc-tcc780x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Dave Chapman
  *
diff --git a/firmware/target/arm/tcc780x/ata-nand-target.h b/firmware/target/arm/tcc780x/ata-nand-target.h
index f95d07886e..ae62b5748a 100644
--- a/firmware/target/arm/tcc780x/ata-nand-target.h
+++ b/firmware/target/arm/tcc780x/ata-nand-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/adc-target.h b/firmware/target/arm/tcc780x/cowond2/adc-target.h
index cc95243701..029572f308 100644
--- a/firmware/target/arm/tcc780x/cowond2/adc-target.h
+++ b/firmware/target/arm/tcc780x/cowond2/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/audio-cowond2.c b/firmware/target/arm/tcc780x/cowond2/audio-cowond2.c
index a6cace3d7d..fe3b20639d 100644
--- a/firmware/target/arm/tcc780x/cowond2/audio-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/audio-cowond2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/backlight-cowond2.c b/firmware/target/arm/tcc780x/cowond2/backlight-cowond2.c
index 37ee0e57a1..39da1c3843 100644
--- a/firmware/target/arm/tcc780x/cowond2/backlight-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/backlight-cowond2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Rob Purchase
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/backlight-target.h b/firmware/target/arm/tcc780x/cowond2/backlight-target.h
index 6577f74474..d7e5991209 100644
--- a/firmware/target/arm/tcc780x/cowond2/backlight-target.h
+++ b/firmware/target/arm/tcc780x/cowond2/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Rob Purchase
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/button-cowond2.c b/firmware/target/arm/tcc780x/cowond2/button-cowond2.c
index 8968c4f908..41e2387f05 100644
--- a/firmware/target/arm/tcc780x/cowond2/button-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/button-cowond2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Rob Purchase
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/button-target.h b/firmware/target/arm/tcc780x/cowond2/button-target.h
index cca1021957..3615566682 100644
--- a/firmware/target/arm/tcc780x/cowond2/button-target.h
+++ b/firmware/target/arm/tcc780x/cowond2/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Rob Purchase
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/i2c-target.h b/firmware/target/arm/tcc780x/cowond2/i2c-target.h
index d9fba9c933..c865a6c186 100644
--- a/firmware/target/arm/tcc780x/cowond2/i2c-target.h
+++ b/firmware/target/arm/tcc780x/cowond2/i2c-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Rob Purchase
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c b/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c
index b4c37b716c..c8e4de223a 100644
--- a/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Rob Purchase
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/lcd-target.h b/firmware/target/arm/tcc780x/cowond2/lcd-target.h
index 52caf34a45..93b196cafa 100644
--- a/firmware/target/arm/tcc780x/cowond2/lcd-target.h
+++ b/firmware/target/arm/tcc780x/cowond2/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Rob Purchase
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/pmu-target.h b/firmware/target/arm/tcc780x/cowond2/pmu-target.h
index 38288f38c8..14d34de823 100644
--- a/firmware/target/arm/tcc780x/cowond2/pmu-target.h
+++ b/firmware/target/arm/tcc780x/cowond2/pmu-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Rob Purchase
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/power-cowond2.c b/firmware/target/arm/tcc780x/cowond2/power-cowond2.c
index 6576afb09c..5cf579fb2e 100644
--- a/firmware/target/arm/tcc780x/cowond2/power-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/power-cowond2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/powermgmt-cowond2.c b/firmware/target/arm/tcc780x/cowond2/powermgmt-cowond2.c
index db42c5957a..c111609eb5 100644
--- a/firmware/target/arm/tcc780x/cowond2/powermgmt-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/powermgmt-cowond2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c b/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c
index 5f1cfc6455..fb5490761f 100644
--- a/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Rob Purchase, Carsten Schreiter, Jonas Aaberg
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/touchscreen-target.h b/firmware/target/arm/tcc780x/cowond2/touchscreen-target.h
index be18aed723..6efdfa7352 100644
--- a/firmware/target/arm/tcc780x/cowond2/touchscreen-target.h
+++ b/firmware/target/arm/tcc780x/cowond2/touchscreen-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Jonas Aaberg
  *
diff --git a/firmware/target/arm/tcc780x/cowond2/usb-cowond2.c b/firmware/target/arm/tcc780x/cowond2/usb-cowond2.c
index ef1d1506a1..53eec91bf9 100644
--- a/firmware/target/arm/tcc780x/cowond2/usb-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/usb-cowond2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Rob Purchase
  *
diff --git a/firmware/target/arm/tcc780x/crt0.S b/firmware/target/arm/tcc780x/crt0.S
index bbdbf96f17..6be35329b4 100644
--- a/firmware/target/arm/tcc780x/crt0.S
+++ b/firmware/target/arm/tcc780x/crt0.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/arm/tcc780x/debug-tcc780x.c b/firmware/target/arm/tcc780x/debug-tcc780x.c
index fc03871c9c..cf9509b5ab 100644
--- a/firmware/target/arm/tcc780x/debug-tcc780x.c
+++ b/firmware/target/arm/tcc780x/debug-tcc780x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Rob Purchase
  *
diff --git a/firmware/target/arm/tcc780x/kernel-tcc780x.c b/firmware/target/arm/tcc780x/kernel-tcc780x.c
index 76395d2b33..df0f5ebe7a 100644
--- a/firmware/target/arm/tcc780x/kernel-tcc780x.c
+++ b/firmware/target/arm/tcc780x/kernel-tcc780x.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2008 by Rob Purchase
 *
diff --git a/firmware/target/arm/tcc780x/sd-tcc780x.c b/firmware/target/arm/tcc780x/sd-tcc780x.c
index 3ef8972ee9..57d4f3fb3d 100644
--- a/firmware/target/arm/tcc780x/sd-tcc780x.c
+++ b/firmware/target/arm/tcc780x/sd-tcc780x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Daniel Ankers
  * Copyright (C) 2009 Rob Purchase
diff --git a/firmware/target/arm/tcc780x/system-target.h b/firmware/target/arm/tcc780x/system-target.h
index 995e745a64..0df511131a 100644
--- a/firmware/target/arm/tcc780x/system-target.h
+++ b/firmware/target/arm/tcc780x/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Dave Chapman
  *
diff --git a/firmware/target/arm/tcc780x/system-tcc780x.c b/firmware/target/arm/tcc780x/system-tcc780x.c
index d1927c065f..55b87f1db3 100644
--- a/firmware/target/arm/tcc780x/system-tcc780x.c
+++ b/firmware/target/arm/tcc780x/system-tcc780x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Rob Purchase
  *
diff --git a/firmware/target/arm/tcc780x/timer-tcc780x.c b/firmware/target/arm/tcc780x/timer-tcc780x.c
index 74502ae369..9470fdf183 100644
--- a/firmware/target/arm/tcc780x/timer-tcc780x.c
+++ b/firmware/target/arm/tcc780x/timer-tcc780x.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2008 by Rob Purchase
 *
diff --git a/firmware/target/arm/tms320dm320/crt0.S b/firmware/target/arm/tms320dm320/crt0.S
index 4abf1e5e30..bc19ed91f5 100644
--- a/firmware/target/arm/tms320dm320/crt0.S
+++ b/firmware/target/arm/tms320dm320/crt0.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/debug-dm320.c b/firmware/target/arm/tms320dm320/debug-dm320.c
index a82984f90b..badf272dcf 100644
--- a/firmware/target/arm/tms320dm320/debug-dm320.c
+++ b/firmware/target/arm/tms320dm320/debug-dm320.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Tomasz Moń
  * Copyright (C) 2007, 2009 by Karl Kurbjun
diff --git a/firmware/target/arm/tms320dm320/dma-dm320.c b/firmware/target/arm/tms320dm320/dma-dm320.c
index e60102b6fb..90ef858255 100644
--- a/firmware/target/arm/tms320dm320/dma-dm320.c
+++ b/firmware/target/arm/tms320dm320/dma-dm320.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/target/arm/tms320dm320/dma-target.h b/firmware/target/arm/tms320dm320/dma-target.h
index 37053b319b..d31c71d267 100644
--- a/firmware/target/arm/tms320dm320/dma-target.h
+++ b/firmware/target/arm/tms320dm320/dma-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/target/arm/tms320dm320/dsp-dm320.c b/firmware/target/arm/tms320dm320/dsp-dm320.c
index a8610f703a..0b6b3c1203 100644
--- a/firmware/target/arm/tms320dm320/dsp-dm320.c
+++ b/firmware/target/arm/tms320dm320/dsp-dm320.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Catalin Patulea <cat@vv.carleton.ca>
  *
diff --git a/firmware/target/arm/tms320dm320/dsp/Makefile b/firmware/target/arm/tms320dm320/dsp/Makefile
index 42cd01254b..d73e2502ee 100644
--- a/firmware/target/arm/tms320dm320/dsp/Makefile
+++ b/firmware/target/arm/tms320dm320/dsp/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id: Makefile 12058 2007-01-18 00:46:52Z dave $
 #
 
 # http://daniel.haxx.se/blog/2007/11/18/free-to-use-compiler-from-ti/
diff --git a/firmware/target/arm/tms320dm320/dsp/arm.c b/firmware/target/arm/tms320dm320/dsp/arm.c
index 2469a44eb1..8e15399729 100644
--- a/firmware/target/arm/tms320dm320/dsp/arm.c
+++ b/firmware/target/arm/tms320dm320/dsp/arm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Catalin Patulea
  * Copyright (C) 2009 by Karl Kurbjun
diff --git a/firmware/target/arm/tms320dm320/dsp/arm.h b/firmware/target/arm/tms320dm320/dsp/arm.h
index e9217f3499..f8e0efa742 100644
--- a/firmware/target/arm/tms320dm320/dsp/arm.h
+++ b/firmware/target/arm/tms320dm320/dsp/arm.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Catalin Patulea
  * Copyright (C) 2009 by Karl Kurbjun
diff --git a/firmware/target/arm/tms320dm320/dsp/audio.h b/firmware/target/arm/tms320dm320/dsp/audio.h
index 93bc0e9c3c..3c7b774c1e 100644
--- a/firmware/target/arm/tms320dm320/dsp/audio.h
+++ b/firmware/target/arm/tms320dm320/dsp/audio.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/arm/tms320dm320/dsp/dma.c b/firmware/target/arm/tms320dm320/dsp/dma.c
index 9ca67df2a0..c5c465e060 100644
--- a/firmware/target/arm/tms320dm320/dsp/dma.c
+++ b/firmware/target/arm/tms320dm320/dsp/dma.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Catalin Patulea
  * Copyright (C) 2008 by Maurus Cuelenaere
diff --git a/firmware/target/arm/tms320dm320/dsp/dma.h b/firmware/target/arm/tms320dm320/dsp/dma.h
index 97ac44f8d5..fe8f304adc 100644
--- a/firmware/target/arm/tms320dm320/dsp/dma.h
+++ b/firmware/target/arm/tms320dm320/dsp/dma.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/arm/tms320dm320/dsp/ipc.h b/firmware/target/arm/tms320dm320/dsp/ipc.h
index eb886d8638..78d5a74f03 100644
--- a/firmware/target/arm/tms320dm320/dsp/ipc.h
+++ b/firmware/target/arm/tms320dm320/dsp/ipc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Catalin Patulea
  *
diff --git a/firmware/target/arm/tms320dm320/dsp/main.c b/firmware/target/arm/tms320dm320/dsp/main.c
index 8dfd2b6e9f..577fff58a1 100644
--- a/firmware/target/arm/tms320dm320/dsp/main.c
+++ b/firmware/target/arm/tms320dm320/dsp/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Catalin Patulea
  *
diff --git a/firmware/target/arm/tms320dm320/dsp/registers.h b/firmware/target/arm/tms320dm320/dsp/registers.h
index aeaa7e8616..ef972f9abc 100644
--- a/firmware/target/arm/tms320dm320/dsp/registers.h
+++ b/firmware/target/arm/tms320dm320/dsp/registers.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Catalin Patulea
  *
diff --git a/firmware/target/arm/tms320dm320/dsp/tsc2100.c b/firmware/target/arm/tms320dm320/dsp/tsc2100.c
index 51b09a8e94..5d4a7d1fe7 100644
--- a/firmware/target/arm/tms320dm320/dsp/tsc2100.c
+++ b/firmware/target/arm/tms320dm320/dsp/tsc2100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Catalin Patulea
  *
diff --git a/firmware/target/arm/tms320dm320/dsp/xml2h.py b/firmware/target/arm/tms320dm320/dsp/xml2h.py
index 166048be26..915d27eb0d 100644
--- a/firmware/target/arm/tms320dm320/dsp/xml2h.py
+++ b/firmware/target/arm/tms320dm320/dsp/xml2h.py
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2007 Catalin Patulea <cat@vv.carleton.ca>
 #
diff --git a/firmware/target/arm/tms320dm320/i2c-dm320.c b/firmware/target/arm/tms320dm320/i2c-dm320.c
index d552ba6b68..3ec923c54f 100644
--- a/firmware/target/arm/tms320dm320/i2c-dm320.c
+++ b/firmware/target/arm/tms320dm320/i2c-dm320.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Tomasz Moń
  * Copyright (C) 2008 by Maurus Cuelenaere
diff --git a/firmware/target/arm/tms320dm320/i2c-dm320.h b/firmware/target/arm/tms320dm320/i2c-dm320.h
index 89a8e6f1a4..3b9c76501b 100644
--- a/firmware/target/arm/tms320dm320/i2c-dm320.h
+++ b/firmware/target/arm/tms320dm320/i2c-dm320.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/arm/tms320dm320/kernel-dm320.c b/firmware/target/arm/tms320dm320/kernel-dm320.c
index 79206c3413..d723dc4032 100644
--- a/firmware/target/arm/tms320dm320/kernel-dm320.c
+++ b/firmware/target/arm/tms320dm320/kernel-dm320.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
index ba85749bad..fef029431d 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c
index 1abe0843b3..12600c998a 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/ata-target.h b/firmware/target/arm/tms320dm320/mrobe-500/ata-target.h
index 564ff3031f..373afddabd 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/ata-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/ata-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c
index 0b338c1640..a9e887afc4 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h b/firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h
index 5e91cd691a..31f1c96f34 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
index 512c9ec42f..0eb5136ded 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007, 2009 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/button-target.h b/firmware/target/arm/tms320dm320/mrobe-500/button-target.h
index 7349387041..b4f7a3e818 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/button-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jonathan Gordon
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/crt0-board.S b/firmware/target/arm/tms320dm320/mrobe-500/crt0-board.S
index ace04df847..08ce0d0946 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/crt0-board.S
+++ b/firmware/target/arm/tms320dm320/mrobe-500/crt0-board.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2010 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c
index b4774935b8..ce27f13eb5 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
index 218d616f3b..e73e06d720 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c
index e21e1fa193..480d1c69a4 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2009 Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-target.h b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-target.h
index 5a6a88d9b1..296cfb9c0e 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2009 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-target.h b/firmware/target/arm/tms320dm320/mrobe-500/lcd-target.h
index 2415fdb928..0900b5c4e9 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
index c46fa00022..8cb966fb8a 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 and 2009 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c
index 77348317a6..b0152ca3da 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
index 6c5eee9a16..533f071c34 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c
index 3762cbb896..b7db624915 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007, 2009 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.h b/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.h
index ce8e84f4d1..789b96a6c6 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2009 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/adc-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/adc-sansaconnect.c
index b3e427b9a5..5cfadcf647 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/adc-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/adc-sansaconnect.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c
index a7b982b645..bb32299a3a 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id: $
 *
 * Copyright (C) 2011-2021 by Tomasz Moń
 *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.h b/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.h
index ed23e84936..5ac73897d5 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.h
+++ b/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id: $
 *
 * Copyright (C) 2011 by Tomasz Moń
 *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c
index 37cb672738..b9cf896d3c 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/backlight-target.h b/firmware/target/arm/tms320dm320/sansa-connect/backlight-target.h
index 3a6fc8cf11..d30e71d19b 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/backlight-target.h
+++ b/firmware/target/arm/tms320dm320/sansa-connect/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/button-target.h b/firmware/target/arm/tms320dm320/sansa-connect/button-target.h
index 5dddfc68d3..717425d70c 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/button-target.h
+++ b/firmware/target/arm/tms320dm320/sansa-connect/button-target.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id: $
 *
 * Copyright (C) 2011 by Tomasz Moń
 *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/crt0-board.S b/firmware/target/arm/tms320dm320/sansa-connect/crt0-board.S
index 1848143fc1..0d689b3f0e 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/crt0-board.S
+++ b/firmware/target/arm/tms320dm320/sansa-connect/crt0-board.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/cryptomem-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/cryptomem-sansaconnect.c
index ac01525500..5b141f8d32 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/cryptomem-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/cryptomem-sansaconnect.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id: $
 *
 * Copyright (C) 2021 by Tomasz Moń
 *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/cryptomem-sansaconnect.h b/firmware/target/arm/tms320dm320/sansa-connect/cryptomem-sansaconnect.h
index b6b52d3b2c..41ce95662e 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/cryptomem-sansaconnect.h
+++ b/firmware/target/arm/tms320dm320/sansa-connect/cryptomem-sansaconnect.h
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id: $
 *
 * Copyright (C) 2021 by Tomasz Moń
 *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c
index 9674f07a64..4ec0bc1f79 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/lcd-target.h b/firmware/target/arm/tms320dm320/sansa-connect/lcd-target.h
index 6a62140b27..8ca870028f 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/lcd-target.h
+++ b/firmware/target/arm/tms320dm320/sansa-connect/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/pcm-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/pcm-sansaconnect.c
index 7069d0b0e6..0f529f733d 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/pcm-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/pcm-sansaconnect.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/power-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/power-sansaconnect.c
index 35fbb7fff8..7d717c0bce 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/power-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/power-sansaconnect.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_cppi.c b/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_cppi.c
index 1ce6e4a640..9c40fbb19c 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_cppi.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_cppi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2021 by Tomasz Moń
  * Copied with minor modifications from Sansa Connect Linux driver
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_cppi.h b/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_cppi.h
index b240f9593d..3530def286 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_cppi.h
+++ b/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_cppi.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2021 by Tomasz Moń
  * Copied with minor modifications from Sansa Connect Linux driver
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c b/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c
index 8e6a8610bd..6354062d85 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2021 by Tomasz Moń
  * Ported from Sansa Connect TNETV105 UDC Linux driver
@@ -1182,7 +1181,7 @@ void VLYNQ(void)
             }
 
             /* Process control packet */
-            usb_core_legacy_control_request(&setup);
+            usb_core_setup_received(&setup);
         }
 
         if (sysIntrStatus.f.ep0_in_ack)
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.h b/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.h
index c31c9c6505..08461fd0e5 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.h
+++ b/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2021 by Tomasz Moń
  * Ported from Sansa Connect TNETV105 UDC Linux driver
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/usb-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/usb-sansaconnect.c
index 2802814284..c72384c88e 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/usb-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/usb-sansaconnect.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011-2021 by Tomasz Moń
  *
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/wifi-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/wifi-sansaconnect.c
index 1f201ca1c9..3631ad457a 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/wifi-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/wifi-sansaconnect.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2021 by Tomasz Moń
 *
diff --git a/firmware/target/arm/tms320dm320/sdmmc-dm320.c b/firmware/target/arm/tms320dm320/sdmmc-dm320.c
index 17cb239374..677912176c 100644
--- a/firmware/target/arm/tms320dm320/sdmmc-dm320.c
+++ b/firmware/target/arm/tms320dm320/sdmmc-dm320.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/firmware/target/arm/tms320dm320/spi-target.h b/firmware/target/arm/tms320dm320/spi-target.h
index 16fb2ff01b..d47351de37 100644
--- a/firmware/target/arm/tms320dm320/spi-target.h
+++ b/firmware/target/arm/tms320dm320/spi-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Catalin Patulea
  *
diff --git a/firmware/target/arm/tms320dm320/system-dm320.c b/firmware/target/arm/tms320dm320/system-dm320.c
index ae8472ca53..edbe14fc33 100644
--- a/firmware/target/arm/tms320dm320/system-dm320.c
+++ b/firmware/target/arm/tms320dm320/system-dm320.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Tomasz Moń
  * Copyright (C) 2007 by Karl Kurbjun
diff --git a/firmware/target/arm/tms320dm320/system-target.h b/firmware/target/arm/tms320dm320/system-target.h
index cf5a278dc2..ed26c37d8a 100644
--- a/firmware/target/arm/tms320dm320/system-target.h
+++ b/firmware/target/arm/tms320dm320/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007, 2009 by Karl Kurbjun
  *
diff --git a/firmware/target/arm/tms320dm320/timer-dm320.c b/firmware/target/arm/tms320dm320/timer-dm320.c
index 0b7ad893d3..5ebdebf347 100644
--- a/firmware/target/arm/tms320dm320/timer-dm320.c
+++ b/firmware/target/arm/tms320dm320/timer-dm320.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2007 by Karl Kurbjun
 *
diff --git a/firmware/target/arm/tms320dm320/uart-dm320.c b/firmware/target/arm/tms320dm320/uart-dm320.c
index 0aeb856027..44ca4e642c 100644
--- a/firmware/target/arm/tms320dm320/uart-dm320.c
+++ b/firmware/target/arm/tms320dm320/uart-dm320.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Catalin Patulea <cat@vv.carleton.ca>
  *
diff --git a/firmware/target/arm/uc87xx.c b/firmware/target/arm/uc87xx.c
index e42454e581..1776b5421a 100644
--- a/firmware/target/arm/uc87xx.c
+++ b/firmware/target/arm/uc87xx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Cástor Muñoz
  *
diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c
index cd78de764f..9707ef8330 100644
--- a/firmware/target/arm/usb-drv-arc.c
+++ b/firmware/target/arm/usb-drv-arc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Driver for ARC USBOTG Device Controller
  *
@@ -1081,7 +1080,7 @@ static void control_received(void)
         }
     }
 
-    usb_core_legacy_control_request((struct usb_ctrlrequest*)tmp);
+    usb_core_setup_received((struct usb_ctrlrequest*)tmp);
 }
 
 static void transfer_completed(void)
diff --git a/firmware/target/arm/usb-s3c6400x.c b/firmware/target/arm/usb-s3c6400x.c
index c26072d70c..79191eec35 100644
--- a/firmware/target/arm/usb-s3c6400x.c
+++ b/firmware/target/arm/usb-s3c6400x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Michael Sparmann
  * Copyright © 2010 Amaury Pouly
@@ -530,7 +529,7 @@ static void handle_ep_int(int ep, bool out)
                ep0_setup_pkt->bRequest     == USB_REQ_SET_ADDRESS)
                 DCFG = (DCFG & ~bitm(DCFG, devadr)) | (ep0_setup_pkt->wValue << DCFG_devadr_bitp);
 
-            usb_core_legacy_control_request(ep0_setup_pkt);
+            usb_core_setup_received(ep0_setup_pkt);
         }
     }
 
diff --git a/firmware/target/arm/usb-tcc.c b/firmware/target/arm/usb-tcc.c
index ab2260e48e..694b38f225 100644
--- a/firmware/target/arm/usb-tcc.c
+++ b/firmware/target/arm/usb-tcc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Vitja Makarov
  *
@@ -229,7 +228,7 @@ void handle_control(void)
         DEBUG(2, "req: %02x %02d", req->bRequestType, req->bRequest);
     }
 
-    usb_core_legacy_control_request(req);
+    usb_core_setup_received(req);
 }
 
 static
diff --git a/firmware/target/arm/vectors-arm-micro.S b/firmware/target/arm/vectors-arm-micro.S
index 9119b72d17..fb9e8c6828 100644
--- a/firmware/target/arm/vectors-arm-micro.S
+++ b/firmware/target/arm/vectors-arm-micro.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Aidan MacDonald
  *
diff --git a/firmware/target/arm/wmcodec-telechips.c b/firmware/target/arm/wmcodec-telechips.c
index deaced2682..14ad25e25e 100644
--- a/firmware/target/arm/wmcodec-telechips.c
+++ b/firmware/target/arm/wmcodec-telechips.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * TCC specific code for Wolfson audio codecs
  *
diff --git a/firmware/target/coldfire/ata-as-coldfire.S b/firmware/target/coldfire/ata-as-coldfire.S
index 0b2cb850f4..067aa4824b 100644
--- a/firmware/target/coldfire/ata-as-coldfire.S
+++ b/firmware/target/coldfire/ata-as-coldfire.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Jens Arnold
  * Copyright (C) 2010 by Marcin Bukat (byte swaps)
diff --git a/firmware/target/coldfire/ata-target.h b/firmware/target/coldfire/ata-target.h
index 405dbcafe5..1da21261b4 100644
--- a/firmware/target/coldfire/ata-target.h
+++ b/firmware/target/coldfire/ata-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/crt0.S b/firmware/target/coldfire/crt0.S
index 7ea4c49dca..2129f61c7c 100644
--- a/firmware/target/coldfire/crt0.S
+++ b/firmware/target/coldfire/crt0.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/debug-coldfire.c b/firmware/target/coldfire/debug-coldfire.c
index ef44a82176..27abe56e38 100644
--- a/firmware/target/coldfire/debug-coldfire.c
+++ b/firmware/target/coldfire/debug-coldfire.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/i2c-coldfire.c b/firmware/target/coldfire/i2c-coldfire.c
index 1c4bd338fc..5b15162bbc 100644
--- a/firmware/target/coldfire/i2c-coldfire.c
+++ b/firmware/target/coldfire/i2c-coldfire.c
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  *
- * $Id$
  *
  * Copyright (C) 2005 by Andy Young
  *
diff --git a/firmware/target/coldfire/iaudio/adc-iaudio.c b/firmware/target/coldfire/iaudio/adc-iaudio.c
index c5c8b517ce..c48be302aa 100644
--- a/firmware/target/coldfire/iaudio/adc-iaudio.c
+++ b/firmware/target/coldfire/iaudio/adc-iaudio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/adc-target.h b/firmware/target/coldfire/iaudio/adc-target.h
index eaa148e046..859be0426c 100644
--- a/firmware/target/coldfire/iaudio/adc-target.h
+++ b/firmware/target/coldfire/iaudio/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/ata-iaudio.c b/firmware/target/coldfire/iaudio/ata-iaudio.c
index 91b6c87093..4d7fb3d465 100644
--- a/firmware/target/coldfire/iaudio/ata-iaudio.c
+++ b/firmware/target/coldfire/iaudio/ata-iaudio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/audio-iaudio.c b/firmware/target/coldfire/iaudio/audio-iaudio.c
index ed3a926d72..41ea520b8e 100644
--- a/firmware/target/coldfire/iaudio/audio-iaudio.c
+++ b/firmware/target/coldfire/iaudio/audio-iaudio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michael Sevakis
  *
diff --git a/firmware/target/coldfire/iaudio/button-target.h b/firmware/target/coldfire/iaudio/button-target.h
index 655a172404..2f43db3020 100644
--- a/firmware/target/coldfire/iaudio/button-target.h
+++ b/firmware/target/coldfire/iaudio/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/fmradio_i2c-iaudio.c b/firmware/target/coldfire/iaudio/fmradio_i2c-iaudio.c
index 8bc6fb8445..663607c1a3 100644
--- a/firmware/target/coldfire/iaudio/fmradio_i2c-iaudio.c
+++ b/firmware/target/coldfire/iaudio/fmradio_i2c-iaudio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Physical interface of the Philips TEA5767 in iAudio M3
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
diff --git a/firmware/target/coldfire/iaudio/lcd-remote-as-iaudio.S b/firmware/target/coldfire/iaudio/lcd-remote-as-iaudio.S
index 6c10cd50a0..7bed63761e 100644
--- a/firmware/target/coldfire/iaudio/lcd-remote-as-iaudio.S
+++ b/firmware/target/coldfire/iaudio/lcd-remote-as-iaudio.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/lcd-remote-iaudio.c b/firmware/target/coldfire/iaudio/lcd-remote-iaudio.c
index 6a16cae5c3..c6721cd79a 100644
--- a/firmware/target/coldfire/iaudio/lcd-remote-iaudio.c
+++ b/firmware/target/coldfire/iaudio/lcd-remote-iaudio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/lcd-remote-target.h b/firmware/target/coldfire/iaudio/lcd-remote-target.h
index 55739edde0..25974227da 100644
--- a/firmware/target/coldfire/iaudio/lcd-remote-target.h
+++ b/firmware/target/coldfire/iaudio/lcd-remote-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/m3/adc-m3.c b/firmware/target/coldfire/iaudio/m3/adc-m3.c
index 39c03ddbd5..cc3f506103 100644
--- a/firmware/target/coldfire/iaudio/m3/adc-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/adc-m3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/m3/adc-target.h b/firmware/target/coldfire/iaudio/m3/adc-target.h
index ec35c31e89..db5bbdefdc 100644
--- a/firmware/target/coldfire/iaudio/m3/adc-target.h
+++ b/firmware/target/coldfire/iaudio/m3/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/m3/ata-m3.c b/firmware/target/coldfire/iaudio/m3/ata-m3.c
index b3630798cf..b1776d7c1d 100644
--- a/firmware/target/coldfire/iaudio/m3/ata-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/ata-m3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/m3/backlight-m3.c b/firmware/target/coldfire/iaudio/m3/backlight-m3.c
index 1163d6acb7..251d94bd15 100644
--- a/firmware/target/coldfire/iaudio/m3/backlight-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/backlight-m3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/m3/backlight-target.h b/firmware/target/coldfire/iaudio/m3/backlight-target.h
index fdc8438ea7..300098b391 100644
--- a/firmware/target/coldfire/iaudio/m3/backlight-target.h
+++ b/firmware/target/coldfire/iaudio/m3/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/m3/button-m3.c b/firmware/target/coldfire/iaudio/m3/button-m3.c
index 1c7f4a15de..635ddfae77 100644
--- a/firmware/target/coldfire/iaudio/m3/button-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/button-m3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/m3/button-target.h b/firmware/target/coldfire/iaudio/m3/button-target.h
index 8409cf6075..39b943941b 100644
--- a/firmware/target/coldfire/iaudio/m3/button-target.h
+++ b/firmware/target/coldfire/iaudio/m3/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/m3/lcd-as-m3.S b/firmware/target/coldfire/iaudio/m3/lcd-as-m3.S
index d26409cd90..1ed49d1faf 100644
--- a/firmware/target/coldfire/iaudio/m3/lcd-as-m3.S
+++ b/firmware/target/coldfire/iaudio/m3/lcd-as-m3.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/m3/lcd-m3.c b/firmware/target/coldfire/iaudio/m3/lcd-m3.c
index 5e84cbacd3..3fdbcaad88 100644
--- a/firmware/target/coldfire/iaudio/m3/lcd-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/lcd-m3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/m3/power-m3.c b/firmware/target/coldfire/iaudio/m3/power-m3.c
index 4c446e54d0..1030cb2912 100644
--- a/firmware/target/coldfire/iaudio/m3/power-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/power-m3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/m3/powermgmt-m3.c b/firmware/target/coldfire/iaudio/m3/powermgmt-m3.c
index 76693ebb1c..9dbc7cac31 100644
--- a/firmware/target/coldfire/iaudio/m3/powermgmt-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/powermgmt-m3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/m3/system-m3.c b/firmware/target/coldfire/iaudio/m3/system-m3.c
index 9c65619e1e..dccc945108 100644
--- a/firmware/target/coldfire/iaudio/m3/system-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/system-m3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/m3/usb-m3.c b/firmware/target/coldfire/iaudio/m3/usb-m3.c
index 7dea79c53b..d9ea32e727 100644
--- a/firmware/target/coldfire/iaudio/m3/usb-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/usb-m3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/m5/backlight-m5.c b/firmware/target/coldfire/iaudio/m5/backlight-m5.c
index 2738a327c9..634a451082 100644
--- a/firmware/target/coldfire/iaudio/m5/backlight-m5.c
+++ b/firmware/target/coldfire/iaudio/m5/backlight-m5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/m5/backlight-target.h b/firmware/target/coldfire/iaudio/m5/backlight-target.h
index 38acdd0e5f..103735c890 100644
--- a/firmware/target/coldfire/iaudio/m5/backlight-target.h
+++ b/firmware/target/coldfire/iaudio/m5/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/m5/button-m5.c b/firmware/target/coldfire/iaudio/m5/button-m5.c
index 3a9b973402..c921bb6d41 100644
--- a/firmware/target/coldfire/iaudio/m5/button-m5.c
+++ b/firmware/target/coldfire/iaudio/m5/button-m5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/m5/lcd-as-m5.S b/firmware/target/coldfire/iaudio/m5/lcd-as-m5.S
index 12d0c670e9..c739a9df43 100644
--- a/firmware/target/coldfire/iaudio/m5/lcd-as-m5.S
+++ b/firmware/target/coldfire/iaudio/m5/lcd-as-m5.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/m5/lcd-m5.c b/firmware/target/coldfire/iaudio/m5/lcd-m5.c
index 35fd173f18..7416571557 100644
--- a/firmware/target/coldfire/iaudio/m5/lcd-m5.c
+++ b/firmware/target/coldfire/iaudio/m5/lcd-m5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iaudio/pcf50606-iaudio.c b/firmware/target/coldfire/iaudio/pcf50606-iaudio.c
index fd5af21987..7072bd5c7e 100644
--- a/firmware/target/coldfire/iaudio/pcf50606-iaudio.c
+++ b/firmware/target/coldfire/iaudio/pcf50606-iaudio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/power-x5m5.c b/firmware/target/coldfire/iaudio/power-x5m5.c
index e9bdde16ec..e00b3107c1 100644
--- a/firmware/target/coldfire/iaudio/power-x5m5.c
+++ b/firmware/target/coldfire/iaudio/power-x5m5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/powermgmt-iaudio.c b/firmware/target/coldfire/iaudio/powermgmt-iaudio.c
index 10388a4a2a..3d8498400f 100644
--- a/firmware/target/coldfire/iaudio/powermgmt-iaudio.c
+++ b/firmware/target/coldfire/iaudio/powermgmt-iaudio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/coldfire/iaudio/system-iaudio.c b/firmware/target/coldfire/iaudio/system-iaudio.c
index 61578c939e..c16db1ccb0 100644
--- a/firmware/target/coldfire/iaudio/system-iaudio.c
+++ b/firmware/target/coldfire/iaudio/system-iaudio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/usb-iaudio.c b/firmware/target/coldfire/iaudio/usb-iaudio.c
index f03942667d..be665f2320 100644
--- a/firmware/target/coldfire/iaudio/usb-iaudio.c
+++ b/firmware/target/coldfire/iaudio/usb-iaudio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/x5/backlight-target.h b/firmware/target/coldfire/iaudio/x5/backlight-target.h
index 1d9bee0545..4ccf4768c7 100644
--- a/firmware/target/coldfire/iaudio/x5/backlight-target.h
+++ b/firmware/target/coldfire/iaudio/x5/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/x5/backlight-x5.c b/firmware/target/coldfire/iaudio/x5/backlight-x5.c
index de8b3d8e14..dc8df30724 100644
--- a/firmware/target/coldfire/iaudio/x5/backlight-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/backlight-x5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/x5/button-x5.c b/firmware/target/coldfire/iaudio/x5/button-x5.c
index b94a0de678..5cf5a4f373 100644
--- a/firmware/target/coldfire/iaudio/x5/button-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/button-x5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/x5/ds2411-x5.c b/firmware/target/coldfire/iaudio/x5/ds2411-x5.c
index ffc227a83f..30507d7270 100644
--- a/firmware/target/coldfire/iaudio/x5/ds2411-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/ds2411-x5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/target/coldfire/iaudio/x5/lcd-as-x5.S b/firmware/target/coldfire/iaudio/x5/lcd-as-x5.S
index e6621e1dea..2fe3f26f0a 100644
--- a/firmware/target/coldfire/iaudio/x5/lcd-as-x5.S
+++ b/firmware/target/coldfire/iaudio/x5/lcd-as-x5.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michael Sevakis
  * Based on lcd_write_data for H300 in lcd.S
diff --git a/firmware/target/coldfire/iaudio/x5/lcd-x5.c b/firmware/target/coldfire/iaudio/x5/lcd-x5.c
index d5ec63b20b..caf831918a 100644
--- a/firmware/target/coldfire/iaudio/x5/lcd-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/lcd-x5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iaudio/x5/m5636-target.h b/firmware/target/coldfire/iaudio/x5/m5636-target.h
index 3395add25f..5bca6260b0 100644
--- a/firmware/target/coldfire/iaudio/x5/m5636-target.h
+++ b/firmware/target/coldfire/iaudio/x5/m5636-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Ulrich Pegelow
  *
diff --git a/firmware/target/coldfire/iaudio/x5/m5636-x5.c b/firmware/target/coldfire/iaudio/x5/m5636-x5.c
index 2150727711..7b8bde00a3 100644
--- a/firmware/target/coldfire/iaudio/x5/m5636-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/m5636-x5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Ulrich Pegelow
  *
diff --git a/firmware/target/coldfire/iriver/ata-iriver.c b/firmware/target/coldfire/iriver/ata-iriver.c
index 92b953d24e..9fda693947 100644
--- a/firmware/target/coldfire/iriver/ata-iriver.c
+++ b/firmware/target/coldfire/iriver/ata-iriver.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/audio-iriver.c b/firmware/target/coldfire/iriver/audio-iriver.c
index 36e33f9ea1..45736cf9f3 100644
--- a/firmware/target/coldfire/iriver/audio-iriver.c
+++ b/firmware/target/coldfire/iriver/audio-iriver.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michael Sevakis
  *
diff --git a/firmware/target/coldfire/iriver/button-target.h b/firmware/target/coldfire/iriver/button-target.h
index a677d042b3..4d908bcdd8 100644
--- a/firmware/target/coldfire/iriver/button-target.h
+++ b/firmware/target/coldfire/iriver/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Jonathan Gordon
  *
diff --git a/firmware/target/coldfire/iriver/fmradio_i2c-iriver.c b/firmware/target/coldfire/iriver/fmradio_i2c-iriver.c
index cd64097fc0..102a739a26 100644
--- a/firmware/target/coldfire/iriver/fmradio_i2c-iriver.c
+++ b/firmware/target/coldfire/iriver/fmradio_i2c-iriver.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Physical interface of the Philips TEA5767 in iriver H100/H300 series
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
diff --git a/firmware/target/coldfire/iriver/h100/adc-h100.c b/firmware/target/coldfire/iriver/h100/adc-h100.c
index 1b9ae4be17..3ed7a9e571 100644
--- a/firmware/target/coldfire/iriver/h100/adc-h100.c
+++ b/firmware/target/coldfire/iriver/h100/adc-h100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h100/adc-target.h b/firmware/target/coldfire/iriver/h100/adc-target.h
index 8cf724d640..dbb94ea712 100644
--- a/firmware/target/coldfire/iriver/h100/adc-target.h
+++ b/firmware/target/coldfire/iriver/h100/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h100/backlight-h100.c b/firmware/target/coldfire/iriver/h100/backlight-h100.c
index 80e340c0d5..dce1920241 100644
--- a/firmware/target/coldfire/iriver/h100/backlight-h100.c
+++ b/firmware/target/coldfire/iriver/h100/backlight-h100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h100/backlight-target.h b/firmware/target/coldfire/iriver/h100/backlight-target.h
index b6cc4a2000..7ae0727743 100644
--- a/firmware/target/coldfire/iriver/h100/backlight-target.h
+++ b/firmware/target/coldfire/iriver/h100/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h100/button-h100.c b/firmware/target/coldfire/iriver/h100/button-h100.c
index 63f772b65e..e1359cea3b 100644
--- a/firmware/target/coldfire/iriver/h100/button-h100.c
+++ b/firmware/target/coldfire/iriver/h100/button-h100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Jonathan Gordon
  *
diff --git a/firmware/target/coldfire/iriver/h100/lcd-as-h100.S b/firmware/target/coldfire/iriver/h100/lcd-as-h100.S
index b13d5146b9..a60331f914 100644
--- a/firmware/target/coldfire/iriver/h100/lcd-as-h100.S
+++ b/firmware/target/coldfire/iriver/h100/lcd-as-h100.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Jens Arnold
  * Based on the work of Alan Korr and Jörg Hohensohn
diff --git a/firmware/target/coldfire/iriver/h100/lcd-h100.c b/firmware/target/coldfire/iriver/h100/lcd-h100.c
index b6eea1dfa3..d7dbf86264 100644
--- a/firmware/target/coldfire/iriver/h100/lcd-h100.c
+++ b/firmware/target/coldfire/iriver/h100/lcd-h100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h100/power-h100.c b/firmware/target/coldfire/iriver/h100/power-h100.c
index 1dcea9ce0e..15c9103f73 100644
--- a/firmware/target/coldfire/iriver/h100/power-h100.c
+++ b/firmware/target/coldfire/iriver/h100/power-h100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h100/powermgmt-h100.c b/firmware/target/coldfire/iriver/h100/powermgmt-h100.c
index ae5c3263c7..bf0a978103 100644
--- a/firmware/target/coldfire/iriver/h100/powermgmt-h100.c
+++ b/firmware/target/coldfire/iriver/h100/powermgmt-h100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/coldfire/iriver/h100/spdif-h100.c b/firmware/target/coldfire/iriver/h100/spdif-h100.c
index eb2d367d17..a687e3b500 100644
--- a/firmware/target/coldfire/iriver/h100/spdif-h100.c
+++ b/firmware/target/coldfire/iriver/h100/spdif-h100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michal Sevakis
  * Based on the work of Thom Johansen
diff --git a/firmware/target/coldfire/iriver/h100/usb-h100.c b/firmware/target/coldfire/iriver/h100/usb-h100.c
index 647c9f8b64..66fcb89799 100644
--- a/firmware/target/coldfire/iriver/h100/usb-h100.c
+++ b/firmware/target/coldfire/iriver/h100/usb-h100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h300/adc-h300.c b/firmware/target/coldfire/iriver/h300/adc-h300.c
index 5316d7cba6..c219975d21 100644
--- a/firmware/target/coldfire/iriver/h300/adc-h300.c
+++ b/firmware/target/coldfire/iriver/h300/adc-h300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h300/adc-target.h b/firmware/target/coldfire/iriver/h300/adc-target.h
index 1ad13c9f79..fbe98bbef5 100644
--- a/firmware/target/coldfire/iriver/h300/adc-target.h
+++ b/firmware/target/coldfire/iriver/h300/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h300/backlight-h300.c b/firmware/target/coldfire/iriver/h300/backlight-h300.c
index 9e44dfa80e..207744d1a0 100644
--- a/firmware/target/coldfire/iriver/h300/backlight-h300.c
+++ b/firmware/target/coldfire/iriver/h300/backlight-h300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h300/backlight-target.h b/firmware/target/coldfire/iriver/h300/backlight-target.h
index 1ea9087a7b..fefd13ff05 100644
--- a/firmware/target/coldfire/iriver/h300/backlight-target.h
+++ b/firmware/target/coldfire/iriver/h300/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h300/button-h300.c b/firmware/target/coldfire/iriver/h300/button-h300.c
index 437c9fd2d3..162cbb547d 100644
--- a/firmware/target/coldfire/iriver/h300/button-h300.c
+++ b/firmware/target/coldfire/iriver/h300/button-h300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Jonathan Gordon
  *
diff --git a/firmware/target/coldfire/iriver/h300/lcd-as-h300.S b/firmware/target/coldfire/iriver/h300/lcd-as-h300.S
index 223c183860..037032fc4b 100644
--- a/firmware/target/coldfire/iriver/h300/lcd-as-h300.S
+++ b/firmware/target/coldfire/iriver/h300/lcd-as-h300.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iriver/h300/lcd-h300.c b/firmware/target/coldfire/iriver/h300/lcd-h300.c
index 7e73ea3905..f60b5b1d1e 100644
--- a/firmware/target/coldfire/iriver/h300/lcd-h300.c
+++ b/firmware/target/coldfire/iriver/h300/lcd-h300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h300/pcf50606-h300.c b/firmware/target/coldfire/iriver/h300/pcf50606-h300.c
index 587b36833c..cc2c05b23f 100644
--- a/firmware/target/coldfire/iriver/h300/pcf50606-h300.c
+++ b/firmware/target/coldfire/iriver/h300/pcf50606-h300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h300/power-h300.c b/firmware/target/coldfire/iriver/h300/power-h300.c
index 202e1d68ed..568bb92d42 100644
--- a/firmware/target/coldfire/iriver/h300/power-h300.c
+++ b/firmware/target/coldfire/iriver/h300/power-h300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/h300/powermgmt-h300.c b/firmware/target/coldfire/iriver/h300/powermgmt-h300.c
index e47aac5f8b..5096f435ae 100644
--- a/firmware/target/coldfire/iriver/h300/powermgmt-h300.c
+++ b/firmware/target/coldfire/iriver/h300/powermgmt-h300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/firmware/target/coldfire/iriver/h300/sw_i2c-h300.c b/firmware/target/coldfire/iriver/h300/sw_i2c-h300.c
index 066949e2f6..f8ffbfcbd9 100644
--- a/firmware/target/coldfire/iriver/h300/sw_i2c-h300.c
+++ b/firmware/target/coldfire/iriver/h300/sw_i2c-h300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Miika Pekkarinen
  *
diff --git a/firmware/target/coldfire/iriver/h300/usb-h300.c b/firmware/target/coldfire/iriver/h300/usb-h300.c
index 895bf37f2b..d2856cc8ea 100644
--- a/firmware/target/coldfire/iriver/h300/usb-h300.c
+++ b/firmware/target/coldfire/iriver/h300/usb-h300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/lcd-remote-as-iriver.S b/firmware/target/coldfire/iriver/lcd-remote-as-iriver.S
index d652710bf3..7078b8a540 100644
--- a/firmware/target/coldfire/iriver/lcd-remote-as-iriver.S
+++ b/firmware/target/coldfire/iriver/lcd-remote-as-iriver.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/firmware/target/coldfire/iriver/lcd-remote-iriver.c b/firmware/target/coldfire/iriver/lcd-remote-iriver.c
index fcf741af3f..c4c2e92fc5 100644
--- a/firmware/target/coldfire/iriver/lcd-remote-iriver.c
+++ b/firmware/target/coldfire/iriver/lcd-remote-iriver.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Richard S. La Charité III
  *
diff --git a/firmware/target/coldfire/iriver/system-iriver.c b/firmware/target/coldfire/iriver/system-iriver.c
index 1ceb89bd16..d16931ac1f 100644
--- a/firmware/target/coldfire/iriver/system-iriver.c
+++ b/firmware/target/coldfire/iriver/system-iriver.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/iriver/udacodec-iriver.c b/firmware/target/coldfire/iriver/udacodec-iriver.c
index 6c41964ffa..2e2849ce2f 100644
--- a/firmware/target/coldfire/iriver/udacodec-iriver.c
+++ b/firmware/target/coldfire/iriver/udacodec-iriver.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/coldfire/kernel-coldfire.c b/firmware/target/coldfire/kernel-coldfire.c
index a16f7ad05e..2a93a38170 100644
--- a/firmware/target/coldfire/kernel-coldfire.c
+++ b/firmware/target/coldfire/kernel-coldfire.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/firmware/target/coldfire/mpio/adc-mpio.c b/firmware/target/coldfire/mpio/adc-mpio.c
index 4c796d5d15..ea5f86dcb4 100644
--- a/firmware/target/coldfire/mpio/adc-mpio.c
+++ b/firmware/target/coldfire/mpio/adc-mpio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/adc-target.h b/firmware/target/coldfire/mpio/adc-target.h
index fb541833cf..5abe5ae4b3 100644
--- a/firmware/target/coldfire/mpio/adc-target.h
+++ b/firmware/target/coldfire/mpio/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/ata-mpio.c b/firmware/target/coldfire/mpio/ata-mpio.c
index 94a572a0e8..def28e51a1 100644
--- a/firmware/target/coldfire/mpio/ata-mpio.c
+++ b/firmware/target/coldfire/mpio/ata-mpio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/ata-target.h b/firmware/target/coldfire/mpio/ata-target.h
index 095a7fc1bd..bd256f6e83 100644
--- a/firmware/target/coldfire/mpio/ata-target.h
+++ b/firmware/target/coldfire/mpio/ata-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/audio-mpio.c b/firmware/target/coldfire/mpio/audio-mpio.c
index ba1258e5e7..6038363ebc 100644
--- a/firmware/target/coldfire/mpio/audio-mpio.c
+++ b/firmware/target/coldfire/mpio/audio-mpio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/backlight-mpio.c b/firmware/target/coldfire/mpio/backlight-mpio.c
index 9d8186beed..9c2b2cada0 100644
--- a/firmware/target/coldfire/mpio/backlight-mpio.c
+++ b/firmware/target/coldfire/mpio/backlight-mpio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/backlight-target.h b/firmware/target/coldfire/mpio/backlight-target.h
index 12a3e7a225..f91bcd9e56 100644
--- a/firmware/target/coldfire/mpio/backlight-target.h
+++ b/firmware/target/coldfire/mpio/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/fmradio_i2c-mpio.c b/firmware/target/coldfire/mpio/fmradio_i2c-mpio.c
index a687c13200..ad685cc209 100644
--- a/firmware/target/coldfire/mpio/fmradio_i2c-mpio.c
+++ b/firmware/target/coldfire/mpio/fmradio_i2c-mpio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * Physical interface of the Philips TEA5767 in iAudio M3
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
diff --git a/firmware/target/coldfire/mpio/hd200/button-hd200.c b/firmware/target/coldfire/mpio/hd200/button-hd200.c
index 5ff70783cd..1446f3031a 100644
--- a/firmware/target/coldfire/mpio/hd200/button-hd200.c
+++ b/firmware/target/coldfire/mpio/hd200/button-hd200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/hd200/button-target.h b/firmware/target/coldfire/mpio/hd200/button-target.h
index 3370935a45..a8f8e5630f 100644
--- a/firmware/target/coldfire/mpio/hd200/button-target.h
+++ b/firmware/target/coldfire/mpio/hd200/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/hd200/lcd-as-hd200.S b/firmware/target/coldfire/mpio/hd200/lcd-as-hd200.S
index ac80f4edb6..4791d6ee7e 100644
--- a/firmware/target/coldfire/mpio/hd200/lcd-as-hd200.S
+++ b/firmware/target/coldfire/mpio/hd200/lcd-as-hd200.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  * based on lcd-as-m3.S by Jens Arnold
diff --git a/firmware/target/coldfire/mpio/hd200/lcd-hd200.c b/firmware/target/coldfire/mpio/hd200/lcd-hd200.c
index 967618fce1..a2d5c46d20 100644
--- a/firmware/target/coldfire/mpio/hd200/lcd-hd200.c
+++ b/firmware/target/coldfire/mpio/hd200/lcd-hd200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/hd200/powermgmt-hd200.c b/firmware/target/coldfire/mpio/hd200/powermgmt-hd200.c
index 5d5919a616..d34e644074 100644
--- a/firmware/target/coldfire/mpio/hd200/powermgmt-hd200.c
+++ b/firmware/target/coldfire/mpio/hd200/powermgmt-hd200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/hd300/button-hd300.c b/firmware/target/coldfire/mpio/hd300/button-hd300.c
index b78276f351..160efbdae4 100644
--- a/firmware/target/coldfire/mpio/hd300/button-hd300.c
+++ b/firmware/target/coldfire/mpio/hd300/button-hd300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  * scrollstrip logic inspired by button-mini1g.c
diff --git a/firmware/target/coldfire/mpio/hd300/button-target.h b/firmware/target/coldfire/mpio/hd300/button-target.h
index 7f902b0ecf..99fc837567 100644
--- a/firmware/target/coldfire/mpio/hd300/button-target.h
+++ b/firmware/target/coldfire/mpio/hd300/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/hd300/lcd-as-hd300.S b/firmware/target/coldfire/mpio/hd300/lcd-as-hd300.S
index e5b04001dc..c44d38a85b 100644
--- a/firmware/target/coldfire/mpio/hd300/lcd-as-hd300.S
+++ b/firmware/target/coldfire/mpio/hd300/lcd-as-hd300.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * 
  * Adopted for MPIO HD300 by Marcin Bukat
  * Copyright (C) 2007 by Jens Arnold
diff --git a/firmware/target/coldfire/mpio/hd300/lcd-hd300.c b/firmware/target/coldfire/mpio/hd300/lcd-hd300.c
index 9cff9cd712..7e9c252d4c 100644
--- a/firmware/target/coldfire/mpio/hd300/lcd-hd300.c
+++ b/firmware/target/coldfire/mpio/hd300/lcd-hd300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Adopted for MPIO HD300 by Marcin Bukat
  * Copyright (C) 2007 by Jens Arnold
diff --git a/firmware/target/coldfire/mpio/hd300/powermgmt-hd300.c b/firmware/target/coldfire/mpio/hd300/powermgmt-hd300.c
index dfb86cca43..5689772fb5 100644
--- a/firmware/target/coldfire/mpio/hd300/powermgmt-hd300.c
+++ b/firmware/target/coldfire/mpio/hd300/powermgmt-hd300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/power-mpio.c b/firmware/target/coldfire/mpio/power-mpio.c
index 5ca3b947b0..5efb3d7b6d 100644
--- a/firmware/target/coldfire/mpio/power-mpio.c
+++ b/firmware/target/coldfire/mpio/power-mpio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/mpio/system-mpio.c b/firmware/target/coldfire/mpio/system-mpio.c
index 846f77b56e..85cfe6c567 100644
--- a/firmware/target/coldfire/mpio/system-mpio.c
+++ b/firmware/target/coldfire/mpio/system-mpio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Marcin Bukat
  * Copyright (C) 2006 by Linus Nielsen Feltzing
diff --git a/firmware/target/coldfire/mpio/usb-mpio.c b/firmware/target/coldfire/mpio/usb-mpio.c
index 9436517134..f910554e99 100644
--- a/firmware/target/coldfire/mpio/usb-mpio.c
+++ b/firmware/target/coldfire/mpio/usb-mpio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/firmware/target/coldfire/pcf50606-coldfire.c b/firmware/target/coldfire/pcf50606-coldfire.c
index d5d0022fc0..142d425e5c 100644
--- a/firmware/target/coldfire/pcf50606-coldfire.c
+++ b/firmware/target/coldfire/pcf50606-coldfire.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Linus Nielsen Feltzing
  *
diff --git a/firmware/target/coldfire/pcm-coldfire.c b/firmware/target/coldfire/pcm-coldfire.c
index 6c4d701d5b..531feeec2d 100644
--- a/firmware/target/coldfire/pcm-coldfire.c
+++ b/firmware/target/coldfire/pcm-coldfire.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Michael Sevakis
  * Copyright (C) 2005 by Linus Nielsen Feltzing
diff --git a/firmware/target/coldfire/system-coldfire.c b/firmware/target/coldfire/system-coldfire.c
index 1ab08c8772..19ea0fc01d 100644
--- a/firmware/target/coldfire/system-coldfire.c
+++ b/firmware/target/coldfire/system-coldfire.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/target/coldfire/system-target.h b/firmware/target/coldfire/system-target.h
index 5c810eb9b1..e30899a98e 100644
--- a/firmware/target/coldfire/system-target.h
+++ b/firmware/target/coldfire/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr
  *
diff --git a/firmware/target/coldfire/timer-coldfire.c b/firmware/target/coldfire/timer-coldfire.c
index cc665cb9c6..fa35005ae8 100644
--- a/firmware/target/coldfire/timer-coldfire.c
+++ b/firmware/target/coldfire/timer-coldfire.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2005 Jens Arnold
 *
diff --git a/firmware/target/coldfire/uart-coldfire.c b/firmware/target/coldfire/uart-coldfire.c
index c5992a956c..2d76ea8e4b 100644
--- a/firmware/target/coldfire/uart-coldfire.c
+++ b/firmware/target/coldfire/uart-coldfire.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Alan Korr & Nick Robinson
  *
diff --git a/firmware/target/coldfire/wmcodec-coldfire.c b/firmware/target/coldfire/wmcodec-coldfire.c
index e5bf2d65a8..fb72d2f94a 100644
--- a/firmware/target/coldfire/wmcodec-coldfire.c
+++ b/firmware/target/coldfire/wmcodec-coldfire.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Coldfire specific code for Wolfson audio codecs based on
  * wmcodec-pp.c
diff --git a/firmware/target/hosted/agptek/rocker_codec.c b/firmware/target/hosted/agptek/rocker_codec.c
index 20e45d5afb..3fcb36d443 100644
--- a/firmware/target/hosted/agptek/rocker_codec.c
+++ b/firmware/target/hosted/agptek/rocker_codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2018 Marcin Bukat
diff --git a/firmware/target/hosted/aigo/erosqlinux_codec.c b/firmware/target/hosted/aigo/erosqlinux_codec.c
index 274d77ddb2..2168f1a05d 100644
--- a/firmware/target/hosted/aigo/erosqlinux_codec.c
+++ b/firmware/target/hosted/aigo/erosqlinux_codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2018 Marcin Bukat
diff --git a/firmware/target/hosted/anbernic/button-rgnano.c b/firmware/target/hosted/anbernic/button-rgnano.c
index a76a3f830a..0be15c56c0 100644
--- a/firmware/target/hosted/anbernic/button-rgnano.c
+++ b/firmware/target/hosted/anbernic/button-rgnano.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Hairo R. Carela
  *
diff --git a/firmware/target/hosted/anbernic/button-target.h b/firmware/target/hosted/anbernic/button-target.h
index fc56ac11af..9ac8da3a70 100644
--- a/firmware/target/hosted/anbernic/button-target.h
+++ b/firmware/target/hosted/anbernic/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Hairo R. Carela
  *
diff --git a/firmware/target/hosted/anbernic/powermgmt-rgnano.c b/firmware/target/hosted/anbernic/powermgmt-rgnano.c
index 4655bf77d5..44a24c2307 100644
--- a/firmware/target/hosted/anbernic/powermgmt-rgnano.c
+++ b/firmware/target/hosted/anbernic/powermgmt-rgnano.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Hairo R. Carela
  *
diff --git a/firmware/target/hosted/android/android-codec.c b/firmware/target/hosted/android/android-codec.c
index d2c650f348..6e069210df 100644
--- a/firmware/target/hosted/android/android-codec.c
+++ b/firmware/target/hosted/android/android-codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright © 2010 Thomas Martitz
  *
diff --git a/firmware/target/hosted/android/app/backlight-target.h b/firmware/target/hosted/android/app/backlight-target.h
index f753e7c1dd..2b4b8f4f52 100644
--- a/firmware/target/hosted/android/app/backlight-target.h
+++ b/firmware/target/hosted/android/app/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/android/app/button-application.c b/firmware/target/hosted/android/app/button-application.c
index 65aff1a1a9..a5bf593019 100644
--- a/firmware/target/hosted/android/app/button-application.c
+++ b/firmware/target/hosted/android/app/button-application.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/firmware/target/hosted/android/app/button-target.h b/firmware/target/hosted/android/app/button-target.h
index 5430d7f600..255698c0be 100644
--- a/firmware/target/hosted/android/app/button-target.h
+++ b/firmware/target/hosted/android/app/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Rob Purchase
  *
diff --git a/firmware/target/hosted/android/button-android.c b/firmware/target/hosted/android/button-android.c
index 8dad5961c4..ee5344b1e0 100644
--- a/firmware/target/hosted/android/button-android.c
+++ b/firmware/target/hosted/android/button-android.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2010 Thomas Martitz
  *
diff --git a/firmware/target/hosted/android/buttonmap.h b/firmware/target/hosted/android/buttonmap.h
index e90b8a40d4..5fb29fa2b7 100644
--- a/firmware/target/hosted/android/buttonmap.h
+++ b/firmware/target/hosted/android/buttonmap.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Fred Bauer
  *
diff --git a/firmware/target/hosted/android/debug-android.c b/firmware/target/hosted/android/debug-android.c
index d819bde3cb..229c836af6 100644
--- a/firmware/target/hosted/android/debug-android.c
+++ b/firmware/target/hosted/android/debug-android.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2010 Thomas Martitz
  *
diff --git a/firmware/target/hosted/android/lcd-android.c b/firmware/target/hosted/android/lcd-android.c
index 0b308eeced..15c0603be6 100644
--- a/firmware/target/hosted/android/lcd-android.c
+++ b/firmware/target/hosted/android/lcd-android.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2010 Thomas Martitz
  *
diff --git a/firmware/target/hosted/android/pcm-android.c b/firmware/target/hosted/android/pcm-android.c
index 189099eecc..467f60e6cb 100644
--- a/firmware/target/hosted/android/pcm-android.c
+++ b/firmware/target/hosted/android/pcm-android.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2010 Thomas Martitz
  *
diff --git a/firmware/target/hosted/android/powermgmt-android.c b/firmware/target/hosted/android/powermgmt-android.c
index 1e70a81753..8823f980e5 100644
--- a/firmware/target/hosted/android/powermgmt-android.c
+++ b/firmware/target/hosted/android/powermgmt-android.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c
index d13b8d6462..3a9d4a4407 100644
--- a/firmware/target/hosted/android/system-android.c
+++ b/firmware/target/hosted/android/system-android.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2010 Thomas Martitz
  *
diff --git a/firmware/target/hosted/android/system-target.h b/firmware/target/hosted/android/system-target.h
index 455fcc95fa..ea17bdaeed 100644
--- a/firmware/target/hosted/android/system-target.h
+++ b/firmware/target/hosted/android/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
  *                     \/            \/     \/    \/            \/ 
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/android/telephony-android.c b/firmware/target/hosted/android/telephony-android.c
index 63f0f05e39..194cbda0fe 100644
--- a/firmware/target/hosted/android/telephony-android.c
+++ b/firmware/target/hosted/android/telephony-android.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/backtrace-glibc.c b/firmware/target/hosted/backtrace-glibc.c
index 3a63499187..24ad3b1681 100644
--- a/firmware/target/hosted/backtrace-glibc.c
+++ b/firmware/target/hosted/backtrace-glibc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2017 Amaury Pouly
  *
diff --git a/firmware/target/hosted/cpuinfo-linux.c b/firmware/target/hosted/cpuinfo-linux.c
index b6056b3dab..1c91b6019b 100644
--- a/firmware/target/hosted/cpuinfo-linux.c
+++ b/firmware/target/hosted/cpuinfo-linux.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/ 
- * $Id$
  *
  * Copyright (C) 2011 Thomas Martitz
  *
diff --git a/firmware/target/hosted/cpuinfo-linux.h b/firmware/target/hosted/cpuinfo-linux.h
index defbf2f374..9a9cb472f0 100644
--- a/firmware/target/hosted/cpuinfo-linux.h
+++ b/firmware/target/hosted/cpuinfo-linux.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Thomas Martitz
  *
diff --git a/firmware/target/hosted/ctru/app/button-target.h b/firmware/target/hosted/ctru/app/button-target.h
index 36fed8b59d..f4d6ab30ae 100644
--- a/firmware/target/hosted/ctru/app/button-target.h
+++ b/firmware/target/hosted/ctru/app/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Rob Purchase
  *
diff --git a/firmware/target/hosted/ctru/button-ctru.c b/firmware/target/hosted/ctru/button-ctru.c
index 59dfffef67..a03c0d0eb5 100644
--- a/firmware/target/hosted/ctru/button-ctru.c
+++ b/firmware/target/hosted/ctru/button-ctru.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Felix Arends
  *
diff --git a/firmware/target/hosted/ctru/button-ctru.h b/firmware/target/hosted/ctru/button-ctru.h
index 637fcbf077..606c7d09f4 100644
--- a/firmware/target/hosted/ctru/button-ctru.h
+++ b/firmware/target/hosted/ctru/button-ctru.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/ctru/buttonmap.h b/firmware/target/hosted/ctru/buttonmap.h
index b6fcaa2efc..28d2b170c4 100644
--- a/firmware/target/hosted/ctru/buttonmap.h
+++ b/firmware/target/hosted/ctru/buttonmap.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Fred Bauer
  *
diff --git a/firmware/target/hosted/ctru/filesystem-ctru.c b/firmware/target/hosted/ctru/filesystem-ctru.c
index 5643afe8c3..07a3b012de 100644
--- a/firmware/target/hosted/ctru/filesystem-ctru.c
+++ b/firmware/target/hosted/ctru/filesystem-ctru.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/ctru/filesystem-ctru.h b/firmware/target/hosted/ctru/filesystem-ctru.h
index a67c7b58a0..086af83a67 100644
--- a/firmware/target/hosted/ctru/filesystem-ctru.h
+++ b/firmware/target/hosted/ctru/filesystem-ctru.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/kernel-ctru.c b/firmware/target/hosted/ctru/kernel-ctru.c
index e035af282d..27d7f2cee0 100644
--- a/firmware/target/hosted/ctru/kernel-ctru.c
+++ b/firmware/target/hosted/ctru/kernel-ctru.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/lc-ctru.c b/firmware/target/hosted/ctru/lc-ctru.c
index 286944eed3..af7cfc8655 100644
--- a/firmware/target/hosted/ctru/lc-ctru.c
+++ b/firmware/target/hosted/ctru/lc-ctru.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/lc-program-resolver.c b/firmware/target/hosted/ctru/lc-program-resolver.c
index 5c504b1069..e0e992c8c3 100644
--- a/firmware/target/hosted/ctru/lc-program-resolver.c
+++ b/firmware/target/hosted/ctru/lc-program-resolver.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/lcd-bitmap.c b/firmware/target/hosted/ctru/lcd-bitmap.c
index 53efbeabca..20e344e349 100644
--- a/firmware/target/hosted/ctru/lcd-bitmap.c
+++ b/firmware/target/hosted/ctru/lcd-bitmap.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/firmware/target/hosted/ctru/lcd-bitmap.h b/firmware/target/hosted/ctru/lcd-bitmap.h
index ba3bcfcc70..c8d6e205d9 100644
--- a/firmware/target/hosted/ctru/lcd-bitmap.h
+++ b/firmware/target/hosted/ctru/lcd-bitmap.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \ 
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/lcd-target.h b/firmware/target/hosted/ctru/lcd-target.h
index 4b1c1a4315..bf9931893f 100644
--- a/firmware/target/hosted/ctru/lcd-target.h
+++ b/firmware/target/hosted/ctru/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/lib/sys_dir.c b/firmware/target/hosted/ctru/lib/sys_dir.c
index f657d6c15e..1088110b94 100644
--- a/firmware/target/hosted/ctru/lib/sys_dir.c
+++ b/firmware/target/hosted/ctru/lib/sys_dir.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/lib/sys_file.c b/firmware/target/hosted/ctru/lib/sys_file.c
index 6a40cd659f..72ebfa8fcd 100644
--- a/firmware/target/hosted/ctru/lib/sys_file.c
+++ b/firmware/target/hosted/ctru/lib/sys_file.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/lib/sys_file.h b/firmware/target/hosted/ctru/lib/sys_file.h
index 112d932b5e..4640b16db4 100644
--- a/firmware/target/hosted/ctru/lib/sys_file.h
+++ b/firmware/target/hosted/ctru/lib/sys_file.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 by Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/lib/sys_thread.c b/firmware/target/hosted/ctru/lib/sys_thread.c
index 04e80b75ac..1634fb3d7f 100644
--- a/firmware/target/hosted/ctru/lib/sys_thread.c
+++ b/firmware/target/hosted/ctru/lib/sys_thread.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Mauricio Ga.
  *
diff --git a/firmware/target/hosted/ctru/lib/sys_thread.h b/firmware/target/hosted/ctru/lib/sys_thread.h
index a11a1b3bb4..d6dea134c5 100644
--- a/firmware/target/hosted/ctru/lib/sys_thread.h
+++ b/firmware/target/hosted/ctru/lib/sys_thread.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/lib/sys_timer.c b/firmware/target/hosted/ctru/lib/sys_timer.c
index 60123e6025..8cc5fa334a 100644
--- a/firmware/target/hosted/ctru/lib/sys_timer.c
+++ b/firmware/target/hosted/ctru/lib/sys_timer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/firmware/target/hosted/ctru/lib/sys_timer.h b/firmware/target/hosted/ctru/lib/sys_timer.h
index cccaab4fce..302fc216a2 100644
--- a/firmware/target/hosted/ctru/lib/sys_timer.h
+++ b/firmware/target/hosted/ctru/lib/sys_timer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/pcm-ctru.c b/firmware/target/hosted/ctru/pcm-ctru.c
index 048809fa93..4c296b6284 100644
--- a/firmware/target/hosted/ctru/pcm-ctru.c
+++ b/firmware/target/hosted/ctru/pcm-ctru.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Nick Lanham
  * Copyright (C) 2010 by Thomas Martitz
diff --git a/firmware/target/hosted/ctru/system-ctru.c b/firmware/target/hosted/ctru/system-ctru.c
index 777e15bbe8..d1f760ad32 100644
--- a/firmware/target/hosted/ctru/system-ctru.c
+++ b/firmware/target/hosted/ctru/system-ctru.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Daniel Everton <dan@iocaine.org>
  *
diff --git a/firmware/target/hosted/ctru/system-ctru.h b/firmware/target/hosted/ctru/system-ctru.h
index 53a01e0b5f..fb96af2912 100644
--- a/firmware/target/hosted/ctru/system-ctru.h
+++ b/firmware/target/hosted/ctru/system-ctru.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
  *                     \/            \/     \/    \/            \/ 
- * $Id$
  *
  * Copyright (C) 2025 by Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/thread-ctru.c b/firmware/target/hosted/ctru/thread-ctru.c
index 675cb314be..6dc057e333 100644
--- a/firmware/target/hosted/ctru/thread-ctru.c
+++ b/firmware/target/hosted/ctru/thread-ctru.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/firmware/target/hosted/ctru/thread-ctru.h b/firmware/target/hosted/ctru/thread-ctru.h
index 89e2d121cb..6f18576991 100644
--- a/firmware/target/hosted/ctru/thread-ctru.h
+++ b/firmware/target/hosted/ctru/thread-ctru.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2025 Mauricio G.
  *
diff --git a/firmware/target/hosted/ctru/timer-ctru.c b/firmware/target/hosted/ctru/timer-ctru.c
index 4c608b667b..2b40fa1343 100644
--- a/firmware/target/hosted/ctru/timer-ctru.c
+++ b/firmware/target/hosted/ctru/timer-ctru.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2025 Mauricio G.
 *
diff --git a/firmware/target/hosted/ctru/timer-ctru_sys.c b/firmware/target/hosted/ctru/timer-ctru_sys.c
index 4c608b667b..2b40fa1343 100644
--- a/firmware/target/hosted/ctru/timer-ctru_sys.c
+++ b/firmware/target/hosted/ctru/timer-ctru_sys.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2025 Mauricio G.
 *
diff --git a/firmware/target/hosted/debug-hosted.c b/firmware/target/hosted/debug-hosted.c
index 678b435298..cabd10e503 100644
--- a/firmware/target/hosted/debug-hosted.c
+++ b/firmware/target/hosted/debug-hosted.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2002 Daniel Stenberg
  *
diff --git a/firmware/target/hosted/fiio/fiio.make b/firmware/target/hosted/fiio/fiio.make
index 117ecb8eac..f3c956aa86 100644
--- a/firmware/target/hosted/fiio/fiio.make
+++ b/firmware/target/hosted/fiio/fiio.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 INCLUDES += -I$(FIRMDIR)/include -I$(FIRMDIR)/export $(TARGET_INC) -I$(BUILDDIR) -I$(APPSDIR)
diff --git a/firmware/target/hosted/fiio/fiiolinux_codec.c b/firmware/target/hosted/fiio/fiiolinux_codec.c
index 397e58286f..eeb59f6823 100644
--- a/firmware/target/hosted/fiio/fiiolinux_codec.c
+++ b/firmware/target/hosted/fiio/fiiolinux_codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2018 Marcin Bukat
diff --git a/firmware/target/hosted/filesystem-app.c b/firmware/target/hosted/filesystem-app.c
index 6287762574..03a7bf7f18 100644
--- a/firmware/target/hosted/filesystem-app.c
+++ b/firmware/target/hosted/filesystem-app.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  * Copyright (C) 2020 Solomon Peachy
diff --git a/firmware/target/hosted/filesystem-app.h b/firmware/target/hosted/filesystem-app.h
index 6233524bb4..423e723dd1 100644
--- a/firmware/target/hosted/filesystem-app.h
+++ b/firmware/target/hosted/filesystem-app.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/target/hosted/filesystem-hosted.h b/firmware/target/hosted/filesystem-hosted.h
index 348a921f82..3716da76f7 100644
--- a/firmware/target/hosted/filesystem-hosted.h
+++ b/firmware/target/hosted/filesystem-hosted.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/target/hosted/filesystem-unix.c b/firmware/target/hosted/filesystem-unix.c
index 14e977abc0..5e4c2a7207 100644
--- a/firmware/target/hosted/filesystem-unix.c
+++ b/firmware/target/hosted/filesystem-unix.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/filesystem-unix.h b/firmware/target/hosted/filesystem-unix.h
index a09712d8b0..9e38eab0f6 100644
--- a/firmware/target/hosted/filesystem-unix.h
+++ b/firmware/target/hosted/filesystem-unix.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/target/hosted/filesystem-win32.c b/firmware/target/hosted/filesystem-win32.c
index 01e3e888ad..2e61e5a4ce 100644
--- a/firmware/target/hosted/filesystem-win32.c
+++ b/firmware/target/hosted/filesystem-win32.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/target/hosted/filesystem-win32.h b/firmware/target/hosted/filesystem-win32.h
index c6e89a66aa..68f77dbf98 100644
--- a/firmware/target/hosted/filesystem-win32.h
+++ b/firmware/target/hosted/filesystem-win32.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/target/hosted/hiby/hibylinux_codec.c b/firmware/target/hosted/hiby/hibylinux_codec.c
index 656e07a6a1..0464dceaf2 100644
--- a/firmware/target/hosted/hiby/hibylinux_codec.c
+++ b/firmware/target/hosted/hiby/hibylinux_codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2018 Marcin Bukat
diff --git a/firmware/target/hosted/hiby/usb-hiby-gadget.c b/firmware/target/hosted/hiby/usb-hiby-gadget.c
index 91e178dd03..651b25bb70 100644
--- a/firmware/target/hosted/hiby/usb-hiby-gadget.c
+++ b/firmware/target/hosted/hiby/usb-hiby-gadget.c
@@ -95,12 +95,8 @@ void usb_enable(bool on)
     logf(">>>>>>>>>>>>>>>>> usb_enable(%d)\n", on);
     logf("usb enable %d %d\n", on, _usb_mode);
 
-    /* Ignore usb enable/disable when ADB is enabled so we can fireup adb shell
-     * without entering ums mode
-     */
-    //if (_usb_mode != USB_MODE_ADB) {
-        sysfs_set_string("/sys/kernel/config/usb_gadget/adb_demo/UDC", on ? "13500000.otg_new" : "");
-    //}
+    sysfs_set_string("/sys/kernel/config/usb_gadget/adb_demo/UDC",
+                     on ? "13500000.otg_new" : "\n");
 }
 
 /* This is called by usb thread after usb extract in order to return
diff --git a/firmware/target/hosted/hibyos.make b/firmware/target/hosted/hibyos.make
index 117ecb8eac..f3c956aa86 100644
--- a/firmware/target/hosted/hibyos.make
+++ b/firmware/target/hosted/hibyos.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 INCLUDES += -I$(FIRMDIR)/include -I$(FIRMDIR)/export $(TARGET_INC) -I$(BUILDDIR) -I$(APPSDIR)
diff --git a/firmware/target/hosted/ibasso/usb-ibasso.c b/firmware/target/hosted/ibasso/usb-ibasso.c
index 9889318cf2..e4f2a8c016 100644
--- a/firmware/target/hosted/ibasso/usb-ibasso.c
+++ b/firmware/target/hosted/ibasso/usb-ibasso.c
@@ -87,7 +87,26 @@ void ibasso_set_usb_mode(int mode)
     }
 }
 
-bool usb_powered_only(void)
+void usb_enable(bool on)
 {
-  return false;
+    (void)on; // XXX maybe implement?
+}
+
+int usb_detect(void)
+{
+    return 0; // XXX figure this out?
+}
+
+void usb_init_device(void)
+{
+    // XXX maybe something?
+}
+
+int disk_mount_all(void)
+{
+    return 1;  // XXX maybe do sometihng?
+}
+int disk_unmount_all(void)
+{
+    return 1;  // XXX maybe do sometihng?
 }
diff --git a/firmware/target/hosted/kernel-unix.c b/firmware/target/hosted/kernel-unix.c
index 5e9204effd..6b9dde1eda 100644
--- a/firmware/target/hosted/kernel-unix.c
+++ b/firmware/target/hosted/kernel-unix.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2010 Thomas Martitz
  *
diff --git a/firmware/target/hosted/kernel-unix.h b/firmware/target/hosted/kernel-unix.h
index f296668861..62ad0f76f4 100644
--- a/firmware/target/hosted/kernel-unix.h
+++ b/firmware/target/hosted/kernel-unix.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
  *                     \/            \/     \/    \/            \/ 
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/lc-unix.c b/firmware/target/hosted/lc-unix.c
index 1061883832..727fb908d6 100644
--- a/firmware/target/hosted/lc-unix.c
+++ b/firmware/target/hosted/lc-unix.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/rtc.c b/firmware/target/hosted/rtc.c
index 82266d8e40..959b1cb8c1 100644
--- a/firmware/target/hosted/rtc.c
+++ b/firmware/target/hosted/rtc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Based upon code (C) 2002 by Björn Stenberg
  * Copyright (C) 2011 by Thomas Jarosch
diff --git a/firmware/target/hosted/samsungypr/backlight-target.h b/firmware/target/hosted/samsungypr/backlight-target.h
index 138c2ccd3c..a44b5d05b5 100644
--- a/firmware/target/hosted/samsungypr/backlight-target.h
+++ b/firmware/target/hosted/samsungypr/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Lorenzo Miori
  *
diff --git a/firmware/target/hosted/samsungypr/lcd-target.h b/firmware/target/hosted/samsungypr/lcd-target.h
index 900350eca2..cb10910576 100644
--- a/firmware/target/hosted/samsungypr/lcd-target.h
+++ b/firmware/target/hosted/samsungypr/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/firmware/target/hosted/samsungypr/lcd-ypr.c b/firmware/target/hosted/samsungypr/lcd-ypr.c
index 035abaeba7..b99fdf2540 100644
--- a/firmware/target/hosted/samsungypr/lcd-ypr.c
+++ b/firmware/target/hosted/samsungypr/lcd-ypr.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: lcd-bitmap.c 29248 2011-02-08 20:05:25Z thomasjfox $
  *
  * Copyright (C) 2011 Lorenzo Miori, Thomas Martitz
  * Copyright (C) 2013 Lorenzo Miori
diff --git a/firmware/target/hosted/samsungypr/system-target.h b/firmware/target/hosted/samsungypr/system-target.h
index 1ef8b9aeda..3a2b0b7531 100644
--- a/firmware/target/hosted/samsungypr/system-target.h
+++ b/firmware/target/hosted/samsungypr/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
  *                     \/            \/     \/    \/            \/ 
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/samsungypr/ypr0/audio-ypr0.c b/firmware/target/hosted/samsungypr/ypr0/audio-ypr0.c
index dfd63ef5cd..9fd2b79ac5 100644
--- a/firmware/target/hosted/samsungypr/ypr0/audio-ypr0.c
+++ b/firmware/target/hosted/samsungypr/ypr0/audio-ypr0.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Bertrik Sikken
  *
diff --git a/firmware/target/hosted/samsungypr/ypr0/button-target.h b/firmware/target/hosted/samsungypr/ypr0/button-target.h
index 3a3866932a..6ace1e706e 100644
--- a/firmware/target/hosted/samsungypr/ypr0/button-target.h
+++ b/firmware/target/hosted/samsungypr/ypr0/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Lorenzo Miori
  *
diff --git a/firmware/target/hosted/samsungypr/ypr0/button-ypr0.c b/firmware/target/hosted/samsungypr/ypr0/button-ypr0.c
index 860ad50cae..216e8b71a0 100644
--- a/firmware/target/hosted/samsungypr/ypr0/button-ypr0.c
+++ b/firmware/target/hosted/samsungypr/ypr0/button-ypr0.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: button-sdl.c 30482 2011-09-08 14:53:28Z kugel $
  *
  * Copyright (C) 2011 Lorenzo Miori
  *
diff --git a/firmware/target/hosted/samsungypr/ypr0/ypr0.make b/firmware/target/hosted/samsungypr/ypr0/ypr0.make
index 3583293a0f..9b9371440f 100644
--- a/firmware/target/hosted/samsungypr/ypr0/ypr0.make
+++ b/firmware/target/hosted/samsungypr/ypr0/ypr0.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 INCLUDES += -I$(FIRMDIR)/include -I$(FIRMDIR)/export $(TARGET_INC) -I$(BUILDDIR) -I$(APPSDIR)
diff --git a/firmware/target/hosted/samsungypr/ypr1/button-ypr1.c b/firmware/target/hosted/samsungypr/ypr1/button-ypr1.c
index 26755716f4..c4f6c60900 100644
--- a/firmware/target/hosted/samsungypr/ypr1/button-ypr1.c
+++ b/firmware/target/hosted/samsungypr/ypr1/button-ypr1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: button-sdl.c 30482 2011-09-08 14:53:28Z kugel $
  *
  * Copyright (C) 2013 Lorenzo Miori
  *
diff --git a/firmware/target/hosted/samsungypr/ypr1/ypr1.make b/firmware/target/hosted/samsungypr/ypr1/ypr1.make
index 3583293a0f..9b9371440f 100644
--- a/firmware/target/hosted/samsungypr/ypr1/ypr1.make
+++ b/firmware/target/hosted/samsungypr/ypr1/ypr1.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 INCLUDES += -I$(FIRMDIR)/include -I$(FIRMDIR)/export $(TARGET_INC) -I$(BUILDDIR) -I$(APPSDIR)
diff --git a/firmware/target/hosted/sdl/app/backlight-target.h b/firmware/target/hosted/sdl/app/backlight-target.h
index f753e7c1dd..2b4b8f4f52 100644
--- a/firmware/target/hosted/sdl/app/backlight-target.h
+++ b/firmware/target/hosted/sdl/app/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/sdl/app/button-application.c b/firmware/target/hosted/sdl/app/button-application.c
index 1f908ebfc5..939580a954 100644
--- a/firmware/target/hosted/sdl/app/button-application.c
+++ b/firmware/target/hosted/sdl/app/button-application.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/firmware/target/hosted/sdl/app/button-target.h b/firmware/target/hosted/sdl/app/button-target.h
index 26d0fedcc5..f9138780ce 100644
--- a/firmware/target/hosted/sdl/app/button-target.h
+++ b/firmware/target/hosted/sdl/app/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Rob Purchase
  *
diff --git a/firmware/target/hosted/sdl/app/load_code-sdl-app.c b/firmware/target/hosted/sdl/app/load_code-sdl-app.c
index 686944343f..a11867b402 100644
--- a/firmware/target/hosted/sdl/app/load_code-sdl-app.c
+++ b/firmware/target/hosted/sdl/app/load_code-sdl-app.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 00b1016f2a..a329bb6fc1 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Felix Arends
  *
diff --git a/firmware/target/hosted/sdl/button-sdl.h b/firmware/target/hosted/sdl/button-sdl.h
index 1dfc0b7828..fb3ff26da5 100644
--- a/firmware/target/hosted/sdl/button-sdl.h
+++ b/firmware/target/hosted/sdl/button-sdl.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/sdl/buttonmap.h b/firmware/target/hosted/sdl/buttonmap.h
index e90b8a40d4..5fb29fa2b7 100644
--- a/firmware/target/hosted/sdl/buttonmap.h
+++ b/firmware/target/hosted/sdl/buttonmap.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Fred Bauer
  *
diff --git a/firmware/target/hosted/sdl/filesystem-sdl.c b/firmware/target/hosted/sdl/filesystem-sdl.c
index 5a8e2c417a..1a1ab7f0f7 100644
--- a/firmware/target/hosted/sdl/filesystem-sdl.c
+++ b/firmware/target/hosted/sdl/filesystem-sdl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/target/hosted/sdl/filesystem-sdl.h b/firmware/target/hosted/sdl/filesystem-sdl.h
index 934b43b34b..6b1f661fc9 100644
--- a/firmware/target/hosted/sdl/filesystem-sdl.h
+++ b/firmware/target/hosted/sdl/filesystem-sdl.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
  *                     \/            \/     \/    \/            \/ 
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/target/hosted/sdl/kernel-sdl.c b/firmware/target/hosted/sdl/kernel-sdl.c
index bcad39b4d8..784199647d 100644
--- a/firmware/target/hosted/sdl/kernel-sdl.c
+++ b/firmware/target/hosted/sdl/kernel-sdl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Felix Arends
  *
diff --git a/firmware/target/hosted/sdl/key_to_touch-sdl.c b/firmware/target/hosted/sdl/key_to_touch-sdl.c
index 93332f6559..067675abd5 100644
--- a/firmware/target/hosted/sdl/key_to_touch-sdl.c
+++ b/firmware/target/hosted/sdl/key_to_touch-sdl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Jonathan Gordon
  *
diff --git a/firmware/target/hosted/sdl/lcd-bitmap.c b/firmware/target/hosted/sdl/lcd-bitmap.c
index 4f44506f3c..0280bd537b 100644
--- a/firmware/target/hosted/sdl/lcd-bitmap.c
+++ b/firmware/target/hosted/sdl/lcd-bitmap.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
@@ -114,6 +113,17 @@ static unsigned long get_lcd_pixel(int x, int y)
 #endif
 }
 
+#ifdef HAVE_LCD_FLIP
+/* The simulator has no real LCD controller, so flip_display is done in software
+   here: when set, the framebuffer is mirrored as it is copied to the surface.
+   (On the device the controller flips itself; see lcd-clipzip.c.) */
+static bool sim_lcd_flipped = false;
+void lcd_set_flip(bool yesno)
+{
+    sim_lcd_flipped = yesno;
+}
+#endif
+
 void lcd_update(void)
 {
     /* update a full screen rect */
@@ -122,6 +132,29 @@ void lcd_update(void)
 
 void lcd_update_rect(int x_start, int y_start, int width, int height)
 {
+#ifdef HAVE_LCD_FLIP
+    if (sim_lcd_flipped)
+    {
+        /* redraw the whole panel mirrored in both axes (sim software flip) */
+        SDL_Rect d = {0, 0, 1, 1};
+        int x, y;
+        for (y = 0; y < LCD_HEIGHT; y++)
+        {
+            for (x = 0; x < LCD_WIDTH; x++)
+            {
+                d.x = x;
+                d.y = y;
+                SDL_FillRect(lcd_surface, &d, (Uint32)
+                    get_lcd_pixel(LCD_WIDTH - 1 - x, LCD_HEIGHT - 1 - y));
+            }
+        }
+        sdl_gui_update(lcd_surface, 0, 0, LCD_WIDTH,
+                       LCD_HEIGHT + LCD_SPLIT_LINES, SIM_LCD_WIDTH, SIM_LCD_HEIGHT,
+                       background ? UI_LCD_POSX : 0, background? UI_LCD_POSY : 0);
+        return;
+    }
+#endif
+
     sdl_update_rect(lcd_surface, x_start, y_start, width, height,
                     LCD_WIDTH, LCD_HEIGHT, get_lcd_pixel);
     sdl_gui_update(lcd_surface, x_start, y_start, width,
diff --git a/firmware/target/hosted/sdl/lcd-bitmap.h b/firmware/target/hosted/sdl/lcd-bitmap.h
index a898744b41..9ad2d3641e 100644
--- a/firmware/target/hosted/sdl/lcd-bitmap.h
+++ b/firmware/target/hosted/sdl/lcd-bitmap.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \ 
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/firmware/target/hosted/sdl/lcd-remote-bitmap.c b/firmware/target/hosted/sdl/lcd-remote-bitmap.c
index 1bbcc96542..04cf4bb4aa 100644
--- a/firmware/target/hosted/sdl/lcd-remote-bitmap.c
+++ b/firmware/target/hosted/sdl/lcd-remote-bitmap.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/firmware/target/hosted/sdl/lcd-remote-bitmap.h b/firmware/target/hosted/sdl/lcd-remote-bitmap.h
index 0a92ee6b79..94cd07572e 100644
--- a/firmware/target/hosted/sdl/lcd-remote-bitmap.h
+++ b/firmware/target/hosted/sdl/lcd-remote-bitmap.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \ 
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/firmware/target/hosted/sdl/lcd-sdl.c b/firmware/target/hosted/sdl/lcd-sdl.c
index a2c5cea647..325ff0da3a 100644
--- a/firmware/target/hosted/sdl/lcd-sdl.c
+++ b/firmware/target/hosted/sdl/lcd-sdl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/firmware/target/hosted/sdl/lcd-sdl.h b/firmware/target/hosted/sdl/lcd-sdl.h
index a4c57d1b3a..86e9d5e4e3 100644
--- a/firmware/target/hosted/sdl/lcd-sdl.h
+++ b/firmware/target/hosted/sdl/lcd-sdl.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/firmware/target/hosted/sdl/load_code-sdl.c b/firmware/target/hosted/sdl/load_code-sdl.c
index ee29853ab5..7ee3bbe2a8 100644
--- a/firmware/target/hosted/sdl/load_code-sdl.c
+++ b/firmware/target/hosted/sdl/load_code-sdl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Daniel Stenberg
  *
diff --git a/firmware/target/hosted/sdl/pcm-sdl.c b/firmware/target/hosted/sdl/pcm-sdl.c
index 26c0bef563..2b9df50faf 100644
--- a/firmware/target/hosted/sdl/pcm-sdl.c
+++ b/firmware/target/hosted/sdl/pcm-sdl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Nick Lanham
  * Copyright (C) 2010 by Thomas Martitz
diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h
index c29c4e0be7..3a10589da6 100644
--- a/firmware/target/hosted/sdl/sim-ui-defines.h
+++ b/firmware/target/hosted/sdl/sim-ui-defines.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c
index 639f2baeef..97fb0f9b7d 100644
--- a/firmware/target/hosted/sdl/system-sdl.c
+++ b/firmware/target/hosted/sdl/system-sdl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Daniel Everton <dan@iocaine.org>
  *
diff --git a/firmware/target/hosted/sdl/system-sdl.h b/firmware/target/hosted/sdl/system-sdl.h
index 3568910fae..f1aae61b84 100644
--- a/firmware/target/hosted/sdl/system-sdl.h
+++ b/firmware/target/hosted/sdl/system-sdl.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
  *                     \/            \/     \/    \/            \/ 
- * $Id$
  *
  * Copyright (C) 2007 by Michael Sevakis
  *
diff --git a/firmware/target/hosted/sdl/system-sim.h b/firmware/target/hosted/sdl/system-sim.h
index 16c0cdde52..559adcf0f7 100644
--- a/firmware/target/hosted/sdl/system-sim.h
+++ b/firmware/target/hosted/sdl/system-sim.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/firmware/target/hosted/sdl/thread-sdl.c b/firmware/target/hosted/sdl/thread-sdl.c
index 29bdd89921..6510c57261 100644
--- a/firmware/target/hosted/sdl/thread-sdl.c
+++ b/firmware/target/hosted/sdl/thread-sdl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/firmware/target/hosted/sdl/thread-sdl.h b/firmware/target/hosted/sdl/thread-sdl.h
index 9edb3ee74e..3f1352c9fc 100644
--- a/firmware/target/hosted/sdl/thread-sdl.h
+++ b/firmware/target/hosted/sdl/thread-sdl.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/firmware/target/hosted/sdl/timer-sdl.c b/firmware/target/hosted/sdl/timer-sdl.c
index ebde3e7428..836f75b08b 100644
--- a/firmware/target/hosted/sdl/timer-sdl.c
+++ b/firmware/target/hosted/sdl/timer-sdl.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2005 Kévin Ferrare
 *
diff --git a/firmware/target/hosted/sdl/window-sdl.c b/firmware/target/hosted/sdl/window-sdl.c
index 05e2772778..514fe2cfa5 100644
--- a/firmware/target/hosted/sdl/window-sdl.c
+++ b/firmware/target/hosted/sdl/window-sdl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/firmware/target/hosted/sdl/window-sdl.h b/firmware/target/hosted/sdl/window-sdl.h
index 9f2d920a56..1f9cf98ec0 100644
--- a/firmware/target/hosted/sdl/window-sdl.h
+++ b/firmware/target/hosted/sdl/window-sdl.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/firmware/target/hosted/sonynwz/adc-target.h b/firmware/target/hosted/sonynwz/adc-target.h
index bee028a8ac..595890a144 100644
--- a/firmware/target/hosted/sonynwz/adc-target.h
+++ b/firmware/target/hosted/sonynwz/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/firmware/target/hosted/sonynwz/backlight-target.h b/firmware/target/hosted/sonynwz/backlight-target.h
index b5a200d07a..29df993b4e 100644
--- a/firmware/target/hosted/sonynwz/backlight-target.h
+++ b/firmware/target/hosted/sonynwz/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/firmware/target/hosted/sonynwz/button-target.h b/firmware/target/hosted/sonynwz/button-target.h
index 5070728236..7f6fc25dde 100644
--- a/firmware/target/hosted/sonynwz/button-target.h
+++ b/firmware/target/hosted/sonynwz/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/firmware/target/hosted/sonynwz/nvp-nwz.c b/firmware/target/hosted/sonynwz/nvp-nwz.c
index f7511d6118..07cd35652a 100644
--- a/firmware/target/hosted/sonynwz/nvp-nwz.c
+++ b/firmware/target/hosted/sonynwz/nvp-nwz.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/firmware/target/hosted/sonynwz/nvp-nwz.h b/firmware/target/hosted/sonynwz/nvp-nwz.h
index 648e8b5ca4..8ffc82d8e6 100644
--- a/firmware/target/hosted/sonynwz/nvp-nwz.h
+++ b/firmware/target/hosted/sonynwz/nvp-nwz.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/firmware/target/hosted/sonynwz/nwz_audio.h b/firmware/target/hosted/sonynwz/nwz_audio.h
index f18674345d..b457e420b9 100644
--- a/firmware/target/hosted/sonynwz/nwz_audio.h
+++ b/firmware/target/hosted/sonynwz/nwz_audio.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 Amaury Pouly
  *
diff --git a/firmware/target/hosted/sonynwz/nwz_keys.h b/firmware/target/hosted/sonynwz/nwz_keys.h
index d2314d4a12..1ebb19984b 100644
--- a/firmware/target/hosted/sonynwz/nwz_keys.h
+++ b/firmware/target/hosted/sonynwz/nwz_keys.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 Amaury Pouly
  *
diff --git a/firmware/target/hosted/sonynwz/nwz_sysinfo.h b/firmware/target/hosted/sonynwz/nwz_sysinfo.h
index ef63c9ad51..85c3f667b9 100644
--- a/firmware/target/hosted/sonynwz/nwz_sysinfo.h
+++ b/firmware/target/hosted/sonynwz/nwz_sysinfo.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Amaury Pouly
  *
diff --git a/firmware/target/hosted/sonynwz/nwz_ts.h b/firmware/target/hosted/sonynwz/nwz_ts.h
index 4528609ddc..df48d1c47e 100644
--- a/firmware/target/hosted/sonynwz/nwz_ts.h
+++ b/firmware/target/hosted/sonynwz/nwz_ts.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 Amaury Pouly
  *
diff --git a/firmware/target/hosted/sonynwz/nwz_tuner.h b/firmware/target/hosted/sonynwz/nwz_tuner.h
index 03aa8dac74..28b6cd8e81 100644
--- a/firmware/target/hosted/sonynwz/nwz_tuner.h
+++ b/firmware/target/hosted/sonynwz/nwz_tuner.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Amaury Pouly
  *
diff --git a/firmware/target/hosted/sonynwz/power-nwz.c b/firmware/target/hosted/sonynwz/power-nwz.c
index a5b19d6ead..349dd47b1d 100644
--- a/firmware/target/hosted/sonynwz/power-nwz.c
+++ b/firmware/target/hosted/sonynwz/power-nwz.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 Amaury Pouly
  *
diff --git a/firmware/target/hosted/sonynwz/power-nwz.h b/firmware/target/hosted/sonynwz/power-nwz.h
index 965013a35a..7e934193b2 100644
--- a/firmware/target/hosted/sonynwz/power-nwz.h
+++ b/firmware/target/hosted/sonynwz/power-nwz.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 Amaury Pouly
  *
diff --git a/firmware/target/hosted/sonynwz/sonynwz.make b/firmware/target/hosted/sonynwz/sonynwz.make
index bf2d0aa53c..a6a90c24da 100644
--- a/firmware/target/hosted/sonynwz/sonynwz.make
+++ b/firmware/target/hosted/sonynwz/sonynwz.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 INCLUDES += -I$(FIRMDIR)/include -I$(FIRMDIR)/export $(TARGET_INC) -I$(BUILDDIR) -I$(APPSDIR)
diff --git a/firmware/target/hosted/sonynwz/system-target.h b/firmware/target/hosted/sonynwz/system-target.h
index 0e3ed5f5ce..f0fb777db3 100644
--- a/firmware/target/hosted/sonynwz/system-target.h
+++ b/firmware/target/hosted/sonynwz/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
  *                     \/            \/     \/    \/            \/ 
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/firmware/target/hosted/surfans/surfanslinux_codec.c b/firmware/target/hosted/surfans/surfanslinux_codec.c
index 2a2edb4be5..ca0d6b2cd2 100644
--- a/firmware/target/hosted/surfans/surfanslinux_codec.c
+++ b/firmware/target/hosted/surfans/surfanslinux_codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2018 Marcin Bukat
diff --git a/firmware/target/hosted/system-hosted.h b/firmware/target/hosted/system-hosted.h
index 5e7a7d7d99..977e78d0ce 100644
--- a/firmware/target/hosted/system-hosted.h
+++ b/firmware/target/hosted/system-hosted.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
  *                     \/            \/     \/    \/            \/ 
- * $Id$
  *
  * Copyright (C) 2010 by Thomas Martitz
  *
diff --git a/firmware/target/hosted/xduoo/xduoolinux_codec.c b/firmware/target/hosted/xduoo/xduoolinux_codec.c
index 3a25f6f7cf..f3a24b49bb 100644
--- a/firmware/target/hosted/xduoo/xduoolinux_codec.c
+++ b/firmware/target/hosted/xduoo/xduoolinux_codec.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * Copyright (c) 2018 Marcin Bukat
diff --git a/firmware/target/mips/exception-mips.S b/firmware/target/mips/exception-mips.S
index 605817c7d5..bd87e1e1ec 100644
--- a/firmware/target/mips/exception-mips.S
+++ b/firmware/target/mips/exception-mips.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
index 8d928ff27e..368d7c062d 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c
index 9189450794..2aebcad327 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
index 9883f2bf39..34e9e34fc6 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c
index 4b9e0387b2..9058aae075 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/backlight-target.h b/firmware/target/mips/ingenic_jz47xx/backlight-target.h
index 1b61d13e4c..7f0a053040 100644
--- a/firmware/target/mips/ingenic_jz47xx/backlight-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c b/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c
index a41f047026..26f8aa70d2 100644
--- a/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/crt0.S b/firmware/target/mips/ingenic_jz47xx/crt0.S
index ee203b3b4d..b9a98c6648 100644
--- a/firmware/target/mips/ingenic_jz47xx/crt0.S
+++ b/firmware/target/mips/ingenic_jz47xx/crt0.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
@@ -44,7 +43,7 @@
     .extern main
     .global _start
 
-    .section .init.text
+    .section .init.text,"ax",%progbits
     .set    push
     .set    mips32
     .set    noreorder
diff --git a/firmware/target/mips/ingenic_jz47xx/debug-jz4740.c b/firmware/target/mips/ingenic_jz47xx/debug-jz4740.c
index 00399f9313..3cb8c25bd7 100644
--- a/firmware/target/mips/ingenic_jz47xx/debug-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/debug-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/dma-target.h b/firmware/target/mips/ingenic_jz47xx/dma-target.h
index 792d8fe87c..17c9d432b1 100644
--- a/firmware/target/mips/ingenic_jz47xx/dma-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/dma-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/dma_acc-jz4740.c b/firmware/target/mips/ingenic_jz47xx/dma_acc-jz4740.c
index f4f363b25b..7cab47d86f 100644
--- a/firmware/target/mips/ingenic_jz47xx/dma_acc-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/dma_acc-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/dma_acc-jz4760.c b/firmware/target/mips/ingenic_jz47xx/dma_acc-jz4760.c
index 87d2b4e210..c7e049e787 100644
--- a/firmware/target/mips/ingenic_jz47xx/dma_acc-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/dma_acc-jz4760.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/fmradio-i2c-jz4740.c b/firmware/target/mips/ingenic_jz47xx/fmradio-i2c-jz4740.c
index 995e3ae875..ac38adb76a 100644
--- a/firmware/target/mips/ingenic_jz47xx/fmradio-i2c-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/fmradio-i2c-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/i2c-jz4740.c b/firmware/target/mips/ingenic_jz47xx/i2c-jz4740.c
index dadea65599..1cadecb895 100644
--- a/firmware/target/mips/ingenic_jz47xx/i2c-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/i2c-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/i2c-jz4760.c b/firmware/target/mips/ingenic_jz47xx/i2c-jz4760.c
index cf67b9d1f6..90059f23a4 100644
--- a/firmware/target/mips/ingenic_jz47xx/i2c-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/i2c-jz4760.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/kernel-jz4740.c b/firmware/target/mips/ingenic_jz47xx/kernel-jz4740.c
index 2ef66a1d19..243ee89141 100644
--- a/firmware/target/mips/ingenic_jz47xx/kernel-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/kernel-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/kernel-jz4760.c b/firmware/target/mips/ingenic_jz47xx/kernel-jz4760.c
index ab0f152669..54ea300e1b 100644
--- a/firmware/target/mips/ingenic_jz47xx/kernel-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/kernel-jz4760.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c
index a2d5b73ea8..18f7816d20 100644
--- a/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/lcd-jz4760.c b/firmware/target/mips/ingenic_jz47xx/lcd-jz4760.c
index 03fb937d0a..23c3d8ce00 100644
--- a/firmware/target/mips/ingenic_jz47xx/lcd-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/lcd-jz4760.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/lcd-target.h b/firmware/target/mips/ingenic_jz47xx/lcd-target.h
index dff6b2caa3..61dab39fe5 100644
--- a/firmware/target/mips/ingenic_jz47xx/lcd-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/lcd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/adc-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx747/adc-target.h
index e74f008a3e..f643942a16 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/adc-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/ata-sd-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx747/ata-sd-target.h
index 757a12d9f2..d578edced1 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/ata-sd-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/ata-sd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/backlight-onda_vx7X7.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/backlight-onda_vx7X7.c
index aacfe36f82..61b06b15e9 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/backlight-onda_vx7X7.c
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/backlight-onda_vx7X7.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h
index 994b9b09fa..20d9652e5f 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/lcd-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/lcd-onda_vx747.c
index 22a6709166..09a5b07ed5 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/lcd-onda_vx747.c
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/lcd-onda_vx747.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/power-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/power-onda_vx747.c
index e2e66c86ac..81067406c6 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/power-onda_vx747.c
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/power-onda_vx747.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
index b1d2708db7..3a7257030f 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/speaker-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/speaker-onda_vx747.c
index 12dd03e8c7..0f42f9e2d4 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/speaker-onda_vx747.c
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/speaker-onda_vx747.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/adc-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx767/adc-target.h
index e74f008a3e..f643942a16 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/adc-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/ata-sd-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx767/ata-sd-target.h
index 16b5d4087b..007640f207 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/ata-sd-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/ata-sd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/backlight-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx767/backlight-target.h
index 0dc7ce387a..b69bf32aa4 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/backlight-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-onda_vx767.c b/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-onda_vx767.c
index d98df9c42d..15ae5a0917 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-onda_vx767.c
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-onda_vx767.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h
index cea469c541..296f6b718b 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/lcd-onda_vx767.c b/firmware/target/mips/ingenic_jz47xx/onda_vx767/lcd-onda_vx767.c
index a32fe45608..ef81cd8a42 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/lcd-onda_vx767.c
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/lcd-onda_vx767.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/power-onda_vx767.c b/firmware/target/mips/ingenic_jz47xx/onda_vx767/power-onda_vx767.c
index 8412b203f4..243a0ef513 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/power-onda_vx767.c
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/power-onda_vx767.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/sadc-onda_vx767.c b/firmware/target/mips/ingenic_jz47xx/onda_vx767/sadc-onda_vx767.c
index 88babbbc19..71aae618b5 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/sadc-onda_vx767.c
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/sadc-onda_vx767.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c b/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c
index b0cbefc66f..a843480309 100644
--- a/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/pcm-jz4760.c b/firmware/target/mips/ingenic_jz47xx/pcm-jz4760.c
index fa4102a846..37718d08da 100644
--- a/firmware/target/mips/ingenic_jz47xx/pcm-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/pcm-jz4760.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c
index 5aff144327..bf0e46138b 100644
--- a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/system-jz4760.c b/firmware/target/mips/ingenic_jz47xx/system-jz4760.c
index 3a1321b992..7d2a5c7109 100644
--- a/firmware/target/mips/ingenic_jz47xx/system-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/system-jz4760.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/system-target.h b/firmware/target/mips/ingenic_jz47xx/system-target.h
index 968a738632..3bc285d7f7 100644
--- a/firmware/target/mips/ingenic_jz47xx/system-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/timer-jz4740.c b/firmware/target/mips/ingenic_jz47xx/timer-jz4740.c
index b3f0f71aa3..ef66350f0f 100644
--- a/firmware/target/mips/ingenic_jz47xx/timer-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/timer-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/timer-jz4760.c b/firmware/target/mips/ingenic_jz47xx/timer-jz4760.c
index 34517965d5..eeaa3e7dc1 100644
--- a/firmware/target/mips/ingenic_jz47xx/timer-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/timer-jz4760.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c b/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c
index 13542b0a5d..828dbaf2c4 100644
--- a/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
@@ -246,7 +245,7 @@ static void EP0_handler(void)
     {
         readFIFO(ep_recv, REG_USB_REG_COUNT0);
         REG_USB_REG_CSR0 = csr0 | USB_CSR0_SVDOUTPKTRDY; /* clear OUTPKTRDY bit */
-        usb_core_legacy_control_request((struct usb_ctrlrequest*)ep_recv->buf);
+        usb_core_setup_received((struct usb_ctrlrequest*)ep_recv->buf);
     }
 }
 
diff --git a/firmware/target/mips/ingenic_jz47xx/usb-jz4760.c b/firmware/target/mips/ingenic_jz47xx/usb-jz4760.c
index 28a8d3619a..217b097a15 100644
--- a/firmware/target/mips/ingenic_jz47xx/usb-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/usb-jz4760.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 Roman Stolyarov
  * Copyright (C) 2020 Solomon Peachy
@@ -320,7 +319,7 @@ static void EP0_handler(void)
         	ep0_data_supplied = true;
 	    }
             REG_USB_CSR0 = csr0;
-            usb_core_legacy_control_request(&ep0_rx.request);
+            usb_core_setup_received(&ep0_rx.request);
             ep_transfer_completed(ep_recv);
         }
     }
diff --git a/firmware/target/mips/ingenic_jz47xx/xdebug.h b/firmware/target/mips/ingenic_jz47xx/xdebug.h
index 2f348e266b..f294abb8c7 100644
--- a/firmware/target/mips/ingenic_jz47xx/xdebug.h
+++ b/firmware/target/mips/ingenic_jz47xx/xdebug.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/adc-target.h b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/adc-target.h
index c47406ca21..aaa89f2886 100644
--- a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/adc-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/adc-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/ata-sd-target.h b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/ata-sd-target.h
index bb2cced15b..1f51ca6a4e 100644
--- a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/ata-sd-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/ata-sd-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/backlight-xduoo_x3.c b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/backlight-xduoo_x3.c
index b60b33a528..59b94cbd3a 100644
--- a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/backlight-xduoo_x3.c
+++ b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/backlight-xduoo_x3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/button-target.h b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/button-target.h
index a471c419e6..f7b3cdfc1c 100644
--- a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/button-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/lcd-xduoo_x3.c b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/lcd-xduoo_x3.c
index 2c1c3a226e..60fe8742a4 100644
--- a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/lcd-xduoo_x3.c
+++ b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/lcd-xduoo_x3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  * Copyright (C) 2020 by William Wilgus
diff --git a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/power-xduoo_x3.c b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/power-xduoo_x3.c
index f178d11a04..4ef501ded2 100644
--- a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/power-xduoo_x3.c
+++ b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/power-xduoo_x3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c
index 8fe2147fcc..eabffa64e8 100644
--- a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c
+++ b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  * Copyright (C) 2020 by William Wilgus
diff --git a/firmware/target/mips/ingenic_x1000/aic-x1000.c b/firmware/target/mips/ingenic_x1000/aic-x1000.c
index ff9802501d..f00239f285 100644
--- a/firmware/target/mips/ingenic_x1000/aic-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/aic-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/aic-x1000.h b/firmware/target/mips/ingenic_x1000/aic-x1000.h
index f272655b9c..637b378671 100644
--- a/firmware/target/mips/ingenic_x1000/aic-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/aic-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/boot-x1000.c b/firmware/target/mips/ingenic_x1000/boot-x1000.c
index 2f2714c67a..078541054c 100644
--- a/firmware/target/mips/ingenic_x1000/boot-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/boot-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/boot-x1000.h b/firmware/target/mips/ingenic_x1000/boot-x1000.h
index eb476c513d..177b55c873 100644
--- a/firmware/target/mips/ingenic_x1000/boot-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/boot-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/clk-x1000.c b/firmware/target/mips/ingenic_x1000/clk-x1000.c
index e3b0f792bb..5ea09c2ecb 100644
--- a/firmware/target/mips/ingenic_x1000/clk-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/clk-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/clk-x1000.h b/firmware/target/mips/ingenic_x1000/clk-x1000.h
index 4b1d4ef838..182b907885 100644
--- a/firmware/target/mips/ingenic_x1000/clk-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/clk-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/crt0.S b/firmware/target/mips/ingenic_x1000/crt0.S
index 23daaefb5e..280da5f663 100644
--- a/firmware/target/mips/ingenic_x1000/crt0.S
+++ b/firmware/target/mips/ingenic_x1000/crt0.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021-2022 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/debug-x1000.c b/firmware/target/mips/ingenic_x1000/debug-x1000.c
index 827bb37855..dae9d675a8 100644
--- a/firmware/target/mips/ingenic_x1000/debug-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/debug-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/dma-x1000.c b/firmware/target/mips/ingenic_x1000/dma-x1000.c
index 28fd328a85..f3b68494fb 100644
--- a/firmware/target/mips/ingenic_x1000/dma-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/dma-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/dma-x1000.h b/firmware/target/mips/ingenic_x1000/dma-x1000.h
index 4a526cec02..514d6e3097 100644
--- a/firmware/target/mips/ingenic_x1000/dma-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/dma-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/audiohw-erosqnative.c b/firmware/target/mips/ingenic_x1000/erosqnative/audiohw-erosqnative.c
index 3fc774cfdd..8bab20abfa 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/audiohw-erosqnative.c
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/audiohw-erosqnative.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald, Dana Conrad
  *
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/backlight-erosqnative.c b/firmware/target/mips/ingenic_x1000/erosqnative/backlight-erosqnative.c
index 2c86a995db..7d21dcbf19 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/backlight-erosqnative.c
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/backlight-erosqnative.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald, Dana Conrad
  *
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/backlight-target.h b/firmware/target/mips/ingenic_x1000/erosqnative/backlight-target.h
index 05d6e36679..a206a03a6c 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/backlight-target.h
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald, Dana Conrad
  *
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/button-erosqnative.c b/firmware/target/mips/ingenic_x1000/erosqnative/button-erosqnative.c
index cc157cccf4..eeaff810d4 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/button-erosqnative.c
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/button-erosqnative.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald, Dana Conrad
  *
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/gpio-target.h b/firmware/target/mips/ingenic_x1000/erosqnative/gpio-target.h
index 53b17c2098..428a659f30 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/gpio-target.h
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/gpio-target.h
@@ -106,6 +106,18 @@ DEFINE_GPIO(BTN_SCROLL_B,       GPIO_PB(23),    GPIOF_INPUT)
 // GPIO 86 --> Port C, Pin 22
 DEFINE_GPIO(BT_PWR,             GPIO_PC(22),    GPIOF_OUTPUT(0))
 
+/* uart0_rxd */
+DEFINE_GPIO(BT_HCI_RXD,       GPIO_PC(10),    GPIOF_DEVICE(0b00))
+
+/* uart0_txd */
+DEFINE_GPIO(BT_HCI_TXD,       GPIO_PC(11),    GPIOF_DEVICE(0b00))
+
+/* uart0_cts */
+DEFINE_GPIO(BT_HCI_CTS,       GPIO_PC(12),    GPIOF_DEVICE(0b00))
+
+/* uart0_rts */
+DEFINE_GPIO(BT_HCI_RTS,       GPIO_PC(13),    GPIOF_DEVICE(0b00))
+
 
 
 
@@ -157,6 +169,10 @@ DEFINE_GPIO(BT_WAKE_HOST,       GPIO_PC(20),    GPIOF_INPUT)
 // gpio 83 --> port C, pin 19
 DEFINE_GPIO(HOST_WAKE_BT,       GPIO_PC(19),    GPIOF_OUTPUT(0))
 
+/* bt_reg_on */
+// gpio 82 --> port C, pin 18
+DEFINE_GPIO(BT_REG_ON_HW4,       GPIO_PC(18),    GPIOF_OUTPUT(0))
+
 /**************/
 /* USB        */
 /**************/
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/i2c-target.h b/firmware/target/mips/ingenic_x1000/erosqnative/i2c-target.h
index 89d995f33a..5bbd063f1a 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/i2c-target.h
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/i2c-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald, Dana Conrad
  *
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/lcd-erosqnative.c b/firmware/target/mips/ingenic_x1000/erosqnative/lcd-erosqnative.c
index f6ece28635..e19eefe275 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/lcd-erosqnative.c
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/lcd-erosqnative.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald, Dana Conrad
  *
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/power-erosqnative.c b/firmware/target/mips/ingenic_x1000/erosqnative/power-erosqnative.c
index c61cdfc7bf..6b9395c119 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/power-erosqnative.c
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/power-erosqnative.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald, Dana Conrad
  *
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/audiohw-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/audiohw-fiiom3k.c
index 9374d23a81..3e2b2fa204 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/audiohw-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/audiohw-fiiom3k.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021-2022 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/backlight-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/backlight-fiiom3k.c
index a158f615e0..d3a6b47d98 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/backlight-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/backlight-fiiom3k.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/backlight-target.h b/firmware/target/mips/ingenic_x1000/fiiom3k/backlight-target.h
index 791a013c32..61858947d4 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/backlight-target.h
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c
index 9a1cecd873..e27fa08d36 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/button-target.h b/firmware/target/mips/ingenic_x1000/fiiom3k/button-target.h
index f75a43242d..6ddde37c09 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/button-target.h
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/i2c-target.h b/firmware/target/mips/ingenic_x1000/fiiom3k/i2c-target.h
index 1e8ebfbb15..72fdee5056 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/i2c-target.h
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/i2c-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/lcd-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/lcd-fiiom3k.c
index 29e72286ff..a4f051bd27 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/lcd-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/lcd-fiiom3k.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c
index dead6ff4ab..a992c3de45 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/gpio-x1000.c b/firmware/target/mips/ingenic_x1000/gpio-x1000.c
index 128687a358..b67eb1739c 100644
--- a/firmware/target/mips/ingenic_x1000/gpio-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/gpio-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/gpio-x1000.h b/firmware/target/mips/ingenic_x1000/gpio-x1000.h
index 310a457ab5..3798027cf8 100644
--- a/firmware/target/mips/ingenic_x1000/gpio-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/gpio-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/i2c-x1000.c b/firmware/target/mips/ingenic_x1000/i2c-x1000.c
index 6a5d2e08d2..c73f78fb2a 100644
--- a/firmware/target/mips/ingenic_x1000/i2c-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/i2c-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/i2c-x1000.h b/firmware/target/mips/ingenic_x1000/i2c-x1000.h
index 9b9ba5e088..12ac5465d4 100644
--- a/firmware/target/mips/ingenic_x1000/i2c-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/i2c-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/installer-x1000.c b/firmware/target/mips/ingenic_x1000/installer-x1000.c
index d2f9e4e5e0..769371d29d 100644
--- a/firmware/target/mips/ingenic_x1000/installer-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/installer-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/installer-x1000.h b/firmware/target/mips/ingenic_x1000/installer-x1000.h
index 9b0f1e4bd6..47bc7d7bfb 100644
--- a/firmware/target/mips/ingenic_x1000/installer-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/installer-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/irq-x1000.h b/firmware/target/mips/ingenic_x1000/irq-x1000.h
index 849e436dcf..020f12eca0 100644
--- a/firmware/target/mips/ingenic_x1000/irq-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/irq-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/kernel-x1000.c b/firmware/target/mips/ingenic_x1000/kernel-x1000.c
index 8d272bdaa9..bf6be959a1 100644
--- a/firmware/target/mips/ingenic_x1000/kernel-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/kernel-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/lcd-x1000.c b/firmware/target/mips/ingenic_x1000/lcd-x1000.c
index f8c03ff9b8..e8139d377d 100644
--- a/firmware/target/mips/ingenic_x1000/lcd-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/lcd-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/lcd-x1000.h b/firmware/target/mips/ingenic_x1000/lcd-x1000.h
index 17ae06df2b..ea31db7468 100644
--- a/firmware/target/mips/ingenic_x1000/lcd-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/lcd-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/msc-x1000.c b/firmware/target/mips/ingenic_x1000/msc-x1000.c
index f0d417e4f7..0ce6ff4990 100644
--- a/firmware/target/mips/ingenic_x1000/msc-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/msc-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/msc-x1000.h b/firmware/target/mips/ingenic_x1000/msc-x1000.h
index 119b754358..60f15b749e 100644
--- a/firmware/target/mips/ingenic_x1000/msc-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/msc-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/nand-x1000.c b/firmware/target/mips/ingenic_x1000/nand-x1000.c
index e3175ca0d9..39e06b1964 100644
--- a/firmware/target/mips/ingenic_x1000/nand-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/nand-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/nand-x1000.h b/firmware/target/mips/ingenic_x1000/nand-x1000.h
index f2e5ffa478..c0796528c7 100644
--- a/firmware/target/mips/ingenic_x1000/nand-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/nand-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/pcm-x1000.c b/firmware/target/mips/ingenic_x1000/pcm-x1000.c
index 9bd6f4ae0f..24dc49a1a1 100644
--- a/firmware/target/mips/ingenic_x1000/pcm-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/pcm-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021-2022 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/pwm-x1000.c b/firmware/target/mips/ingenic_x1000/pwm-x1000.c
index e8243a42ce..8a111b484e 100644
--- a/firmware/target/mips/ingenic_x1000/pwm-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/pwm-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/pwm-x1000.h b/firmware/target/mips/ingenic_x1000/pwm-x1000.h
index 0cea266d63..9c8b629180 100644
--- a/firmware/target/mips/ingenic_x1000/pwm-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/pwm-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/sd-x1000.c b/firmware/target/mips/ingenic_x1000/sd-x1000.c
index f7313cebfa..e40db5833d 100644
--- a/firmware/target/mips/ingenic_x1000/sd-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/sd-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/sfc-x1000.c b/firmware/target/mips/ingenic_x1000/sfc-x1000.c
index 5ade6bcc64..ee840530db 100644
--- a/firmware/target/mips/ingenic_x1000/sfc-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/sfc-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/sfc-x1000.h b/firmware/target/mips/ingenic_x1000/sfc-x1000.h
index 92430880be..19686f3215 100644
--- a/firmware/target/mips/ingenic_x1000/sfc-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/sfc-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/shanlingq1/audiohw-shanlingq1.c b/firmware/target/mips/ingenic_x1000/shanlingq1/audiohw-shanlingq1.c
index 787c35c494..b55208c05f 100644
--- a/firmware/target/mips/ingenic_x1000/shanlingq1/audiohw-shanlingq1.c
+++ b/firmware/target/mips/ingenic_x1000/shanlingq1/audiohw-shanlingq1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/shanlingq1/backlight-shanlingq1.c b/firmware/target/mips/ingenic_x1000/shanlingq1/backlight-shanlingq1.c
index 32c1b902aa..65670019f1 100644
--- a/firmware/target/mips/ingenic_x1000/shanlingq1/backlight-shanlingq1.c
+++ b/firmware/target/mips/ingenic_x1000/shanlingq1/backlight-shanlingq1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/shanlingq1/backlight-target.h b/firmware/target/mips/ingenic_x1000/shanlingq1/backlight-target.h
index 7298c1c06a..68bc881e8b 100644
--- a/firmware/target/mips/ingenic_x1000/shanlingq1/backlight-target.h
+++ b/firmware/target/mips/ingenic_x1000/shanlingq1/backlight-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/shanlingq1/button-shanlingq1.c b/firmware/target/mips/ingenic_x1000/shanlingq1/button-shanlingq1.c
index 5dbfb6b7d5..66806bc013 100644
--- a/firmware/target/mips/ingenic_x1000/shanlingq1/button-shanlingq1.c
+++ b/firmware/target/mips/ingenic_x1000/shanlingq1/button-shanlingq1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  * Copyright (C) 2021 Dana Conrad
diff --git a/firmware/target/mips/ingenic_x1000/shanlingq1/button-target.h b/firmware/target/mips/ingenic_x1000/shanlingq1/button-target.h
index 905d148afa..8d64a067e6 100644
--- a/firmware/target/mips/ingenic_x1000/shanlingq1/button-target.h
+++ b/firmware/target/mips/ingenic_x1000/shanlingq1/button-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/shanlingq1/i2c-target.h b/firmware/target/mips/ingenic_x1000/shanlingq1/i2c-target.h
index af19aeb28c..f07a607609 100644
--- a/firmware/target/mips/ingenic_x1000/shanlingq1/i2c-target.h
+++ b/firmware/target/mips/ingenic_x1000/shanlingq1/i2c-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/shanlingq1/lcd-shanlingq1.c b/firmware/target/mips/ingenic_x1000/shanlingq1/lcd-shanlingq1.c
index 532a149185..4cb72ceef0 100644
--- a/firmware/target/mips/ingenic_x1000/shanlingq1/lcd-shanlingq1.c
+++ b/firmware/target/mips/ingenic_x1000/shanlingq1/lcd-shanlingq1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/shanlingq1/power-shanlingq1.c b/firmware/target/mips/ingenic_x1000/shanlingq1/power-shanlingq1.c
index d58e3adfcf..1a3a2bc164 100644
--- a/firmware/target/mips/ingenic_x1000/shanlingq1/power-shanlingq1.c
+++ b/firmware/target/mips/ingenic_x1000/shanlingq1/power-shanlingq1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/spl-nand-x1000.c b/firmware/target/mips/ingenic_x1000/spl-nand-x1000.c
index 24eb42081e..b9e5b53336 100644
--- a/firmware/target/mips/ingenic_x1000/spl-nand-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/spl-nand-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/spl-start.S b/firmware/target/mips/ingenic_x1000/spl-start.S
index ecdc47f283..3a3a55be00 100644
--- a/firmware/target/mips/ingenic_x1000/spl-start.S
+++ b/firmware/target/mips/ingenic_x1000/spl-start.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
@@ -31,7 +30,7 @@
     .set noreorder
     .set noat
 
-    .section .startup.spl
+    .section .startup.spl, "ax", %progbits
 
 _spl_start:
     /* Clear data watchpoint */
diff --git a/firmware/target/mips/ingenic_x1000/spl-x1000.c b/firmware/target/mips/ingenic_x1000/spl-x1000.c
index 08f88f506c..fd8a49e14d 100644
--- a/firmware/target/mips/ingenic_x1000/spl-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/spl-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/spl-x1000.h b/firmware/target/mips/ingenic_x1000/spl-x1000.h
index 9ee1aa768e..3732f70342 100644
--- a/firmware/target/mips/ingenic_x1000/spl-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/spl-x1000.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/system-target.h b/firmware/target/mips/ingenic_x1000/system-target.h
index ed077a3cce..72385dc0ce 100644
--- a/firmware/target/mips/ingenic_x1000/system-target.h
+++ b/firmware/target/mips/ingenic_x1000/system-target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/system-x1000.c b/firmware/target/mips/ingenic_x1000/system-x1000.c
index 365b0031ec..adc6ecf924 100644
--- a/firmware/target/mips/ingenic_x1000/system-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/system-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/timer-x1000.c b/firmware/target/mips/ingenic_x1000/timer-x1000.c
index de97cbb3a3..c40deda24a 100644
--- a/firmware/target/mips/ingenic_x1000/timer-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/timer-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/uart-x1000.c b/firmware/target/mips/ingenic_x1000/uart-x1000.c
new file mode 100644
index 0000000000..fd8ea9e4b7
--- /dev/null
+++ b/firmware/target/mips/ingenic_x1000/uart-x1000.c
@@ -0,0 +1,245 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ * Copyright (C) 2026 Skye Green
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include "gpio-x1000.h"
+#include "irq-x1000.h"
+#include "kernel.h"
+#include "panic.h"
+#include "semaphore.h"
+#include "system.h"
+#include "uart-x1000.h"
+#include "thread.h"
+#include "x1000/macro.h"
+#include "x1000/uart.h"
+#include "x1000/cpm.h"
+#include <assert.h>
+
+const uint8_t *tx_buf[PORT_MAX];
+size_t tx_available[PORT_MAX];
+
+struct semaphore tx_done_sem[PORT_MAX];
+
+uint8_t *rx_buf[PORT_MAX];
+size_t rx_available[PORT_MAX];
+
+struct semaphore rx_done_sem[PORT_MAX];
+
+void uart_init(uart_port_t port, int baud) {
+    switch (port) {
+        case PORT_UART0:
+            jz_writef(CPM_CLKGR, UART0(0));
+            system_enable_irq(IRQ_UART0);
+            break;
+        case PORT_UART1:
+            jz_writef(CPM_CLKGR, UART1(0));
+            system_enable_irq(IRQ_UART1);
+            break;
+        case PORT_UART2:
+            jz_writef(CPM_CLKGR, UART2(0));
+            system_enable_irq(IRQ_UART2);
+            break;
+        default:
+            panicf("invalid UART port %d", port);
+    }
+
+    tx_available[port] = 0;
+    rx_available[port] = 0;
+
+    semaphore_init(&tx_done_sem[port], 1, 0);
+    semaphore_init(&rx_done_sem[port], 1, 0);
+
+    jz_write(UART_ULCR(port), 0);
+    jz_write(UART_UIER(port), 0);
+
+    jz_overwritef(UART_ULCR(port), WLS(0b11));
+    uart_set_baud(port, baud);
+    jz_overwritef(UART_UMCR(port), MDCE(1), FCM(1));
+    jz_overwritef(UART_UFCR(port), RDTR(0b11), UME(1), TFRT(1), RFRT(1), FME(1));
+}
+
+void uart_deinit(uart_port_t port) {
+    jz_write(UART_ULCR(port), 0);
+    jz_write(UART_UIER(port), 0);
+    jz_writef(UART_UFCR(port), UME(0));
+
+    if (tx_available[port] > 0) {
+        semaphore_release(&tx_done_sem[port]);
+    }
+
+    if (rx_available[port] > 0) {
+        semaphore_release(&rx_done_sem[port]);
+    }
+
+    switch (port) {
+        case PORT_UART0:
+            system_disable_irq(IRQ_UART0);
+            jz_writef(CPM_CLKGR, UART0(1));
+            break;
+        case PORT_UART1:
+            system_disable_irq(IRQ_UART1);
+            jz_writef(CPM_CLKGR, UART1(1));
+            break;
+        case PORT_UART2:
+            system_disable_irq(IRQ_UART2);
+            jz_writef(CPM_CLKGR, UART2(1));
+            break;
+        default:
+            panicf("invalid UART port %d", port);
+    }
+}
+
+void uart_set_baud(uart_port_t port, int baud) {
+    uint32_t udllr, udlhr, umr, uacr;
+    switch (baud) {
+#if X1000_EXCLK_FREQ == 24000000
+        case 115200:
+            udllr = 13;
+            udlhr = 0;
+            umr = 16;
+            uacr = 0;
+            break;
+        case 1500000:
+            udllr = 1;
+            udlhr = 0;
+            umr = 16;
+            uacr = 0;
+            break;
+        case 2000000:
+            udllr = 1;
+            udlhr = 0;
+            umr = 12;
+            uacr = 0;
+            break;
+        case 3000000:
+            udllr = 1;
+            udlhr = 0;
+            umr = 8;
+            uacr = 0;
+            break;
+        case 4000000:
+            udllr = 1;
+            udlhr = 0;
+            umr = 6;
+            uacr = 0;
+            break;
+#endif
+        default:
+            panicf("UART(%d): unsupported baud %d", port, baud);
+    }
+
+    jz_writef(UART_ULCR(port), DLAB(1));
+    jz_write(UART_UDLLR(port), udllr);
+    jz_write(UART_UDLHR(port), udlhr);
+    jz_writef(UART_ULCR(port), DLAB(0));
+    jz_write(UART_UMR(port), umr);
+    jz_write(UART_UACR(port), uacr);
+}
+
+void uart_refill_tx(uart_port_t port) {
+    for (int i = 0; i < 32 && tx_available[port] > 0; i++) {
+        uint8_t byte = *tx_buf[port];
+        jz_write(UART_UTHR(port), byte);
+        tx_available[port]--;
+        tx_buf[port]++;
+    }
+}
+
+void uart_empty_rx(uart_port_t port) {
+    int slots = jz_read(UART_URCR(port));
+    while (slots > 0 && rx_available[port] > 0) {
+        *rx_buf[port] = jz_read(UART_URBR(port));
+        rx_available[port]--;
+        rx_buf[port]++;
+        slots--;
+    }
+}
+
+void uart_tx(uart_port_t port, const uint8_t *buf, size_t len) {
+    assert(buf != NULL);
+    assert(len > 0);
+    tx_buf[port] = buf;
+    tx_available[port] = len;
+    jz_writef(UART_UIER(port), TDRIE(1));
+    semaphore_wait(&tx_done_sem[port], TIMEOUT_BLOCK);
+    while (jz_readf(UART_ULSR(port), TEMP) == 0) {
+        yield();
+    }
+}
+
+size_t uart_rx(uart_port_t port, uint8_t *buf, size_t len) {
+    rx_buf[port] = buf;
+    rx_available[port] = len;
+    jz_writef(UART_UIER(port), RTOIE(1), RDRIE(1));
+    semaphore_wait(&rx_done_sem[port], TIMEOUT_BLOCK);
+    size_t rem = rx_available[port];
+    rx_available[port] = 0;
+    return len - rem;
+}
+
+bool uart_pending_rx(uart_port_t port) {
+    return jz_read(UART_URCR(port)) > 0;
+}
+
+void uart_irq(uart_port_t port) {
+    uint32_t uiir = jz_read(UART_UIIR(port));
+    if (jz_vreadf(uiir, UART_UIIR, INPEND) != 0) {
+        return;
+    }
+
+    uint32_t ulsr = jz_read(UART_ULSR(port));
+
+    if (jz_vreadf(ulsr, UART_ULSR, TDRQ) != 0) {
+        uart_refill_tx(port);
+        if (tx_available[port] == 0) {
+            jz_writef(UART_UIER(port), TDRIE(0));
+            semaphore_release(&tx_done_sem[port]);
+        }
+    }
+
+    if (jz_vreadf(ulsr, UART_ULSR, DRY) != 0) {
+        bool was_avail = rx_available[port] > 0;
+        uart_empty_rx(port);
+        if (was_avail && rx_available[port] == 0) {
+            jz_writef(UART_UIER(port), RDRIE(0), RLSIE(0), RTOIE(0));
+            semaphore_release(&rx_done_sem[port]);
+            return;
+        }
+    }
+
+    if (jz_vreadf(uiir, UART_UIIR, INID) == 0b110) {
+        jz_writef(UART_UIER(port), RDRIE(0), RLSIE(0), RTOIE(0));
+        semaphore_release(&rx_done_sem[port]);
+    }
+}
+
+void UART0(void)
+{
+    uart_irq(PORT_UART0);
+}
+
+void UART1(void)
+{
+    uart_irq(PORT_UART1);
+}
+
+void UART2(void)
+{
+    uart_irq(PORT_UART2);
+}
\ No newline at end of file
diff --git a/firmware/target/mips/ingenic_x1000/uart-x1000.h b/firmware/target/mips/ingenic_x1000/uart-x1000.h
new file mode 100644
index 0000000000..b6497c8083
--- /dev/null
+++ b/firmware/target/mips/ingenic_x1000/uart-x1000.h
@@ -0,0 +1,42 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ * Copyright (C) 2026 Skye Green
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#ifndef __UART_X1000_H__
+#define __UART_X1000_H__
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+typedef enum {
+    PORT_UART0 = 0,
+    PORT_UART1 = 1,
+    PORT_UART2 = 2,
+    PORT_MAX = 3,
+} uart_port_t;
+
+extern void uart_init(uart_port_t port, int baud);
+extern void uart_tx(uart_port_t port, const uint8_t *buf, size_t len);
+extern size_t uart_rx(uart_port_t port, uint8_t *buf, size_t len);
+extern bool uart_pending_rx(uart_port_t port);
+extern void uart_set_baud(uart_port_t port, int baud);
+extern void uart_deinit(uart_port_t port);
+
+#endif /* __UART_X1000_H__ */
diff --git a/firmware/target/mips/ingenic_x1000/usb-x1000.c b/firmware/target/mips/ingenic_x1000/usb-x1000.c
index 398528c6c4..2c82b47cd5 100644
--- a/firmware/target/mips/ingenic_x1000/usb-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/usb-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/ingenic_x1000/x1000boot.make b/firmware/target/mips/ingenic_x1000/x1000boot.make
index 7a861b0a3d..478feaa936 100644
--- a/firmware/target/mips/ingenic_x1000/x1000boot.make
+++ b/firmware/target/mips/ingenic_x1000/x1000boot.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 include $(ROOTDIR)/lib/microtar/microtar.make
diff --git a/firmware/target/mips/mipsr2-endian.h b/firmware/target/mips/mipsr2-endian.h
index 4de1eb825b..f96996c3a3 100644
--- a/firmware/target/mips/mipsr2-endian.h
+++ b/firmware/target/mips/mipsr2-endian.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/firmware/target/mips/mmu-mips.h b/firmware/target/mips/mmu-mips.h
index ca865f9909..729d2741d8 100644
--- a/firmware/target/mips/mmu-mips.h
+++ b/firmware/target/mips/mmu-mips.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/firmware/target/mips/system-mips.c b/firmware/target/mips/system-mips.c
index f6fac3fc3e..a2bba8f51f 100644
--- a/firmware/target/mips/system-mips.c
+++ b/firmware/target/mips/system-mips.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/firmware/target/mips/system-mips.h b/firmware/target/mips/system-mips.h
index d9108ef7c2..bd84e88200 100644
--- a/firmware/target/mips/system-mips.h
+++ b/firmware/target/mips/system-mips.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/firmware/timer.c b/firmware/timer.c
index c618f72e02..27f82efb14 100644
--- a/firmware/timer.c
+++ b/firmware/timer.c
@@ -5,7 +5,6 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
-* $Id$
 *
 * Copyright (C) 2005 Jens Arnold
 *
diff --git a/firmware/tuner.c b/firmware/tuner.c
index cdc1da5b79..702c774f19 100644
--- a/firmware/tuner.c
+++ b/firmware/tuner.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  * General tuner functions
  *
  * Copyright (C) 2007 by Michael Sevakis
diff --git a/firmware/usb.c b/firmware/usb.c
index 406a635140..1e91efd96b 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
@@ -54,6 +53,9 @@
 #if defined(HIBY_R3PROII) || defined(HIBY_R1)
 #include "usb-hiby-gadget.h"
 #endif
+#if defined(DX50) || defined(DX90)
+#include "usb-ibasso.h"
+#endif
 
 #if defined(IPOD_ACCESSORY_PROTOCOL)
 #include "iap.h"
@@ -74,12 +76,26 @@
 bool do_screendump_instead_of_usb = false;
 
 #if !defined(SIMULATOR) && !defined(USB_NONE)
-
 /* We assume that the USB cable is extracted */
 static int usb_state = USB_EXTRACTED;
 #if (CONFIG_STORAGE & STORAGE_MMC) && defined(USB_FULL_INIT) && !defined(HAVE_USBSTACK)
 static int usb_mmc_countdown = 0;
 #endif
+#if defined(HAVE_USB_POWER) || defined(HAVE_USB_ADB)
+#ifdef USB_FULL_INIT
+static bool usb_power_only = false;
+#endif
+static int usb_mode = USBMODE_DEFAULT;
+void usb_set_mode(int mode)
+{
+    usb_mode = mode;
+#if defined(DX50) || defined(DX90)
+    ibasso_set_usb_mode(mode);
+#elif defined(HIBY_R3PROII) || defined(HIBY_R1)
+    hiby_set_usb_mode(mode);
+#endif
+}
+#endif
 
 #ifdef USB_FULL_INIT
 /* Make sure there's enough stack space for screendump */
@@ -107,11 +123,6 @@ static int usb_audio = 0;
 static bool usb_host_present = false;
 static int usb_num_acks_to_expect = 0;
 static uint32_t usb_broadcast_seqnum = 0x80000000;
-#ifdef HAVE_USB_POWER
-static int usb_mode = USBMODE_DEFAULT;
-static bool usb_power_only = false;
-#endif
-
 #if defined(USB_FIREWIRE_HANDLING)
 static void try_reboot(void)
 {
@@ -150,18 +161,6 @@ static inline bool usb_do_screendump(void)
     return false;
 }
 
-#ifdef HAVE_USB_POWER
-void usb_set_mode(int mode)
-{
-    usb_mode = mode;
-#if defined(DX50) || defined(DX90)
-    ibasso_set_usb_mode(mode);
-#elif defined(HIBY_R3PROII) || defined(HIBY_R1)
-    hiby_set_usb_mode(mode);
-#endif
-}
-#endif
-
 #ifdef USB_FIREWIRE_HANDLING
 static inline bool usb_reboot_button(void)
 {
@@ -565,6 +564,7 @@ void usb_charger_update(void)
 #endif
 
 #ifdef USB_STATUS_BY_EVENT
+#if 0 /* usb_dw_gonak_effective: failed! PANIC */
 static int usb_status_tmo_callback(struct timeout* tmo)
 {
     if(usb_monitor_enabled)
@@ -586,11 +586,14 @@ static int usb_status_tmo_callback(struct timeout* tmo)
 
     return 0;
 }
+#endif
 
 void usb_status_event(int current_status)
 {
+#if 0 /* usb_dw_gonak_effective: failed! PANIC */
     static struct timeout tmo;
     static int last_status = USB_EXTRACTED;
+#endif
 
     /* Caller isn't expected to filter for changes in status.
      * current_status:
@@ -599,9 +602,14 @@ void usb_status_event(int current_status)
     if(usb_monitor_enabled)
     {
         int oldstatus = disable_irq_save(); /* Dual-use function */
+#if 0 /* usb_dw_gonak_effective: failed! PANIC */
         last_status = current_status;
         timeout_register(&tmo, usb_status_tmo_callback, USB_DEBOUNCE_TIME,
                          (intptr_t)&last_status);
+#else
+        queue_remove_from_head(&usb_queue, current_status);
+        queue_post(&usb_queue, current_status, 0);
+#endif
         restore_irq(oldstatus);
     }
 }
diff --git a/firmware/usbstack/iap/audio.c b/firmware/usbstack/iap/audio.c
index d01b133d69..9dcbd01025 100644
--- a/firmware/usbstack/iap/audio.c
+++ b/firmware/usbstack/iap/audio.c
@@ -215,7 +215,7 @@ bool iap_audio_init(void) {
     enabled          = false;
     exhausted        = true;
     track_attrs_sent = false;
-    packet_count = 0;
+    packet_count     = 0;
 
     return true;
 
@@ -260,6 +260,16 @@ bool iap_audio_set_sampr(uint32_t sampr) {
         }
     }
     check_act(freq < ARRAYLEN(samprs), return false);
+
+    if(set_freq >= 0 && freq != set_freq) {
+        /* Accessories should only set the frequency we requested via
+         * TrackNewAudioAttributes, but in some cases, USB control requests may arrive late,
+         * breaking established cur_freq == set_freq.
+         * Ignoring sets of frequencies that were not requested can work around this. */
+        ERROR("wrong frequency set: expected=%d got=%d", set_freq, freq);
+        return true;
+    }
+
     cur_freq = freq;
 
     LOG("sampr=%lu, set_freq=%d cur_freq=%d", sampr, set_freq, cur_freq);
diff --git a/firmware/usbstack/usb_audio.c b/firmware/usbstack/usb_audio.c
index 2b633e34b1..19fa859c81 100644
--- a/firmware/usbstack/usb_audio.c
+++ b/firmware/usbstack/usb_audio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:  $
  *
  * Copyright (C) 2010 by Amaury Pouly
  *
@@ -307,9 +306,6 @@ static struct usb_class_driver_ep_allocation ep_allocs[2] = {
 #define EP_ISO_OUT (ep_allocs[0].ep)
 #define EP_ISO_FEEDBACK_IN (ep_allocs[1].ep)
 
-/* small buffer used for control transfers */
-static unsigned char usb_buffer[128] USB_DEVBSS_ATTR;
-
 /* number of buffers: 2 is double-buffering (one for usb, one for playback),
  * 3 is triple-buffering (one for usb, one for playback, one for queuing), ... */
 
@@ -833,8 +829,10 @@ int32_t usb_audio_get_samples_rx_perframe(void)
     return samples_received_report;
 }
 
-static bool usb_audio_as_ctrldata_endpoint_request(struct usb_ctrlrequest* req, void *reqdata)
+static bool usb_audio_as_ctrldata_endpoint_request(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
+    (void)reqdata_size; /* should check this? */
+
     /* only support sampling frequency */
     if(req->wValue != (USB_AS_EP_CS_SAMPLING_FREQ_CTL << 8))
     {
@@ -848,40 +846,26 @@ static bool usb_audio_as_ctrldata_endpoint_request(struct usb_ctrlrequest* req,
             if(req->wLength != 3)
             {
                 logf("usbaudio: bad length for SET_CUR");
-                usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+                usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
                 return true;
             }
             logf("usbaudio: SET_CUR sampling freq");
 
-            if (reqdata) { /* control write, second pass */
-                set_playback_sampling_frequency(decode3(reqdata));
-                usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
-                return true;
-            } else { /* control write, first pass */
-                bool error = false;
+            set_playback_sampling_frequency(decode3(reqdata));
+            usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
 
-                if (req->wLength != 3)
-                    error = true;
-                    /* ... other validation? */
-
-                if (error)
-                    usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
-                else
-                    usb_drv_control_response(USB_CONTROL_RECEIVE, usb_buffer, 3);
-
-                return true;
-            }
+            return true;
 
         case USB_AC_GET_CUR:
             if(req->wLength != 3)
             {
                 logf("usbaudio: bad length for GET_CUR");
-                usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+                usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
                 return true;
             }
             logf("usbaudio: GET_CUR sampling freq");
-            encode3(usb_buffer, usb_audio_get_playback_sampling_frequency());
-            usb_drv_control_response(USB_CONTROL_ACK, usb_buffer, req->wLength);
+            encode3(reqdata, usb_audio_get_playback_sampling_frequency());
+            usb_core_control_response(USB_CONTROL_ACK, reqdata, 3);
 
             return true;
 
@@ -892,12 +876,12 @@ static bool usb_audio_as_ctrldata_endpoint_request(struct usb_ctrlrequest* req,
     return true;
 }
 
-static bool usb_audio_endpoint_request(struct usb_ctrlrequest* req, void *reqdata)
+static bool usb_audio_endpoint_request(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
     int ep = req->wIndex & 0xff;
 
     if(ep == EP_ISO_OUT)
-        return usb_audio_as_ctrldata_endpoint_request(req, reqdata);
+        return usb_audio_as_ctrldata_endpoint_request(req, reqdata, reqdata_size);
     else
     {
         logf("usbaudio: unhandled ep req (ep=%d)", ep);
@@ -1029,8 +1013,10 @@ int usb_audio_get_cur_volume(void)
     return usb_audio_volume_to_db(vol, sound_numdecimals(SOUND_VOLUME));
 }
 
-static bool usb_audio_set_get_feature_unit(struct usb_ctrlrequest* req, void *reqdata)
+static bool usb_audio_set_get_feature_unit(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
+    (void)reqdata_size; /* should check this? */
+
     int channel = req->wValue & 0xff;
     int selector = req->wValue >> 8;
     uint8_t cmd = (req->bRequest & ~USB_AC_GET_REQ);
@@ -1066,7 +1052,7 @@ static bool usb_audio_set_get_feature_unit(struct usb_ctrlrequest* req, void *re
         if(!handled)
         {
             logf("usbaudio: unhandled get control 0x%x selector 0x%x of feature unit", cmd, selector);
-            usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+            usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
             return true;
         }
 
@@ -1077,9 +1063,9 @@ static bool usb_audio_set_get_feature_unit(struct usb_ctrlrequest* req, void *re
         }
 
         for(i = 0; i < req->wLength; i++)
-            usb_buffer[i] = (value >> (8 * i)) & 0xff;
+            reqdata[i] = (value >> (8 * i)) & 0xff;
 
-        usb_drv_control_response(USB_CONTROL_ACK, usb_buffer, req->wLength);
+        usb_core_control_response(USB_CONTROL_ACK, reqdata, req->wLength);
         return true;
     }
     else
@@ -1091,68 +1077,47 @@ static bool usb_audio_set_get_feature_unit(struct usb_ctrlrequest* req, void *re
             return false;
         }
 
-        if (reqdata) {
+        for(i = 0; i < req->wLength; i++)
+            value = value | (reqdata[i] << (i * 8));
 
-            for(i = 0; i < req->wLength; i++)
-                value = value | (usb_buffer[i] << (i * 8));
+        switch(selector)
+        {
+            case USB_AC_FU_MUTE:
+                handled = (req->wLength == 1) && feature_unit_set_mute(value, cmd);
+                break;
+            case USB_AC_VOLUME_CONTROL:
+                handled = (req->wLength == 2) && feature_unit_set_volume(value, cmd);
+                break;
+            default:
+                handled = false;
+                logf("usbaudio: unhandled control selector of feature unit (0x%x)", selector);
+                break;
+        }
 
-            switch(selector)
-            {
-                case USB_AC_FU_MUTE:
-                    handled = (req->wLength == 1) && feature_unit_set_mute(value, cmd);
-                    break;
-                case USB_AC_VOLUME_CONTROL:
-                    handled = (req->wLength == 2) && feature_unit_set_volume(value, cmd);
-                    break;
-                default:
-                    handled = false;
-                    logf("usbaudio: unhandled control selector of feature unit (0x%x)", selector);
-                    break;
-            }
-
-            if(!handled)
-            {
-                logf("usbaudio: unhandled set control 0x%x selector 0x%x of feature unit", cmd, selector);
-                usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
-                return true;
-            }
-
-            usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
-            return true;
+        if(!handled) {
+            logf("usbaudio: unhandled set control 0x%x selector 0x%x of feature unit", cmd, selector);
+            usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
         } else {
-            /*
-             * should handle the following (req->wValue >> 8):
-             * USB_AC_FU_MUTE
-             * USB_AC_VOLUME_CONTROL
-             */
-
-            bool error = false;
-
-            if (error)
-                usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
-            else
-                usb_drv_control_response(USB_CONTROL_RECEIVE, usb_buffer, 3);
-
-            return true;
+            usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
         }
 
         return true;
     }
 }
 
-static bool usb_audio_ac_set_get_request(struct usb_ctrlrequest* req, void *reqdata)
+static bool usb_audio_ac_set_get_request(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
     switch(req->wIndex >> 8)
     {
         case AC_PLAYBACK_FEATURE_ID:
-            return usb_audio_set_get_feature_unit(req, reqdata);
+            return usb_audio_set_get_feature_unit(req, reqdata, reqdata_size);
         default:
             logf("usbaudio: unhandled set/get on entity %d", req->wIndex >> 8);
             return false;
     }
 }
 
-static bool usb_audio_interface_request(struct usb_ctrlrequest* req, void *reqdata)
+static bool usb_audio_interface_request(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
     int intf = req->wIndex & 0xff;
 
@@ -1163,7 +1128,7 @@ static bool usb_audio_interface_request(struct usb_ctrlrequest* req, void *reqda
             case USB_AC_SET_CUR: case USB_AC_SET_MIN: case USB_AC_SET_MAX: case USB_AC_SET_RES:
             case USB_AC_SET_MEM: case USB_AC_GET_CUR: case USB_AC_GET_MIN: case USB_AC_GET_MAX:
             case USB_AC_GET_RES: case USB_AC_GET_MEM:
-                return usb_audio_ac_set_get_request(req, reqdata);
+                return usb_audio_ac_set_get_request(req, reqdata, reqdata_size);
             default:
                 logf("usbaudio: unhandled ac intf req 0x%x", req->bRequest);
                 return false;
@@ -1182,17 +1147,14 @@ static bool usb_audio_interface_request(struct usb_ctrlrequest* req, void *reqda
  *
  * Return true if this driver handles the request, false otherwise.
  */
-static bool usb_audio_control_request(struct usb_ctrlrequest* req, void *reqdata, unsigned char* dest)
+static bool usb_audio_control_request(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
-    (void) reqdata;
-    (void) dest;
-
     switch(req->bRequestType & USB_RECIP_MASK)
     {
         case USB_RECIP_ENDPOINT:
-            return usb_audio_endpoint_request(req, reqdata);
+            return usb_audio_endpoint_request(req, reqdata, reqdata_size);
         case USB_RECIP_INTERFACE:
-            return usb_audio_interface_request(req, reqdata);
+            return usb_audio_interface_request(req, reqdata, reqdata_size);
         default:
             logf("usbaudio: unhandled req type 0x%x", req->bRequestType);
             return false;
diff --git a/firmware/usbstack/usb_audio.h b/firmware/usbstack/usb_audio.h
index a610fbe90a..ccf0f1e0db 100644
--- a/firmware/usbstack/usb_audio.h
+++ b/firmware/usbstack/usb_audio.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:  $
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/firmware/usbstack/usb_audio_def.h b/firmware/usbstack/usb_audio_def.h
index b641ac15f2..c4e9d6bf33 100644
--- a/firmware/usbstack/usb_audio_def.h
+++ b/firmware/usbstack/usb_audio_def.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:  $
  *
  * Copyright (C) 2010 by Amaury Pouly
  *
diff --git a/firmware/usbstack/usb_charging_only.c b/firmware/usbstack/usb_charging_only.c
index 66683593db..ac1d567c23 100644
--- a/firmware/usbstack/usb_charging_only.c
+++ b/firmware/usbstack/usb_charging_only.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:  $
  *
  * Copyright (C) 2008 by Frank Gevaerts
  *
diff --git a/firmware/usbstack/usb_charging_only.h b/firmware/usbstack/usb_charging_only.h
index 1c49c9788c..32fdaf40f4 100644
--- a/firmware/usbstack/usb_charging_only.h
+++ b/firmware/usbstack/usb_charging_only.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Frank Gevaerts
  *
diff --git a/firmware/usbstack/usb_class_driver.h b/firmware/usbstack/usb_class_driver.h
index b6e5c16941..bebc07b1e5 100644
--- a/firmware/usbstack/usb_class_driver.h
+++ b/firmware/usbstack/usb_class_driver.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Frank Gevaerts
  *
@@ -112,7 +111,7 @@ struct usb_class_driver {
        able to handle it, it should ack the request, and return true. Otherwise
        it should return false.
        Optional function */
-    bool (*control_request)(struct usb_ctrlrequest* req, void* reqdata, unsigned char *dest);
+    bool (*control_request)(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size);
 
 #ifdef HAVE_HOTSWAP
     /* Tells the driver that a hotswappable disk/card was inserted or
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c
index 4961f653f3..b0b32e85ea 100644
--- a/firmware/usbstack/usb_core.c
+++ b/firmware/usbstack/usb_core.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Björn Stenberg
  *
@@ -184,10 +183,71 @@ static int usb_no_host_callback(struct timeout *tmo)
 }
 #endif
 
+static struct usb_ctrlrequest handling_request;
+static struct usb_ctrlrequest pending_request;
+static volatile bool have_pending_request;
+
+/* control endpoint typical state flow
+ * READY -setup_received(IN, wLength==0)->
+ *           HANDLING_TX_CONTROL -control_response(size==0)->
+ *           EXPECT_TX_STATUS_COMP -transfer_complete(OUT)->
+ *           READY
+ *       -setup_received(IN, wLength>0)->
+ *           HANDLING_TX_CONTROL -control_response(size>0)->
+ *           EXPECT_TX_DATA_STATUS_COMP
+ *           -transfer_complete(OUT)->
+ *               EXPECT_TX_DATA_COMP -transfer_complete(IN)->
+ *               READY
+ *           -transfer_complete(IN)->
+ *               EXPECT_TX_STATUS_COMP -transfer_complete(OUT)->
+ *               READY
+ *       -setup_received(OUT, wLength==0)->
+ *           HANDLING_RX_CONTROL -control_response(size==0)->
+ *           EXPECT_RX_STATUS_COMP -transfer_complete(IN)->
+ *           READY
+ *       -setup_received(OUT, wLength>0)->
+ *           HANDLING_RX_CONTROL ->
+ *           EXPECT_RX_DATA_COMP -transfer_complete(OUT)->
+ *           HANDLING_TX_CONTROL -control_response(size==0)->
+ *           EXPECT_RX_STATUS_COMP -transfer_complete()->
+ *           READY
+ * */
+enum {
+    EP0_READY,                      /* waiting for new setup packet */
+    /* IN request */
+    EP0_HANDLING_TX_CONTROL,        /* control in received, usb thread is processing it */
+    EP0_EXPECT_TX_DATA_STATUS_COMP, /* sending control in data phase */
+    EP0_EXPECT_TX_DATA_COMP,        /* status packet received earlier than tx completion */
+    EP0_EXPECT_TX_STATUS_COMP,      /* receiving status */
+    /* OUT request */
+    EP0_HANDLING_RX_CONTROL,        /* control out received, usb thread is processing it */
+    EP0_EXPECT_RX_DATA_COMP,        /* receiving control out data phase */
+    EP0_EXPECT_RX_STATUS_COMP,      /* sending status */
+};
+static volatile int ep0_state;
+
+#define TRACE_EP0_STATE 0
+#if TRACE_EP0_STATE == 1
+#define set_ep0_state(new) \
+    { \
+        logf("usb_core:%d ep0_state %d -> %d", __LINE__, ep0_state, new); \
+        ep0_state = new; \
+    }
+#else
+#define set_ep0_state(new) {ep0_state = new;}
+#endif
+
+struct usb_transfer_completion_event_data
+{
+    struct usb_ctrlrequest* req;
+    unsigned char ep;
+    int status;
+    int length;
+};
+
 typedef void (*completion_handler_t)(int ep, int dir, int status, int length);
 typedef bool (*fast_completion_handler_t)(int ep, int dir, int status, int length);
-typedef bool (*control_handler_t)(struct usb_ctrlrequest* req, void* reqdata,
-    unsigned char* dest);
+typedef bool (*control_handler_t)(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size);
 
 static struct
 {
@@ -232,18 +292,8 @@ static struct usb_class_driver* drivers[USB_NUM_DRIVERS] =
 #endif
 };
 
-#ifdef USB_LEGACY_CONTROL_API
-static struct usb_ctrlrequest buffered_request;
-static struct usb_ctrlrequest* volatile active_request = NULL;
-static volatile unsigned int num_active_requests = 0;
-static void* volatile control_write_data = NULL;
-static volatile bool control_write_data_done = false;
-#endif
-
 static int usb_core_do_set_config(uint8_t new_config);
-static void usb_core_control_request_handler(struct usb_ctrlrequest* req, void* reqdata);
-
-static unsigned char response_data[256] USB_DEVBSS_ATTR;
+static void usb_core_control_request_handler(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size);
 
 #define is_active(driver) ((driver)->enabled && !(driver)->error && (driver)->config == usb_config)
 #define has_if(driver, interface) ((interface) >= (driver)->first_interface && (interface) < (driver)->last_interface)
@@ -441,27 +491,24 @@ void usb_core_exit(void)
     logf("usb_core_exit() finished");
 }
 
+/* for sending/receiving control data */
+static uint8_t usb_control_data[256] USB_DEVBSS_ATTR;
+
 void usb_core_handle_transfer_completion(
     struct usb_transfer_completion_event_data* event)
 {
-    completion_handler_t handler;
-    int ep = event->endpoint;
+    int num = EP_NUM(event->ep);
+    int dir = EP_DIR(event->ep);
 
-    switch(ep) {
-        case EP_CONTROL:
-            logf("ctrl handled %ld req=0x%x",
-                 current_tick,
-                 ((struct usb_ctrlrequest*)event->data[0])->bRequest);
-
-            usb_core_control_request_handler(
-                (struct usb_ctrlrequest*)event->data[0], event->data[1]);
-            break;
-        default:
-            handler = ep_data[ep].completion_handler[EP_DIR(event->dir)];
-            if(handler != NULL)
-                handler(ep, event->dir, event->status, event->length);
-            break;
+    if(num == EP_CONTROL) {
+        logf("ctrl handled %ld req=0x%x", current_tick,event->req->bRequest);
+        usb_core_control_request_handler(event->req, usb_control_data, sizeof(usb_control_data));
+        return;
     }
+
+    completion_handler_t handler = ep_data[num].completion_handler[dir];
+    if(handler != NULL)
+        handler(num, dir == DIR_IN ? USB_DIR_IN : USB_DIR_OUT, event->status, event->length);
 }
 
 void usb_core_enable_driver(int driver, bool enabled)
@@ -676,8 +723,7 @@ retry:
     }
 }
 
-
-static void control_request_handler_drivers(struct usb_ctrlrequest* req, void* reqdata)
+static void control_request_handler_drivers(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
     int i, interface = req->wIndex & 0xff;
     bool handled = false;
@@ -694,7 +740,7 @@ static void control_request_handler_drivers(struct usb_ctrlrequest* req, void* r
             if(req->bRequest == USB_REQ_SET_INTERFACE) {
                 logf("usb_core: SET INTERFACE 0x%x 0x%x", req->wValue, req->wIndex);
                 if(driver->set_interface && driver->set_interface(req->wIndex, req->wValue) >= 0) {
-                    usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+                    usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
                     handled = true;
                 }
                 break;
@@ -706,26 +752,26 @@ static void control_request_handler_drivers(struct usb_ctrlrequest* req, void* r
                     alt = driver->get_interface(req->wIndex);
 
                 if(alt >= 0 && alt < 255) {
-                    response_data[0] = alt;
-                    usb_drv_control_response(USB_CONTROL_ACK, response_data, 1);
+                    reqdata[0] = alt;
+                    usb_core_control_response(USB_CONTROL_ACK, reqdata, 1);
                     handled = true;
                 }
                 break;
             }
         }
 
-        handled = driver->control_request(req, reqdata, response_data);
+        handled = driver->control_request(req, reqdata, reqdata_size);
         break; /* no other driver can handle it because it's interface specific */
     }
     if(!handled) {
         /* nope. flag error */
         logf("bad req 0x%x:0x%x:0x%x:0x%x:0x%x", req->bRequestType,req->bRequest,
             req->wValue, req->wIndex, req->wLength);
-        usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+        usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
     }
 }
 
-static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req, void* reqdata)
+static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
     int size;
     const void* ptr = NULL;
@@ -769,16 +815,16 @@ static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req, v
 
             for(i = 0; i < USB_NUM_DRIVERS; i++) {
                 if(drivers[i]->enabled && drivers[i]->config == index + 1 && drivers[i]->get_config_descriptor) {
-                    size += drivers[i]->get_config_descriptor(&response_data[size], max_packet_size);
+                    size += drivers[i]->get_config_descriptor(reqdata + size, max_packet_size);
                 }
             }
 
             config_descriptor.bNumInterfaces = config_states[index].num_interfaces;
             config_descriptor.bConfigurationValue = index + 1;
             config_descriptor.wTotalLength = (uint16_t)size;
-            memcpy(&response_data[0], &config_descriptor, sizeof(struct usb_config_descriptor));
+            memcpy(reqdata, &config_descriptor, sizeof(struct usb_config_descriptor));
 
-            ptr = response_data;
+            ptr = reqdata;
         } break;
         case USB_DT_STRING:
             logf("STRING %d", index);
@@ -807,7 +853,7 @@ static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req, v
 
         default:
             logf("ctrl desc.");
-            control_request_handler_drivers(req, reqdata);
+            control_request_handler_drivers(req, reqdata, reqdata_size);
             return;
     }
 
@@ -815,12 +861,12 @@ static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req, v
         logf("data %d (%d)", size, length);
         length = MIN(size, length);
 
-        if (ptr != response_data)
-            memcpy(response_data, ptr, length);
+        if (ptr != reqdata)
+            memcpy(reqdata, ptr, length);
 
-        usb_drv_control_response(USB_CONTROL_ACK, response_data, length);
+        usb_core_control_response(USB_CONTROL_ACK, reqdata, length);
     } else {
-        usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+        usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
     }
 }
 
@@ -916,22 +962,22 @@ static void usb_core_do_clear_feature(int recip, int recip_nr, int feature)
     }
 }
 
-static void request_handler_device(struct usb_ctrlrequest* req, void* reqdata)
+static void request_handler_device(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
     unsigned address;
 
     switch(req->bRequest) {
         case USB_REQ_GET_CONFIGURATION:
             logf("usb_core: GET_CONFIG");
-            response_data[0] = usb_config;
-            usb_drv_control_response(USB_CONTROL_ACK, response_data, 1);
+            reqdata[0] = usb_config;
+            usb_core_control_response(USB_CONTROL_ACK, reqdata, 1);
             break;
         case USB_REQ_SET_CONFIGURATION:
             usb_drv_cancel_all_transfers();
             if(usb_core_do_set_config(req->wValue) == 0) {
-                usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+                usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
             } else {
-                usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+                usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
             }
             break;
         case USB_REQ_SET_ADDRESS:
@@ -939,85 +985,85 @@ static void request_handler_device(struct usb_ctrlrequest* req, void* reqdata)
              * should just handle it themselves. We don't care beyond
              * knowing if we've been assigned an address yet, or not. */
             address = req->wValue;
-            usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
             usb_drv_cancel_all_transfers();
+            usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
             usb_drv_set_address(address);
             usb_core_do_set_addr(address);
             break;
         case USB_REQ_GET_DESCRIPTOR:
             logf("usb_core: GET_DESC %d", req->wValue >> 8);
-            request_handler_device_get_descriptor(req, reqdata);
+            request_handler_device_get_descriptor(req, reqdata, reqdata_size);
             break;
         case USB_REQ_SET_FEATURE:
             if(req->wValue==USB_DEVICE_TEST_MODE) {
                 int mode = req->wIndex >> 8;
-                usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+                usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
                 usb_drv_set_test_mode(mode);
             } else {
-                usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+                usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
             }
             break;
         case USB_REQ_GET_STATUS:
-            response_data[0] = 0;
-            response_data[1] = 0;
-            usb_drv_control_response(USB_CONTROL_ACK, response_data, 2);
+            reqdata[0] = 0;
+            reqdata[1] = 0;
+            usb_core_control_response(USB_CONTROL_ACK, reqdata, 2);
             break;
         #ifdef USB_ENABLE_IAP
         case USB_REQ_APPLE_SET_AVAIL_CURRENT:
-            usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+            usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
             break;
         #endif
         default:
             logf("bad req:desc %d:%d", req->bRequest, req->wValue);
-            usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+            usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
             break;
     }
 }
 
-static void request_handler_interface_standard(struct usb_ctrlrequest* req, void* reqdata)
+static void request_handler_interface_standard(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
     switch (req->bRequest)
     {
         case USB_REQ_SET_INTERFACE:
             logf("usb_core: SET_INTERFACE");
         case USB_REQ_GET_INTERFACE:
-            control_request_handler_drivers(req, reqdata);
+            control_request_handler_drivers(req, reqdata, reqdata_size);
             break;
         case USB_REQ_GET_STATUS:
-            response_data[0] = 0;
-            response_data[1] = 0;
-            usb_drv_control_response(USB_CONTROL_ACK, response_data, 2);
+            reqdata[0] = 0;
+            reqdata[1] = 0;
+            usb_core_control_response(USB_CONTROL_ACK, reqdata, 2);
             break;
         case USB_REQ_CLEAR_FEATURE:
         case USB_REQ_SET_FEATURE:
             /* TODO: These used to be ignored (erroneously).
              * Should they be passed to the drivers instead? */
-            usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+            usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
             break;
         default:
-            control_request_handler_drivers(req, reqdata);
+            control_request_handler_drivers(req, reqdata, reqdata_size);
             break;
     }
 }
 
-static void request_handler_interface(struct usb_ctrlrequest* req, void* reqdata)
+static void request_handler_interface(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
     switch(req->bRequestType & USB_TYPE_MASK) {
         case USB_TYPE_STANDARD:
-            request_handler_interface_standard(req, reqdata);
+            request_handler_interface_standard(req, reqdata, reqdata_size);
             break;
         case USB_TYPE_CLASS:
-            control_request_handler_drivers(req, reqdata);
+            control_request_handler_drivers(req, reqdata, reqdata_size);
             break;
         case USB_TYPE_VENDOR:
         default:
             logf("bad req:desc %d", req->bRequest);
-            usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+            usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
             break;
     }
 }
 
-static void request_handler_endpoint_drivers(struct usb_ctrlrequest* req, void* reqdata)
+static void request_handler_endpoint_drivers(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
     bool handled = false;
     control_handler_t control_handler = NULL;
@@ -1027,67 +1073,67 @@ static void request_handler_endpoint_drivers(struct usb_ctrlrequest* req, void*
             ep_data[EP_NUM(req->wIndex)].control_handler[EP_DIR(req->wIndex)];
 
     if(control_handler)
-        handled = control_handler(req, reqdata, response_data);
+        handled = control_handler(req, reqdata, reqdata_size);
 
     if(!handled) {
         /* nope. flag error */
         logf("bad req 0x%x:0x%x:0x%x:0x%x:0x%x", req->bRequestType,req->bRequest,
              req->wValue, req->wIndex, req->wLength);
-        usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+        usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
     }
 }
 
-static void request_handler_endpoint_standard(struct usb_ctrlrequest* req, void* reqdata)
+static void request_handler_endpoint_standard(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
     switch (req->bRequest) {
         case USB_REQ_CLEAR_FEATURE:
             usb_core_do_clear_feature(USB_RECIP_ENDPOINT,
                                       req->wIndex,
                                       req->wValue);
-            usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+            usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
             break;
         case USB_REQ_SET_FEATURE:
             logf("usb_core: SET FEATURE (%d)", req->wValue);
             if(req->wValue == USB_ENDPOINT_HALT)
                usb_drv_stall(EP_NUM(req->wIndex), true, EP_DIR(req->wIndex));
 
-            usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+            usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
             break;
         case USB_REQ_GET_STATUS:
-            response_data[0] = 0;
-            response_data[1] = 0;
+            reqdata[0] = 0;
+            reqdata[1] = 0;
             logf("usb_core: GET_STATUS");
             if(req->wIndex > 0)
-                response_data[0] = usb_drv_stalled(EP_NUM(req->wIndex),
-                                                    EP_DIR(req->wIndex));
+                reqdata[0] = usb_drv_stalled(EP_NUM(req->wIndex),
+                                             EP_DIR(req->wIndex));
 
-            usb_drv_control_response(USB_CONTROL_ACK, response_data, 2);
+            usb_core_control_response(USB_CONTROL_ACK, reqdata, 2);
             break;
         default:
-            request_handler_endpoint_drivers(req, reqdata);
+            request_handler_endpoint_drivers(req, reqdata, reqdata_size);
             break;
     }
 }
 
-static void request_handler_endpoint(struct usb_ctrlrequest* req, void* reqdata)
+static void request_handler_endpoint(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
     switch(req->bRequestType & USB_TYPE_MASK) {
         case USB_TYPE_STANDARD:
-            request_handler_endpoint_standard(req, reqdata);
+            request_handler_endpoint_standard(req, reqdata, reqdata_size);
             break;
         case USB_TYPE_CLASS:
-            request_handler_endpoint_drivers(req, reqdata);
+            request_handler_endpoint_drivers(req, reqdata, reqdata_size);
             break;
         case USB_TYPE_VENDOR:
         default:
             logf("bad req:desc %d", req->bRequest);
-            usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+            usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
             break;
     }
 }
 
 /* Handling USB requests starts here */
-static void usb_core_control_request_handler(struct usb_ctrlrequest* req, void* reqdata)
+static void usb_core_control_request_handler(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
 #ifdef HAVE_USB_CHARGING_ENABLE
     timeout_cancel(&usb_no_host_timeout);
@@ -1105,17 +1151,17 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req, void*
 
     switch(req->bRequestType & USB_RECIP_MASK) {
         case USB_RECIP_DEVICE:
-            request_handler_device(req, reqdata);
+            request_handler_device(req, reqdata, reqdata_size);
             break;
         case USB_RECIP_INTERFACE:
-            request_handler_interface(req, reqdata);
+            request_handler_interface(req, reqdata, reqdata_size);
             break;
         case USB_RECIP_ENDPOINT:
-            request_handler_endpoint(req, reqdata);
+            request_handler_endpoint(req, reqdata, reqdata_size);
             break;
         default:
             logf("unsupported recipient");
-            usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+            usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
             break;
     }
 }
@@ -1123,10 +1169,9 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req, void*
 static void do_bus_reset(void) {
     usb_address = 0;
     usb_state = DEFAULT;
-#ifdef USB_LEGACY_CONTROL_API
-    num_active_requests = 0;
-#endif
     bus_reset_pending = false;
+    set_ep0_state(EP0_READY);
+    have_pending_request = false;
 }
 
 /* called by usb_drv_int() */
@@ -1145,9 +1190,51 @@ void usb_core_bus_reset(void)
     }
 }
 
+static void signal_xfer_complete(int ep, struct usb_ctrlrequest* req, int status, int length) {
+    struct usb_transfer_completion_event_data* completion_event =
+        &ep_data[EP_NUM(ep)].completion_event[EP_DIR(ep)];
+
+    completion_event->req = req;
+    completion_event->ep = ep;
+    completion_event->status = status;
+    completion_event->length = length;
+    usb_signal_transfer_completion(completion_event);
+}
+
+static void process_setup_request(struct usb_ctrlrequest* req) {
+    set_ep0_state(req->bRequestType & USB_DIR_IN ? EP0_HANDLING_TX_CONTROL : EP0_HANDLING_RX_CONTROL);
+
+    if(ep0_state == EP0_HANDLING_TX_CONTROL || req->wLength == 0) {
+        signal_xfer_complete(EP_CONTROL | USB_DIR_IN, req, 0, 0);
+        return;
+    }
+
+    /* start control out data phase without usb thread interaction */
+    if(req->wLength > sizeof(usb_control_data)) {
+        logf("usb_core: control write too large %u > %u", req->wLength, sizeof(usb_control_data));
+        usb_drv_stall(EP_CONTROL, true, false);
+        return;
+    }
+    set_ep0_state(EP0_EXPECT_RX_DATA_COMP);
+    usb_drv_recv_nonblocking(EP_CONTROL, usb_control_data, req->wLength);
+    return;
+}
+
+static bool check_for_new_setup(void) {
+    int oldlevel = disable_irq_save();
+    if(!have_pending_request) {
+        restore_irq(oldlevel);
+        return false;
+    }
+    have_pending_request = false;
+    handling_request = pending_request;
+    process_setup_request(&handling_request);
+    restore_irq(oldlevel);
+    return true;
+}
+
 /* called by usb_drv_transfer_completed() */
-void usb_core_transfer_complete(int endpoint, int dir, int status, int length)
-{
+void usb_core_transfer_complete(int endpoint, int dir, int status, int length) {
 #ifdef USB_BATCH_NON_NATIVE
     /* batch api */
     if(batch_ep != 0 && (endpoint | dir) == batch_ep) {
@@ -1158,37 +1245,52 @@ void usb_core_transfer_complete(int endpoint, int dir, int status, int length)
 
     /* Fast notification */
     fast_completion_handler_t handler = ep_data[endpoint].fast_completion_handler[EP_DIR(dir)];
-    if(handler != NULL && handler(endpoint, dir, status, length))
+    if(handler != NULL && handler(endpoint, dir, status, length)) {
         return; /* do not dispatch to the queue if handled */
-
-    void* data0 = NULL;
-    void* data1 = NULL;
-
-#ifdef USB_LEGACY_CONTROL_API
-    if(endpoint == EP_CONTROL) {
-        bool cwdd = control_write_data_done;
-        struct usb_ctrlrequest* req = active_request;
-
-        if(dir == USB_DIR_OUT && req && cwdd) {
-            data0 = req;
-            data1 = control_write_data;
-        } else {
-            return;
-        }
     }
-#endif
 
-    struct usb_transfer_completion_event_data* completion_event =
-        &ep_data[endpoint].completion_event[EP_DIR(dir)];
+    /* Non-control packet handling */
+    if(endpoint != EP_CONTROL) {
+        signal_xfer_complete(endpoint | dir, NULL, status, length);
+        return;
+    }
 
-    completion_event->endpoint = endpoint;
-    completion_event->dir = dir;
-    completion_event->data[0] = data0;
-    completion_event->data[1] = data1;
-    completion_event->status = status;
-    completion_event->length = length;
+    /* Control packet handling */
+    switch(dir | ep0_state) {
+    /* EXPECT_TX_DATA_STATUS_COMP -(status comp)-> EXPECT_TX_DATA_COMP -(data comp)-> READY 
+     *                            -(data comp)-> EXPECT_TX_STATUS_COMP -(status comp)-> READY */
+    case USB_DIR_OUT | EP0_EXPECT_TX_DATA_STATUS_COMP:
+        logf("usb_core: control-in done success=%d", status == 0 && length == 0);
+        set_ep0_state(EP0_EXPECT_TX_DATA_COMP);
+        break;
+    case USB_DIR_IN | EP0_EXPECT_TX_DATA_STATUS_COMP:
+        set_ep0_state(EP0_EXPECT_TX_STATUS_COMP);
+        break;
+    case USB_DIR_OUT | EP0_EXPECT_TX_STATUS_COMP:
+        logf("usb_core: control-in done success=%d", status == 0 && length == 0);
+        set_ep0_state(EP0_READY);
+        break;
+    case USB_DIR_IN | EP0_EXPECT_TX_DATA_COMP:
+        set_ep0_state(EP0_READY);
+        break;
+    /* EXPECT_RX_DATA_COMP -(data comp)-> HANDLING_RX_CONTROL [-(send status)-> EXPECT_RX_STATUS_COMP] -(status comp)-> READY
+     *                                                        ^ done in control_response() */
+    case USB_DIR_OUT | EP0_EXPECT_RX_DATA_COMP:
+        set_ep0_state(EP0_HANDLING_RX_CONTROL);
+        signal_xfer_complete(EP_CONTROL | USB_DIR_OUT, &handling_request, status, length);
+        break;
+    case USB_DIR_IN | EP0_EXPECT_RX_STATUS_COMP:
+        logf("usb_core: control-out done success=%d", status == 0 && length == 0);
+        set_ep0_state(EP0_READY);
+        break;
+    default:
+        panicf("unhandled endpoint xfer completion ep0_state=%d dir=%d", ep0_state, dir);
+        break;
+    }
 
-    usb_signal_transfer_completion(completion_event);
+    if(ep0_state == EP0_READY) {
+        check_for_new_setup();
+    }
 }
 
 void usb_core_handle_notify(long id, intptr_t data)
@@ -1227,153 +1329,68 @@ void usb_core_handle_notify(long id, intptr_t data)
     }
 }
 
-void usb_core_control_request(struct usb_ctrlrequest* req, void* reqdata)
-{
-    struct usb_transfer_completion_event_data* completion_event =
-        &ep_data[EP_CONTROL].completion_event[EP_DIR(USB_DIR_IN)];
-
-    completion_event->endpoint = EP_CONTROL;
-    completion_event->dir = 0;
-    completion_event->data[0] = (void*)req;
-    completion_event->data[1] = reqdata;
-    completion_event->status = 0;
-    completion_event->length = 0;
-    logf("ctrl received %ld, req=0x%x", current_tick, req->bRequest);
-    usb_signal_transfer_completion(completion_event);
-}
-
-void usb_core_control_complete(int status)
-{
-    /* We currently don't use this, it's here to make the API look good ;)
-     * It makes sense to #define it away on normal builds.
-     */
-    (void)status;
-    logf("ctrl complete %ld, %d", current_tick, status);
-}
-
-#ifdef USB_LEGACY_CONTROL_API
-/* Only needed if the driver does not support the new API yet */
-void usb_core_legacy_control_request(struct usb_ctrlrequest* req)
-{
-    /* Only submit non-overlapping requests */
-    if (num_active_requests++ == 0)
-    {
-        buffered_request = *req;
-        active_request = &buffered_request;
-        control_write_data = NULL;
-        control_write_data_done = false;
-
-        usb_core_control_request(req, NULL);
+void usb_core_setup_received(struct usb_ctrlrequest* req) {
+    if(bus_reset_pending) {
+        logf("usb_core: bus resetting tick=%lu", current_tick);
+        return;
     }
+    if(ep0_state != EP0_READY) {
+        logf("usb_core: control pending tick=%lu", current_tick);
+        pending_request = *req;
+        have_pending_request = true;
+        return;
+    }
+    handling_request = *req;
+    process_setup_request(&handling_request);
 }
 
-void usb_drv_control_response(enum usb_control_response resp,
-                              void* data, int length)
-{
-    struct usb_ctrlrequest* req = active_request;
-    unsigned int num_active = num_active_requests--;
+void usb_core_control_response(enum usb_control_response response, const void* data, size_t size) {
+    logf("usb_core: response ack=%d size=%u ep0_state=%d tick=%lu", response, size, ep0_state, current_tick);
 
-    /*
-     * There should have been a prior request submission, at least.
-     * FIXME: It seems the iPod video can get here and ignoring it
-     * allows the connection to succeed??
-     */
-    if (num_active == 0)
-    {
-        //panicf("null ctrl req");
+    if((ep0_state == EP0_HANDLING_TX_CONTROL || ep0_state == EP0_HANDLING_RX_CONTROL) && check_for_new_setup()) {
         return;
     }
 
-    /*
-     * This can happen because an active request was already pending when
-     * the driver submitted a new one in usb_core_legacy_control_request().
-     * This could mean two things: (a) a driver bug; or (b) the host sent
-     * another request because we were too slow in handling an earlier one.
-     *
-     * The USB spec requires we respond to the latest request and drop any
-     * earlier ones, but that's not easy to do with the current design of
-     * the USB stack. Thus, the host will be expecting a response for the
-     * latest request, but this response is for the _earliest_ request.
-     *
-     * Play it safe and return a STALL. At this point we've recovered from
-     * the error on our end and will be ready to handle the next request.
-     */
-    if (num_active > 1)
-    {
-        active_request = NULL;
-        num_active_requests = 0;
+    if(response == USB_CONTROL_STALL) {
+        set_ep0_state(EP0_READY);
         usb_drv_stall(EP_CONTROL, true, true);
         return;
     }
 
-    if(req->wLength == 0)
-    {
-        active_request = NULL;
-
-        /* No-data request */
-        if(resp == USB_CONTROL_ACK)
-            usb_drv_send(EP_CONTROL, data, length);
-        else if(resp == USB_CONTROL_STALL)
-            usb_drv_stall(EP_CONTROL, true, true);
-        else
-            panicf("RECEIVE on non-data req");
-    }
-    else if(req->bRequestType & USB_DIR_IN)
-    {
-        /* Control read request */
-        if(resp == USB_CONTROL_ACK)
-        {
-            active_request = NULL;
+    switch(ep0_state) {
+    case EP0_HANDLING_TX_CONTROL:
+        if(size == 0) {
+            /* non-data control-in */
+            set_ep0_state(EP0_EXPECT_TX_STATUS_COMP);
             usb_drv_recv_nonblocking(EP_CONTROL, NULL, 0);
-            usb_drv_send(EP_CONTROL, data, length);
+        } else {
+            /* control-in data phase */
+            set_ep0_state(EP0_EXPECT_TX_DATA_STATUS_COMP);
+            /* prepare for a status packet before sending data.
+             * note that it is driver and host-dependent that which completion
+             * of the following two commands is notified first. */
+            usb_drv_recv_nonblocking(EP_CONTROL, NULL, 0);
+            /* send data packets */
+            usb_drv_send_nonblocking(EP_CONTROL, (void*)data, size);
         }
-        else if(resp == USB_CONTROL_STALL)
-        {
-            active_request = NULL;
-            usb_drv_stall(EP_CONTROL, true, true);
+        break;
+    case EP0_HANDLING_RX_CONTROL:
+        if(size == 0) {
+            /* non-data control-out */
+            set_ep0_state(EP0_EXPECT_RX_STATUS_COMP);
+            /* send status packet*/
+            usb_drv_send_nonblocking(EP_CONTROL, NULL, 0);
+        } else {
+            /* control-out data phase */
+            /* should not happen, we've received it internally */
+            logf("usb_core: receiving control data by class drivers is not allowed");
         }
-        else
-        {
-            panicf("RECEIVE on ctrl read req");
-        }
-    }
-    else if(!control_write_data_done)
-    {
-        /* Control write request, data phase */
-        if(resp == USB_CONTROL_RECEIVE)
-        {
-            control_write_data = data;
-            control_write_data_done = true;
-            usb_drv_recv_nonblocking(EP_CONTROL, data, length);
-        }
-        else if(resp == USB_CONTROL_STALL)
-        {
-            /* We should stall the OUT endpoint here, but the old code did
-             * not do so and some drivers may not handle it correctly. */
-            active_request = NULL;
-            usb_drv_stall(EP_CONTROL, true, true);
-        }
-        else
-        {
-            panicf("ACK on ctrl write data");
-        }
-    }
-    else
-    {
-        active_request = NULL;
-        control_write_data = NULL;
-        control_write_data_done = false;
-
-        /* Control write request, status phase */
-        if(resp == USB_CONTROL_ACK)
-            usb_drv_send(EP_CONTROL, NULL, 0);
-        else if(resp == USB_CONTROL_STALL)
-            usb_drv_stall(EP_CONTROL, true, true);
-        else
-            panicf("RECEIVE on ctrl write status");
+        break;
+    default:
+        panicf("usb_core: invalid control response ep_state=%d", ep0_state);
+        break;
     }
 }
-#endif
 
 void usb_core_notify_set_address(uint8_t addr)
 {
diff --git a/firmware/usbstack/usb_hid.c b/firmware/usbstack/usb_hid.c
index bd0e590a04..3084dd61e2 100644
--- a/firmware/usbstack/usb_hid.c
+++ b/firmware/usbstack/usb_hid.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Tomer Shalev
  *
@@ -594,9 +593,11 @@ static void usb_hid_transfer_complete(int ep, int dir, int status, int length)
  * In order to allow sending info to the DAP, the Set Report mechanism can be
  * used by defining vendor specific output reports and send them from the host
  * to the DAP using the host's custom driver */
-static int usb_hid_set_report(struct usb_ctrlrequest *req, void *reqdata)
+static int usb_hid_set_report(struct usb_ctrlrequest *req, uint8_t* reqdata, size_t reqdata_size)
 {
-    static unsigned char buf[64] USB_DEVBSS_ATTR __attribute__((aligned(32)));
+    (void)reqdata;
+    (void)reqdata_size;
+
     int length;
 
     if ((req->wValue >> 8) != USB_HID_REPORT_TYPE_OUTPUT)
@@ -621,28 +622,22 @@ static int usb_hid_set_report(struct usb_ctrlrequest *req, void *reqdata)
         return 4;
     }
 
-    if(!reqdata) {
-        memset(buf, 0, length);
-        usb_drv_control_response(USB_CONTROL_RECEIVE, buf, length);
-        return 0;
-    }
-
 #ifdef LOGF_ENABLE
-    if (buf[1] & 0x01)
+    if (reqdata[1] & 0x01)
         logf("Num Lock enabled");
-    if (buf[1] & 0x02)
+    if (reqdata[1] & 0x02)
         logf("Caps Lock enabled");
-    if (buf[1] & 0x04)
+    if (reqdata[1] & 0x04)
         logf("Scroll Lock enabled");
-    if (buf[1] & 0x08)
+    if (reqdata[1] & 0x08)
         logf("Compose enabled");
-    if (buf[1] & 0x10)
+    if (reqdata[1] & 0x10)
         logf("Kana enabled");
 #endif
 
     /* Defining other LEDs and setting them from the USB host (OS) can be used
      * to send messages to the DAP */
-    usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+    usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
     return 0;
 }
 
@@ -674,15 +669,14 @@ static int usb_hid_get_report(struct usb_ctrlrequest *req, unsigned char* dest)
 
     dest[0] = 0;
     dest[1] = battery_level();
-    usb_drv_control_response(USB_CONTROL_ACK, dest, 2);
+    usb_core_control_response(USB_CONTROL_ACK, dest, 2);
     return 0;
 }
 
 /* called by usb_core_control_request() */
-static bool usb_hid_control_request(struct usb_ctrlrequest *req, void *reqdata, unsigned char *dest)
+static bool usb_hid_control_request(struct usb_ctrlrequest *req, uint8_t* reqdata, size_t reqdata_size)
 {
-    (void)reqdata;
-
+    unsigned char* dest = reqdata;
     unsigned char *orig_dest = dest;
     switch (req->bRequestType & USB_TYPE_MASK)
     {
@@ -706,7 +700,7 @@ static bool usb_hid_control_request(struct usb_ctrlrequest *req, void *reqdata,
 
         if (dest != orig_dest)
         {
-            usb_drv_control_response(USB_CONTROL_ACK, orig_dest, dest - orig_dest);
+            usb_core_control_response(USB_CONTROL_ACK, orig_dest, dest - orig_dest);
             return true;
         }
         break;
@@ -723,13 +717,13 @@ static bool usb_hid_control_request(struct usb_ctrlrequest *req, void *reqdata,
         switch (req->bRequest)
         {
         case USB_HID_SET_REPORT:
-            rc = usb_hid_set_report(req, reqdata);
+            rc = usb_hid_set_report(req, reqdata, reqdata_size);
             break;
         case USB_HID_GET_REPORT:
             rc = usb_hid_get_report(req, dest);
             break;
         case USB_HID_SET_IDLE:
-            usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+            usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
             return true;
         default:
             /* all other requests are errors */
diff --git a/firmware/usbstack/usb_hid.h b/firmware/usbstack/usb_hid.h
index 7a62b4e353..478709d6cf 100644
--- a/firmware/usbstack/usb_hid.h
+++ b/firmware/usbstack/usb_hid.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Tomer Shalev
  *
diff --git a/firmware/usbstack/usb_hid_def.h b/firmware/usbstack/usb_hid_def.h
index 8bee1bed44..5d159a426d 100644
--- a/firmware/usbstack/usb_hid_def.h
+++ b/firmware/usbstack/usb_hid_def.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:  $
  *
  * Copyright (C) 2010 by Amaury Pouly
  *
diff --git a/firmware/usbstack/usb_hid_usage_tables.h b/firmware/usbstack/usb_hid_usage_tables.h
index 538463e5a3..eb57a95948 100644
--- a/firmware/usbstack/usb_hid_usage_tables.h
+++ b/firmware/usbstack/usb_hid_usage_tables.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Tomer Shalev
  *
diff --git a/firmware/usbstack/usb_iap.c b/firmware/usbstack/usb_iap.c
index df2a0e575c..6b2cfd6fe9 100644
--- a/firmware/usbstack/usb_iap.c
+++ b/firmware/usbstack/usb_iap.c
@@ -18,6 +18,7 @@
  *
  ****************************************************************************/
 #include "audio.h"
+#include "panic.h"
 #include "pcm_mixer.h"
 #include "pcm_sink.h"
 #include "playback.h"
@@ -25,7 +26,6 @@
 #include "timefuncs.h"
 #include "usb_core.h"
 #include "usb_drv.h"
-#include "panic.h"
 
 #include "iap/audio.h"
 #include "iap/libiap/iap.h"
@@ -481,39 +481,19 @@ static bool usb_iap_fast_transfer_complete(int ep, int dir, int status, int leng
     return (ep | dir) == AS_EP_IN;
 }
 
-static unsigned char ctrl_buf[256] USB_DEVBSS_ATTR;
-
-static void respond_zero(struct usb_ctrlrequest* req) {
-    if(req->wLength > sizeof(ctrl_buf)) {
-        ERROR("required data too long %u > %u", req->wLength, sizeof(ctrl_buf));
-        usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+static void respond_zero(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size) {
+    if(req->wLength > reqdata_size) {
+        ERROR("required data too long %u > %u", req->wLength, reqdata_size);
+        usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
     } else {
-        memset(ctrl_buf, 0, req->wLength);
-        usb_drv_control_response(USB_CONTROL_ACK, ctrl_buf, req->wLength);
+        memset(reqdata, 0, req->wLength);
+        usb_core_control_response(USB_CONTROL_ACK, reqdata, req->wLength);
     }
 }
 
-/* returns true when ctrl_buf has received data */
-static bool receive_data(struct usb_ctrlrequest* req, void* reqdata) {
-    if(reqdata == NULL) {
-        /* setup */
-        if(req->wLength > sizeof(ctrl_buf)) {
-            ERROR("parameter too long");
-            usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
-        } else {
-            usb_drv_control_response(USB_CONTROL_RECEIVE, ctrl_buf, req->wLength);
-        }
-        return false;
-    } else {
-        /* data */
-        return true;
-    }
-}
-
-static bool control_request_if_std(struct usb_ctrlrequest* req, void* reqdata, unsigned char* dest) {
-    (void)reqdata;
-
-    unsigned char* const orig_dest = dest;
+static bool control_request_if_std(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size) {
+    const void* src = NULL;
+    size_t      size;
     switch(req->bRequest) {
     case USB_REQ_GET_DESCRIPTOR: {
         const uint8_t desc_type  = req->wValue >> 8;
@@ -522,18 +502,28 @@ static bool control_request_if_std(struct usb_ctrlrequest* req, void* reqdata, u
         (void)desc_index;
         switch(desc_type) {
         case USB_DT_HID:
-            PACK_DATA(&dest, ipod_hid_hid_desc);
+            src  = &ipod_hid_hid_desc;
+            size = sizeof(ipod_hid_hid_desc);
             break;
         case USB_DT_REPORT:
             if(usb_drv_port_speed()) {
-                PACK_DATA(&dest, ipod_hid_report_hs);
+                src  = &ipod_hid_report_hs;
+                size = sizeof(ipod_hid_report_hs);
             } else {
-                PACK_DATA(&dest, ipod_hid_report_fs);
+                src  = &ipod_hid_report_fs;
+                size = sizeof(ipod_hid_report_fs);
             }
             break;
         }
-        if(dest != orig_dest) {
-            usb_drv_control_response(USB_CONTROL_ACK, orig_dest, MIN(dest - orig_dest, req->wLength));
+        if(src != NULL) {
+            if(size > reqdata_size) {
+                LOG("descriptor size too large");
+                usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
+            } else {
+                size = MIN(size, req->wLength);
+                memcpy(reqdata, src, size);
+                usb_core_control_response(USB_CONTROL_ACK, reqdata, size);
+            }
             return true;
         }
     } break;
@@ -541,19 +531,14 @@ static bool control_request_if_std(struct usb_ctrlrequest* req, void* reqdata, u
     return false;
 }
 
-static bool control_request_if_class(struct usb_ctrlrequest* req, void* reqdata, unsigned char* dest) {
-    (void)dest;
-
+static bool control_request_if_class(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size) {
     const uint8_t recip_interface = req->wIndex & 0xff;
     if(recip_interface == hid.interface) {
         switch(req->bRequest) {
         case USB_HID_GET_REPORT:
-            respond_zero(req);
+            respond_zero(req, reqdata, reqdata_size);
             return true;
         case USB_HID_SET_REPORT: {
-            if(!receive_data(req, reqdata)) {
-                return true;
-            }
 #if DEBUG_DUMP_RX == 1
             logf("==== acc: %u bytes ====", req->wLength);
             iap_platform_dump_hex(reqdata, req->wLength);
@@ -564,20 +549,18 @@ static bool control_request_if_class(struct usb_ctrlrequest* req, void* reqdata,
             _iap_release_ctx();
 
             check_act(ret, return false);
-            usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+            usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
             return true;
         }
         case USB_HID_SET_IDLE:
-            usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+            usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
             return true;
         }
     }
     return false;
 }
 
-static bool control_request_if_endpoint(struct usb_ctrlrequest* req, void* reqdata, unsigned char* dest) {
-    (void)dest;
-
+static bool control_request_if_endpoint(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size) {
     LOG("ctrl to endpoint %x (stream=%x, hid=%x)", req->wIndex, AS_EP_IN, HID_EP_IN);
     if(req->wIndex == AS_EP_IN) {
         const uint8_t recip_entity     = req->wIndex >> 8;
@@ -585,45 +568,42 @@ static bool control_request_if_endpoint(struct usb_ctrlrequest* req, void* reqda
         (void)recip_entity;
         switch(req->bRequest) {
         case USB_AC_SET_CUR:
-            if(!receive_data(req, reqdata)) {
-                return true;
-            }
             LOG("audio ctrl to stream endpoint entity=0x%02X request=0x%02X length=%u", recip_entity, req->bRequest, req->wLength);
             switch(control_selector) {
             case USB_AS_EP_CS_SAMPLING_FREQ_CTL:
                 check_act(req->wLength == 3, goto stall);
-                stream.sample_rate = ctrl_buf[0] | (ctrl_buf[1] << 8) | (ctrl_buf[2] << 16);
+                stream.sample_rate = reqdata[0] | (reqdata[1] << 8) | (reqdata[2] << 16);
                 LOG("audio stream sampling rate %lu", stream.sample_rate);
                 check_act(iap_audio_set_sampr(stream.sample_rate), goto stall);
                 break;
             }
-            usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+            usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
             return true;
         case USB_AC_GET_CUR:
             switch(control_selector) {
             case USB_AS_EP_CS_SAMPLING_FREQ_CTL:
                 check_act(req->wLength == 3, goto stall);
-                ctrl_buf[2] = (stream.sample_rate >> 16) & 0xff;
-                ctrl_buf[1] = (stream.sample_rate >> 8) & 0xff;
-                ctrl_buf[0] = (stream.sample_rate & 0xff);
-                usb_drv_control_response(USB_CONTROL_ACK, ctrl_buf, req->wLength);
+                reqdata[2] = (stream.sample_rate >> 16) & 0xff;
+                reqdata[1] = (stream.sample_rate >> 8) & 0xff;
+                reqdata[0] = (stream.sample_rate & 0xff);
+                usb_core_control_response(USB_CONTROL_ACK, reqdata, 3);
                 return true;
             }
             /* fallthrough */
         case USB_AC_GET_MIN:
         case USB_AC_GET_MAX:
         case USB_AC_GET_RES:
-            respond_zero(req);
+            respond_zero(req, reqdata, reqdata_size);
             return true;
         stall:
-            usb_drv_control_response(USB_CONTROL_STALL, NULL, 0);
+            usb_core_control_response(USB_CONTROL_STALL, NULL, 0);
             return true;
         }
     }
     return false;
 }
 
-static bool usb_iap_control_request(struct usb_ctrlrequest* req, void* reqdata, unsigned char* dest) {
+static bool usb_iap_control_request(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size) {
     const uint8_t req_recipient = req->bRequestType & USB_RECIP_MASK;
     const uint8_t req_type      = req->bRequestType & USB_TYPE_MASK;
 #if 0
@@ -631,11 +611,11 @@ static bool usb_iap_control_request(struct usb_ctrlrequest* req, void* reqdata,
     LOG("recip=%x type=%x", req_recipient, req_type);
 #endif
     if(req_recipient == USB_RECIP_INTERFACE && req_type == USB_TYPE_STANDARD) {
-        return control_request_if_std(req, reqdata, dest);
+        return control_request_if_std(req, reqdata, reqdata_size);
     } else if(req_recipient == USB_RECIP_INTERFACE && req_type == USB_TYPE_CLASS) {
-        return control_request_if_class(req, reqdata, dest);
+        return control_request_if_class(req, reqdata, reqdata_size);
     } else if(req_recipient == USB_RECIP_ENDPOINT && req_type == USB_TYPE_CLASS) {
-        return control_request_if_endpoint(req, reqdata, dest);
+        return control_request_if_endpoint(req, reqdata, reqdata_size);
     }
     return false;
 }
diff --git a/firmware/usbstack/usb_serial.c b/firmware/usbstack/usb_serial.c
index 3dbf41828b..4820d66d62 100644
--- a/firmware/usbstack/usb_serial.c
+++ b/firmware/usbstack/usb_serial.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Christian Gmeiner
  * Copyright (C) 2021 by Tomasz Moń
@@ -180,7 +179,7 @@ union line_coding_buffer
     unsigned char raw[64];
 };
 
-static union line_coding_buffer line_coding USB_DEVBSS_ATTR;
+static union line_coding_buffer line_coding;
 
 /* send_buffer: local ring buffer.
  * transit_buffer: used to store aligned data that will be sent by the USB
@@ -270,12 +269,11 @@ static int usb_serial_get_config_descriptor(unsigned char *dest, int max_packet_
 }
 
 /* called by usb_core_control_request() */
-static bool usb_serial_control_request(struct usb_ctrlrequest* req, void* reqdata, unsigned char* dest)
+static bool usb_serial_control_request(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
-    bool handled = false;
+    (void)reqdata_size; /* should check this? */
 
-    (void)dest;
-    (void)reqdata;
+    bool handled = false;
 
     if (req->wIndex != control_interface)
     {
@@ -289,16 +287,7 @@ static bool usb_serial_control_request(struct usb_ctrlrequest* req, void* reqdat
             if (req->wLength == sizeof(struct cdc_line_coding))
             {
                 /* Receive line coding into local copy */
-                if (!reqdata)
-                {
-                    usb_drv_control_response(USB_CONTROL_RECEIVE, line_coding.raw,
-                                             sizeof(struct cdc_line_coding));
-                }
-                else
-                {
-                    usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
-                }
-
+                memcpy(line_coding.raw, reqdata, sizeof(struct cdc_line_coding));
                 handled = true;
             }
         }
@@ -307,7 +296,7 @@ static bool usb_serial_control_request(struct usb_ctrlrequest* req, void* reqdat
             if (req->wLength == 0)
             {
                 /* wValue holds Control Signal Bitmap that is simply ignored here */
-                usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+                usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
                 handled = true;
             }
         }
@@ -319,7 +308,7 @@ static bool usb_serial_control_request(struct usb_ctrlrequest* req, void* reqdat
             if (req->wLength == sizeof(struct cdc_line_coding))
             {
                 /* Send back line coding so host is happy */
-                usb_drv_control_response(USB_CONTROL_ACK, line_coding.raw,
+                usb_core_control_response(USB_CONTROL_ACK, line_coding.raw,
                                          sizeof(struct cdc_line_coding));
                 handled = true;
             }
diff --git a/firmware/usbstack/usb_serial.h b/firmware/usbstack/usb_serial.h
index a71e91b920..6717610cfd 100644
--- a/firmware/usbstack/usb_serial.h
+++ b/firmware/usbstack/usb_serial.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Christian Gmeiner
  *
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index 2a24f71f36..7f9057f643 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Björn Stenberg
  *
@@ -695,12 +694,12 @@ static void usb_storage_send_smart(uint8_t cmd)
 #endif /* STORAGE_ATA */
 
 /* called by usb_core_control_request() */
-static bool usb_storage_control_request(struct usb_ctrlrequest* req, void* reqdata, unsigned char* dest)
+static bool usb_storage_control_request(struct usb_ctrlrequest* req, uint8_t* reqdata, size_t reqdata_size)
 {
-    bool handled = false;
-
-    (void)dest;
     (void)reqdata;
+    (void)reqdata_size;
+
+    bool handled = false;
 
     switch (req->bRequest) {
         case USB_BULK_GET_MAX_LUN: {
@@ -709,7 +708,7 @@ static bool usb_storage_control_request(struct usb_ctrlrequest* req, void* reqda
             if(skip_first) (*tb.max_lun) --;
 #endif
             logf("ums: getmaxlun");
-            usb_drv_control_response(USB_CONTROL_ACK, tb.max_lun, 1);
+            usb_core_control_response(USB_CONTROL_ACK, tb.max_lun, 1);
             handled = true;
             break;
         }
@@ -724,7 +723,7 @@ static bool usb_storage_control_request(struct usb_ctrlrequest* req, void* reqda
             usb_drv_reset_endpoint(EP_IN, false);
             usb_drv_reset_endpoint(EP_OUT, true);
 #endif
-            usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
+            usb_core_control_response(USB_CONTROL_ACK, NULL, 0);
             handled = true;
             break;
     }
@@ -801,11 +800,8 @@ static void handle_scsi(struct command_block_wrapper* cbw)
     block_count=info.num_sectors;
 #endif
 
-#ifdef HAVE_HOTSWAP
-    if(storage_removable(lun) && !storage_present(lun)) {
+    if(storage_removable(lun) && !storage_present(lun))
         ejected[lun] = true;
-    }
-#endif
 
     if(ejected[lun])
         lun_present = false;
@@ -856,11 +852,9 @@ static void handle_scsi(struct command_block_wrapper* cbw)
             tb.lun_data->lun_list_length=htobe32(8*storage_num_drives());
             for(i=0;i<storage_num_drives();i++)
             {
-#ifdef HAVE_HOTSWAP
                 if(storage_removable(i))
                     tb.lun_data->luns[i][1]=1;
                 else
-#endif
                     tb.lun_data->luns[i][1]=0;
             }
             length = MIN(length, allocation_length);
diff --git a/firmware/usbstack/usb_storage.h b/firmware/usbstack/usb_storage.h
index 16bc172ce5..2a38a4d5a7 100644
--- a/firmware/usbstack/usb_storage.h
+++ b/firmware/usbstack/usb_storage.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Björn Stenberg
  *
diff --git a/fonts/07-Fixed.bdf b/fonts/07-Fixed.bdf
index 4fcb9bd31a..7da0ba52ae 100644
--- a/fonts/07-Fixed.bdf
+++ b/fonts/07-Fixed.bdf
@@ -1,5 +1,4 @@
 STARTFONT 2.1
-COMMENT "$Id$"
 COMMENT "Send bug reports to Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>"
 FONT -Misc-Fixed-Medium-R-Normal--7-70-75-75-C-50-ISO10646-1
 SIZE 7 75 75
diff --git a/fonts/08-Fixed.bdf b/fonts/08-Fixed.bdf
index a0a32fa7d4..d435ef1934 100644
--- a/fonts/08-Fixed.bdf
+++ b/fonts/08-Fixed.bdf
@@ -1,5 +1,4 @@
 STARTFONT 2.1
-COMMENT $Id$
 COMMENT Send bug reports to Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>
 FONT -Misc-Fixed-Medium-R-Normal--8-80-75-75-C-50-ISO10646-1
 SIZE 11 75 75
diff --git a/fonts/09-Fixed.bdf b/fonts/09-Fixed.bdf
index 6a19bb1107..a207398036 100644
--- a/fonts/09-Fixed.bdf
+++ b/fonts/09-Fixed.bdf
@@ -1,5 +1,4 @@
 STARTFONT 2.1
-COMMENT $Id$
 COMMENT Send bug reports to Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>
 FONT -Misc-Fixed-Medium-R-Normal--9-90-75-75-C-60-ISO10646-1
 SIZE 9 75 75
diff --git a/fonts/10-Fixed.bdf b/fonts/10-Fixed.bdf
index 79c4cafcee..255efacccb 100644
--- a/fonts/10-Fixed.bdf
+++ b/fonts/10-Fixed.bdf
@@ -1,5 +1,4 @@
 STARTFONT 2.1
-COMMENT "$Id$"
 COMMENT "Send bug reports to Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>"
 FONT -Misc-Fixed-Medium-R-Normal--10-100-75-75-C-60-ISO10646-1
 SIZE 10 75 75
diff --git a/fonts/12-Fixed-SemiCond.bdf b/fonts/12-Fixed-SemiCond.bdf
index d4de8acbc1..2b3af71d08 100644
--- a/fonts/12-Fixed-SemiCond.bdf
+++ b/fonts/12-Fixed-SemiCond.bdf
@@ -1,5 +1,4 @@
 STARTFONT 2.1
-COMMENT $Id$
 COMMENT Send bug reports to Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>
 FONT -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
 SIZE 12 75 75
diff --git a/fonts/13-Fixed-Bold.bdf b/fonts/13-Fixed-Bold.bdf
index 652abe3cd3..4b9aa7048a 100644
--- a/fonts/13-Fixed-Bold.bdf
+++ b/fonts/13-Fixed-Bold.bdf
@@ -1,5 +1,4 @@
 STARTFONT 2.1
-COMMENT "$Id$"
 COMMENT "Send bug reports to Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>"
 FONT -Misc-Fixed-Bold-R-Normal--13-120-75-75-C-80-ISO10646-1
 SIZE 13 78 78
diff --git a/fonts/13-Fixed-SemiCond-Bold.bdf b/fonts/13-Fixed-SemiCond-Bold.bdf
index 10c6c3767f..0977b0b691 100644
--- a/fonts/13-Fixed-SemiCond-Bold.bdf
+++ b/fonts/13-Fixed-SemiCond-Bold.bdf
@@ -1,5 +1,4 @@
 STARTFONT 2.1
-COMMENT "$Id$"
 COMMENT "Send bug reports to Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>"
 FONT -Misc-Fixed-Bold-R-SemiCondensed--13-120-75-75-C-60-ISO10646-1
 SIZE 13 78 78
diff --git a/fonts/13-Fixed-SemiCond.bdf b/fonts/13-Fixed-SemiCond.bdf
index ded393e305..71f1115c2b 100644
--- a/fonts/13-Fixed-SemiCond.bdf
+++ b/fonts/13-Fixed-SemiCond.bdf
@@ -1,5 +1,4 @@
 STARTFONT 2.1
-COMMENT $Id$
 COMMENT Send bug reports to Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>
 FONT -Misc-Fixed-Medium-R-SemiCondensed--13-120-75-75-C-60-ISO10646-1
 SIZE 12 75 75
diff --git a/fonts/13-Fixed.bdf b/fonts/13-Fixed.bdf
index 94833452aa..1de9385e53 100644
--- a/fonts/13-Fixed.bdf
+++ b/fonts/13-Fixed.bdf
@@ -5,7 +5,6 @@ COMMENT This font was scaled down from a 14x14 source font
 COMMENT Hangul glyphs prepared by Won-kyu Park <wkpark@chem.skku.ac.kr>
 COMMENT from BAEKMUK font.
 COMMENT Send bug reports to Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>
-COMMENT $Id$
 FONT -Misc-Fixed-Medium-R-Normal-ja-13-120-75-75-C-120-ISO10646-1
 SIZE 12 75 75
 FONTBOUNDINGBOX 12 13 0 -2
diff --git a/fonts/15-Adobe-Helvetica.bdf b/fonts/15-Adobe-Helvetica.bdf
index 6112d28166..249a8b74d0 100644
--- a/fonts/15-Adobe-Helvetica.bdf
+++ b/fonts/15-Adobe-Helvetica.bdf
@@ -1,6 +1,5 @@
 STARTFONT 2.1
 COMMENT $XConsortium: helvR12.bdf,v 1.15 95/01/26 18:02:58 gildea Exp $
-COMMENT $Id$
 COMMENT 
 COMMENT +
 COMMENT  Copyright 1984-1989, 1994 Adobe Systems Incorporated.
diff --git a/fonts/18-Fixed-Bold.bdf b/fonts/18-Fixed-Bold.bdf
index e252c1f869..63a11270c4 100644
--- a/fonts/18-Fixed-Bold.bdf
+++ b/fonts/18-Fixed-Bold.bdf
@@ -12,7 +12,6 @@ COMMENT "-daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0"
 COMMENT "(donated by Daewoo Inc. of Korea to the X Consortium)."
 COMMENT "Remain glyphs come from 18x18ja.bdf."
 COMMENT "Prepared by Jungshik SHIN <jshin@pantheon.yale.edu>, 2000-04-02"
-COMMENT "$Id$"
 COMMENT "Send bug reports to Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>"
 STARTPROPERTIES 20
 FONT_ASCENT 15
diff --git a/fonts/18-Fixed.bdf b/fonts/18-Fixed.bdf
index 0a804b016d..551178d8ab 100644
--- a/fonts/18-Fixed.bdf
+++ b/fonts/18-Fixed.bdf
@@ -12,7 +12,6 @@ COMMENT "-daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0"
 COMMENT "(donated by Daewoo Inc. of Korea to the X Consortium)."
 COMMENT "Remain glyphs come from 18x18ja.bdf."
 COMMENT "Prepared by Jungshik SHIN <jshin@pantheon.yale.edu>, 2000-04-02"
-COMMENT "$Id$"
 COMMENT "Send bug reports to Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>"
 STARTPROPERTIES 20
 FONT_ASCENT 15
diff --git a/icons/create-icons-from-tango.pl b/icons/create-icons-from-tango.pl
index 8cd0ece2d3..a68fff21f0 100755
--- a/icons/create-icons-from-tango.pl
+++ b/icons/create-icons-from-tango.pl
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2011 Dominik Riebeling
 #
diff --git a/lib/arm_support/support-arm.S b/lib/arm_support/support-arm.S
index 37687ef272..0e06131d7c 100644
--- a/lib/arm_support/support-arm.S
+++ b/lib/arm_support/support-arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  * Copyright (C) 2009 by Andrew Mahone
diff --git a/lib/fixedpoint/fixedpoint.c b/lib/fixedpoint/fixedpoint.c
index d1307bb248..b6cc589eec 100644
--- a/lib/fixedpoint/fixedpoint.c
+++ b/lib/fixedpoint/fixedpoint.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jens Arnold
  *
diff --git a/lib/fixedpoint/fixedpoint.h b/lib/fixedpoint/fixedpoint.h
index dcd7c8298c..f941b2bcdf 100644
--- a/lib/fixedpoint/fixedpoint.h
+++ b/lib/fixedpoint/fixedpoint.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jens Arnold
  *
diff --git a/lib/microtar/src/Makefile b/lib/microtar/src/Makefile
index 27277f7c73..d4d9123f46 100644
--- a/lib/microtar/src/Makefile
+++ b/lib/microtar/src/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # Shameless copy+paste from tools/ucl/src/Makefile
diff --git a/lib/microtar/src/microtar-rockbox.c b/lib/microtar/src/microtar-rockbox.c
index d0f579fefb..7c4eb05eef 100644
--- a/lib/microtar/src/microtar-rockbox.c
+++ b/lib/microtar/src/microtar-rockbox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/lib/microtar/src/microtar-rockbox.h b/lib/microtar/src/microtar-rockbox.h
index 36acbb2bfe..749cb07b9a 100644
--- a/lib/microtar/src/microtar-rockbox.h
+++ b/lib/microtar/src/microtar-rockbox.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/lib/mipsunwinder/backtrace-mips32.c b/lib/mipsunwinder/backtrace-mips32.c
index c5ab41e628..4de0330253 100644
--- a/lib/mipsunwinder/backtrace-mips32.c
+++ b/lib/mipsunwinder/backtrace-mips32.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * MIPS32 backtrace implementation
  * Copyright (C) 2022 Aidan MacDonald
diff --git a/lib/mipsunwinder/backtrace-mipsunwinder.h b/lib/mipsunwinder/backtrace-mipsunwinder.h
index 4d6288b5fe..9ed180e967 100644
--- a/lib/mipsunwinder/backtrace-mipsunwinder.h
+++ b/lib/mipsunwinder/backtrace-mipsunwinder.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/lib/rbcodec/codecs/a52.c b/lib/rbcodec/codecs/a52.c
index 5094913259..7470148efe 100644
--- a/lib/rbcodec/codecs/a52.c
+++ b/lib/rbcodec/codecs/a52.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/codecs/a52_rm.c b/lib/rbcodec/codecs/a52_rm.c
index e5204762f4..df3b5dd94f 100644
--- a/lib/rbcodec/codecs/a52_rm.c
+++ b/lib/rbcodec/codecs/a52_rm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mohamed Tarek
  *
diff --git a/lib/rbcodec/codecs/aac.c b/lib/rbcodec/codecs/aac.c
index 67cfd09ded..30922eab21 100644
--- a/lib/rbcodec/codecs/aac.c
+++ b/lib/rbcodec/codecs/aac.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
@@ -249,7 +248,8 @@ enum codec_status codec_run(void)
         if (i == demux_res.num_sample_byte_sizes - 1)
         {
             // Size of the last frame
-            const uint32_t sample_duration = (demux_res.num_time_to_samples > 0) ?
+            // Currently ignored if time_to_sample table fails to fit.
+            const uint32_t sample_duration = (demux_res.num_time_to_samples > 0 && demux_res.time_to_sample) ?
                 demux_res.time_to_sample[demux_res.num_time_to_samples - 1].sample_duration :
                 frame_samples;
 
diff --git a/lib/rbcodec/codecs/aac_bsf.c b/lib/rbcodec/codecs/aac_bsf.c
index 14d4baa028..23904ba681 100644
--- a/lib/rbcodec/codecs/aac_bsf.c
+++ b/lib/rbcodec/codecs/aac_bsf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Codec for aac files without container
  *
diff --git a/lib/rbcodec/codecs/aiff.c b/lib/rbcodec/codecs/aiff.c
index a82ae5f2e2..1d2ac8396c 100644
--- a/lib/rbcodec/codecs/aiff.c
+++ b/lib/rbcodec/codecs/aiff.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2005 Jvo Studer
  * Copyright (c) 2009 Yoshihisa Uchida
diff --git a/lib/rbcodec/codecs/aiff_enc.c b/lib/rbcodec/codecs/aiff_enc.c
index 8dec0bbff3..a4ccd2a91c 100644
--- a/lib/rbcodec/codecs/aiff_enc.c
+++ b/lib/rbcodec/codecs/aiff_enc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Antonius Hellmann
  * Copyright (C) 2006-2013 Michael Sevakis
diff --git a/lib/rbcodec/codecs/alac.c b/lib/rbcodec/codecs/alac.c
index 34f447df47..5dde95b36d 100644
--- a/lib/rbcodec/codecs/alac.c
+++ b/lib/rbcodec/codecs/alac.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/codecs/ape.c b/lib/rbcodec/codecs/ape.c
index 937af1945f..c8b7b11979 100644
--- a/lib/rbcodec/codecs/ape.c
+++ b/lib/rbcodec/codecs/ape.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/lib/rbcodec/codecs/asap.c b/lib/rbcodec/codecs/asap.c
index 8d1eb447cc..4a5c5475ae 100644
--- a/lib/rbcodec/codecs/asap.c
+++ b/lib/rbcodec/codecs/asap.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dominik Wenger
  *
diff --git a/lib/rbcodec/codecs/atrac3_oma.c b/lib/rbcodec/codecs/atrac3_oma.c
index 2b212ad5f8..ede11840d1 100644
--- a/lib/rbcodec/codecs/atrac3_oma.c
+++ b/lib/rbcodec/codecs/atrac3_oma.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mohamed Tarek
  *
diff --git a/lib/rbcodec/codecs/atrac3_rm.c b/lib/rbcodec/codecs/atrac3_rm.c
index b365dac926..0ce961fd96 100644
--- a/lib/rbcodec/codecs/atrac3_rm.c
+++ b/lib/rbcodec/codecs/atrac3_rm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mohamed Tarek
  *
@@ -68,7 +67,7 @@ enum codec_status codec_run(void)
 {
     int datasize, res, consumed, i, time_offset;
     uint16_t fs,sps,h;
-    uint32_t packet_count;
+//    uint32_t packet_count;
     int spn, packet_header_size, scrambling_unit_size, num_units, elapsed;
     int playback_on = -1;
     size_t resume_offset;
@@ -91,7 +90,7 @@ enum codec_status codec_run(void)
 
     ci->seek_buffer(0);
     init_rm(&rmctx);
- 
+
     ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
     ci->configure(DSP_SET_SAMPLE_DEPTH, 17); /* Remark: atrac3 uses s15.0 by default, s15.2 was hacked. */
     ci->configure(DSP_SET_STEREO_MODE, rmctx.nb_channels == 1 ?
@@ -99,7 +98,7 @@ enum codec_status codec_run(void)
 
     packet_header_size = PACKET_HEADER_SIZE +
       ((rmctx.flags & RM_PKT_V1) ? 1 : 0);
-    packet_count = rmctx.nb_packets;
+//    packet_count = rmctx.nb_packets;
     rmctx.audio_framesize = rmctx.block_align;
     rmctx.block_align = rmctx.sub_packet_size;
     fs = rmctx.audio_framesize;
@@ -113,7 +112,7 @@ enum codec_status codec_run(void)
         DEBUGF("failed to initialize RM atrac decoder\n");
         return CODEC_ERROR;
     }
-    
+
     /* check for a mid-track resume and force a seek time accordingly */
     if(resume_offset) {
         resume_offset -= MIN(resume_offset, rmctx.data_offset + DATA_HEADER_SIZE);
@@ -134,10 +133,10 @@ enum codec_status codec_run(void)
 
     ci->advance_buffer(rmctx.data_offset + DATA_HEADER_SIZE);
 
-    /* The main decoder loop */  
-seek_start :         
+    /* The main decoder loop */
+seek_start :
     while((unsigned)elapsed < rmctx.duration)
-    {  
+    {
         consumed = request_packet(scrambling_unit_size);
         if (!consumed)
             break;
@@ -152,7 +151,7 @@ seek_start :
         }
 
         for (i = 0; i < spn; i++)
-        { 
+        {
             if (action == CODEC_ACTION_NULL)
                 action = ci->get_command(&param);
 
@@ -165,10 +164,10 @@ seek_start :
                     ci->set_elapsed(ci->id3->length);
                     ci->seek_complete();
                     return CODEC_OK;
-                }       
+                }
 
                 ci->seek_buffer(rmctx.data_offset + DATA_HEADER_SIZE);
-                packet_count = rmctx.nb_packets;
+//                packet_count = rmctx.nb_packets;
                 rmctx.audio_pkt_cnt = 0;
                 rmctx.frame_number = 0;
 
@@ -178,8 +177,8 @@ seek_start :
                     ci->set_elapsed(0);
                     ci->seek_complete();
                     action = CODEC_ACTION_NULL;
-                    goto seek_start;           
-                }                                                                
+                    goto seek_start;
+                }
                 num_units = (param/(sps*1000*8/rmctx.bit_rate))/spn;
                 ci->seek_buffer(rmctx.data_offset + DATA_HEADER_SIZE + scrambling_unit_size * num_units);
                 consumed = request_packet(scrambling_unit_size);
@@ -195,8 +194,8 @@ seek_start :
                         return CODEC_OK;
                 }
 
-                packet_count = rmctx.nb_packets - h * num_units;
-                rmctx.frame_number = (param/(sps*1000*8/rmctx.bit_rate)); 
+//                packet_count = rmctx.nb_packets - h * num_units;
+                rmctx.frame_number = (param/(sps*1000*8/rmctx.bit_rate));
                 while (rmctx.audiotimestamp > (unsigned)param && num_units-- > 0) {
                     rmctx.audio_pkt_cnt = 0;
                     ci->seek_buffer(rmctx.data_offset + DATA_HEADER_SIZE + scrambling_unit_size * num_units);
@@ -213,7 +212,7 @@ seek_start :
                             return CODEC_OK;
                     }
 
-                    packet_count += h;
+//                    packet_count += h;
                 }
 
                 if (num_units < 0)
@@ -222,12 +221,12 @@ seek_start :
                 i = (time_offset/((sps * 8 * 1000)/rmctx.bit_rate));
                 elapsed = param;
                 ci->set_elapsed(elapsed);
-                ci->seek_complete(); 
+                ci->seek_complete();
             }
 
             action = CODEC_ACTION_NULL;
 
-            if(pkt.length)    
+            if(pkt.length)
                 res = atrac3_decode_frame(sps, &q, &datasize, pkt.frames[i], sps);
             else /* indicates that there are no remaining frames */
                 return CODEC_OK;
@@ -244,7 +243,7 @@ seek_start :
             ci->set_elapsed(elapsed);
             rmctx.frame_number++;
         }
-        packet_count -= h;
+//        packet_count -= h;
         rmctx.audio_pkt_cnt = 0;
         ci->advance_buffer(scrambling_unit_size);
     }
diff --git a/lib/rbcodec/codecs/au.c b/lib/rbcodec/codecs/au.c
index 632d6d64dd..e70990b3d3 100644
--- a/lib/rbcodec/codecs/au.c
+++ b/lib/rbcodec/codecs/au.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/codec_crt0.c b/lib/rbcodec/codecs/codec_crt0.c
index 54035fc232..d3bde77339 100644
--- a/lib/rbcodec/codecs/codec_crt0.c
+++ b/lib/rbcodec/codecs/codec_crt0.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Tomasz Malesinski
  *
diff --git a/lib/rbcodec/codecs/codecs.h b/lib/rbcodec/codecs/codecs.h
index dad5cbe8f2..5ea41ab92f 100644
--- a/lib/rbcodec/codecs/codecs.h
+++ b/lib/rbcodec/codecs/codecs.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
@@ -57,14 +56,14 @@
 #define LDEBUGF(...)
 #endif
 
-#ifdef ROCKBOX_HAS_LOGF
 #undef LOGF
+#if defined(LOGF_ENABLE)
+#if defined(ROCKBOX_HAS_LOGF)
 #define LOGF ci->logf
-#elif defined(LOGF_ENABLE)
-#include "logf.h"
-#undef LOGF
-#define LOGF logf
 #else
+#define LOGF DEBUGF
+#endif
+#else /* !LOGF_ENABLE */
 #define LOGF(...)
 #endif
 
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make
index 6f20a8c101..53233f7f02 100644
--- a/lib/rbcodec/codecs/codecs.make
+++ b/lib/rbcodec/codecs/codecs.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 CODECDIR = $(RBCODEC_BLD)/codecs
diff --git a/lib/rbcodec/codecs/cook.c b/lib/rbcodec/codecs/cook.c
index 254e71f576..6b2aae79be 100644
--- a/lib/rbcodec/codecs/cook.c
+++ b/lib/rbcodec/codecs/cook.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mohamed Tarek
  *
diff --git a/lib/rbcodec/codecs/demac/Makefile b/lib/rbcodec/codecs/demac/Makefile
index 7843be6e49..572fab110c 100644
--- a/lib/rbcodec/codecs/demac/Makefile
+++ b/lib/rbcodec/codecs/demac/Makefile
@@ -1,4 +1,3 @@
-# $Id$
 
 FILTERS = libdemac/filter_16_11.o libdemac/filter_64_11.o libdemac/filter_256_13.o libdemac/filter_32_10.o libdemac/filter_1280_15.o
 LIBOBJS = libdemac/parser.o libdemac/decoder.o libdemac/entropy.o libdemac/predictor.o libdemac/crc.o $(FILTERS)
diff --git a/lib/rbcodec/codecs/demac/demac.c b/lib/rbcodec/codecs/demac/demac.c
index 3e97fff2c9..7734db0bbc 100644
--- a/lib/rbcodec/codecs/demac/demac.c
+++ b/lib/rbcodec/codecs/demac/demac.c
@@ -2,7 +2,6 @@
 
 demac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac.make b/lib/rbcodec/codecs/demac/libdemac.make
index 6f64b2ff10..dc10595429 100644
--- a/lib/rbcodec/codecs/demac/libdemac.make
+++ b/lib/rbcodec/codecs/demac/libdemac.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libdemac
diff --git a/lib/rbcodec/codecs/demac/libdemac/crc.c b/lib/rbcodec/codecs/demac/libdemac/crc.c
index fa3ea89d7e..78a9f29d8d 100644
--- a/lib/rbcodec/codecs/demac/libdemac/crc.c
+++ b/lib/rbcodec/codecs/demac/libdemac/crc.c
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/decoder.c b/lib/rbcodec/codecs/demac/libdemac/decoder.c
index b0339a75d9..0955c2c790 100644
--- a/lib/rbcodec/codecs/demac/libdemac/decoder.c
+++ b/lib/rbcodec/codecs/demac/libdemac/decoder.c
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/decoder.h b/lib/rbcodec/codecs/demac/libdemac/decoder.h
index aeac569509..6ea6aa55dd 100644
--- a/lib/rbcodec/codecs/demac/libdemac/decoder.h
+++ b/lib/rbcodec/codecs/demac/libdemac/decoder.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/demac.h b/lib/rbcodec/codecs/demac/libdemac/demac.h
index 696b2aba73..3c6af5e3ee 100644
--- a/lib/rbcodec/codecs/demac/libdemac/demac.h
+++ b/lib/rbcodec/codecs/demac/libdemac/demac.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/demac_config.h b/lib/rbcodec/codecs/demac/libdemac/demac_config.h
index 5c0c9d774b..a2bb890241 100644
--- a/lib/rbcodec/codecs/demac/libdemac/demac_config.h
+++ b/lib/rbcodec/codecs/demac/libdemac/demac_config.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/entropy.c b/lib/rbcodec/codecs/demac/libdemac/entropy.c
index 1cef979808..44b460fe9f 100644
--- a/lib/rbcodec/codecs/demac/libdemac/entropy.c
+++ b/lib/rbcodec/codecs/demac/libdemac/entropy.c
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/entropy.h b/lib/rbcodec/codecs/demac/libdemac/entropy.h
index fac2a44d99..4a2fa34a77 100644
--- a/lib/rbcodec/codecs/demac/libdemac/entropy.h
+++ b/lib/rbcodec/codecs/demac/libdemac/entropy.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/filter.c b/lib/rbcodec/codecs/demac/libdemac/filter.c
index 342f360997..8e1df2b7d5 100644
--- a/lib/rbcodec/codecs/demac/libdemac/filter.c
+++ b/lib/rbcodec/codecs/demac/libdemac/filter.c
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/filter.h b/lib/rbcodec/codecs/demac/libdemac/filter.h
index 609ea12496..080acfd322 100644
--- a/lib/rbcodec/codecs/demac/libdemac/filter.h
+++ b/lib/rbcodec/codecs/demac/libdemac/filter.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/filter_1280_15.c b/lib/rbcodec/codecs/demac/libdemac/filter_1280_15.c
index f2301fb02a..2c3f8e34d3 100644
--- a/lib/rbcodec/codecs/demac/libdemac/filter_1280_15.c
+++ b/lib/rbcodec/codecs/demac/libdemac/filter_1280_15.c
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/filter_16_11.c b/lib/rbcodec/codecs/demac/libdemac/filter_16_11.c
index 94c56e247f..94f0c27808 100644
--- a/lib/rbcodec/codecs/demac/libdemac/filter_16_11.c
+++ b/lib/rbcodec/codecs/demac/libdemac/filter_16_11.c
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/filter_256_13.c b/lib/rbcodec/codecs/demac/libdemac/filter_256_13.c
index 9e4b9fcb13..d13b2c1068 100644
--- a/lib/rbcodec/codecs/demac/libdemac/filter_256_13.c
+++ b/lib/rbcodec/codecs/demac/libdemac/filter_256_13.c
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/filter_32_10.c b/lib/rbcodec/codecs/demac/libdemac/filter_32_10.c
index 5ec85089db..4b4dd1203a 100644
--- a/lib/rbcodec/codecs/demac/libdemac/filter_32_10.c
+++ b/lib/rbcodec/codecs/demac/libdemac/filter_32_10.c
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/filter_64_11.c b/lib/rbcodec/codecs/demac/libdemac/filter_64_11.c
index cd74fa5f6b..b496b11760 100644
--- a/lib/rbcodec/codecs/demac/libdemac/filter_64_11.c
+++ b/lib/rbcodec/codecs/demac/libdemac/filter_64_11.c
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/parser.c b/lib/rbcodec/codecs/demac/libdemac/parser.c
index 2af4a292b8..d2d95594d0 100644
--- a/lib/rbcodec/codecs/demac/libdemac/parser.c
+++ b/lib/rbcodec/codecs/demac/libdemac/parser.c
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/parser.h b/lib/rbcodec/codecs/demac/libdemac/parser.h
index 6f07deac12..30d92245a4 100644
--- a/lib/rbcodec/codecs/demac/libdemac/parser.h
+++ b/lib/rbcodec/codecs/demac/libdemac/parser.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/predictor-arm.S b/lib/rbcodec/codecs/demac/libdemac/predictor-arm.S
index 1e7a2e05c4..0f322f49ff 100644
--- a/lib/rbcodec/codecs/demac/libdemac/predictor-arm.S
+++ b/lib/rbcodec/codecs/demac/libdemac/predictor-arm.S
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/predictor-cf.S b/lib/rbcodec/codecs/demac/libdemac/predictor-cf.S
index fc1d901a59..09ba995afe 100644
--- a/lib/rbcodec/codecs/demac/libdemac/predictor-cf.S
+++ b/lib/rbcodec/codecs/demac/libdemac/predictor-cf.S
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/predictor.c b/lib/rbcodec/codecs/demac/libdemac/predictor.c
index 45912dddbd..584533c7b3 100644
--- a/lib/rbcodec/codecs/demac/libdemac/predictor.c
+++ b/lib/rbcodec/codecs/demac/libdemac/predictor.c
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/predictor.h b/lib/rbcodec/codecs/demac/libdemac/predictor.h
index 6a0a81983b..aa1c828328 100644
--- a/lib/rbcodec/codecs/demac/libdemac/predictor.h
+++ b/lib/rbcodec/codecs/demac/libdemac/predictor.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/udiv32_arm-pre.S b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm-pre.S
index 459cab8240..a728a69141 100644
--- a/lib/rbcodec/codecs/demac/libdemac/udiv32_arm-pre.S
+++ b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm-pre.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Andrew Mahone
  *
diff --git a/lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S
index 514bae2949..214f9f298c 100644
--- a/lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S
+++ b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  * Copyright (C) 2009 by Andrew Mahone
diff --git a/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv5te.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv5te.h
index ae7427c137..09263f5e41 100644
--- a/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv5te.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv5te.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv6.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv6.h
index ad5eed60fb..30a3a5cb00 100644
--- a/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv6.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv6.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv7.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv7.h
index 84afda3e5d..2ab24d719e 100644
--- a/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv7.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv7.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/vector_math16_cf.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_cf.h
index 4d77d3be31..ce658ed8a1 100644
--- a/lib/rbcodec/codecs/demac/libdemac/vector_math16_cf.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math16_cf.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/vector_math16_mmx.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_mmx.h
index 2177fe88ea..36e419f020 100644
--- a/lib/rbcodec/codecs/demac/libdemac/vector_math16_mmx.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math16_mmx.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/vector_math32_armv4.h b/lib/rbcodec/codecs/demac/libdemac/vector_math32_armv4.h
index d6bb9b0d9c..0a8cff43da 100644
--- a/lib/rbcodec/codecs/demac/libdemac/vector_math32_armv4.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math32_armv4.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/libdemac/vector_math_generic.h b/lib/rbcodec/codecs/demac/libdemac/vector_math_generic.h
index 00bf07a007..24eacebb6d 100644
--- a/lib/rbcodec/codecs/demac/libdemac/vector_math_generic.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math_generic.h
@@ -2,7 +2,6 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/wavwrite.c b/lib/rbcodec/codecs/demac/wavwrite.c
index 71d2b7bb97..3b18036372 100644
--- a/lib/rbcodec/codecs/demac/wavwrite.c
+++ b/lib/rbcodec/codecs/demac/wavwrite.c
@@ -2,7 +2,6 @@
 
 demac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/demac/wavwrite.h b/lib/rbcodec/codecs/demac/wavwrite.h
index a124353229..daaec66fee 100644
--- a/lib/rbcodec/codecs/demac/wavwrite.h
+++ b/lib/rbcodec/codecs/demac/wavwrite.h
@@ -2,7 +2,6 @@
 
 demac - A Monkey's Audio decoder
 
-$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/lib/rbcodec/codecs/flac.c b/lib/rbcodec/codecs/flac.c
index 2c0b63ee16..0a9d535c3e 100644
--- a/lib/rbcodec/codecs/flac.c
+++ b/lib/rbcodec/codecs/flac.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
@@ -468,7 +467,9 @@ enum codec_status codec_run(void)
     size_t bytesleft;
     int consumed;
     int res;
-    int frame;
+#if defined(LOGF_ENABLE)
+    int frame = 0;
+#endif
     intptr_t param;
 
     if (codec_init()) {
@@ -503,7 +504,6 @@ enum codec_status codec_run(void)
     ci->set_elapsed(elapsedtime);
 
     /* The main decoding loop */
-    frame=0;
     buf = ci->request_buffer(&bytesleft, MAX_FRAMESIZE);
     while (bytesleft) {
         long action = ci->get_command(&param);
@@ -529,7 +529,9 @@ enum codec_status codec_run(void)
              return CODEC_ERROR;
         }
         consumed=fc.gb.index/8;
+#if defined(LOGF_ENABLE)
         frame++;
+#endif
 
         ci->yield();
         ci->pcmbuf_insert(&fc.decoded[0][fc.sample_skip], &fc.decoded[1][fc.sample_skip],
diff --git a/lib/rbcodec/codecs/lib/codeclib.c b/lib/rbcodec/codecs/lib/codeclib.c
index f1400bbd4e..f6e416607a 100644
--- a/lib/rbcodec/codecs/lib/codeclib.c
+++ b/lib/rbcodec/codecs/lib/codeclib.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/codecs/lib/codeclib.h b/lib/rbcodec/codecs/lib/codeclib.h
index daaa21f423..9408daf5e5 100644
--- a/lib/rbcodec/codecs/lib/codeclib.h
+++ b/lib/rbcodec/codecs/lib/codeclib.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/codecs/lib/fft-ffmpeg_arm.h b/lib/rbcodec/codecs/lib/fft-ffmpeg_arm.h
index 073ad8ee46..7d7844fbb5 100644
--- a/lib/rbcodec/codecs/lib/fft-ffmpeg_arm.h
+++ b/lib/rbcodec/codecs/lib/fft-ffmpeg_arm.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Dave Hooper
  *
diff --git a/lib/rbcodec/codecs/lib/fft-ffmpeg_cf.h b/lib/rbcodec/codecs/lib/fft-ffmpeg_cf.h
index a29464a23d..3432903f13 100644
--- a/lib/rbcodec/codecs/lib/fft-ffmpeg_cf.h
+++ b/lib/rbcodec/codecs/lib/fft-ffmpeg_cf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Nils Wallménius
  *
diff --git a/lib/rbcodec/codecs/lib/libcodec.make b/lib/rbcodec/codecs/lib/libcodec.make
index b197464528..9257de2e5b 100644
--- a/lib/rbcodec/codecs/lib/libcodec.make
+++ b/lib/rbcodec/codecs/lib/libcodec.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 CODECLIB := $(CODECDIR)/libcodec.a
diff --git a/lib/rbcodec/codecs/lib/mdct_lookup.c b/lib/rbcodec/codecs/lib/mdct_lookup.c
index a8ca748206..652b8fe07e 100644
--- a/lib/rbcodec/codecs/lib/mdct_lookup.c
+++ b/lib/rbcodec/codecs/lib/mdct_lookup.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Michael Giacomelli
  *
diff --git a/lib/rbcodec/codecs/liba52/liba52.make b/lib/rbcodec/codecs/liba52/liba52.make
index 04cae4f080..7b777cc333 100644
--- a/lib/rbcodec/codecs/liba52/liba52.make
+++ b/lib/rbcodec/codecs/liba52/liba52.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # liba52
diff --git a/lib/rbcodec/codecs/libalac/libalac.make b/lib/rbcodec/codecs/libalac/libalac.make
index 8b8a842f8e..6be012678e 100644
--- a/lib/rbcodec/codecs/libalac/libalac.make
+++ b/lib/rbcodec/codecs/libalac/libalac.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libalac
diff --git a/lib/rbcodec/codecs/libasap/libasap.make b/lib/rbcodec/codecs/libasap/libasap.make
index cbf461d4fb..b9413b8418 100644
--- a/lib/rbcodec/codecs/libasap/libasap.make
+++ b/lib/rbcodec/codecs/libasap/libasap.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libasap
diff --git a/lib/rbcodec/codecs/libasf/asf.c b/lib/rbcodec/codecs/libasf/asf.c
index 5f6456a2cb..a4561fee06 100644
--- a/lib/rbcodec/codecs/libasf/asf.c
+++ b/lib/rbcodec/codecs/libasf/asf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
@@ -48,7 +47,7 @@ static unsigned short get_short_le(void* buf)
         (((bits) != 0x03) ? ((bits) != 0x02) ? ((bits) != 0x01) ? \
          0 : *(data) : get_short_le(data) : get_long_le(data))
 
-int asf_read_packet(uint8_t** audiobuf, int* audiobufsize, int* packetlength, 
+int asf_read_packet(uint8_t** audiobuf, int* audiobufsize, int* packetlength,
                     asf_waveformatex_t* wfx)
 {
     uint8_t tmp8, packet_flags, packet_property;
@@ -306,10 +305,10 @@ int asf_get_timestamp(int *duration)
     uint32_t padding_length;
     */
     uint32_t send_time;
-    static int packet_count = 0;
+//    static int packet_count = 0;
 
     uint32_t bytesread = 0;
-    packet_count++;
+//    packet_count++;
     if (ci->read_filebuf(&tmp8, 1) == 0) {
         DEBUGF("ASF ERROR (EOF?)\n");
         return ASF_ERROR_EOF;
diff --git a/lib/rbcodec/codecs/libasf/libasf.make b/lib/rbcodec/codecs/libasf/libasf.make
index dad0570402..a974acd686 100644
--- a/lib/rbcodec/codecs/libasf/libasf.make
+++ b/lib/rbcodec/codecs/libasf/libasf.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libasf
diff --git a/lib/rbcodec/codecs/libatrac/atrac3.h b/lib/rbcodec/codecs/libatrac/atrac3.h
index e73d8f2045..68db7af9d1 100644
--- a/lib/rbcodec/codecs/libatrac/atrac3.h
+++ b/lib/rbcodec/codecs/libatrac/atrac3.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mohamed Tarek
  *
diff --git a/lib/rbcodec/codecs/libatrac/atrac3data_fixed.h b/lib/rbcodec/codecs/libatrac/atrac3data_fixed.h
index 9eb79731ce..3cc4e0837c 100644
--- a/lib/rbcodec/codecs/libatrac/atrac3data_fixed.h
+++ b/lib/rbcodec/codecs/libatrac/atrac3data_fixed.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Michael Giacomelli
  * Copyright (C) 2009 Mohamed Tarek
diff --git a/lib/rbcodec/codecs/libatrac/fixp_math.h b/lib/rbcodec/codecs/libatrac/fixp_math.h
index 014c5aa559..0b1178ae2a 100644
--- a/lib/rbcodec/codecs/libatrac/fixp_math.h
+++ b/lib/rbcodec/codecs/libatrac/fixp_math.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mohamed Tarek
  *
diff --git a/lib/rbcodec/codecs/libatrac/libatrac.make b/lib/rbcodec/codecs/libatrac/libatrac.make
index 69a66eb6f5..ec04ca93eb 100644
--- a/lib/rbcodec/codecs/libatrac/libatrac.make
+++ b/lib/rbcodec/codecs/libatrac/libatrac.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id: libatrac.make 20151 2009-03-01 09:04:15Z amiconn $
 #
 
 # libatrac
diff --git a/lib/rbcodec/codecs/libayumi/libayumi.make b/lib/rbcodec/codecs/libayumi/libayumi.make
index 029aa11a6f..888066014d 100644
--- a/lib/rbcodec/codecs/libayumi/libayumi.make
+++ b/lib/rbcodec/codecs/libayumi/libayumi.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libayumi
diff --git a/lib/rbcodec/codecs/libcook/libcook.make b/lib/rbcodec/codecs/libcook/libcook.make
index c7bdca90c5..813533dd8c 100644
--- a/lib/rbcodec/codecs/libcook/libcook.make
+++ b/lib/rbcodec/codecs/libcook/libcook.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id:$
 #
 
 # libcook
diff --git a/lib/rbcodec/codecs/libfaad/analysis.h b/lib/rbcodec/codecs/libfaad/analysis.h
index f1c3da7a8f..c4bd9ef4ed 100644
--- a/lib/rbcodec/codecs/libfaad/analysis.h
+++ b/lib/rbcodec/codecs/libfaad/analysis.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __ANALYSIS_H__
diff --git a/lib/rbcodec/codecs/libfaad/bits.c b/lib/rbcodec/codecs/libfaad/bits.c
index a3640077d8..6ec41f5481 100644
--- a/lib/rbcodec/codecs/libfaad/bits.c
+++ b/lib/rbcodec/codecs/libfaad/bits.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/bits.h b/lib/rbcodec/codecs/libfaad/bits.h
index f9417b8670..dc73870557 100644
--- a/lib/rbcodec/codecs/libfaad/bits.h
+++ b/lib/rbcodec/codecs/libfaad/bits.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __BITS_H__
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb.h b/lib/rbcodec/codecs/libfaad/codebook/hcb.h
index 53e234ade9..c35f1090ff 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __HCB_H__
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb_1.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_1.h
index 88c04b6012..8239d203b8 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb_1.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_1.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* 2-step huffman table HCB_1 */
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb_10.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_10.h
index af48711460..62e6d4af67 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb_10.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_10.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* 2-step huffman table HCB_10 */
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb_11.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_11.h
index 49e97af23f..6ca02a8612 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb_11.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_11.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* 2-step huffman table HCB_11 */
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb_2.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_2.h
index 15e7d57084..251e152e43 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb_2.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_2.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* 2-step huffman table HCB_2 */
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb_3.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_3.h
index 3b12fdff60..bff740b4b0 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb_3.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_3.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* Binary search huffman table HCB_3 */
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb_4.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_4.h
index 67397e1fb0..88750613ae 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb_4.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_4.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* 2-step huffman table HCB_4 */
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb_5.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_5.h
index 0143482901..fd9a04d4c0 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb_5.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_5.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* Binary search huffman table HCB_5 */
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb_6.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_6.h
index 9988133552..71c0bf7b22 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb_6.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_6.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* 2-step huffman table HCB_6 */
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb_7.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_7.h
index 3b378dc5cd..7eb640c204 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb_7.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_7.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* Binary search huffman table HCB_7 */
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb_8.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_8.h
index b76eb8f667..3ed89ec32e 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb_8.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_8.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* 2-step huffman table HCB_8 */
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb_9.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_9.h
index 2932001294..0dbb0fcff9 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb_9.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_9.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* Binary search huffman table HCB_9 */
diff --git a/lib/rbcodec/codecs/libfaad/codebook/hcb_sf.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_sf.h
index 66762e2fce..28c857ee13 100644
--- a/lib/rbcodec/codecs/libfaad/codebook/hcb_sf.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_sf.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* Binary search huffman table HCB_SF */
diff --git a/lib/rbcodec/codecs/libfaad/common.c b/lib/rbcodec/codecs/libfaad/common.c
index bedf56a212..a31e6b9388 100644
--- a/lib/rbcodec/codecs/libfaad/common.c
+++ b/lib/rbcodec/codecs/libfaad/common.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* just some common functions that could be used anywhere */
diff --git a/lib/rbcodec/codecs/libfaad/common.h b/lib/rbcodec/codecs/libfaad/common.h
index 3b45f46ff0..947935603e 100644
--- a/lib/rbcodec/codecs/libfaad/common.h
+++ b/lib/rbcodec/codecs/libfaad/common.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __COMMON_H__
diff --git a/lib/rbcodec/codecs/libfaad/decoder.c b/lib/rbcodec/codecs/libfaad/decoder.c
index 533de50d5b..b21c1c4172 100644
--- a/lib/rbcodec/codecs/libfaad/decoder.c
+++ b/lib/rbcodec/codecs/libfaad/decoder.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/decoder.h b/lib/rbcodec/codecs/libfaad/decoder.h
index f5c477e186..53b93a1fed 100644
--- a/lib/rbcodec/codecs/libfaad/decoder.h
+++ b/lib/rbcodec/codecs/libfaad/decoder.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __DECODER_H__
diff --git a/lib/rbcodec/codecs/libfaad/drc.c b/lib/rbcodec/codecs/libfaad/drc.c
index 6e081489aa..0fdc53e4ce 100644
--- a/lib/rbcodec/codecs/libfaad/drc.c
+++ b/lib/rbcodec/codecs/libfaad/drc.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/drc.h b/lib/rbcodec/codecs/libfaad/drc.h
index 38037a1a12..4ab4e0f1d7 100644
--- a/lib/rbcodec/codecs/libfaad/drc.h
+++ b/lib/rbcodec/codecs/libfaad/drc.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __DRC_H__
diff --git a/lib/rbcodec/codecs/libfaad/drm_dec.c b/lib/rbcodec/codecs/libfaad/drm_dec.c
index f0b0f01f2b..ddeea6f907 100644
--- a/lib/rbcodec/codecs/libfaad/drm_dec.c
+++ b/lib/rbcodec/codecs/libfaad/drm_dec.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include <stdlib.h>
diff --git a/lib/rbcodec/codecs/libfaad/drm_dec.h b/lib/rbcodec/codecs/libfaad/drm_dec.h
index d7ae9d0166..c293008cbe 100644
--- a/lib/rbcodec/codecs/libfaad/drm_dec.h
+++ b/lib/rbcodec/codecs/libfaad/drm_dec.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __DRM_DEC_H__
diff --git a/lib/rbcodec/codecs/libfaad/error.c b/lib/rbcodec/codecs/libfaad/error.c
index ff2f9c3d13..eecdd63e57 100644
--- a/lib/rbcodec/codecs/libfaad/error.c
+++ b/lib/rbcodec/codecs/libfaad/error.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/error.h b/lib/rbcodec/codecs/libfaad/error.h
index 94ca7bba75..f744868f95 100644
--- a/lib/rbcodec/codecs/libfaad/error.h
+++ b/lib/rbcodec/codecs/libfaad/error.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __ERROR_H__
diff --git a/lib/rbcodec/codecs/libfaad/filtbank.c b/lib/rbcodec/codecs/libfaad/filtbank.c
index fd7a4dc91f..7a32fa5af9 100644
--- a/lib/rbcodec/codecs/libfaad/filtbank.c
+++ b/lib/rbcodec/codecs/libfaad/filtbank.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/filtbank.h b/lib/rbcodec/codecs/libfaad/filtbank.h
index 8c9f1e3490..881a4bcee3 100644
--- a/lib/rbcodec/codecs/libfaad/filtbank.h
+++ b/lib/rbcodec/codecs/libfaad/filtbank.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __FILTBANK_H__
diff --git a/lib/rbcodec/codecs/libfaad/fixed.h b/lib/rbcodec/codecs/libfaad/fixed.h
index ca0402e4d3..ffeeaf8443 100644
--- a/lib/rbcodec/codecs/libfaad/fixed.h
+++ b/lib/rbcodec/codecs/libfaad/fixed.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __FIXED_H__
diff --git a/lib/rbcodec/codecs/libfaad/hcr.c b/lib/rbcodec/codecs/libfaad/hcr.c
index f968ea7bec..de4e66a9c7 100644
--- a/lib/rbcodec/codecs/libfaad/hcr.c
+++ b/lib/rbcodec/codecs/libfaad/hcr.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/huffman.c b/lib/rbcodec/codecs/libfaad/huffman.c
index 93e3a2dfc3..223a001f98 100644
--- a/lib/rbcodec/codecs/libfaad/huffman.c
+++ b/lib/rbcodec/codecs/libfaad/huffman.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/huffman.h b/lib/rbcodec/codecs/libfaad/huffman.h
index 214d3a220f..efb5e4219d 100644
--- a/lib/rbcodec/codecs/libfaad/huffman.h
+++ b/lib/rbcodec/codecs/libfaad/huffman.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __HUFFMAN_H__
diff --git a/lib/rbcodec/codecs/libfaad/ic_predict.c b/lib/rbcodec/codecs/libfaad/ic_predict.c
index 02cadd65b1..3cd43742af 100644
--- a/lib/rbcodec/codecs/libfaad/ic_predict.c
+++ b/lib/rbcodec/codecs/libfaad/ic_predict.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/ic_predict.h b/lib/rbcodec/codecs/libfaad/ic_predict.h
index 1f2d2c657e..b7d6145456 100644
--- a/lib/rbcodec/codecs/libfaad/ic_predict.h
+++ b/lib/rbcodec/codecs/libfaad/ic_predict.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifdef MAIN_DEC
diff --git a/lib/rbcodec/codecs/libfaad/iq_table.h b/lib/rbcodec/codecs/libfaad/iq_table.h
index eaf2fe4671..308091c0f1 100644
--- a/lib/rbcodec/codecs/libfaad/iq_table.h
+++ b/lib/rbcodec/codecs/libfaad/iq_table.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef IQ_TABLE_H__
diff --git a/lib/rbcodec/codecs/libfaad/is.c b/lib/rbcodec/codecs/libfaad/is.c
index 89c6fcf228..3ab727ba7d 100644
--- a/lib/rbcodec/codecs/libfaad/is.c
+++ b/lib/rbcodec/codecs/libfaad/is.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/is.h b/lib/rbcodec/codecs/libfaad/is.h
index 1b68f3ec49..c954d0a120 100644
--- a/lib/rbcodec/codecs/libfaad/is.h
+++ b/lib/rbcodec/codecs/libfaad/is.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __IS_H__
diff --git a/lib/rbcodec/codecs/libfaad/kbd_win.h b/lib/rbcodec/codecs/libfaad/kbd_win.h
index 8abd3c070c..ef8413cd29 100644
--- a/lib/rbcodec/codecs/libfaad/kbd_win.h
+++ b/lib/rbcodec/codecs/libfaad/kbd_win.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __KBD_WIN_H__
diff --git a/lib/rbcodec/codecs/libfaad/libfaad.make b/lib/rbcodec/codecs/libfaad/libfaad.make
index ec6998f4d3..96e06b11a9 100644
--- a/lib/rbcodec/codecs/libfaad/libfaad.make
+++ b/lib/rbcodec/codecs/libfaad/libfaad.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libfaad
diff --git a/lib/rbcodec/codecs/libfaad/lt_predict.c b/lib/rbcodec/codecs/libfaad/lt_predict.c
index f03354fc01..070410e151 100644
--- a/lib/rbcodec/codecs/libfaad/lt_predict.c
+++ b/lib/rbcodec/codecs/libfaad/lt_predict.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 
diff --git a/lib/rbcodec/codecs/libfaad/lt_predict.h b/lib/rbcodec/codecs/libfaad/lt_predict.h
index 1c10751888..179753ccd0 100644
--- a/lib/rbcodec/codecs/libfaad/lt_predict.h
+++ b/lib/rbcodec/codecs/libfaad/lt_predict.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifdef LTP_DEC
diff --git a/lib/rbcodec/codecs/libfaad/mp4.c b/lib/rbcodec/codecs/libfaad/mp4.c
index 43a4d8da4c..1e22579e5f 100644
--- a/lib/rbcodec/codecs/libfaad/mp4.c
+++ b/lib/rbcodec/codecs/libfaad/mp4.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/mp4.h b/lib/rbcodec/codecs/libfaad/mp4.h
index afcf094796..245765fef8 100644
--- a/lib/rbcodec/codecs/libfaad/mp4.h
+++ b/lib/rbcodec/codecs/libfaad/mp4.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __MP4_H__
diff --git a/lib/rbcodec/codecs/libfaad/ms.c b/lib/rbcodec/codecs/libfaad/ms.c
index b42e95a408..d3cec9b7ae 100644
--- a/lib/rbcodec/codecs/libfaad/ms.c
+++ b/lib/rbcodec/codecs/libfaad/ms.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/ms.h b/lib/rbcodec/codecs/libfaad/ms.h
index 384fa4294b..825fe4cdcf 100644
--- a/lib/rbcodec/codecs/libfaad/ms.h
+++ b/lib/rbcodec/codecs/libfaad/ms.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __MS_H__
diff --git a/lib/rbcodec/codecs/libfaad/output.c b/lib/rbcodec/codecs/libfaad/output.c
index 6594582bbd..d10d1b8f72 100644
--- a/lib/rbcodec/codecs/libfaad/output.c
+++ b/lib/rbcodec/codecs/libfaad/output.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/output.h b/lib/rbcodec/codecs/libfaad/output.h
index 9fe8356541..4e820c863d 100644
--- a/lib/rbcodec/codecs/libfaad/output.h
+++ b/lib/rbcodec/codecs/libfaad/output.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __OUTPUT_H__
diff --git a/lib/rbcodec/codecs/libfaad/pns.c b/lib/rbcodec/codecs/libfaad/pns.c
index b75cf9f1ed..627fe294fd 100644
--- a/lib/rbcodec/codecs/libfaad/pns.c
+++ b/lib/rbcodec/codecs/libfaad/pns.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/pns.h b/lib/rbcodec/codecs/libfaad/pns.h
index e789f5708a..33603aad89 100644
--- a/lib/rbcodec/codecs/libfaad/pns.h
+++ b/lib/rbcodec/codecs/libfaad/pns.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __PNS_H__
diff --git a/lib/rbcodec/codecs/libfaad/ps_dec.c b/lib/rbcodec/codecs/libfaad/ps_dec.c
index 3fed4e6a0a..229e457751 100644
--- a/lib/rbcodec/codecs/libfaad/ps_dec.c
+++ b/lib/rbcodec/codecs/libfaad/ps_dec.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/ps_dec.h b/lib/rbcodec/codecs/libfaad/ps_dec.h
index 14e4bd54e6..c8677164fa 100644
--- a/lib/rbcodec/codecs/libfaad/ps_dec.h
+++ b/lib/rbcodec/codecs/libfaad/ps_dec.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __PS_DEC_H__
diff --git a/lib/rbcodec/codecs/libfaad/ps_syntax.c b/lib/rbcodec/codecs/libfaad/ps_syntax.c
index 290d7e5523..320c62348c 100644
--- a/lib/rbcodec/codecs/libfaad/ps_syntax.c
+++ b/lib/rbcodec/codecs/libfaad/ps_syntax.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/ps_tables.h b/lib/rbcodec/codecs/libfaad/ps_tables.h
index 83cd20abbf..d70f542e1f 100644
--- a/lib/rbcodec/codecs/libfaad/ps_tables.h
+++ b/lib/rbcodec/codecs/libfaad/ps_tables.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __PS_TABLES_H__
diff --git a/lib/rbcodec/codecs/libfaad/pulse.c b/lib/rbcodec/codecs/libfaad/pulse.c
index d75877db70..f056f3b83d 100644
--- a/lib/rbcodec/codecs/libfaad/pulse.c
+++ b/lib/rbcodec/codecs/libfaad/pulse.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/pulse.h b/lib/rbcodec/codecs/libfaad/pulse.h
index 84d7fd38d8..ed1db9ae8e 100644
--- a/lib/rbcodec/codecs/libfaad/pulse.h
+++ b/lib/rbcodec/codecs/libfaad/pulse.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __PULSE_H__
diff --git a/lib/rbcodec/codecs/libfaad/rvlc.c b/lib/rbcodec/codecs/libfaad/rvlc.c
index 5b17edd06c..fb9a5d57ed 100644
--- a/lib/rbcodec/codecs/libfaad/rvlc.c
+++ b/lib/rbcodec/codecs/libfaad/rvlc.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* RVLC scalefactor decoding
diff --git a/lib/rbcodec/codecs/libfaad/rvlc.h b/lib/rbcodec/codecs/libfaad/rvlc.h
index b17246a452..794e5e3fa8 100644
--- a/lib/rbcodec/codecs/libfaad/rvlc.h
+++ b/lib/rbcodec/codecs/libfaad/rvlc.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __RVLC_SCF_H__
diff --git a/lib/rbcodec/codecs/libfaad/sbr_dct.c b/lib/rbcodec/codecs/libfaad/sbr_dct.c
index e9c56c3a18..cb06bb31d5 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_dct.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_dct.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/sbr_dct.h b/lib/rbcodec/codecs/libfaad/sbr_dct.h
index 95394df307..3b39b68a34 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_dct.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_dct.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SBR_DCT_H__
diff --git a/lib/rbcodec/codecs/libfaad/sbr_dec.c b/lib/rbcodec/codecs/libfaad/sbr_dec.c
index 21e8e028a1..e0271c0f56 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_dec.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_dec.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 
diff --git a/lib/rbcodec/codecs/libfaad/sbr_dec.h b/lib/rbcodec/codecs/libfaad/sbr_dec.h
index 89fe72b7e9..9ee031e5e4 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_dec.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_dec.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SBR_DEC_H__
diff --git a/lib/rbcodec/codecs/libfaad/sbr_e_nf.c b/lib/rbcodec/codecs/libfaad/sbr_e_nf.c
index ea2cbb8e35..ce94819bf8 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_e_nf.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_e_nf.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/sbr_e_nf.h b/lib/rbcodec/codecs/libfaad/sbr_e_nf.h
index 6c8b30f06d..b0bebe3f00 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_e_nf.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_e_nf.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SBR_E_NF_H__
diff --git a/lib/rbcodec/codecs/libfaad/sbr_fbt.c b/lib/rbcodec/codecs/libfaad/sbr_fbt.c
index c685c710d5..3f7574a250 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_fbt.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_fbt.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* Calculate frequency band tables */
diff --git a/lib/rbcodec/codecs/libfaad/sbr_fbt.h b/lib/rbcodec/codecs/libfaad/sbr_fbt.h
index ac25335268..71b5d457ed 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_fbt.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_fbt.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SBR_FBT_H__
diff --git a/lib/rbcodec/codecs/libfaad/sbr_hfadj.c b/lib/rbcodec/codecs/libfaad/sbr_hfadj.c
index b562bf904a..cc55f3fb37 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_hfadj.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_hfadj.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* High Frequency adjustment */
diff --git a/lib/rbcodec/codecs/libfaad/sbr_hfadj.h b/lib/rbcodec/codecs/libfaad/sbr_hfadj.h
index 1411769799..2924840fc9 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_hfadj.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_hfadj.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SBR_HFADJ_H__
diff --git a/lib/rbcodec/codecs/libfaad/sbr_hfgen.c b/lib/rbcodec/codecs/libfaad/sbr_hfgen.c
index 3a5b250aa7..e427f755b1 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_hfgen.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_hfgen.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* High Frequency generation */
diff --git a/lib/rbcodec/codecs/libfaad/sbr_hfgen.h b/lib/rbcodec/codecs/libfaad/sbr_hfgen.h
index a69e53e47d..970101f4b1 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_hfgen.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_hfgen.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SBR_HFGEN_H__
diff --git a/lib/rbcodec/codecs/libfaad/sbr_huff.c b/lib/rbcodec/codecs/libfaad/sbr_huff.c
index 92fe07a392..984b585b60 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_huff.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_huff.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/sbr_huff.h b/lib/rbcodec/codecs/libfaad/sbr_huff.h
index d81c5dc528..25b7a99bda 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_huff.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_huff.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SBR_HUFF_H__
diff --git a/lib/rbcodec/codecs/libfaad/sbr_noise.h b/lib/rbcodec/codecs/libfaad/sbr_noise.h
index 48f0ea9d18..b5e87c829b 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_noise.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_noise.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SBR_NOISE_H__
diff --git a/lib/rbcodec/codecs/libfaad/sbr_qmf.c b/lib/rbcodec/codecs/libfaad/sbr_qmf.c
index 97f8307318..eeac93d0d0 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_qmf.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_qmf.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/sbr_qmf.h b/lib/rbcodec/codecs/libfaad/sbr_qmf.h
index 87bfe5a9ef..326edc2695 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_qmf.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_qmf.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SBR_QMF_H__
diff --git a/lib/rbcodec/codecs/libfaad/sbr_qmf_c.h b/lib/rbcodec/codecs/libfaad/sbr_qmf_c.h
index 0ceb487bec..82deab2c22 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_qmf_c.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_qmf_c.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SBR_QMF_C_H__
diff --git a/lib/rbcodec/codecs/libfaad/sbr_syntax.c b/lib/rbcodec/codecs/libfaad/sbr_syntax.c
index 519a37b137..b60f328a1b 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_syntax.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_syntax.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/sbr_syntax.h b/lib/rbcodec/codecs/libfaad/sbr_syntax.h
index 33aecaaf73..9e8cdd6489 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_syntax.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_syntax.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SBR_SYNTAX_H__
diff --git a/lib/rbcodec/codecs/libfaad/sbr_tf_grid.c b/lib/rbcodec/codecs/libfaad/sbr_tf_grid.c
index 2c21173490..19573d3d10 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_tf_grid.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_tf_grid.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /* Time/Frequency grid */
diff --git a/lib/rbcodec/codecs/libfaad/sbr_tf_grid.h b/lib/rbcodec/codecs/libfaad/sbr_tf_grid.h
index b7a6b32290..b4231e836d 100644
--- a/lib/rbcodec/codecs/libfaad/sbr_tf_grid.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_tf_grid.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SBR_TF_GRID_H__
diff --git a/lib/rbcodec/codecs/libfaad/sine_win.h b/lib/rbcodec/codecs/libfaad/sine_win.h
index 3e042f15f7..c4c4d7b53c 100644
--- a/lib/rbcodec/codecs/libfaad/sine_win.h
+++ b/lib/rbcodec/codecs/libfaad/sine_win.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SINE_WIN_H__
diff --git a/lib/rbcodec/codecs/libfaad/specrec.c b/lib/rbcodec/codecs/libfaad/specrec.c
index 02deb298b9..5197b5ae32 100644
--- a/lib/rbcodec/codecs/libfaad/specrec.c
+++ b/lib/rbcodec/codecs/libfaad/specrec.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /*
diff --git a/lib/rbcodec/codecs/libfaad/specrec.h b/lib/rbcodec/codecs/libfaad/specrec.h
index c3540ac973..6efc05c48a 100644
--- a/lib/rbcodec/codecs/libfaad/specrec.h
+++ b/lib/rbcodec/codecs/libfaad/specrec.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SPECREC_H__
diff --git a/lib/rbcodec/codecs/libfaad/structs.h b/lib/rbcodec/codecs/libfaad/structs.h
index a6114f412a..49e98f9a97 100644
--- a/lib/rbcodec/codecs/libfaad/structs.h
+++ b/lib/rbcodec/codecs/libfaad/structs.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __STRUCTS_H__
diff --git a/lib/rbcodec/codecs/libfaad/syntax.c b/lib/rbcodec/codecs/libfaad/syntax.c
index 65e1bf7744..33a1262c1c 100644
--- a/lib/rbcodec/codecs/libfaad/syntax.c
+++ b/lib/rbcodec/codecs/libfaad/syntax.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 /*
diff --git a/lib/rbcodec/codecs/libfaad/syntax.h b/lib/rbcodec/codecs/libfaad/syntax.h
index f9efde7d9b..53fa599584 100644
--- a/lib/rbcodec/codecs/libfaad/syntax.h
+++ b/lib/rbcodec/codecs/libfaad/syntax.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __SYNTAX_H__
diff --git a/lib/rbcodec/codecs/libfaad/tns.c b/lib/rbcodec/codecs/libfaad/tns.c
index a2bec86519..c586f9210c 100644
--- a/lib/rbcodec/codecs/libfaad/tns.c
+++ b/lib/rbcodec/codecs/libfaad/tns.c
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #include "common.h"
diff --git a/lib/rbcodec/codecs/libfaad/tns.h b/lib/rbcodec/codecs/libfaad/tns.h
index dd10a61f3b..e2f91c9004 100644
--- a/lib/rbcodec/codecs/libfaad/tns.h
+++ b/lib/rbcodec/codecs/libfaad/tns.h
@@ -22,7 +22,6 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id$
 **/
 
 #ifndef __TNS_H__
diff --git a/lib/rbcodec/codecs/libffmpegFLAC/arm.S b/lib/rbcodec/codecs/libffmpegFLAC/arm.S
index 70a0f7de49..8c4e810da8 100644
--- a/lib/rbcodec/codecs/libffmpegFLAC/arm.S
+++ b/lib/rbcodec/codecs/libffmpegFLAC/arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Thom Johansen 
  *
diff --git a/lib/rbcodec/codecs/libffmpegFLAC/coldfire.S b/lib/rbcodec/codecs/libffmpegFLAC/coldfire.S
index efbb907874..7b9d4b68ca 100644
--- a/lib/rbcodec/codecs/libffmpegFLAC/coldfire.S
+++ b/lib/rbcodec/codecs/libffmpegFLAC/coldfire.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Thom Johansen 
  *
diff --git a/lib/rbcodec/codecs/libffmpegFLAC/libffmpegFLAC.make b/lib/rbcodec/codecs/libffmpegFLAC/libffmpegFLAC.make
index 7ae7e96b26..86998aa773 100644
--- a/lib/rbcodec/codecs/libffmpegFLAC/libffmpegFLAC.make
+++ b/lib/rbcodec/codecs/libffmpegFLAC/libffmpegFLAC.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libffmpegFLAC
diff --git a/lib/rbcodec/codecs/libgme/blargg_endian.h b/lib/rbcodec/codecs/libgme/blargg_endian.h
index dce5cb2048..b703da9e1a 100644
--- a/lib/rbcodec/codecs/libgme/blargg_endian.h
+++ b/lib/rbcodec/codecs/libgme/blargg_endian.h
@@ -33,10 +33,8 @@
 #if defined (LSB_FIRST) || defined (__LITTLE_ENDIAN__) || defined (BLARGG_CPU_X86) || \
 		(defined (LITTLE_ENDIAN) && LITTLE_ENDIAN+0 != 1234)
 	#define BLARGG_LITTLE_ENDIAN 1
-#endif
-
-#if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
-	defined (__mips__)      || defined (__sparc__)      ||  defined (BLARGG_CPU_POWERPC) || \
+#elif defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
+	defined (__mips__) || defined (__sparc__) || defined (BLARGG_CPU_POWERPC) || \
 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
 	#define BLARGG_BIG_ENDIAN 1
 #else
diff --git a/lib/rbcodec/codecs/libgme/inflate/bbfuncs.c b/lib/rbcodec/codecs/libgme/inflate/bbfuncs.c
index 3b23c3b6db..f54ad018ab 100644
--- a/lib/rbcodec/codecs/libgme/inflate/bbfuncs.c
+++ b/lib/rbcodec/codecs/libgme/inflate/bbfuncs.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/lib/rbcodec/codecs/libgme/inflate/bbfuncs.h b/lib/rbcodec/codecs/libgme/inflate/bbfuncs.h
index fe03ec1a3c..13452f4c13 100644
--- a/lib/rbcodec/codecs/libgme/inflate/bbfuncs.h
+++ b/lib/rbcodec/codecs/libgme/inflate/bbfuncs.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/lib/rbcodec/codecs/libgme/inflate/inflate.h b/lib/rbcodec/codecs/libgme/inflate/inflate.h
index 05164621b9..7469f54fc4 100644
--- a/lib/rbcodec/codecs/libgme/inflate/inflate.h
+++ b/lib/rbcodec/codecs/libgme/inflate/inflate.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/lib/rbcodec/codecs/libm4a/demux.c b/lib/rbcodec/codecs/libm4a/demux.c
index 78f3c97861..f9203a0893 100644
--- a/lib/rbcodec/codecs/libm4a/demux.c
+++ b/lib/rbcodec/codecs/libm4a/demux.c
@@ -6,7 +6,7 @@
  * This is the quicktime container demuxer.
  *
  * http://crazney.net/programs/itunes/alac.html
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -58,7 +58,7 @@ static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len)
 {
     size_t size_remaining = chunk_len - 8;
 
-    // filetype (supported ignore case values: m4a, m4b, mp42, 3gp6, qt, isom)  
+    // filetype (supported ignore case values: m4a, m4b, mp42, 3gp6, qt, isom)
     char filetype[4];
     stream_read(qtmovie->stream, 4, filetype);
     size_remaining-=4;
@@ -137,12 +137,12 @@ static bool read_chunk_esds(qtmovie_t *qtmovie, size_t chunk_len)
     {
         return false;
     }
-    
+
     /* read length */
     qtmovie->res->codecdata_len = mp4ff_read_mp4_descr_length(qtmovie->stream);
     if (qtmovie->res->codecdata_len > MAX_CODECDATA_SIZE)
     {
-        DEBUGF("codecdata too large (%d) in esds\n", 
+        DEBUGF("codecdata too large (%d) in esds\n",
                (int)qtmovie->res->codecdata_len);
         return false;
     }
@@ -158,20 +158,21 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len)
     unsigned int i;
     int j;
     uint32_t numentries;
-    size_t size_remaining = chunk_len - 8;
+//    size_t size_remaining = chunk_len - 8;
     bool got_codec_data = false;
+    (void)chunk_len;
 
     /* version */
     stream_read_uint8(qtmovie->stream);
-    size_remaining -= 1;
+//    size_remaining -= 1;
     /* flags */
     stream_read_uint8(qtmovie->stream);
     stream_read_uint8(qtmovie->stream);
     stream_read_uint8(qtmovie->stream);
-    size_remaining -= 3;
+//    size_remaining -= 3;
 
     numentries = stream_read_uint32(qtmovie->stream);
-    size_remaining -= 4;
+//    size_remaining -= 4;
 
     /* if (numentries != 1)
     {
@@ -219,7 +220,7 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len)
           qtmovie->res->codecdata_len = entry_remaining + 12 + 8;
           if (qtmovie->res->codecdata_len > MAX_CODECDATA_SIZE)
           {
-              DEBUGF("codecdata too large (%d) in stsd\n", 
+              DEBUGF("codecdata too large (%d) in stsd\n",
                       (int)qtmovie->res->codecdata_len);
               return false;
           }
@@ -316,13 +317,29 @@ static bool read_chunk_stts(qtmovie_t *qtmovie, size_t chunk_len)
 
     qtmovie->res->num_time_to_samples = numentries;
     qtmovie->res->time_to_sample = malloc(numentries * sizeof(*qtmovie->res->time_to_sample));
-
+    if (qtmovie->res->time_to_sample && numentries > 1)
+    {
+        //Make sure we leave space for at least 100 records in lookup table
+        void* enough_mem = malloc(sizeof(*qtmovie->res->lookup_table)*100);
+        if (!enough_mem)
+        {
+            free(qtmovie->res->time_to_sample);
+            qtmovie->res->time_to_sample = NULL;
+        }
+        else
+        {
+            free(enough_mem);
+        }
+    }
     if (!qtmovie->res->time_to_sample)
     {
-        DEBUGF("stts too large\n");
-        return false;
+        qtmovie->res->time_to_sample_offset = stream_tell(qtmovie->stream);
+        stream_skip(qtmovie->stream, size_remaining);
+        DEBUGF("stts too large %ld, save time_to_sample_offset\n", size_remaining);
+        return true;
     }
 
+    DEBUGF("stts numentires %d, size: %ld\n", numentries, numentries * sizeof(*qtmovie->res->time_to_sample));
     for (i = 0; i < numentries; i++)
     {
         qtmovie->res->time_to_sample[i].sample_count = stream_read_uint32(qtmovie->stream);
@@ -335,7 +352,7 @@ static bool read_chunk_stts(qtmovie_t *qtmovie, size_t chunk_len)
         DEBUGF("ehm, size remianing?\n");
         stream_skip(qtmovie->stream, size_remaining);
     }
-    
+
     return true;
 }
 
@@ -399,7 +416,7 @@ static bool read_chunk_stsz(qtmovie_t *qtmovie, size_t chunk_len)
     {
         stream_skip(qtmovie->stream, size_remaining);
     }
-    
+
     return true;
 }
 
@@ -421,7 +438,7 @@ static bool read_chunk_stsc(qtmovie_t *qtmovie, size_t chunk_len)
     {
         stream_skip(qtmovie->stream, size_remaining);
     }
-    
+
     return true;
 }
 
@@ -464,7 +481,7 @@ static bool read_chunk_stco(qtmovie_t *qtmovie, size_t chunk_len)
             fit_numentries = numentries / accuracy_divider;
         }
     }
-    DEBUGF("lookup_table numentries %d, fit_numentries %d\n", numentries, fit_numentries);
+    DEBUGF("lookup_table numentries %d, fit_numentries %ld\n", numentries, fit_numentries);
     qtmovie->res->num_lookup_table = fit_numentries;
 
     if (!qtmovie->res->lookup_table)
@@ -483,14 +500,14 @@ static bool read_chunk_stco(qtmovie_t *qtmovie, size_t chunk_len)
 
     /* Build up lookup table. The lookup table contains the sample index and
      * byte position in the file for each chunk. This table is used to seek
-     * and resume (see m4a_seek() and m4a_seek_raw() in libm4a/m4a.c) and 
+     * and resume (see m4a_seek() and m4a_seek_raw() in libm4a/m4a.c) and
      * to skip empty chunks (see m4a_check_sample_offset() in codecs/aac.c and
      * libm4a/m4a.c).
-     * The seek/resume precision is lower than using sample_byte_size[] and 
+     * The seek/resume precision is lower than using sample_byte_size[] and
      * depends on numentries. Typically the resolution is ~1/10 of all frames
-     * which equals about 1/4-1/2 seconds. The loss of seek precision is 
-     * accepted to be able to avoid allocation of the large sample_byte_size[] 
-     * table. This reduces the memory consumption by a factor of 2 or even 
+     * which equals about 1/4-1/2 seconds. The loss of seek precision is
+     * accepted to be able to avoid allocation of the large sample_byte_size[]
+     * table. This reduces the memory consumption by a factor of 2 or even
      * more. */
     uint32_t idx = 0;
     for (i = 0; i < numentries; ++i)
@@ -527,10 +544,10 @@ static bool read_chunk_stco(qtmovie_t *qtmovie, size_t chunk_len)
                     stream_read_sample_to_chunk(qtmovie->stream, &new_first, &new_frame);
                 old_i = i;
             }
-            
+
             if (new_first > k)
                 break;
-            
+
             frame += (new_first - old_first) * old_frame;
         }
 
@@ -551,7 +568,7 @@ static bool read_chunk_stco(qtmovie_t *qtmovie, size_t chunk_len)
         DEBUGF("ehm, size remianing?\n");
         stream_skip(qtmovie->stream, size_remaining);
     }
-    
+
     return true;
 }
 
@@ -655,7 +672,7 @@ static bool read_chunk_minf(qtmovie_t *qtmovie, size_t chunk_len)
         }
 
         sub_chunk_id = stream_read_uint32(qtmovie->stream);
-        
+
         switch (sub_chunk_id)
         {
         case MAKEFOURCC('s','t','b','l'):
@@ -866,5 +883,3 @@ int qtmovie_read(stream_t *file, demux_res_t *demux_res)
     }
     return 0;
 }
-
-
diff --git a/lib/rbcodec/codecs/libm4a/libm4a.make b/lib/rbcodec/codecs/libm4a/libm4a.make
index c25f63fa70..618e417ef7 100644
--- a/lib/rbcodec/codecs/libm4a/libm4a.make
+++ b/lib/rbcodec/codecs/libm4a/libm4a.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libm4a
diff --git a/lib/rbcodec/codecs/libm4a/m4a.c b/lib/rbcodec/codecs/libm4a/m4a.c
index 6c943b408f..980689bdec 100644
--- a/lib/rbcodec/codecs/libm4a/m4a.c
+++ b/lib/rbcodec/codecs/libm4a/m4a.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman, 2011 Andree Buschmann
  *
@@ -137,6 +136,12 @@ int m4a_check_sample_offset(demux_res_t *demux_res, uint32_t frame, uint32_t *st
     return -1;
 }
 
+static inline void read_time_to_sample_entry(stream_t* stream, uint32_t* time_cnt, uint32_t* time_dur)
+{
+    *time_cnt = stream_read_uint32(stream);
+    *time_dur = stream_read_uint32(stream);
+}
+
 /* Seek to desired sound sample location. Return 1 on success (and modify
  * sound_samples_done and current_sample), 0 if failed. */
 unsigned int m4a_seek(demux_res_t* demux_res, stream_t* stream,
@@ -161,10 +166,21 @@ unsigned int m4a_seek(demux_res_t* demux_res, stream_t* stream,
     /* The 'sound_sample_loc' we have is PCM-based and not directly usable.
      * We need to convert it to an MP4 sample number 'sample_i' first. */
     sample_i = sound_sample_i = 0;
+    if (tts_tab == NULL)
+    {
+        stream_seek(stream, demux_res->time_to_sample_offset);
+    }
     for (time = 0; time < demux_res->num_time_to_samples; ++time)
     {
-        time_cnt = tts_tab[time].sample_count;
-        time_dur = tts_tab[time].sample_duration;
+        if (tts_tab)
+        {
+            time_dur = tts_tab[time].sample_duration;
+            time_cnt = tts_tab[time].sample_count;
+        }
+        else
+        {
+            read_time_to_sample_entry(stream, &time_cnt, &time_dur);
+        }
         uint32_t time_var = time_cnt * time_dur;
 
         if (sound_sample_loc < sound_sample_i + time_var)
@@ -194,10 +210,22 @@ unsigned int m4a_seek(demux_res_t* demux_res, stream_t* stream,
     /* Compute the PCM sample number of the chunk's first sample
      * to get an accurate base for sound_sample_i. */
     i = sound_sample_i = 0;
+    if (tts_tab == NULL)
+    {
+        stream_seek(stream, demux_res->time_to_sample_offset);
+    }
+
     for (time = 0; time < demux_res->num_time_to_samples; ++time)
     {
-        time_cnt = tts_tab[time].sample_count;
-        time_dur = tts_tab[time].sample_duration;
+        if (tts_tab)
+        {
+            time_dur = tts_tab[time].sample_duration;
+            time_cnt = tts_tab[time].sample_count;
+        }
+        else
+        {
+            read_time_to_sample_entry(stream, &time_cnt, &time_dur);
+        }
 
         if (chunk_first_sample < i + time_cnt)
         {
@@ -223,7 +251,7 @@ unsigned int m4a_seek(demux_res_t* demux_res, stream_t* stream,
              i < sample_i && i < demux_res->num_sample_byte_sizes; ++i)
         {
             /* this could be unnecessary */
-            if (time_cnt == 0 && ++time < demux_res->num_time_to_samples)
+            if (time_cnt == 0 && tts_tab && ++time < demux_res->num_time_to_samples)
             {
                 time_cnt = tts_tab[time].sample_count;
                 time_dur = tts_tab[time].sample_duration;
@@ -279,8 +307,8 @@ unsigned int m4a_seek_raw(demux_res_t* demux_res, stream_t* stream,
     uint32_t chunk_sample     = 0;
     uint32_t total_samples    = 0;
     uint64_t new_sound_sample = 0;
-    uint32_t tmp_dur;
-    uint32_t tmp_cnt;
+    uint32_t time_dur;
+    uint32_t time_cnt;
     uint32_t new_pos;
 
     /* We know the desired byte offset, search for the chunk right before.
@@ -297,16 +325,27 @@ unsigned int m4a_seek_raw(demux_res_t* demux_res, stream_t* stream,
 
     /* Get sound sample offset. */
     i = 0;
-    time_to_sample_t *tab2 = demux_res->time_to_sample;
+    time_to_sample_t *tts_tab = demux_res->time_to_sample;
+    if (tts_tab == NULL)
+    {
+        stream_seek(stream, demux_res->time_to_sample_offset);
+    }
     while (i < demux_res->num_time_to_samples)
     {
-        tmp_dur = tab2[i].sample_duration;
-        tmp_cnt = tab2[i].sample_count;
-        total_samples    += tmp_cnt;
-        new_sound_sample += tmp_cnt * tmp_dur;
+        if (tts_tab)
+        {
+            time_dur = tts_tab[i].sample_duration;
+            time_cnt = tts_tab[i].sample_count;
+        }
+        else
+        {
+            read_time_to_sample_entry(stream, &time_cnt, &time_dur);
+        }
+        total_samples    += time_cnt;
+        new_sound_sample += time_cnt * time_dur;
         if (chunk_sample <= total_samples)
         {
-            new_sound_sample -= (total_samples - chunk_sample) * tmp_dur;
+            new_sound_sample -= (total_samples - chunk_sample) * time_dur;
             break;
         }
         ++i;
diff --git a/lib/rbcodec/codecs/libm4a/m4a.h b/lib/rbcodec/codecs/libm4a/m4a.h
index 14b22f5dbf..a93ec26580 100644
--- a/lib/rbcodec/codecs/libm4a/m4a.h
+++ b/lib/rbcodec/codecs/libm4a/m4a.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
@@ -79,6 +78,7 @@ typedef struct
 
     time_to_sample_t *time_to_sample;
     uint32_t num_time_to_samples;
+    uint32_t time_to_sample_offset;
 
     uint32_t *sample_byte_sizes;
     uint32_t num_sample_byte_sizes;
diff --git a/lib/rbcodec/codecs/libmad/CHANGES b/lib/rbcodec/codecs/libmad/CHANGES
index 3fa57ef0cf..ed13a080e6 100644
--- a/lib/rbcodec/codecs/libmad/CHANGES
+++ b/lib/rbcodec/codecs/libmad/CHANGES
@@ -2,7 +2,6 @@
  libmad - MPEG audio decoder library
  Copyright (C) 2000-2004 Underbit Technologies, Inc.
 
- $Id$
 
 ===============================================================================
 
diff --git a/lib/rbcodec/codecs/libmad/CREDITS b/lib/rbcodec/codecs/libmad/CREDITS
index 69016c201d..0d2b6063a5 100644
--- a/lib/rbcodec/codecs/libmad/CREDITS
+++ b/lib/rbcodec/codecs/libmad/CREDITS
@@ -2,7 +2,6 @@
  libmad - MPEG audio decoder library
  Copyright (C) 2000-2004 Underbit Technologies, Inc.
 
- $Id$
 
 ===============================================================================
 
diff --git a/lib/rbcodec/codecs/libmad/D.dat b/lib/rbcodec/codecs/libmad/D.dat
index 2bff1a8890..cc25543571 100644
--- a/lib/rbcodec/codecs/libmad/D.dat
+++ b/lib/rbcodec/codecs/libmad/D.dat
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 /*
diff --git a/lib/rbcodec/codecs/libmad/README b/lib/rbcodec/codecs/libmad/README
index 524a94b29d..d0132e2990 100644
--- a/lib/rbcodec/codecs/libmad/README
+++ b/lib/rbcodec/codecs/libmad/README
@@ -2,7 +2,6 @@
  libmad - MPEG audio decoder library
  Copyright (C) 2000-2004 Underbit Technologies, Inc.
 
- $Id$
 
 ===============================================================================
 
diff --git a/lib/rbcodec/codecs/libmad/TODO b/lib/rbcodec/codecs/libmad/TODO
index a397655c6c..727e4428e9 100644
--- a/lib/rbcodec/codecs/libmad/TODO
+++ b/lib/rbcodec/codecs/libmad/TODO
@@ -2,7 +2,6 @@
  libmad - MPEG audio decoder library
  Copyright (C) 2000-2004 Underbit Technologies, Inc.
 
- $Id$
 
 ===============================================================================
 
diff --git a/lib/rbcodec/codecs/libmad/bit.c b/lib/rbcodec/codecs/libmad/bit.c
index c08806d385..9ff57e6538 100644
--- a/lib/rbcodec/codecs/libmad/bit.c
+++ b/lib/rbcodec/codecs/libmad/bit.c
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/lib/rbcodec/codecs/libmad/bit.h b/lib/rbcodec/codecs/libmad/bit.h
index 1c49522af5..259575cc8f 100644
--- a/lib/rbcodec/codecs/libmad/bit.h
+++ b/lib/rbcodec/codecs/libmad/bit.h
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifndef LIBMAD_BIT_H
diff --git a/lib/rbcodec/codecs/libmad/dct32_arm.S b/lib/rbcodec/codecs/libmad/dct32_arm.S
index 440841bb5e..040ab875d2 100644
--- a/lib/rbcodec/codecs/libmad/dct32_arm.S
+++ b/lib/rbcodec/codecs/libmad/dct32_arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Tomasz Malesinski
  *
diff --git a/lib/rbcodec/codecs/libmad/fixed.h b/lib/rbcodec/codecs/libmad/fixed.h
index 1b4d29dad6..0c77bcac79 100644
--- a/lib/rbcodec/codecs/libmad/fixed.h
+++ b/lib/rbcodec/codecs/libmad/fixed.h
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifndef LIBMAD_FIXED_H
diff --git a/lib/rbcodec/codecs/libmad/frame.c b/lib/rbcodec/codecs/libmad/frame.c
index c1cc10396b..6acf3b7c26 100644
--- a/lib/rbcodec/codecs/libmad/frame.c
+++ b/lib/rbcodec/codecs/libmad/frame.c
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/lib/rbcodec/codecs/libmad/frame.h b/lib/rbcodec/codecs/libmad/frame.h
index a8eb2b51f9..9368c57218 100644
--- a/lib/rbcodec/codecs/libmad/frame.h
+++ b/lib/rbcodec/codecs/libmad/frame.h
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifndef LIBMAD_FRAME_H
diff --git a/lib/rbcodec/codecs/libmad/global.h b/lib/rbcodec/codecs/libmad/global.h
index 9f4b32e66d..ebcf3694e2 100644
--- a/lib/rbcodec/codecs/libmad/global.h
+++ b/lib/rbcodec/codecs/libmad/global.h
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 #include "codeclib.h"
diff --git a/lib/rbcodec/codecs/libmad/huffman.c b/lib/rbcodec/codecs/libmad/huffman.c
index bec44434a7..173bc298f3 100644
--- a/lib/rbcodec/codecs/libmad/huffman.c
+++ b/lib/rbcodec/codecs/libmad/huffman.c
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/lib/rbcodec/codecs/libmad/huffman.h b/lib/rbcodec/codecs/libmad/huffman.h
index e4c1b35d93..3b767e8e4b 100644
--- a/lib/rbcodec/codecs/libmad/huffman.h
+++ b/lib/rbcodec/codecs/libmad/huffman.h
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifndef LIBMAD_HUFFMAN_H
diff --git a/lib/rbcodec/codecs/libmad/imdct_l_arm.S b/lib/rbcodec/codecs/libmad/imdct_l_arm.S
index 86a0fcde8b..4c06821537 100644
--- a/lib/rbcodec/codecs/libmad/imdct_l_arm.S
+++ b/lib/rbcodec/codecs/libmad/imdct_l_arm.S
@@ -22,7 +22,6 @@
 *
 *****************************************************************************
 *
-* $Id$
 *
 * 2001/03/24:  Andre McCurdy <armccurdy@yahoo.co.uk>
 *   - Corrected PIC unsafe loading of address of 'imdct36_long_karray'
diff --git a/lib/rbcodec/codecs/libmad/imdct_mcf5249.S b/lib/rbcodec/codecs/libmad/imdct_mcf5249.S
index b5e2a12b0f..32f8586f25 100644
--- a/lib/rbcodec/codecs/libmad/imdct_mcf5249.S
+++ b/lib/rbcodec/codecs/libmad/imdct_mcf5249.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Thom Johansen
  *
diff --git a/lib/rbcodec/codecs/libmad/imdct_s.dat b/lib/rbcodec/codecs/libmad/imdct_s.dat
index 0f1f3c9b60..24b839f4ab 100644
--- a/lib/rbcodec/codecs/libmad/imdct_s.dat
+++ b/lib/rbcodec/codecs/libmad/imdct_s.dat
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
   /*  0 */  {  MAD_F(0x09bd7ca0) /*  0.608761429 */,
diff --git a/lib/rbcodec/codecs/libmad/layer12.c b/lib/rbcodec/codecs/libmad/layer12.c
index e00bb64530..fe4a7b5b31 100644
--- a/lib/rbcodec/codecs/libmad/layer12.c
+++ b/lib/rbcodec/codecs/libmad/layer12.c
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/lib/rbcodec/codecs/libmad/layer12.h b/lib/rbcodec/codecs/libmad/layer12.h
index 3fe6bd8b0f..6dba9188ef 100644
--- a/lib/rbcodec/codecs/libmad/layer12.h
+++ b/lib/rbcodec/codecs/libmad/layer12.h
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifndef LIBMAD_LAYER12_H
diff --git a/lib/rbcodec/codecs/libmad/layer3.c b/lib/rbcodec/codecs/libmad/layer3.c
index 802c626fe0..c3da79e2e3 100644
--- a/lib/rbcodec/codecs/libmad/layer3.c
+++ b/lib/rbcodec/codecs/libmad/layer3.c
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/lib/rbcodec/codecs/libmad/layer3.h b/lib/rbcodec/codecs/libmad/layer3.h
index 15948037e9..79f9ba6f5f 100644
--- a/lib/rbcodec/codecs/libmad/layer3.h
+++ b/lib/rbcodec/codecs/libmad/layer3.h
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifndef LIBMAD_LAYER3_H
diff --git a/lib/rbcodec/codecs/libmad/libmad.make b/lib/rbcodec/codecs/libmad/libmad.make
index 6c50e1d201..f536b7e1e4 100644
--- a/lib/rbcodec/codecs/libmad/libmad.make
+++ b/lib/rbcodec/codecs/libmad/libmad.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # we need to build two different mad libraries
diff --git a/lib/rbcodec/codecs/libmad/mad_iram.h b/lib/rbcodec/codecs/libmad/mad_iram.h
index 2f9423ab47..84ff422af9 100644
--- a/lib/rbcodec/codecs/libmad/mad_iram.h
+++ b/lib/rbcodec/codecs/libmad/mad_iram.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/lib/rbcodec/codecs/libmad/qc_table.dat b/lib/rbcodec/codecs/libmad/qc_table.dat
index d28a207049..a89e1e649b 100644
--- a/lib/rbcodec/codecs/libmad/qc_table.dat
+++ b/lib/rbcodec/codecs/libmad/qc_table.dat
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 /*
diff --git a/lib/rbcodec/codecs/libmad/rq_table.dat b/lib/rbcodec/codecs/libmad/rq_table.dat
index b3a37c13cd..d439af3307 100644
--- a/lib/rbcodec/codecs/libmad/rq_table.dat
+++ b/lib/rbcodec/codecs/libmad/rq_table.dat
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 /*
diff --git a/lib/rbcodec/codecs/libmad/sf_table.dat b/lib/rbcodec/codecs/libmad/sf_table.dat
index de084d97da..c94e054f65 100644
--- a/lib/rbcodec/codecs/libmad/sf_table.dat
+++ b/lib/rbcodec/codecs/libmad/sf_table.dat
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 /*
diff --git a/lib/rbcodec/codecs/libmad/stream.c b/lib/rbcodec/codecs/libmad/stream.c
index 6c8bbcf850..274be2628e 100644
--- a/lib/rbcodec/codecs/libmad/stream.c
+++ b/lib/rbcodec/codecs/libmad/stream.c
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/lib/rbcodec/codecs/libmad/stream.h b/lib/rbcodec/codecs/libmad/stream.h
index 0aafb98787..2cfcf1552b 100644
--- a/lib/rbcodec/codecs/libmad/stream.h
+++ b/lib/rbcodec/codecs/libmad/stream.h
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifndef LIBMAD_STREAM_H
diff --git a/lib/rbcodec/codecs/libmad/synth.c b/lib/rbcodec/codecs/libmad/synth.c
index b60694604e..c4d87c0a00 100644
--- a/lib/rbcodec/codecs/libmad/synth.c
+++ b/lib/rbcodec/codecs/libmad/synth.c
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/lib/rbcodec/codecs/libmad/synth.h b/lib/rbcodec/codecs/libmad/synth.h
index 93dd3946d4..5f4fdc6dfb 100644
--- a/lib/rbcodec/codecs/libmad/synth.h
+++ b/lib/rbcodec/codecs/libmad/synth.h
@@ -16,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
  */
 
 # ifndef LIBMAD_SYNTH_H
diff --git a/lib/rbcodec/codecs/libmad/synth_full_arm.S b/lib/rbcodec/codecs/libmad/synth_full_arm.S
index 3489cea09d..bfcaaadd8c 100644
--- a/lib/rbcodec/codecs/libmad/synth_full_arm.S
+++ b/lib/rbcodec/codecs/libmad/synth_full_arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Tomasz Malesinski
  *
diff --git a/lib/rbcodec/codecs/libmusepack/libmusepack.make b/lib/rbcodec/codecs/libmusepack/libmusepack.make
index 53b07869bf..dd18730421 100644
--- a/lib/rbcodec/codecs/libmusepack/libmusepack.make
+++ b/lib/rbcodec/codecs/libmusepack/libmusepack.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libmusepack
diff --git a/lib/rbcodec/codecs/libmusepack/synth_filter_arm.S b/lib/rbcodec/codecs/libmusepack/synth_filter_arm.S
index da560bb14a..944723d8b8 100644
--- a/lib/rbcodec/codecs/libmusepack/synth_filter_arm.S
+++ b/lib/rbcodec/codecs/libmusepack/synth_filter_arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Andree Buschmann
  *
diff --git a/lib/rbcodec/codecs/libmusepack/synth_filter_coldfire.S b/lib/rbcodec/codecs/libmusepack/synth_filter_coldfire.S
index 758ab3d496..c7e7f566bf 100644
--- a/lib/rbcodec/codecs/libmusepack/synth_filter_coldfire.S
+++ b/lib/rbcodec/codecs/libmusepack/synth_filter_coldfire.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Thom Johansen 
  *
diff --git a/lib/rbcodec/codecs/libopus/celt/bands.c b/lib/rbcodec/codecs/libopus/celt/bands.c
index 2702963c37..186468568c 100644
--- a/lib/rbcodec/codecs/libopus/celt/bands.c
+++ b/lib/rbcodec/codecs/libopus/celt/bands.c
@@ -910,6 +910,8 @@ static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
    int encode;
    ec_ctx *ec;
 
+   (void)b;
+
    encode = ctx->encode;
    ec = ctx->ec;
 
@@ -1669,4 +1671,3 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
 
    RESTORE_STACK;
 }
-
diff --git a/lib/rbcodec/codecs/libopus/libopus.make b/lib/rbcodec/codecs/libopus/libopus.make
index 5cfb34aac3..d737b4de26 100644
--- a/lib/rbcodec/codecs/libopus/libopus.make
+++ b/lib/rbcodec/codecs/libopus/libopus.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libopus
diff --git a/lib/rbcodec/codecs/libpcm/adpcm_seek.c b/lib/rbcodec/codecs/libpcm/adpcm_seek.c
index ce49d5fcd3..a2350f9b06 100644
--- a/lib/rbcodec/codecs/libpcm/adpcm_seek.c
+++ b/lib/rbcodec/codecs/libpcm/adpcm_seek.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/libpcm/adpcm_seek.h b/lib/rbcodec/codecs/libpcm/adpcm_seek.h
index 2dd3f000b1..a35d360a8c 100644
--- a/lib/rbcodec/codecs/libpcm/adpcm_seek.h
+++ b/lib/rbcodec/codecs/libpcm/adpcm_seek.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c b/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c
index 6aa5798e5c..8c110ed427 100644
--- a/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/libpcm/dvi_adpcm.c b/lib/rbcodec/codecs/libpcm/dvi_adpcm.c
index d91bb1b6f6..732ce8c041 100644
--- a/lib/rbcodec/codecs/libpcm/dvi_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/dvi_adpcm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  * Copyright (C) 2009 Yoshihisa Uchida
diff --git a/lib/rbcodec/codecs/libpcm/ieee_float.c b/lib/rbcodec/codecs/libpcm/ieee_float.c
index 29e145b381..45c63a5bdc 100644
--- a/lib/rbcodec/codecs/libpcm/ieee_float.c
+++ b/lib/rbcodec/codecs/libpcm/ieee_float.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/libpcm/ima_adpcm_common.c b/lib/rbcodec/codecs/libpcm/ima_adpcm_common.c
index 724cce31b0..e2bf6701fe 100644
--- a/lib/rbcodec/codecs/libpcm/ima_adpcm_common.c
+++ b/lib/rbcodec/codecs/libpcm/ima_adpcm_common.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/libpcm/ima_adpcm_common.h b/lib/rbcodec/codecs/libpcm/ima_adpcm_common.h
index 46fd6083ec..150d6edd71 100644
--- a/lib/rbcodec/codecs/libpcm/ima_adpcm_common.h
+++ b/lib/rbcodec/codecs/libpcm/ima_adpcm_common.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/libpcm/itut_g711.c b/lib/rbcodec/codecs/libpcm/itut_g711.c
index cbc302ca09..0fc02c859d 100644
--- a/lib/rbcodec/codecs/libpcm/itut_g711.c
+++ b/lib/rbcodec/codecs/libpcm/itut_g711.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  * Copyright (C) 2009 Yoshihisa Uchida
diff --git a/lib/rbcodec/codecs/libpcm/libpcm.make b/lib/rbcodec/codecs/libpcm/libpcm.make
index 15c23bedf2..172d0f7696 100644
--- a/lib/rbcodec/codecs/libpcm/libpcm.make
+++ b/lib/rbcodec/codecs/libpcm/libpcm.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libpcm
diff --git a/lib/rbcodec/codecs/libpcm/linear_pcm.c b/lib/rbcodec/codecs/libpcm/linear_pcm.c
index fd0aaeb013..51ae37daa0 100644
--- a/lib/rbcodec/codecs/libpcm/linear_pcm.c
+++ b/lib/rbcodec/codecs/libpcm/linear_pcm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  * Copyright (C) 2009 Yoshihisa Uchida
diff --git a/lib/rbcodec/codecs/libpcm/ms_adpcm.c b/lib/rbcodec/codecs/libpcm/ms_adpcm.c
index b5fe463c74..c4dad51ccb 100644
--- a/lib/rbcodec/codecs/libpcm/ms_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/ms_adpcm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/libpcm/pcm_common.h b/lib/rbcodec/codecs/libpcm/pcm_common.h
index 626133dc41..6a6d1f4613 100644
--- a/lib/rbcodec/codecs/libpcm/pcm_common.h
+++ b/lib/rbcodec/codecs/libpcm/pcm_common.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c b/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c
index 26deb7c045..23347b5ce3 100644
--- a/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/libpcm/support_formats.h b/lib/rbcodec/codecs/libpcm/support_formats.h
index b1e089e464..161b7f1c9d 100644
--- a/lib/rbcodec/codecs/libpcm/support_formats.h
+++ b/lib/rbcodec/codecs/libpcm/support_formats.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/libpcm/swf_adpcm.c b/lib/rbcodec/codecs/libpcm/swf_adpcm.c
index 7eb74fdd19..d3ca09c8d3 100644
--- a/lib/rbcodec/codecs/libpcm/swf_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/swf_adpcm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c b/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c
index 946d7ed0ec..4d240cf38e 100644
--- a/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/librm/librm.make b/lib/rbcodec/codecs/librm/librm.make
index 3c736abec9..0e39fe75bb 100644
--- a/lib/rbcodec/codecs/librm/librm.make
+++ b/lib/rbcodec/codecs/librm/librm.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id: librm.make 20151 2009-03-01 09:04:15Z amiconn $
 #
 
 # librm
diff --git a/lib/rbcodec/codecs/librm/rm.c b/lib/rbcodec/codecs/librm/rm.c
index e64d2efff7..49ec6da0a3 100644
--- a/lib/rbcodec/codecs/librm/rm.c
+++ b/lib/rbcodec/codecs/librm/rm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dave Chapman
  * Copyright (C) 2009 Mohamed Tarek
diff --git a/lib/rbcodec/codecs/librm/rm.h b/lib/rbcodec/codecs/librm/rm.h
index 47ea559f2e..8e4d124d68 100644
--- a/lib/rbcodec/codecs/librm/rm.h
+++ b/lib/rbcodec/codecs/librm/rm.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mohamed Tarek
  *
diff --git a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv4.c b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv4.c
index ff34c910d7..610aebb139 100644
--- a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv4.c
+++ b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv4.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2010 Michael Sevakis (jhMikeS)
  *
diff --git a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv4.h b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv4.h
index c9985e124a..8764567fbc 100644
--- a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv4.h
+++ b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv4.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2010 Michael Sevakis (jhMikeS)
  *
diff --git a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv5.c b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv5.c
index 10bbb47a5f..ca667b6d1e 100644
--- a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv5.c
+++ b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Michael Sevakis (jhMikeS)
  *
diff --git a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv6.c b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv6.c
index 2e3de87613..b29533c7f6 100644
--- a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv6.c
+++ b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv6.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Michael Sevakis (jhMikeS)
  *
diff --git a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv6.h b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv6.h
index a36d8166c2..1bef7fb46b 100644
--- a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv6.h
+++ b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_armv6.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Michael Sevakis (jhMikeS)
  *
diff --git a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_coldfire.c b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_coldfire.c
index b0d14d157e..cf816bf80d 100644
--- a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_coldfire.c
+++ b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_coldfire.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Michael Sevakis (jhMikeS)
  *
diff --git a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_coldfire.h b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_coldfire.h
index f9aafabd18..73db42ce9d 100644
--- a/lib/rbcodec/codecs/libspc/cpu/spc_dsp_coldfire.h
+++ b/lib/rbcodec/codecs/libspc/cpu/spc_dsp_coldfire.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Michael Sevakis (jhMikeS)
  *
diff --git a/lib/rbcodec/codecs/libspc/libspc.make b/lib/rbcodec/codecs/libspc/libspc.make
index a005f7914a..ff179bfb16 100644
--- a/lib/rbcodec/codecs/libspc/libspc.make
+++ b/lib/rbcodec/codecs/libspc/libspc.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libspc
diff --git a/lib/rbcodec/codecs/libspc/spc_codec.h b/lib/rbcodec/codecs/libspc/spc_codec.h
index 75c344474e..1df1149b97 100644
--- a/lib/rbcodec/codecs/libspc/spc_codec.h
+++ b/lib/rbcodec/codecs/libspc/spc_codec.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2008 Michael Sevakis (jhMikeS)
  * Copyright (C) 2006-2007 Adam Gashlin (hcs)
diff --git a/lib/rbcodec/codecs/libspc/spc_cpu.c b/lib/rbcodec/codecs/libspc/spc_cpu.c
index dbbc6cda0f..f91ca247d6 100644
--- a/lib/rbcodec/codecs/libspc/spc_cpu.c
+++ b/lib/rbcodec/codecs/libspc/spc_cpu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Adam Gashlin (hcs)
  * Copyright (C) 2004-2007 Shay Green (blargg)
diff --git a/lib/rbcodec/codecs/libspc/spc_dsp.c b/lib/rbcodec/codecs/libspc/spc_dsp.c
index 28385c6498..3b4f3ce689 100644
--- a/lib/rbcodec/codecs/libspc/spc_dsp.c
+++ b/lib/rbcodec/codecs/libspc/spc_dsp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2008 Michael Sevakis (jhMikeS)
  * Copyright (C) 2006-2007 Adam Gashlin (hcs)
diff --git a/lib/rbcodec/codecs/libspc/spc_dsp_generic.c b/lib/rbcodec/codecs/libspc/spc_dsp_generic.c
index 60e79f8763..df4a5d7080 100644
--- a/lib/rbcodec/codecs/libspc/spc_dsp_generic.c
+++ b/lib/rbcodec/codecs/libspc/spc_dsp_generic.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Adam Gashlin (hcs)
  * Copyright (C) 2004-2007 Shay Green (blargg)
diff --git a/lib/rbcodec/codecs/libspc/spc_dsp_generic.h b/lib/rbcodec/codecs/libspc/spc_dsp_generic.h
index beeb87deb2..c9a976a9f8 100644
--- a/lib/rbcodec/codecs/libspc/spc_dsp_generic.h
+++ b/lib/rbcodec/codecs/libspc/spc_dsp_generic.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Adam Gashlin (hcs)
  * Copyright (C) 2004-2007 Shay Green (blargg)
diff --git a/lib/rbcodec/codecs/libspc/spc_emu.c b/lib/rbcodec/codecs/libspc/spc_emu.c
index dab4199ef0..23070735f6 100644
--- a/lib/rbcodec/codecs/libspc/spc_emu.c
+++ b/lib/rbcodec/codecs/libspc/spc_emu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Adam Gashlin (hcs)
  * Copyright (C) 2004-2007 Shay Green (blargg)
diff --git a/lib/rbcodec/codecs/libspc/spc_profiler.c b/lib/rbcodec/codecs/libspc/spc_profiler.c
index 0ced8b5bd3..f415e39675 100644
--- a/lib/rbcodec/codecs/libspc/spc_profiler.c
+++ b/lib/rbcodec/codecs/libspc/spc_profiler.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Adam Gashlin (hcs)
  *
diff --git a/lib/rbcodec/codecs/libspc/spc_profiler.h b/lib/rbcodec/codecs/libspc/spc_profiler.h
index 405ee43ef9..63136be3d0 100644
--- a/lib/rbcodec/codecs/libspc/spc_profiler.h
+++ b/lib/rbcodec/codecs/libspc/spc_profiler.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Adam Gashlin (hcs)
  *
diff --git a/lib/rbcodec/codecs/libspeex/cb_search.c b/lib/rbcodec/codecs/libspeex/cb_search.c
index 35fe3a2f67..3d8d926d67 100644
--- a/lib/rbcodec/codecs/libspeex/cb_search.c
+++ b/lib/rbcodec/codecs/libspeex/cb_search.c
@@ -53,6 +53,7 @@
 #ifndef OVERRIDE_COMPUTE_WEIGHTED_CODEBOOK
 static void compute_weighted_codebook(const signed char *shape_cb, const spx_word16_t *r, spx_word16_t *resp, spx_word16_t *resp2, spx_word32_t *E, int shape_cb_size, int subvect_size, char *stack)
 {
+   (void)resp2; (void)stack;
    int i, j, k;
    VARDECL(spx_word16_t *shape);
    ALLOC(shape, subvect_size, spx_word16_t);
@@ -590,6 +591,7 @@ int   complexity,
 int   update_target
 )
 {
+   (void)par; (void)r; (void)bits; (void)complexity; (void)update_target;
    int i;
    VARDECL(spx_word16_t *tmp);
    ALLOC(tmp, nsf, spx_word16_t);
diff --git a/lib/rbcodec/codecs/libspeex/filters.c b/lib/rbcodec/codecs/libspeex/filters.c
index b6fb79c9e0..23fdabe319 100644
--- a/lib/rbcodec/codecs/libspeex/filters.c
+++ b/lib/rbcodec/codecs/libspeex/filters.c
@@ -334,6 +334,7 @@ spx_word16_t compute_rms16(const spx_word16_t *x, int len)
 #ifndef OVERRIDE_FILTER_MEM16
 void filter_mem16(const spx_word16_t *x, const spx_coef_t *num, const spx_coef_t *den, spx_word16_t *y, int N, int ord, spx_mem_t *mem, char *stack)
 {
+   (void)stack;
    int i,j;
    spx_word16_t xi,yi,nyi;
    for (i=0;i<N;i++)
@@ -377,6 +378,7 @@ void iir_mem16(const spx_word16_t *x, const spx_coef_t *den, spx_word16_t *y, in
 #ifndef OVERRIDE_FIR_MEM16
 void fir_mem16(const spx_word16_t *x, const spx_coef_t *num, spx_word16_t *y, int N, int ord, spx_mem_t *mem, char *stack)
 {
+   (void)stack;
    int i,j;
    spx_word16_t xi,yi;
 
@@ -424,6 +426,7 @@ void residue_percep_zero16(const spx_word16_t *xx, const spx_coef_t *ak, const s
 #ifndef OVERRIDE_COMPUTE_IMPULSE_RESPONSE
 void compute_impulse_response(const spx_coef_t *ak, const spx_coef_t *awk1, const spx_coef_t *awk2, spx_word16_t *y, int N, int ord, char *stack)
 {
+   (void)stack;
    int i,j;
    spx_word16_t y1, ny1i, ny2i;
    VARDECL(spx_mem_t *mem1);
@@ -459,6 +462,7 @@ void compute_impulse_response(const spx_coef_t *ak, const spx_coef_t *awk1, cons
 /* Decomposes a signal into low-band and high-band using a QMF */
 void qmf_decomp(const spx_word16_t *xx, const spx_word16_t *aa, spx_word16_t *y1, spx_word16_t *y2, int N, int M, spx_word16_t *mem, char *stack)
 {
+   (void)stack;
    int i,j,k,M2;
    VARDECL(spx_word16_t *a);
    VARDECL(spx_word16_t *x);
diff --git a/lib/rbcodec/codecs/libspeex/libspeex.make b/lib/rbcodec/codecs/libspeex/libspeex.make
index 9883c5d8fc..f8ee843859 100644
--- a/lib/rbcodec/codecs/libspeex/libspeex.make
+++ b/lib/rbcodec/codecs/libspeex/libspeex.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # we need to build two different speex libraries
diff --git a/lib/rbcodec/codecs/libspeex/lsp.c b/lib/rbcodec/codecs/libspeex/lsp.c
index f19390a151..6451db6782 100644
--- a/lib/rbcodec/codecs/libspeex/lsp.c
+++ b/lib/rbcodec/codecs/libspeex/lsp.c
@@ -180,6 +180,7 @@ static inline spx_word32_t cheb_poly_eva(
 
 static float cheb_poly_eva(spx_word32_t *coef, spx_word16_t x, int m, char *stack)
 {
+   (void)stack;
    int k;
    float b0, b1, tmp;
 
@@ -533,6 +534,7 @@ void lsp_to_lpc(spx_lsp_t *freq,spx_coef_t *ak,int lpcrdr, char *stack)
 
 
 {
+    (void)stack;
     int i,j;
     float xout1,xout2,xin1,xin2;
     VARDECL(float *Wp);
diff --git a/lib/rbcodec/codecs/libspeex/ltp.c b/lib/rbcodec/codecs/libspeex/ltp.c
index c81e8eb2f3..456a184c02 100644
--- a/lib/rbcodec/codecs/libspeex/ltp.c
+++ b/lib/rbcodec/codecs/libspeex/ltp.c
@@ -146,6 +146,7 @@ void pitch_xcorr(const spx_word16_t *_x, const spx_word16_t *_y, spx_word32_t *c
 #else
 void pitch_xcorr(const spx_word16_t *_x, const spx_word16_t *_y, spx_word32_t *corr, int len, int nb_pitch, char *stack)
 {
+   (void)stack;
    int i;
    for (i=0;i<nb_pitch;i++)
    {
@@ -372,6 +373,10 @@ spx_word32_t cumul_gain,
 int scaledown
 )
 {
+   (void)bits;
+#ifndef FIXED_POINT
+   (void)scaledown;
+#endif
    int i,j;
    VARDECL(spx_word16_t *tmp1);
    VARDECL(spx_word16_t *e);
@@ -553,6 +558,7 @@ int plc_tuning,
 spx_word32_t *cumul_gain
 )
 {
+   (void)pitch_coef;
    int i;
    int cdbk_index, pitch=0, best_gain_index=0;
    VARDECL(spx_sig_t *best_exc);
@@ -785,6 +791,8 @@ int plc_tuning,
 spx_word32_t *cumul_gain
 )
 {
+   (void)sw; (void)par; (void)end; (void)bits; (void)r; (void)complexity;
+   (void)cdbk_offset; (void)plc_tuning; (void)cumul_gain;
    int i;
    VARDECL(spx_word16_t *res);
    ALLOC(res, nsf, spx_word16_t);
diff --git a/lib/rbcodec/codecs/libspeex/oggframing.c b/lib/rbcodec/codecs/libspeex/oggframing.c
index 42d29502a8..477c3b5b54 100644
--- a/lib/rbcodec/codecs/libspeex/oggframing.c
+++ b/lib/rbcodec/codecs/libspeex/oggframing.c
@@ -12,7 +12,6 @@
 
  function: code raw [Vorbis] packets into framed OggSquish stream and
            decode Ogg streams back into raw packets
- last mod: $Id$
 
  note: The CRC code is directly derived from public domain code by
  Ross Williams (ross@guest.adelaide.edu.au).  See docs/framing.html
diff --git a/lib/rbcodec/codecs/libspeex/resample.c b/lib/rbcodec/codecs/libspeex/resample.c
index 5861579323..779110cb78 100644
--- a/lib/rbcodec/codecs/libspeex/resample.c
+++ b/lib/rbcodec/codecs/libspeex/resample.c
@@ -591,7 +591,7 @@ static void update_filter(SpeexResamplerState *st)
       }
       for (i=0;i<st->den_rate;i++)
       {
-         spx_int32_t j;
+         spx_uint32_t j;
          for (j=0;j<st->filt_len;j++)
          {
             st->sinc_table[i*st->filt_len+j] = sinc(st->cutoff,((j-(spx_int32_t)st->filt_len/2+1)-((float)i)/st->den_rate), st->filt_len, quality_map[st->quality].window_func);
@@ -663,7 +663,8 @@ static void update_filter(SpeexResamplerState *st)
       }
       for (i=st->nb_channels-1;i>=0;i--)
       {
-         spx_int32_t j;
+         spx_uint32_t j;
+         spx_int32_t k;
          spx_uint32_t olen = old_length;
          /*if (st->magic_samples[i])*/
          {
@@ -671,8 +672,8 @@ static void update_filter(SpeexResamplerState *st)
 
             /* FIXME: This is wrong but for now we need it to avoid going over the array bounds */
             olen = old_length + 2*st->magic_samples[i];
-            for (j=old_length-2+st->magic_samples[i];j>=0;j--)
-               st->mem[i*st->mem_alloc_size+j+st->magic_samples[i]] = st->mem[i*old_alloc_size+j];
+            for (k=old_length-2+st->magic_samples[i];k>=0;k--)
+               st->mem[i*st->mem_alloc_size+k+st->magic_samples[i]] = st->mem[i*old_alloc_size+k];
             for (j=0;j<st->magic_samples[i];j++)
                st->mem[i*st->mem_alloc_size+j] = 0;
             st->magic_samples[i] = 0;
@@ -841,7 +842,7 @@ EXPORT int speex_resampler_process_int(SpeexResamplerState *st, spx_uint32_t cha
 EXPORT int speex_resampler_process_float(SpeexResamplerState *st, spx_uint32_t channel_index, const float *in, spx_uint32_t *in_len, float *out, spx_uint32_t *out_len)
 #endif
 {
-   int j;
+   spx_uint32_t j;
    spx_uint32_t ilen = *in_len;
    spx_uint32_t olen = *out_len;
    spx_word16_t *x = st->mem + channel_index * st->mem_alloc_size;
@@ -882,7 +883,7 @@ EXPORT int speex_resampler_process_float(SpeexResamplerState *st, spx_uint32_t c
 EXPORT int speex_resampler_process_int(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_int16_t *in, spx_uint32_t *in_len, spx_int16_t *out, spx_uint32_t *out_len)
 #endif
 {
-   int j;
+   spx_uint32_t j;
    const int istride_save = st->in_stride;
    const int ostride_save = st->out_stride;
    spx_uint32_t ilen = *in_len;
diff --git a/lib/rbcodec/codecs/libspeex/smallft.c b/lib/rbcodec/codecs/libspeex/smallft.c
index 6e3a927b5f..d3beb44be3 100644
--- a/lib/rbcodec/codecs/libspeex/smallft.c
+++ b/lib/rbcodec/codecs/libspeex/smallft.c
@@ -11,7 +11,6 @@
  ********************************************************************
 
  function: *unnormalized* fft transform
- last mod: $Id$
 
  ********************************************************************/
 
diff --git a/lib/rbcodec/codecs/libspeex/smallft.h b/lib/rbcodec/codecs/libspeex/smallft.h
index 4ef9e58c7d..b0c0ee3428 100644
--- a/lib/rbcodec/codecs/libspeex/smallft.h
+++ b/lib/rbcodec/codecs/libspeex/smallft.h
@@ -11,7 +11,6 @@
  ********************************************************************
 
  function: fft transform
- last mod: $Id$
 
  ********************************************************************/
 /**
diff --git a/lib/rbcodec/codecs/libspeex/speex/ogg.h b/lib/rbcodec/codecs/libspeex/speex/ogg.h
index 8898b99582..cc693cc105 100644
--- a/lib/rbcodec/codecs/libspeex/speex/ogg.h
+++ b/lib/rbcodec/codecs/libspeex/speex/ogg.h
@@ -11,7 +11,6 @@
  ********************************************************************
 
  function: toplevel libogg include
- last mod: $Id$
 
  ********************************************************************/
 #ifndef _OGG_H
diff --git a/lib/rbcodec/codecs/libspeex/speex/speex_types.h b/lib/rbcodec/codecs/libspeex/speex/speex_types.h
index a2ff1d6b53..2c7aac85f1 100644
--- a/lib/rbcodec/codecs/libspeex/speex/speex_types.h
+++ b/lib/rbcodec/codecs/libspeex/speex/speex_types.h
@@ -12,7 +12,6 @@
  ********************************************************************
 
  function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id$
 
  ********************************************************************/
 /**
diff --git a/lib/rbcodec/codecs/libspeex/vbr.c b/lib/rbcodec/codecs/libspeex/vbr.c
index 32b33bc10e..72d7b80df6 100644
--- a/lib/rbcodec/codecs/libspeex/vbr.c
+++ b/lib/rbcodec/codecs/libspeex/vbr.c
@@ -123,10 +123,11 @@ void vbr_init(VBRState *vbr)
 
 float vbr_analysis(VBRState *vbr, spx_word16_t *sig, int len, int pitch, float pitch_coef)
 {
+   (void)pitch;
    int i;
    float ener=0, ener1=0, ener2=0;
    float qual=7;
-   int va;
+   /* int va; */
    float log_energy;
    float non_st=0;
    float voicing;
@@ -159,7 +160,7 @@ float vbr_analysis(VBRState *vbr, spx_word16_t *sig, int len, int pitch, float p
        || (voicing<0 && non_st < .05))
    {
       float tmp;
-      va = 0;
+      /* va = 0; */
       vbr->consec_noise++;
       if (pow_ener > 3*vbr->noise_level)
          tmp = 3*vbr->noise_level;
@@ -171,7 +172,7 @@ float vbr_analysis(VBRState *vbr, spx_word16_t *sig, int len, int pitch, float p
          vbr->noise_accum_count = .95*vbr->noise_accum_count + .05;
       }
    } else {
-      va = 1;
+      /* va = 1; */
       vbr->consec_noise=0;
    }
 
@@ -270,6 +271,7 @@ float vbr_analysis(VBRState *vbr, spx_word16_t *sig, int len, int pitch, float p
 
 void vbr_destroy(VBRState *vbr)
 {
+   (void)vbr;
 }
 
 #endif /* #ifndef DISABLE_VBR */
diff --git a/lib/rbcodec/codecs/libspeex/vq.c b/lib/rbcodec/codecs/libspeex/vq.c
index fff470a588..b10cd19354 100644
--- a/lib/rbcodec/codecs/libspeex/vq.c
+++ b/lib/rbcodec/codecs/libspeex/vq.c
@@ -75,6 +75,7 @@ int scal_quant32(spx_word32_t in, const spx_word32_t *boundary, int entries)
 /*Finds the indices of the n-best entries in a codebook*/
 void vq_nbest(spx_word16_t *in, const spx_word16_t *codebook, int len, int entries, spx_word32_t *E, int N, int *nbest, spx_word32_t *best_dist, char *stack)
 {
+   (void)stack;
    int i,j,k,used;
    used = 0;
    for (i=0;i<entries;i++)
@@ -109,6 +110,7 @@ void vq_nbest(spx_word16_t *in, const spx_word16_t *codebook, int len, int entri
 /*Finds the indices of the n-best entries in a codebook with sign*/
 void vq_nbest_sign(spx_word16_t *in, const spx_word16_t *codebook, int len, int entries, spx_word32_t *E, int N, int *nbest, spx_word32_t *best_dist, char *stack)
 {
+   (void)stack;
    int i,j,k, sign, used;
    used=0;
    for (i=0;i<entries;i++)
diff --git a/lib/rbcodec/codecs/libtremor/bitwise.c b/lib/rbcodec/codecs/libtremor/bitwise.c
index 040384abc6..ef2fc25af8 100644
--- a/lib/rbcodec/codecs/libtremor/bitwise.c
+++ b/lib/rbcodec/codecs/libtremor/bitwise.c
@@ -11,7 +11,6 @@
  ********************************************************************
 
   function: packing variable sized words into an octet stream
-  last mod: $Id$
 
  ********************************************************************/
 
diff --git a/lib/rbcodec/codecs/libtremor/framing.c b/lib/rbcodec/codecs/libtremor/framing.c
index 582084853a..4ea91dfa7b 100644
--- a/lib/rbcodec/codecs/libtremor/framing.c
+++ b/lib/rbcodec/codecs/libtremor/framing.c
@@ -12,7 +12,6 @@
 
  function: code raw packets into framed OggSquish stream and
            decode Ogg streams back into raw packets
- last mod: $Id$
 
  note: The CRC code is directly derived from public domain code by
  Ross Williams (ross@guest.adelaide.edu.au).  See docs/framing.html
diff --git a/lib/rbcodec/codecs/libtremor/libtremor.make b/lib/rbcodec/codecs/libtremor/libtremor.make
index 4a581508b0..c66c74a0fe 100644
--- a/lib/rbcodec/codecs/libtremor/libtremor.make
+++ b/lib/rbcodec/codecs/libtremor/libtremor.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libtremor
diff --git a/lib/rbcodec/codecs/libtremor/ogg.h b/lib/rbcodec/codecs/libtremor/ogg.h
index d3af919b85..ac255d1e72 100644
--- a/lib/rbcodec/codecs/libtremor/ogg.h
+++ b/lib/rbcodec/codecs/libtremor/ogg.h
@@ -11,7 +11,6 @@
  ********************************************************************
 
  function: toplevel libogg include
- last mod: $Id$
 
  ********************************************************************/
 #ifndef _OGG_H
diff --git a/lib/rbcodec/codecs/libtremor/synthesis.c b/lib/rbcodec/codecs/libtremor/synthesis.c
index d1ef99ae37..eff64d4ed6 100644
--- a/lib/rbcodec/codecs/libtremor/synthesis.c
+++ b/lib/rbcodec/codecs/libtremor/synthesis.c
@@ -12,7 +12,6 @@
  ********************************************************************
 
  function: single-block PCM synthesis
- last mod: $Id$
 
  ********************************************************************/
 
diff --git a/lib/rbcodec/codecs/libtremor/vorbisfile.c b/lib/rbcodec/codecs/libtremor/vorbisfile.c
index 688a864077..b9d8758a86 100644
--- a/lib/rbcodec/codecs/libtremor/vorbisfile.c
+++ b/lib/rbcodec/codecs/libtremor/vorbisfile.c
@@ -12,7 +12,6 @@
  ********************************************************************
 
  function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id$
 
  ********************************************************************/
 
diff --git a/lib/rbcodec/codecs/libtta/filter_arm.S b/lib/rbcodec/codecs/libtta/filter_arm.S
index d801a52419..91259455af 100644
--- a/lib/rbcodec/codecs/libtta/filter_arm.S
+++ b/lib/rbcodec/codecs/libtta/filter_arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/libtta/filter_coldfire.S b/lib/rbcodec/codecs/libtta/filter_coldfire.S
index 3950eb52e6..4ea8b719fe 100644
--- a/lib/rbcodec/codecs/libtta/filter_coldfire.S
+++ b/lib/rbcodec/codecs/libtta/filter_coldfire.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Nils Wallménius
  *
diff --git a/lib/rbcodec/codecs/libtta/libtta.make b/lib/rbcodec/codecs/libtta/libtta.make
index 3fe3db1989..fea5b501be 100644
--- a/lib/rbcodec/codecs/libtta/libtta.make
+++ b/lib/rbcodec/codecs/libtta/libtta.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libtta
diff --git a/lib/rbcodec/codecs/libwavpack/arm.S b/lib/rbcodec/codecs/libwavpack/arm.S
index c4cb3459a8..0261ec673a 100644
--- a/lib/rbcodec/codecs/libwavpack/arm.S
+++ b/lib/rbcodec/codecs/libwavpack/arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by David Bryant
  *
diff --git a/lib/rbcodec/codecs/libwavpack/arml.S b/lib/rbcodec/codecs/libwavpack/arml.S
index 0705a5e7ad..166018a8ed 100644
--- a/lib/rbcodec/codecs/libwavpack/arml.S
+++ b/lib/rbcodec/codecs/libwavpack/arml.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by David Bryant
  *
diff --git a/lib/rbcodec/codecs/libwavpack/coldfire.S b/lib/rbcodec/codecs/libwavpack/coldfire.S
index 884a0ac90f..e6cea740f5 100644
--- a/lib/rbcodec/codecs/libwavpack/coldfire.S
+++ b/lib/rbcodec/codecs/libwavpack/coldfire.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by David Bryant
  *
diff --git a/lib/rbcodec/codecs/libwavpack/libwavpack.make b/lib/rbcodec/codecs/libwavpack/libwavpack.make
index 27a2d214a1..3988259d96 100644
--- a/lib/rbcodec/codecs/libwavpack/libwavpack.make
+++ b/lib/rbcodec/codecs/libwavpack/libwavpack.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libwavpack
diff --git a/lib/rbcodec/codecs/libwma/libwma.make b/lib/rbcodec/codecs/libwma/libwma.make
index a916a4f90f..80f3849e66 100644
--- a/lib/rbcodec/codecs/libwma/libwma.make
+++ b/lib/rbcodec/codecs/libwma/libwma.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libwma
diff --git a/lib/rbcodec/codecs/libwmapro/libwmapro.make b/lib/rbcodec/codecs/libwmapro/libwmapro.make
index 3db9000b43..e94dcffec8 100644
--- a/lib/rbcodec/codecs/libwmapro/libwmapro.make
+++ b/lib/rbcodec/codecs/libwmapro/libwmapro.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # libwmapro
diff --git a/lib/rbcodec/codecs/libwmavoice/libwmavoice.make b/lib/rbcodec/codecs/libwmavoice/libwmavoice.make
index 6aabc53a92..058a7e4f1e 100644
--- a/lib/rbcodec/codecs/libwmavoice/libwmavoice.make
+++ b/lib/rbcodec/codecs/libwmavoice/libwmavoice.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id: libwmavoice.make 27586 2010-07-27 06:48:15Z nls $
 #
 
 # libwmavoice
diff --git a/lib/rbcodec/codecs/mod.c b/lib/rbcodec/codecs/mod.c
index ef1db5dea9..d03ac39126 100644
--- a/lib/rbcodec/codecs/mod.c
+++ b/lib/rbcodec/codecs/mod.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * MOD Codec for rockbox
  *
@@ -239,7 +238,7 @@ static struct s_modplayer modplayer IDATA_ATTR;        /* The Module Player */
 static struct s_mixer mixer IDATA_ATTR;
 
 /* The Amiga Period Table (+1 because we use index 0 for period 0 = no new note) */
-static unsigned short s_periodtable[37*8+1] IDATA_ATTR = 
+static unsigned short s_periodtable[37*8+1] IDATA_ATTR =
     { 0,  907,  900,  893,  887,  881,  874,  868,
     862,  856,  849,  843,  837,  831,  825,  819,
     813,  808,  802,  796,  790,  785,  779,  773,
@@ -280,7 +279,7 @@ static unsigned short s_periodtable[37*8+1] IDATA_ATTR =
     107};
 
 /* The sin table */
-static signed short s_sintable[0x40] IDATA_ATTR = 
+static signed short s_sintable[0x40] IDATA_ATTR =
     {  0,   25,   49,   74,   97,  120,  141,  162,
      180,  197,  212,  225,  235,  244,  250,  254,
      255,  254,  250,  244,  235,  225,  212,  197,
@@ -352,7 +351,7 @@ void initmodplayer(void)
 {
     unsigned int c;
 #if 0
-    /* As the calculation of periodtable and sintable uses float and double 
+    /* As the calculation of periodtable and sintable uses float and double
      * rockbox uses two predefined tables. This reduces the codesize by
      * several KB. */
 
@@ -506,13 +505,13 @@ bool loadmod(void *modfile)
 
     /* use 'restartposition' (historically set to 127) which is not used here
        as a marker that periods have already been converted */
-       
-    periodsconverted = (char*)modfile + 20 + modsong.noofinstruments*30 + 1; 
+
+    periodsconverted = (char*)modfile + 20 + modsong.noofinstruments*30 + 1;
 
     /* Get the pattern data; ST doesn't have fileformattag, so 4 bytes less */
-    modsong.patterndata = periodsconverted + 
-                          (modsong.noofinstruments==15 ? 129 : 133); 
- 
+    modsong.patterndata = periodsconverted +
+                          (modsong.noofinstruments==15 ? 129 : 133);
+
     /* Convert the period values in the mod file to offsets
      * in our periodtable (but only, if we haven't done this yet) */
     p = (unsigned char *) modsong.patterndata;
@@ -538,9 +537,9 @@ bool loadmod(void *modfile)
                 p += 4;
             }
         /* Remember that we already converted the periods,
-         * in case the file gets reloaded by rewinding 
+         * in case the file gets reloaded by rewinding
          * with 0xfe (arbitary magic value > 127) */
-        *periodsconverted = 0xfe;  
+        *periodsconverted = 0xfe;
     }
 
     /* Get the samples
@@ -1299,7 +1298,7 @@ enum codec_status codec_run(void)
     size_t n;
     unsigned char *modfile;
     int old_patterntableposition;
-    int bytesdone;
+//    int bytesdone;
     intptr_t param;
 
     if (codec_init()) {
@@ -1329,7 +1328,7 @@ enum codec_status codec_run(void)
 
     ci->set_elapsed(modplayer.patterntableposition*1000);
 
-    bytesdone = 0;
+//    bytesdone = 0;
     old_patterntableposition = 0;
 
     while (1) {
@@ -1352,7 +1351,7 @@ enum codec_status codec_run(void)
 
         synthrender(samples, CHUNK_SIZE/2);
 
-        bytesdone += CHUNK_SIZE;
+//        bytesdone += CHUNK_SIZE;
 
         ci->pcmbuf_insert(samples, NULL, CHUNK_SIZE/2);
 
diff --git a/lib/rbcodec/codecs/mp3_enc.c b/lib/rbcodec/codecs/mp3_enc.c
index fecffc516f..2c189fecf0 100644
--- a/lib/rbcodec/codecs/mp3_enc.c
+++ b/lib/rbcodec/codecs/mp3_enc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Antonius Hellmann
  * Copyright (C) 2006-2013 Michael Sevakis
diff --git a/lib/rbcodec/codecs/mpa.c b/lib/rbcodec/codecs/mpa.c
index 94b45c49f1..48c867a1b6 100644
--- a/lib/rbcodec/codecs/mpa.c
+++ b/lib/rbcodec/codecs/mpa.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/codecs/mpc.c b/lib/rbcodec/codecs/mpc.c
index 44c286ba0a..1f8f28adb7 100644
--- a/lib/rbcodec/codecs/mpc.c
+++ b/lib/rbcodec/codecs/mpc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Thom Johansen
  *
diff --git a/lib/rbcodec/codecs/opus.c b/lib/rbcodec/codecs/opus.c
index 15cb2c8aa4..9692542144 100644
--- a/lib/rbcodec/codecs/opus.c
+++ b/lib/rbcodec/codecs/opus.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Frederik M.J. Vestre
  * Based on speex.c codec interface:
diff --git a/lib/rbcodec/codecs/raac.c b/lib/rbcodec/codecs/raac.c
index 6856afc52e..c08af49395 100644
--- a/lib/rbcodec/codecs/raac.c
+++ b/lib/rbcodec/codecs/raac.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mohamed Tarek
  *
diff --git a/lib/rbcodec/codecs/smaf.c b/lib/rbcodec/codecs/smaf.c
index 5da8eb9aff..24594aca1d 100644
--- a/lib/rbcodec/codecs/smaf.c
+++ b/lib/rbcodec/codecs/smaf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/spc.c b/lib/rbcodec/codecs/spc.c
index dbec407d6a..c7ef021087 100644
--- a/lib/rbcodec/codecs/spc.c
+++ b/lib/rbcodec/codecs/spc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007-2008 Michael Sevakis (jhMikeS)
  * Copyright (C) 2006-2007 Adam Gashlin (hcs)
diff --git a/lib/rbcodec/codecs/speex.c b/lib/rbcodec/codecs/speex.c
index 43c39ffc4d..824c0b3bee 100644
--- a/lib/rbcodec/codecs/speex.c
+++ b/lib/rbcodec/codecs/speex.c
@@ -473,7 +473,7 @@ next_page:
 
         /* Loop for all complete pages we got (most likely only one) */
         while (spx_ogg_sync_pageout(&oy, &og) == 1) {
-            int packet_no;
+//            int packet_no;
             if (stream_init == 0) {
                 spx_ogg_stream_init(&os, spx_ogg_page_serialno(&og));
                 stream_init = 1;
@@ -488,7 +488,7 @@ next_page:
             cur_granule = page_granule;
 
             /* Extract all available packets */
-            packet_no=0;
+//            packet_no=0;
 
             while (!eos && spx_ogg_stream_packetout(&os, &op)==1){
                 /* If first packet, process as Speex header */
@@ -531,7 +531,7 @@ next_page:
                             goto next_page;
                         }
                     }
-                    packet_no++;
+//                    packet_no++;
 
                     if (op.e_o_s) /* End of stream condition */
                         eos=1;
diff --git a/lib/rbcodec/codecs/tta.c b/lib/rbcodec/codecs/tta.c
index 60481c9f28..85a931c368 100644
--- a/lib/rbcodec/codecs/tta.c
+++ b/lib/rbcodec/codecs/tta.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/vorbis.c b/lib/rbcodec/codecs/vorbis.c
index ce1f4ba893..fce7fdeb26 100644
--- a/lib/rbcodec/codecs/vorbis.c
+++ b/lib/rbcodec/codecs/vorbis.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
diff --git a/lib/rbcodec/codecs/vox.c b/lib/rbcodec/codecs/vox.c
index 5ce2a0fb58..1f33ab5556 100644
--- a/lib/rbcodec/codecs/vox.c
+++ b/lib/rbcodec/codecs/vox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/vtx.c b/lib/rbcodec/codecs/vtx.c
index 031af946b9..189ca738e5 100644
--- a/lib/rbcodec/codecs/vtx.c
+++ b/lib/rbcodec/codecs/vtx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * VTX Codec for rockbox based on the Ayumi engine
  *
diff --git a/lib/rbcodec/codecs/wav.c b/lib/rbcodec/codecs/wav.c
index 445d3e8dde..800fc12e9b 100644
--- a/lib/rbcodec/codecs/wav.c
+++ b/lib/rbcodec/codecs/wav.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  * Copyright (C) 2009 Yoshihisa Uchida
diff --git a/lib/rbcodec/codecs/wav64.c b/lib/rbcodec/codecs/wav64.c
index 198e7c79e3..d84281720a 100644
--- a/lib/rbcodec/codecs/wav64.c
+++ b/lib/rbcodec/codecs/wav64.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/codecs/wav_enc.c b/lib/rbcodec/codecs/wav_enc.c
index 0f56eb836c..8ba6b4a755 100644
--- a/lib/rbcodec/codecs/wav_enc.c
+++ b/lib/rbcodec/codecs/wav_enc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Antonius Hellmann
  * Copyright (C) 2006-2013 Michael Sevakis
diff --git a/lib/rbcodec/codecs/wavpack.c b/lib/rbcodec/codecs/wavpack.c
index 71ff88e2ea..148237a147 100644
--- a/lib/rbcodec/codecs/wavpack.c
+++ b/lib/rbcodec/codecs/wavpack.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 David Bryant
  *
diff --git a/lib/rbcodec/codecs/wavpack_enc.c b/lib/rbcodec/codecs/wavpack_enc.c
index 4be1684b12..e0e15978a3 100644
--- a/lib/rbcodec/codecs/wavpack_enc.c
+++ b/lib/rbcodec/codecs/wavpack_enc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Antonius Hellmann
  * Copyright (C) 2006-2013 Michael Sevakis
diff --git a/lib/rbcodec/codecs/wma.c b/lib/rbcodec/codecs/wma.c
index 7583846929..92022f8b90 100644
--- a/lib/rbcodec/codecs/wma.c
+++ b/lib/rbcodec/codecs/wma.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/lib/rbcodec/codecs/wmapro.c b/lib/rbcodec/codecs/wmapro.c
index f874db25f9..b1f9e3e5cf 100644
--- a/lib/rbcodec/codecs/wmapro.c
+++ b/lib/rbcodec/codecs/wmapro.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Mohamed Tarek
  *
diff --git a/lib/rbcodec/codecs/wmavoice.c b/lib/rbcodec/codecs/wmavoice.c
index 2c37da8734..8efdf4ce0a 100644
--- a/lib/rbcodec/codecs/wmavoice.c
+++ b/lib/rbcodec/codecs/wmavoice.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Mohamed Tarek
  *
diff --git a/lib/rbcodec/dsp/afr.c b/lib/rbcodec/dsp/afr.c
index d9b6ef97a4..0ec2b2cf4e 100644
--- a/lib/rbcodec/dsp/afr.c
+++ b/lib/rbcodec/dsp/afr.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Chiwen Chang
  *
diff --git a/lib/rbcodec/dsp/afr.h b/lib/rbcodec/dsp/afr.h
index 783d7e1760..f1d3664e72 100644
--- a/lib/rbcodec/dsp/afr.h
+++ b/lib/rbcodec/dsp/afr.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Chiwen Chang
  *
diff --git a/lib/rbcodec/dsp/channel_mode.c b/lib/rbcodec/dsp/channel_mode.c
index 86dc02e3a4..318a39f774 100644
--- a/lib/rbcodec/dsp/channel_mode.c
+++ b/lib/rbcodec/dsp/channel_mode.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Thom Johansen
  * Copyright (C) 2012 Michael Sevakis
diff --git a/lib/rbcodec/dsp/channel_mode.h b/lib/rbcodec/dsp/channel_mode.h
index 7ca0f74204..6431e2bc2f 100644
--- a/lib/rbcodec/dsp/channel_mode.h
+++ b/lib/rbcodec/dsp/channel_mode.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Thom Johansen
  *
diff --git a/lib/rbcodec/dsp/compressor.c b/lib/rbcodec/dsp/compressor.c
index cc90c4324b..b8a559942a 100644
--- a/lib/rbcodec/dsp/compressor.c
+++ b/lib/rbcodec/dsp/compressor.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Jeffrey Goode
  *
diff --git a/lib/rbcodec/dsp/compressor.h b/lib/rbcodec/dsp/compressor.h
index 35aa0eeb65..8f61d78c00 100644
--- a/lib/rbcodec/dsp/compressor.h
+++ b/lib/rbcodec/dsp/compressor.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Jeffrey Goode
  *
diff --git a/lib/rbcodec/dsp/crossfeed.c b/lib/rbcodec/dsp/crossfeed.c
index a2351f4cb5..995462d331 100644
--- a/lib/rbcodec/dsp/crossfeed.c
+++ b/lib/rbcodec/dsp/crossfeed.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Thom Johansen
  * Copyright (C) 2010 Bertrik Sikken
diff --git a/lib/rbcodec/dsp/crossfeed.h b/lib/rbcodec/dsp/crossfeed.h
index 2c4d47dba5..6ec1538d4d 100644
--- a/lib/rbcodec/dsp/crossfeed.h
+++ b/lib/rbcodec/dsp/crossfeed.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Thom Johansen
  *
diff --git a/lib/rbcodec/dsp/dsp_arm.S b/lib/rbcodec/dsp/dsp_arm.S
index 8592d9cb40..dea9eed000 100644
--- a/lib/rbcodec/dsp/dsp_arm.S
+++ b/lib/rbcodec/dsp/dsp_arm.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Thom Johansen
  * Copyright (C) 2010 Bertrik Sikken
diff --git a/lib/rbcodec/dsp/dsp_arm_v6.S b/lib/rbcodec/dsp/dsp_arm_v6.S
index 777b1d5bdc..09653b586f 100644
--- a/lib/rbcodec/dsp/dsp_arm_v6.S
+++ b/lib/rbcodec/dsp/dsp_arm_v6.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Michael Sevakis
  *
diff --git a/lib/rbcodec/dsp/dsp_cf.S b/lib/rbcodec/dsp/dsp_cf.S
index e34075ef9a..b3738e4982 100644
--- a/lib/rbcodec/dsp/dsp_cf.S
+++ b/lib/rbcodec/dsp/dsp_cf.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Thom Johansen
  * Copyright (C) 2007, 2012 Michael Sevakis
diff --git a/lib/rbcodec/dsp/dsp_core.c b/lib/rbcodec/dsp/dsp_core.c
index 5b515e165a..a1a45063ec 100644
--- a/lib/rbcodec/dsp/dsp_core.c
+++ b/lib/rbcodec/dsp/dsp_core.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Miika Pekkarinen
  * Copyright (C) 2012 Michael Sevakis
diff --git a/lib/rbcodec/dsp/dsp_core.h b/lib/rbcodec/dsp/dsp_core.h
index 6f78733551..ec604f51b0 100644
--- a/lib/rbcodec/dsp/dsp_core.h
+++ b/lib/rbcodec/dsp/dsp_core.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Miika Pekkarinen
  *
diff --git a/lib/rbcodec/dsp/dsp_filter.c b/lib/rbcodec/dsp/dsp_filter.c
index a6ff950ce1..9e6db85b2d 100644
--- a/lib/rbcodec/dsp/dsp_filter.c
+++ b/lib/rbcodec/dsp/dsp_filter.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Thom Johansen
  *
diff --git a/lib/rbcodec/dsp/dsp_filter.h b/lib/rbcodec/dsp/dsp_filter.h
index ec922389c9..100d91a770 100644
--- a/lib/rbcodec/dsp/dsp_filter.h
+++ b/lib/rbcodec/dsp/dsp_filter.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Thom Johansen
  *
diff --git a/lib/rbcodec/dsp/dsp_misc.c b/lib/rbcodec/dsp/dsp_misc.c
index be9afbb34a..57330263a9 100644
--- a/lib/rbcodec/dsp/dsp_misc.c
+++ b/lib/rbcodec/dsp/dsp_misc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Miika Pekkarinen
  * Copyright (C) 2005 Magnus Holmgren
diff --git a/lib/rbcodec/dsp/dsp_misc.h b/lib/rbcodec/dsp/dsp_misc.h
index af259bfa3e..7692cad00c 100644
--- a/lib/rbcodec/dsp/dsp_misc.h
+++ b/lib/rbcodec/dsp/dsp_misc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Miika Pekkarinen
  * Copyright (C) 2005 Magnus Holmgren
diff --git a/lib/rbcodec/dsp/dsp_proc_database.h b/lib/rbcodec/dsp/dsp_proc_database.h
index f30ef0b5c0..b56fac3b84 100644
--- a/lib/rbcodec/dsp/dsp_proc_database.h
+++ b/lib/rbcodec/dsp/dsp_proc_database.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Michael Sevakis
  *
diff --git a/lib/rbcodec/dsp/dsp_proc_entry.h b/lib/rbcodec/dsp/dsp_proc_entry.h
index 7a4b8de1c6..d84fa49ea6 100644
--- a/lib/rbcodec/dsp/dsp_proc_entry.h
+++ b/lib/rbcodec/dsp/dsp_proc_entry.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Michael Sevakis
  *
diff --git a/lib/rbcodec/dsp/dsp_proc_settings.h b/lib/rbcodec/dsp/dsp_proc_settings.h
index 8f6e3efab4..a559e21c5d 100644
--- a/lib/rbcodec/dsp/dsp_proc_settings.h
+++ b/lib/rbcodec/dsp/dsp_proc_settings.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Michael Sevakis
  *
diff --git a/lib/rbcodec/dsp/dsp_sample_input.c b/lib/rbcodec/dsp/dsp_sample_input.c
index 06ce11fab7..3879bb091a 100644
--- a/lib/rbcodec/dsp/dsp_sample_input.c
+++ b/lib/rbcodec/dsp/dsp_sample_input.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Miika Pekkarinen
  * Copyright (C) 2012 Michael Sevakis
diff --git a/lib/rbcodec/dsp/dsp_sample_io.c b/lib/rbcodec/dsp/dsp_sample_io.c
index 8a0d5da7cc..3fbd29cda9 100644
--- a/lib/rbcodec/dsp/dsp_sample_io.c
+++ b/lib/rbcodec/dsp/dsp_sample_io.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Miika Pekkarinen
  * Copyright (C) 2012 Michael Sevakis
diff --git a/lib/rbcodec/dsp/dsp_sample_io.h b/lib/rbcodec/dsp/dsp_sample_io.h
index 095aea3f3a..251843c1c1 100644
--- a/lib/rbcodec/dsp/dsp_sample_io.h
+++ b/lib/rbcodec/dsp/dsp_sample_io.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Michael Sevakis
  *
diff --git a/lib/rbcodec/dsp/dsp_sample_output.c b/lib/rbcodec/dsp/dsp_sample_output.c
index 433c6027d3..e1f1b0bd71 100644
--- a/lib/rbcodec/dsp/dsp_sample_output.c
+++ b/lib/rbcodec/dsp/dsp_sample_output.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Miika Pekkarinen
  * Copyright (C) 2012 Michael Sevakis
diff --git a/lib/rbcodec/dsp/eq.c b/lib/rbcodec/dsp/eq.c
index 8990090f1c..81c4c972ec 100644
--- a/lib/rbcodec/dsp/eq.c
+++ b/lib/rbcodec/dsp/eq.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Thom Johansen
  * Copyright (C) 2012 Michael Sevakis
diff --git a/lib/rbcodec/dsp/eq.h b/lib/rbcodec/dsp/eq.h
index 9bb5f91ca5..6e02999933 100644
--- a/lib/rbcodec/dsp/eq.h
+++ b/lib/rbcodec/dsp/eq.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Thom Johansen
  *
diff --git a/lib/rbcodec/dsp/pbe.c b/lib/rbcodec/dsp/pbe.c
index 23ae48543f..88688baf27 100644
--- a/lib/rbcodec/dsp/pbe.c
+++ b/lib/rbcodec/dsp/pbe.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Chiwen Chang
  *
diff --git a/lib/rbcodec/dsp/pbe.h b/lib/rbcodec/dsp/pbe.h
index 1bcf533a63..e1d045a154 100644
--- a/lib/rbcodec/dsp/pbe.h
+++ b/lib/rbcodec/dsp/pbe.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Chiwen Chang
  *
diff --git a/lib/rbcodec/dsp/pga.c b/lib/rbcodec/dsp/pga.c
index 9d57f4c2cb..1ab48c625d 100644
--- a/lib/rbcodec/dsp/pga.c
+++ b/lib/rbcodec/dsp/pga.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Magnus Holmgren
  * Copyright (C) 2012 Michael Sevakis
diff --git a/lib/rbcodec/dsp/pga.h b/lib/rbcodec/dsp/pga.h
index c05265873b..c88a7d72d0 100644
--- a/lib/rbcodec/dsp/pga.h
+++ b/lib/rbcodec/dsp/pga.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Michael Sevakis
  *
diff --git a/lib/rbcodec/dsp/resample.c b/lib/rbcodec/dsp/resample.c
index 81ab600ade..1c49cccd04 100644
--- a/lib/rbcodec/dsp/resample.c
+++ b/lib/rbcodec/dsp/resample.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Miika Pekkarinen
  * Copyright (C) 2012 Michael Sevakis
diff --git a/lib/rbcodec/dsp/resample.h b/lib/rbcodec/dsp/resample.h
index 1f6edf00ca..9365bf0c01 100644
--- a/lib/rbcodec/dsp/resample.h
+++ b/lib/rbcodec/dsp/resample.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *
diff --git a/lib/rbcodec/dsp/surround.c b/lib/rbcodec/dsp/surround.c
index c0dce33a47..e3d366325b 100644
--- a/lib/rbcodec/dsp/surround.c
+++ b/lib/rbcodec/dsp/surround.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Chiwen Chang
  *
diff --git a/lib/rbcodec/dsp/surround.h b/lib/rbcodec/dsp/surround.h
index 7835f569b6..6d2222773c 100644
--- a/lib/rbcodec/dsp/surround.h
+++ b/lib/rbcodec/dsp/surround.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Chiwen Chang
  *
diff --git a/lib/rbcodec/dsp/tdspeed.c b/lib/rbcodec/dsp/tdspeed.c
index 02a047a940..f2be7eef8a 100644
--- a/lib/rbcodec/dsp/tdspeed.c
+++ b/lib/rbcodec/dsp/tdspeed.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Nicolas Pitre <nico@cam.org>
  * Copyright (C) 2006-2007 by Stéphane Doyon <s.doyon@videotron.ca>
diff --git a/lib/rbcodec/dsp/tdspeed.h b/lib/rbcodec/dsp/tdspeed.h
index dd502df686..c93e40df07 100644
--- a/lib/rbcodec/dsp/tdspeed.h
+++ b/lib/rbcodec/dsp/tdspeed.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Nicolas Pitre <nico@cam.org>
  * Copyright (C) 2006-2007 by Stéphane Doyon <s.doyon@videotron.ca>
diff --git a/lib/rbcodec/dsp/tone_controls.c b/lib/rbcodec/dsp/tone_controls.c
index 4266af4d97..bc82c9cc25 100644
--- a/lib/rbcodec/dsp/tone_controls.c
+++ b/lib/rbcodec/dsp/tone_controls.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Thom Johansen
  * Copyright (C) 2012 Michael Sevakis
diff --git a/lib/rbcodec/dsp/tone_controls.h b/lib/rbcodec/dsp/tone_controls.h
index 1e27ecf800..d7a03cbf9b 100644
--- a/lib/rbcodec/dsp/tone_controls.h
+++ b/lib/rbcodec/dsp/tone_controls.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Thom Johansen
  *
diff --git a/lib/rbcodec/metadata/a52.c b/lib/rbcodec/metadata/a52.c
index 4d53b33056..2176b17a4f 100644
--- a/lib/rbcodec/metadata/a52.c
+++ b/lib/rbcodec/metadata/a52.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/aac.c b/lib/rbcodec/metadata/aac.c
index 1c7e8e5dad..e7312829bd 100644
--- a/lib/rbcodec/metadata/aac.c
+++ b/lib/rbcodec/metadata/aac.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Parsing ADTS and ADIF headers
  *
diff --git a/lib/rbcodec/metadata/adx.c b/lib/rbcodec/metadata/adx.c
index 6250ed176c..ce7429a259 100644
--- a/lib/rbcodec/metadata/adx.c
+++ b/lib/rbcodec/metadata/adx.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/aiff.c b/lib/rbcodec/metadata/aiff.c
index 5a8c4c3978..9b5f772891 100644
--- a/lib/rbcodec/metadata/aiff.c
+++ b/lib/rbcodec/metadata/aiff.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/ape.c b/lib/rbcodec/metadata/ape.c
index a8eb11aec3..4ffe67ccfd 100644
--- a/lib/rbcodec/metadata/ape.c
+++ b/lib/rbcodec/metadata/ape.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/asap.c b/lib/rbcodec/metadata/asap.c
index db23dd69fa..7524d2c6f3 100644
--- a/lib/rbcodec/metadata/asap.c
+++ b/lib/rbcodec/metadata/asap.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dominik Wenger
  *
diff --git a/lib/rbcodec/metadata/asf.c b/lib/rbcodec/metadata/asf.c
index 8a22638296..cf260ad752 100644
--- a/lib/rbcodec/metadata/asf.c
+++ b/lib/rbcodec/metadata/asf.c
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  *
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/au.c b/lib/rbcodec/metadata/au.c
index 07f354571e..7cdd975c7e 100644
--- a/lib/rbcodec/metadata/au.c
+++ b/lib/rbcodec/metadata/au.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/metadata/flac.c b/lib/rbcodec/metadata/flac.c
index dda9fc61c6..6ff69f65a5 100644
--- a/lib/rbcodec/metadata/flac.c
+++ b/lib/rbcodec/metadata/flac.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/id3tags.c b/lib/rbcodec/metadata/id3tags.c
index 442366e054..cf32c039d4 100644
--- a/lib/rbcodec/metadata/id3tags.c
+++ b/lib/rbcodec/metadata/id3tags.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
diff --git a/lib/rbcodec/metadata/metadata.c b/lib/rbcodec/metadata/metadata.c
index 16af58a291..dd41fdbaa7 100644
--- a/lib/rbcodec/metadata/metadata.c
+++ b/lib/rbcodec/metadata/metadata.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
@@ -52,7 +51,7 @@ static bool get_other_asap_metadata(int fd, struct mp3entry *id3)
     id3->frequency = 44100;
     id3->vbr = false;
     id3->filesize = filesize(fd);
-    id3->genre_string = id3_get_num_genre(36);
+    id3->genre_string = id3_get_num_genre(36); /* GAME */
     return true;
 }
 bool write_metadata_log = false;
@@ -60,6 +59,7 @@ bool write_metadata_log = false;
 const struct afmt_entry audio_formats[AFMT_NUM_CODECS] =
 {
  /* NOTE enc_root_fname is ignored here but kept for consistency see get_codec_enc_root_fn() */
+    /*AFMT_ENTRY("label", "root_fname", "enc_root_fname", func, "ext_list")*/
     /* Unknown file format */
     [0 ... AFMT_NUM_CODECS-1] =
         AFMT_ENTRY("???", NULL,    "N/A",        NULL, "\0"  ),
@@ -323,20 +323,22 @@ int get_audio_base_codec_type(int type)
     return base_type;
 }
 
-const char * get_codec_string(int type)
+static const struct afmt_entry *get_afmt_entry(int type)
 {
     if (type < 0 || type >= AFMT_NUM_CODECS)
         type = AFMT_UNKNOWN;
 
-    return audio_formats[type].label;
+    return &audio_formats[type];
+}
+
+const char * get_codec_string(int type)
+{
+    return get_afmt_entry(type)->label;
 }
 
 /* Get the basic audio type */
 bool rbcodec_format_is_atomic(int afmt)
 {
-    if ((unsigned)afmt >= AFMT_NUM_CODECS)
-        return false;
-
     switch (get_audio_base_codec_type(afmt))
     {
     case AFMT_NSF:
@@ -356,7 +358,8 @@ bool rbcodec_format_is_atomic(int afmt)
         /* Type must be allocated and loaded in its entirety onto
            the buffer */
         return true;
-
+    case AFMT_UNKNOWN:
+        return false;
     default:
         /* Assume type may be loaded and discarded incrementally */
         return false;
@@ -421,11 +424,13 @@ unsigned int probe_file_format(const char *filename)
 /* Get metadata for track - return false if parsing showed problems with the
  * file that would prevent playback. supply a filedescriptor <0 and the file will be opened
  * and closed automatically within the get_metadata call
- * get_metadata_ex allows flags to change the way get_metadata behaves
+ * audio_fmt is AFMT_ enum provided by probe_file_format(trackname),
+ * get_metadata_ex & afmt allow flags to change the way get_metadata behaves
  * METADATA_EXCLUDE_ID3_PATH  won't copy filename path to the id3 path buffer
  * METADATA_CLOSE_FD_ON_EXIT closes the open filedescriptor on exit
+ * METADATA_EXCLUDE_NORMALIZE won't utf8 normalize the string type id3 entries
  */
-bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int flags)
+bool get_metadata_afmt(struct mp3entry* id3, int fd, const char* trackname, int audio_fmt, int flags)
 {
     bool success = true;
     const struct afmt_entry *entry;
@@ -450,7 +455,7 @@ bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int fl
     }
 
     /* Take our best guess at the codec type based on file extension */
-    id3->codectype = probe_file_format(trackname);
+    id3->codectype = audio_fmt; /* use probe_file_format(trackname); */
 
     /* default values for embedded cuesheets */
     id3->has_embedded_cuesheet = false;
@@ -458,7 +463,7 @@ bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int fl
 
     id3->tracknum = -1;
 
-    entry = &audio_formats[id3->codectype];
+    entry = get_afmt_entry(id3->codectype);
 
     /* Load codec specific track tag information and confirm the codec type. */
     if (!entry->parse_func)
@@ -476,7 +481,7 @@ bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int fl
     }
 
 #ifdef UTF8PROC_EXPORTS
-    if (success) {
+    if (success && (flags & METADATA_EXCLUDE_NORMALIZE) == 0) {
         utf8_normalize(id3->title);
         utf8_normalize(id3->artist);
         utf8_normalize(id3->album);
@@ -516,6 +521,11 @@ log_on_exit:
     return success;
 }
 
+bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int flags)
+{
+    return get_metadata_afmt(id3, fd, trackname, probe_file_format(trackname), flags);
+}
+
 bool get_metadata(struct mp3entry* id3, int fd, const char* trackname)
 {
     return get_metadata_ex(id3, fd, trackname, 0);
diff --git a/lib/rbcodec/metadata/metadata.h b/lib/rbcodec/metadata/metadata.h
index a48afee004..d801c1adaf 100644
--- a/lib/rbcodec/metadata/metadata.h
+++ b/lib/rbcodec/metadata/metadata.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
@@ -24,8 +23,9 @@
 
 #include "platform.h"
 
-#define METADATA_EXCLUDE_ID3_PATH (0x01) /* don't copy filename path to the id3 path buffer */
-#define METADATA_CLOSE_FD_ON_EXIT (0x02) /* close the filedescriptor when finished */
+#define METADATA_EXCLUDE_ID3_PATH  (0x01) /* don't copy filename path to the id3 path buffer */
+#define METADATA_CLOSE_FD_ON_EXIT  (0x02) /* close the filedescriptor when finished */
+#define METADATA_EXCLUDE_NORMALIZE (0x04) /* don't normalize id3 text entries */
 /* Audio file types. */
 /* NOTE: The values of the AFMT_* items are used for the %fc tag in the WPS
          - so new entries MUST be added to the end to maintain compatibility.
@@ -328,9 +328,10 @@ struct mp3entry {
     bool is_asf_stream;
 };
 
-unsigned int probe_file_format(const char *filename);
+unsigned int probe_file_format(const char *filename); /* returns audio_fmt */
 bool get_metadata(struct mp3entry* id3, int fd, const char* trackname);
 bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int flags);
+bool get_metadata_afmt(struct mp3entry* id3, int fd, const char* trackname, int audio_fmt, int flags);
 void adjust_mp3entry(struct mp3entry *entry, void *dest, const void *orig);
 void copy_mp3entry(struct mp3entry *dest, const struct mp3entry *orig);
 void wipe_mp3entry(struct mp3entry *id3);
diff --git a/lib/rbcodec/metadata/metadata_common.c b/lib/rbcodec/metadata/metadata_common.c
index 4529ec9999..feba3a1449 100644
--- a/lib/rbcodec/metadata/metadata_common.c
+++ b/lib/rbcodec/metadata/metadata_common.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/metadata_common.h b/lib/rbcodec/metadata/metadata_common.h
index 9d2260f76a..61c35da5f7 100644
--- a/lib/rbcodec/metadata/metadata_common.h
+++ b/lib/rbcodec/metadata/metadata_common.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/metadata_parsers.h b/lib/rbcodec/metadata/metadata_parsers.h
index 6a4da51b63..fbc382703a 100644
--- a/lib/rbcodec/metadata/metadata_parsers.h
+++ b/lib/rbcodec/metadata/metadata_parsers.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/mod.c b/lib/rbcodec/metadata/mod.c
index b7f4913257..746a4f6022 100644
--- a/lib/rbcodec/metadata/mod.c
+++ b/lib/rbcodec/metadata/mod.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/monkeys.c b/lib/rbcodec/metadata/monkeys.c
index ba4273466a..382aa65498 100644
--- a/lib/rbcodec/metadata/monkeys.c
+++ b/lib/rbcodec/metadata/monkeys.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/mp3.c b/lib/rbcodec/metadata/mp3.c
index b6a7c46f85..b2466f82a0 100644
--- a/lib/rbcodec/metadata/mp3.c
+++ b/lib/rbcodec/metadata/mp3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
diff --git a/lib/rbcodec/metadata/mp3data.c b/lib/rbcodec/metadata/mp3data.c
index a6a44851fc..5c2db376e5 100644
--- a/lib/rbcodec/metadata/mp3data.c
+++ b/lib/rbcodec/metadata/mp3data.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
  *
diff --git a/lib/rbcodec/metadata/mp3data.h b/lib/rbcodec/metadata/mp3data.h
index 762c2f4583..49b83368e6 100644
--- a/lib/rbcodec/metadata/mp3data.h
+++ b/lib/rbcodec/metadata/mp3data.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/lib/rbcodec/metadata/mp4.c b/lib/rbcodec/metadata/mp4.c
index a23dbb9619..f02d301077 100644
--- a/lib/rbcodec/metadata/mp4.c
+++ b/lib/rbcodec/metadata/mp4.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Magnus Holmgren
  *
diff --git a/lib/rbcodec/metadata/mpc.c b/lib/rbcodec/metadata/mpc.c
index 346053dd3e..326cc471ec 100644
--- a/lib/rbcodec/metadata/mpc.c
+++ b/lib/rbcodec/metadata/mpc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Thom Johansen 
  * Copyright (C) 2010 Andree Buschmann
diff --git a/lib/rbcodec/metadata/ogg.c b/lib/rbcodec/metadata/ogg.c
index 6db8132ab9..b172877351 100644
--- a/lib/rbcodec/metadata/ogg.c
+++ b/lib/rbcodec/metadata/ogg.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/replaygain.c b/lib/rbcodec/metadata/replaygain.c
index d76a1113ea..3283a7fd67 100644
--- a/lib/rbcodec/metadata/replaygain.c
+++ b/lib/rbcodec/metadata/replaygain.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Magnus Holmgren
  *
diff --git a/lib/rbcodec/metadata/replaygain.h b/lib/rbcodec/metadata/replaygain.h
index 215464dfdf..ac4d5fbbe5 100644
--- a/lib/rbcodec/metadata/replaygain.h
+++ b/lib/rbcodec/metadata/replaygain.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Magnus Holmgren
  *
diff --git a/lib/rbcodec/metadata/rm.c b/lib/rbcodec/metadata/rm.c
index 16ffe17b14..0bffe6dfdb 100644
--- a/lib/rbcodec/metadata/rm.c
+++ b/lib/rbcodec/metadata/rm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mohamed Tarek
  *
diff --git a/lib/rbcodec/metadata/sid.c b/lib/rbcodec/metadata/sid.c
index 951ed9b62f..43f693e985 100644
--- a/lib/rbcodec/metadata/sid.c
+++ b/lib/rbcodec/metadata/sid.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/smaf.c b/lib/rbcodec/metadata/smaf.c
index fcd026924c..479c39032b 100644
--- a/lib/rbcodec/metadata/smaf.c
+++ b/lib/rbcodec/metadata/smaf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/metadata/spc.c b/lib/rbcodec/metadata/spc.c
index bb24d7ebf9..64e00ef830 100644
--- a/lib/rbcodec/metadata/spc.c
+++ b/lib/rbcodec/metadata/spc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/tta.c b/lib/rbcodec/metadata/tta.c
index 5e91f411a6..ef0f341f29 100644
--- a/lib/rbcodec/metadata/tta.c
+++ b/lib/rbcodec/metadata/tta.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/metadata/vorbis.c b/lib/rbcodec/metadata/vorbis.c
index 9e4381c643..0f50772ce2 100644
--- a/lib/rbcodec/metadata/vorbis.c
+++ b/lib/rbcodec/metadata/vorbis.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  *
diff --git a/lib/rbcodec/metadata/vox.c b/lib/rbcodec/metadata/vox.c
index cf08b61f35..dcf4e057ef 100644
--- a/lib/rbcodec/metadata/vox.c
+++ b/lib/rbcodec/metadata/vox.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Yoshihisa Uchida
  *
diff --git a/lib/rbcodec/metadata/wave.c b/lib/rbcodec/metadata/wave.c
index 2c918d1357..9ecc816832 100644
--- a/lib/rbcodec/metadata/wave.c
+++ b/lib/rbcodec/metadata/wave.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
  * Copyright (C) 2010 Yoshihisa Uchida
diff --git a/lib/rbcodec/metadata/wavpack.c b/lib/rbcodec/metadata/wavpack.c
index 4ea2684aaa..30be661216 100644
--- a/lib/rbcodec/metadata/wavpack.c
+++ b/lib/rbcodec/metadata/wavpack.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 David Bryant
  *
diff --git a/lib/rbcodec/test/warble.make b/lib/rbcodec/test/warble.make
index 108b539931..f5828dad56 100644
--- a/lib/rbcodec/test/warble.make
+++ b/lib/rbcodec/test/warble.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 RBCODECLIB_DIR = $(ROOTDIR)/lib/rbcodec
diff --git a/lib/skin_parser/skin_buffer.c b/lib/skin_parser/skin_buffer.c
index 05cbe096f6..aedd3775f0 100644
--- a/lib/skin_parser/skin_buffer.c
+++ b/lib/skin_parser/skin_buffer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: skin_buffer.c 25962 2010-05-12 09:31:40Z jdgordon $
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  * Copyright (C) 2010 Jonathan Gordon
diff --git a/lib/skin_parser/skin_buffer.h b/lib/skin_parser/skin_buffer.h
index 7c9bb0b9c0..b67355af6b 100644
--- a/lib/skin_parser/skin_buffer.h
+++ b/lib/skin_parser/skin_buffer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: skin_buffer.c 25962 2010-05-12 09:31:40Z jdgordon $
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  * Copyright (C) 2009 Jonathan Gordon
diff --git a/lib/skin_parser/skin_buffer_debug.pl b/lib/skin_parser/skin_buffer_debug.pl
index 6d0d1ba0e7..5f1295a592 100755
--- a/lib/skin_parser/skin_buffer_debug.pl
+++ b/lib/skin_parser/skin_buffer_debug.pl
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 %allocs = ();
diff --git a/lib/skin_parser/skin_debug.c b/lib/skin_parser/skin_debug.c
index 44fba90445..65c055496f 100644
--- a/lib/skin_parser/skin_debug.c
+++ b/lib/skin_parser/skin_debug.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/lib/skin_parser/skin_debug.h b/lib/skin_parser/skin_debug.h
index e9fc27a10e..d17bf0d276 100644
--- a/lib/skin_parser/skin_debug.h
+++ b/lib/skin_parser/skin_debug.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/lib/skin_parser/skin_parser.c b/lib/skin_parser/skin_parser.c
index 8fe75364a4..d6cab36c31 100644
--- a/lib/skin_parser/skin_parser.c
+++ b/lib/skin_parser/skin_parser.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -466,8 +465,10 @@ static struct skin_element* skin_parse_sublines_optional(const char** document,
     for(i = 0; i < sublines; i++)
     {
         children[i] = skin_buffer_to_offset(skin_parse_line_optional(&cursor, conditional));
+#ifdef OFFSETTYPE_OFFSET
         if (children[i] < 0)
             return NULL;
+#endif
         skip_whitespace(&cursor);
 
         if(*cursor != MULTILINESYM && i != sublines - 1)
@@ -756,8 +757,10 @@ static int skin_parse_tag(struct skin_element* element, const char** document)
             /* Recursively parsing a code argument */
             params[i].type = CODE;
             params[i].data.code = skin_buffer_to_offset(skin_parse_code_as_arg(&cursor));
+#ifdef OFFSETTYPE_OFFSET
             if(params[i].data.code < 0)
                 return 0;
+#endif
         }
         else if (tolower(type_code) == 't')
         {
@@ -875,8 +878,10 @@ static int skin_parse_text(struct skin_element* element, const char** document,
     element->next = skin_buffer_to_offset(NULL);
     text = skin_alloc_string(length);
     element->data = skin_buffer_to_offset(text);
+#ifdef OFFSETTYPE_OFFSET
     if (element->data < 0)
         return 0;
+#endif
 
     for(dest = 0; dest < length; dest++)
     {
@@ -1027,8 +1032,10 @@ static int skin_parse_conditional(struct skin_element* element, const char** doc
                 cursor++;
             }
             children_array[i] = skin_buffer_to_offset(skin_parse_code_as_arg(&cursor));
+#ifdef OFFSETTYPE_OFFSET
             if (children_array[i] < 0)
                 return 0;
+#endif
             skip_whitespace(&cursor);
 #ifdef ROCKBOX
             if ((element->tag->flags&FEATURE_TAG) && feature_available)
diff --git a/lib/skin_parser/skin_parser.h b/lib/skin_parser/skin_parser.h
index f6ba2a2239..e671754e89 100644
--- a/lib/skin_parser/skin_parser.h
+++ b/lib/skin_parser/skin_parser.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -53,6 +52,7 @@ typedef long skinoffset_t;
  * do what you expect.
  */
 #define OFFSETTYPE(type) skinoffset_t
+#define OFFSETTYPE_OFFSET
 #else
 #define SKINOFFSETTOPTR(base, offset) offset
 #define PTRTOSKINOFFSET(base, pointer) pointer
diff --git a/lib/skin_parser/skin_scan.c b/lib/skin_parser/skin_scan.c
index 50aa41b391..87e3428681 100644
--- a/lib/skin_parser/skin_scan.c
+++ b/lib/skin_parser/skin_scan.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/lib/skin_parser/skin_scan.h b/lib/skin_parser/skin_scan.h
index 4a054cf155..b9a5a246a0 100644
--- a/lib/skin_parser/skin_scan.h
+++ b/lib/skin_parser/skin_scan.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/lib/skin_parser/symbols.h b/lib/skin_parser/symbols.h
index e18a770d3b..76d456b7ff 100644
--- a/lib/skin_parser/symbols.h
+++ b/lib/skin_parser/symbols.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/lib/skin_parser/tag_table.c b/lib/skin_parser/tag_table.c
index 2278dd23b3..a13e58a316 100644
--- a/lib/skin_parser/tag_table.c
+++ b/lib/skin_parser/tag_table.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -167,6 +166,7 @@ static const struct tag_info legal_tags[] =
     TAG(SKIN_TOKEN_PLAYLIST_ENTRIES,      "pe", "", SKIN_REFRESH_STATIC),
     TAG(SKIN_TOKEN_PLAYLIST_NAME,         "pn", "", SKIN_REFRESH_STATIC),
     TAG(SKIN_TOKEN_PLAYLIST_SHUFFLE,      "ps", "", SKIN_REFRESH_DYNAMIC),
+    TAG(SKIN_TOKEN_PLAYLIST_ELAPSED_PERCENT, "pX", BAR_PARAMS, SKIN_REFRESH_DYNAMIC),
 
     TAG(SKIN_TOKEN_DATABASE_PLAYCOUNT,    "rp", "", SKIN_REFRESH_DYNAMIC),
     TAG(SKIN_TOKEN_DATABASE_RATING,       "rr", "", SKIN_REFRESH_DYNAMIC),
diff --git a/lib/skin_parser/tag_table.h b/lib/skin_parser/tag_table.h
index 53cf340f5a..eb2d409487 100644
--- a/lib/skin_parser/tag_table.h
+++ b/lib/skin_parser/tag_table.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -214,6 +213,8 @@ enum skin_token_type {
     SKIN_TOKEN_PLAYLIST_PERCENT,
     SKIN_TOKEN_PLAYLIST_PERCENTBAR,
     SKIN_TOKEN_PLAYLIST_SHUFFLE,
+    SKIN_TOKEN_PLAYLIST_ELAPSED_PERCENT,
+    SKIN_TOKEN_PLAYLIST_PROGRESSBAR,
 
 
     SKIN_TOKEN_ENABLE_THEME,
diff --git a/lib/tlsf/libtlsf.make b/lib/tlsf/libtlsf.make
index b420fdc344..5d7de9d3ad 100644
--- a/lib/tlsf/libtlsf.make
+++ b/lib/tlsf/libtlsf.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 TLSFLIB_DIR := $(ROOTDIR)/lib/tlsf
diff --git a/lib/unwarminder/safe_read.S b/lib/unwarminder/safe_read.S
index 557f3dca31..eda9899592 100644
--- a/lib/unwarminder/safe_read.S
+++ b/lib/unwarminder/safe_read.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
@@ -107,7 +106,7 @@ safe_read32_faulty_addr:
     bx      lr
 .size       safe_read32, . - safe_read32
 
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE) && defined(CPU_ARM_CLASSIC)
 .section    .text.data_abort_handler
 .type       data_abort_handler, %function
 .global     data_abort_handler
diff --git a/lib/unwarminder/safe_read.h b/lib/unwarminder/safe_read.h
index fa789a6b99..e02a56e9bb 100644
--- a/lib/unwarminder/safe_read.h
+++ b/lib/unwarminder/safe_read.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/manual/Makefile b/manual/Makefile
index 946d3a9006..641e868b9e 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 ifndef V
diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index f3baa4de62..af5407a8e7 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \chapter{Advanced Topics}
 
 \section{\label{ref:CustomisingUI}Customising the User Interface}
diff --git a/manual/advanced_topics/viewports/colour-vp-syntax.tex b/manual/advanced_topics/viewports/colour-vp-syntax.tex
index d027c3b757..cd72363ac2 100644
--- a/manual/advanced_topics/viewports/colour-vp-syntax.tex
+++ b/manual/advanced_topics/viewports/colour-vp-syntax.tex
@@ -18,6 +18,9 @@
 
 \note{The correct number of commas with hyphens in
       blank fields are still needed.}
+\note{Any text or tags after \%Vf() or \%Vb() may or may not display depending
+      on context thus text or tags following on the same line should be avoided,
+      this behavior preserves backward compatibility.}
 
 \begin{example}
     %V(12,20,-,-,1) %Vf(000000) %Vb(FFFFFF) %Vg(FFC0CB, FF0000, FFFF00)
diff --git a/manual/advanced_topics/viewports/grayscale-vp-syntax.tex b/manual/advanced_topics/viewports/grayscale-vp-syntax.tex
index 2bced327d8..76966406f2 100644
--- a/manual/advanced_topics/viewports/grayscale-vp-syntax.tex
+++ b/manual/advanced_topics/viewports/grayscale-vp-syntax.tex
@@ -16,6 +16,9 @@
 
 \note{The correct number of commas with hyphens in
       blank fields are still needed.}
+\note{Any text or tags after \%Vf() or \%Vb() may or may not display depending
+      on context thus text or tags following on the same line should be avoided,
+      this behavior preserves backward compatibility.}
 
 \begin{example}
     %V(12,20,-,-,1) %Vf(0) %Vb(3)
diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex
index 052fd1d0d5..0305df4870 100644
--- a/manual/appendix/appendix.tex
+++ b/manual/appendix/appendix.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \appendix
 
 \input{appendix/file_formats.tex}
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index d3819e38ef..2b580f3206 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \chapter{\label{ref:config_file_options}Config file options}
 \begin{center}
 % define a local version of endhead, as using the output distinction adds
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index 32e4ddbd8b..5177c5564e 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \newcommand{\includeicon}{\Ifpdfoutput{\includegraphics[width=0.37cm]}{\includegraphics}}
 \chapter{File formats}
 \section{\label{ref:Supportedfileformats}Supported file formats}
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index 7cf0e4af26..7c6dbe713a 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \chapter{\label{ref:wps_tags}Theme Tags}
 Themeing is discussed in detail in section \reference{ref:ConfiguringtheWPS},
 what follows is a list of the available tags.
@@ -63,14 +62,18 @@ show the information for the next song to be played.
      \config{\%V(x,y,[width],\tabnlindent[height],[font])}\newline
       \config{\%Vf([fgshade])}\newline
       \config{\%Vb([bgshade])}
-      & See section \ref{ref:Viewports}\\}}
+      & See section \ref{ref:Viewports}\newline
+      \note{Any text or tags after \%Vf() or \%Vb() may result in
+            unexpected behavior and should be avoided.}\\}}
 
     \opt{lcd_color}{%
       \config{\%V(x,y,[width],\tabnlindent[height],[font])}\newline
       \config{\%Vf([fgcolour])}\newline
       \config{\%Vb([bgcolour])}\newline
       \config{\%Vg(start,end \tabnlindent[,text])}
-      & See section \ref{ref:Viewports}\\}
+      & See section \ref{ref:Viewports}\newline
+      \note{Any text or tags after \%Vf() or \%Vb() may result in
+            unexpected behavior and should be avoided.}\\}
 
     \opt{lcd_non-mono}{%
       \config{\%Vs(mode[,param])}
@@ -177,6 +180,15 @@ or \config{\%D(2)}), produce the information for the next file to be played.
     \config{\%pp} & Playlist position as index\\
     \config{\%pP} & Playlist position as percentage. Can be used as a value, %
             a conditional tag or a bar tag.\\
+    \config{\%pX} & Percentage of the whole playlist played by time. Unlike
+         \config{\%pP} this reflects tracks of differing length when 500 or less, 
+         such as audiobook chapters. Othewise acts like \config{\%pP} except with
+         also including progress through the current track in the percentage.
+    \opt{HAVE_DISK_STORAGE}{
+         Track lengths are estimated from file size to reduce disk use, so
+         the value may be approximate.
+         }
+         Can be used as a value, a conditional tag or a bar tag.\\
     \config{\%pr} & Remaining time in song\\
     \config{\%ps} & ``s'' if shuffle mode is enabled\\
     \config{\%pt} & Total track time\\
@@ -330,17 +342,17 @@ Examples:
       number, can be used in normal viewports to get the selected items icon number.\\
     \config{\%LN} & Get the position of the current item in the list (1-based). Useful for displaying numbered lists.\\
     \config{\%LR} & Get the row number on which the current item will be drawn (1-based). Can be used to change the style based on where on the screen the item appears.\\
-    \config{\%Lc} & Get the column number on which the current item will be drawn (1-based). Can be used to change the style based on where on the screen the item appears.\\
-    \config{\%LC} & Use as a conditional to determine if the current item is the selected item\\
-    \config{\%Lb} & BAR TAG to show the scroll bar, params/options like other bar types. It still needs a bit of work though. Use as a conditional to find out if the bar is actually needed\\
-    \config{\%LB(viewport,width,\tabnlindent height[,tile])} & specify the
+    \config{\%LC} & Get the column number on which the current item will be drawn (1-based). Can be used to change the style based on where on the screen the item appears.\\
+    \config{\%Lc} & Use as a conditional to determine if the current item is the selected item\\
+    \config{\%LB} & BAR TAG to show the scroll bar, params/options like other bar types. It still needs a bit of work though. Use as a conditional to find out if the bar is actually needed\\
+    \config{\%Lb(viewport,width,\tabnlindent height[,tile])} & specify the
       viewport label to draw for each item and the size of each item. if the
       last param is 'tile' it will form a grid instead of a list\\
   \end{tagmap}
   \note{To do this you need at least one viewport which will be drawn for each item on the screen, and the ui viewport configured (using the %Vi tag). To make this work do the following:
     Setup the ui viewport as normal. As many items as can fit in this viewport will be displayed (Titles are not included and need to be drawn in a seperate viewport manually)
     Create one or more viewports with a shared label which you want to display for each item. The x/y position is relative to an imaginary box which each item fits in inside the ui viewport.
-    Tell the skin to draw the lists using the \%LB() tag}
+    Tell the skin to draw the lists using the \%Lb() tag}
 
 
 \section{Changing Volume}
diff --git a/manual/configure_rockbox/autoresume.tex b/manual/configure_rockbox/autoresume.tex
index 10398fd2c3..c7cc1e6569 100644
--- a/manual/configure_rockbox/autoresume.tex
+++ b/manual/configure_rockbox/autoresume.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \section{\label{ref:Autoresumeconfigactual}Automatic resume}
 
 The automatic resume feature stores and recalls resume positions for
diff --git a/manual/configure_rockbox/bookmarking.tex b/manual/configure_rockbox/bookmarking.tex
index 398257e552..e04a97d3c0 100644
--- a/manual/configure_rockbox/bookmarking.tex
+++ b/manual/configure_rockbox/bookmarking.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \section{\label{ref:Bookmarkconfigactual}Bookmarking}
   Bookmarks allow you to save your current position within a track so that 
   you can return to it at a later time. Bookmarks also store rate, pitch
diff --git a/manual/configure_rockbox/database.tex b/manual/configure_rockbox/database.tex
index dcdeb36b6e..3c7c925c3c 100644
--- a/manual/configure_rockbox/database.tex
+++ b/manual/configure_rockbox/database.tex
@@ -1,4 +1,3 @@
-% $Id: $ %
 \section{Database}
   This sub menu allows you to configure the database.
   See \reference{ref:database} for more information about using
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index fe3ac71a84..4b48b768a9 100755
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \section{\label{ref:Displayoptions}Display}
 
   \begin{description}
diff --git a/manual/configure_rockbox/file_view.tex b/manual/configure_rockbox/file_view.tex
index f161e57b0b..1e671fda12 100644
--- a/manual/configure_rockbox/file_view.tex
+++ b/manual/configure_rockbox/file_view.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \section{\label{ref:FileView}File View}
 The File View menu deals with options relating to how the File Browser 
 displays files.
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index da6acf2e82..3287c61739 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 
 The \setting{\label{ref:PlaybackSettings}Playback Settings} menu allows 
 you to configure settings related to audio playback.
diff --git a/manual/configure_rockbox/playlist_options.tex b/manual/configure_rockbox/playlist_options.tex
index 50a832d022..e9a8f1b9c8 100644
--- a/manual/configure_rockbox/playlist_options.tex
+++ b/manual/configure_rockbox/playlist_options.tex
@@ -1,4 +1,3 @@
-% $Id:$ %
 \section{\label{ref:PlaylistOptions}Playlists}
 
 The \setting{Playlists} submenu allows you to configure settings
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index 299a78f46f..9248663aff 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -1,4 +1,3 @@
-% $Id:$ %
 \screenshot{main_menu/images/ss-recording-settings}{The recording settings screen}{}
 
 \note{To change the location where recordings are stored open the
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index a8e94737b9..7e9d09b75e 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \screenshot{configure_rockbox/images/ss-sound-settings}{The sound settings screen}{}
 
 The sound settings menu offers a selection of sound settings you may
diff --git a/manual/configure_rockbox/startup_shutdown_options.tex b/manual/configure_rockbox/startup_shutdown_options.tex
index e4639079b5..4929450df6 100644
--- a/manual/configure_rockbox/startup_shutdown_options.tex
+++ b/manual/configure_rockbox/startup_shutdown_options.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 
 \section{\label{ref:StartupShutdownOptions}Startup/Shutdown}
 
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index ed0dca1d3d..4b1ad69263 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \section{\label{ref:SystemOptions}System}
 
 \nopt{sansa,fuzeplus,rgnano}%will probably be there on Sansas one day -  exclude it the simple way without specific option
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index 7447b822e8..2659ebfef9 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -1,4 +1,3 @@
-% $Id $ %
 The \setting{Theme Settings} menu offers options that you can change to
 customize the visual appearance of Rockbox.
 
diff --git a/manual/configure_rockbox/time_and_date.tex b/manual/configure_rockbox/time_and_date.tex
index 36da0e6204..d53ed07977 100644
--- a/manual/configure_rockbox/time_and_date.tex
+++ b/manual/configure_rockbox/time_and_date.tex
@@ -1,4 +1,3 @@
-% $Id:$ %
 
 \label{ref:Timeanddateactual}
 
diff --git a/manual/configure_rockbox/voice.tex b/manual/configure_rockbox/voice.tex
index c248feefb4..9a8c8711df 100644
--- a/manual/configure_rockbox/voice.tex
+++ b/manual/configure_rockbox/voice.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \section{\label{ref:Voiceconfiguration}Voice}
 
   \begin{description}
diff --git a/manual/configure_rockbox/wps.tex b/manual/configure_rockbox/wps.tex
index 4208806d08..c07325d31e 100644
--- a/manual/configure_rockbox/wps.tex
+++ b/manual/configure_rockbox/wps.tex
@@ -6,7 +6,15 @@
     \item[WPS Hotkey.] Sets the hotkey function for
                      the WPS (see \reference{ref:Hotkeys}). The
                      default is \setting{View Playlist}.
+    \item[Set Context Item (1 - 4).]
   }
-  \item[Set WPS Context Plugin.]
-  This option will allow you to run a Rockbox plugin from the WPS context menu.
-   \end{description}
+  \nopt{hotkey}{\item[Set Context Item (0 - 4).]}
+
+  This option will allow you to set an entry in the WPS context menu.
+  \note{Setting an item to Off will hide the menu item;
+        Each item is only available once, duplicates will be set to Off;}
+
+  \item[Reset Settings.]
+  This option will allow you to return all items to default.
+  \opt{hotkey}{\note{including WPS Hotkey}}
+  \end{description}
diff --git a/manual/credits.pl b/manual/credits.pl
index f636c0cb6c..fdfb01da41 100644
--- a/manual/credits.pl
+++ b/manual/credits.pl
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 while (<STDIN>) {
     if(($_ =~ /^(\S+[\S ]+)/) && ($_ !~ /^People/)) {
diff --git a/manual/getting_started/gigabeat_install.tex b/manual/getting_started/gigabeat_install.tex
index 6519676256..68ff59567a 100644
--- a/manual/getting_started/gigabeat_install.tex
+++ b/manual/getting_started/gigabeat_install.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \begin{itemize}
 \item Download the Rockbox bootloader from
diff --git a/manual/getting_started/gigabeats_install.tex b/manual/getting_started/gigabeats_install.tex
index f7a19384e5..1c13b7d4c7 100644
--- a/manual/getting_started/gigabeats_install.tex
+++ b/manual/getting_started/gigabeats_install.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \warn{Before starting this procedure, ensure that you have a copy
 of the original \playerman{} firmware. Without this, it is
diff --git a/manual/getting_started/iriver_install.tex b/manual/getting_started/iriver_install.tex
index 26dc845d1c..7288f7d054 100644
--- a/manual/getting_started/iriver_install.tex
+++ b/manual/getting_started/iriver_install.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 
   Installing the bootloader is the trickiest part of the installation.
   As explained above, we cannot distribute the bootloader directly, and
diff --git a/manual/getting_started/main.tex b/manual/getting_started/main.tex
index 8779161b9a..825fa1ab49 100644
--- a/manual/getting_started/main.tex
+++ b/manual/getting_started/main.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \chapter{Introduction}
 \section{Welcome}
 This is the manual for Rockbox. Rockbox is an open source firmware replacement
diff --git a/manual/getting_started/mpio_install.tex b/manual/getting_started/mpio_install.tex
index f4b43c230f..1acb335b5f 100644
--- a/manual/getting_started/mpio_install.tex
+++ b/manual/getting_started/mpio_install.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 
   Installing the bootloader is the trickiest part of the installation.
   As explained above, we cannot distribute the bootloader directly, and
diff --git a/manual/getting_started/sansa_install.tex b/manual/getting_started/sansa_install.tex
index 7956e94f76..0649c1960b 100644
--- a/manual/getting_started/sansa_install.tex
+++ b/manual/getting_started/sansa_install.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsubsection{Bootloader installation from Windows}
 
 \begin{enumerate}
diff --git a/manual/intro/main.tex b/manual/intro/main.tex
index 8ec96c880a..5f73076fec 100644
--- a/manual/intro/main.tex
+++ b/manual/intro/main.tex
@@ -7,7 +7,6 @@
 %                     \/            \/     \/    \/            \/
 %                                   - M A N U A L -
 %
-% $Id$
 %
 % Copyright (C) 2006 The Rockbox Manual Team
 %
diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex
index 6d4717cde0..9f7de7e63f 100644
--- a/manual/main_menu/fmradio.tex
+++ b/manual/main_menu/fmradio.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \section{\label{ref:FMradio}FM Radio}
 \opt{sansa}{
   \note{Not all Sansas have a radio receiver. Generally all American models do,
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 08cb289b38..4f22721930 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \chapter{The Main Menu}
 \section{\label{ref:main_menu}Introducing the Main Menu}
 \screenshot{main_menu/images/ss-main-menu}{The main menu}{}
diff --git a/manual/main_menu/recording_screen.tex b/manual/main_menu/recording_screen.tex
index eda5270243..dc567e3ad7 100644
--- a/manual/main_menu/recording_screen.tex
+++ b/manual/main_menu/recording_screen.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \section{\label{ref:Recording}Recording}
 \subsection{\label{ref:while_recording_screen}While Recording Screen}
 \screenshot{main_menu/images/ss-while-recording-screen}{The while recording
diff --git a/manual/platform/agptekrocker.tex b/manual/platform/agptekrocker.tex
index b42ca6951d..b33badbb18 100644
--- a/manual/platform/agptekrocker.tex
+++ b/manual/platform/agptekrocker.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{agptekrocker}
 \edef\UseOption{\UseOption,AGPTEK_ROCKER_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/cowond2.tex b/manual/platform/cowond2.tex
index 9dc14f894f..25ae7fb0c7 100644
--- a/manual/platform/cowond2.tex
+++ b/manual/platform/cowond2.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{cowond2}
 \edef\UseOption{\UseOption,COWON_D2_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/erosqnative.tex b/manual/platform/erosqnative.tex
index c7ce0f3c8b..18ab9dc472 100644
--- a/manual/platform/erosqnative.tex
+++ b/manual/platform/erosqnative.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{erosqnative}
 \edef\UseOption{\UseOption,AIGO_EROSQ_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/fiiom3k.tex b/manual/platform/fiiom3k.tex
index 0f44683214..72d76748cf 100644
--- a/manual/platform/fiiom3k.tex
+++ b/manual/platform/fiiom3k.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{fiiom3k}
 \edef\UseOption{\UseOption,FIIO_M3K_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/gigabeatfx.tex b/manual/platform/gigabeatfx.tex
index 63f31de0cc..2c1fef451f 100644
--- a/manual/platform/gigabeatfx.tex
+++ b/manual/platform/gigabeatfx.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{gigabeatf}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,GIGABEAT_PAD}
diff --git a/manual/platform/gigabeats.tex b/manual/platform/gigabeats.tex
index 9650084bae..a758961cfa 100644
--- a/manual/platform/gigabeats.tex
+++ b/manual/platform/gigabeats.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{gigabeats}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,GIGABEAT_S_PAD}
diff --git a/manual/platform/iaudiom3.tex b/manual/platform/iaudiom3.tex
index cf5c347a59..3b797b6e3e 100644
--- a/manual/platform/iaudiom3.tex
+++ b/manual/platform/iaudiom3.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{iaudiom3}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IAUDIO_M3_PAD}
diff --git a/manual/platform/iaudiom5.tex b/manual/platform/iaudiom5.tex
index 393b86d578..ae02d8ae0a 100644
--- a/manual/platform/iaudiom5.tex
+++ b/manual/platform/iaudiom5.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{iaudiom5}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IAUDIO_X5_PAD}
diff --git a/manual/platform/iaudiox5.tex b/manual/platform/iaudiox5.tex
index f05f31781b..c700764780 100644
--- a/manual/platform/iaudiox5.tex
+++ b/manual/platform/iaudiox5.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{iaudiox5}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IAUDIO_X5_PAD}
diff --git a/manual/platform/ipod1g2g.tex b/manual/platform/ipod1g2g.tex
index 05579821ab..eeed6c4e3a 100644
--- a/manual/platform/ipod1g2g.tex
+++ b/manual/platform/ipod1g2g.tex
@@ -1,4 +1,3 @@
-% $Id: ipod3g.tex 13422 2007-05-19 19:21:52Z christi $ %
 \def\UseOption{ipod1g2g}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_3G_PAD}
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index d4427a83bf..bd4fffd21b 100644
--- a/manual/platform/ipod3g.tex
+++ b/manual/platform/ipod3g.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{ipod3g}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_3G_PAD}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index bc62b4a73a..501a508109 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{ipod4g}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
diff --git a/manual/platform/ipod6g.tex b/manual/platform/ipod6g.tex
index ecab5b96c8..96324c253a 100644
--- a/manual/platform/ipod6g.tex
+++ b/manual/platform/ipod6g.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{ipod6g}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index 645a76d6ab..1264ad4298 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{ipodcolor}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
diff --git a/manual/platform/ipodmini1g.tex b/manual/platform/ipodmini1g.tex
index bba6ca9380..c884ab16de 100644
--- a/manual/platform/ipodmini1g.tex
+++ b/manual/platform/ipodmini1g.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{ipodmini}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
diff --git a/manual/platform/ipodnano1g.tex b/manual/platform/ipodnano1g.tex
index 3ec065e947..f1f6ab2735 100644
--- a/manual/platform/ipodnano1g.tex
+++ b/manual/platform/ipodnano1g.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{ipodnano}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
diff --git a/manual/platform/ipodnano2g.tex b/manual/platform/ipodnano2g.tex
index 55a79ed793..a807f5652f 100644
--- a/manual/platform/ipodnano2g.tex
+++ b/manual/platform/ipodnano2g.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{ipodnano2g}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 7291f105ee..9699a20c55 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{ipodvideo}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
diff --git a/manual/platform/iriverh10.tex b/manual/platform/iriverh10.tex
index e09da7a04d..69d99e35a9 100644
--- a/manual/platform/iriverh10.tex
+++ b/manual/platform/iriverh10.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{iriverh10}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IRIVER_H10_PAD}
diff --git a/manual/platform/iriverh100.tex b/manual/platform/iriverh100.tex
index 4b05e460e1..727fa98fe7 100644
--- a/manual/platform/iriverh100.tex
+++ b/manual/platform/iriverh100.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{iriverh100}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IRIVER_H100_PAD}
diff --git a/manual/platform/iriverh10_5gb.tex b/manual/platform/iriverh10_5gb.tex
index 02359c3536..363ccee990 100644
--- a/manual/platform/iriverh10_5gb.tex
+++ b/manual/platform/iriverh10_5gb.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{iriverh10_5gb}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IRIVER_H10_PAD}
diff --git a/manual/platform/iriverh300.tex b/manual/platform/iriverh300.tex
index 806c99bdbb..df5ab9db48 100644
--- a/manual/platform/iriverh300.tex
+++ b/manual/platform/iriverh300.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{iriverh300}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IRIVER_H300_PAD}
diff --git a/manual/platform/keymap-agptekrocker.tex b/manual/platform/keymap-agptekrocker.tex
index 295f32147c..8e5d0b4910 100644
--- a/manual/platform/keymap-agptekrocker.tex
+++ b/manual/platform/keymap-agptekrocker.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonPower}{\btnfnt{Power}}
 \newcommand{\ButtonVolUp}{\btnfnt{Volume Up}}
diff --git a/manual/platform/keymap-cowond2.tex b/manual/platform/keymap-cowond2.tex
index 6e00daacf4..3605fe0d93 100644
--- a/manual/platform/keymap-cowond2.tex
+++ b/manual/platform/keymap-cowond2.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonMinus}{\btnfnt{Minus}}
 \newcommand{\ButtonPlus}{\btnfnt{Plus}}
diff --git a/manual/platform/keymap-erosqnative.tex b/manual/platform/keymap-erosqnative.tex
index 75e2a756bc..af61a2799f 100644
--- a/manual/platform/keymap-erosqnative.tex
+++ b/manual/platform/keymap-erosqnative.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonPower}{\btnfnt{Power}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
diff --git a/manual/platform/keymap-fiiom3k.tex b/manual/platform/keymap-fiiom3k.tex
index 812ef21b9f..676f033224 100644
--- a/manual/platform/keymap-fiiom3k.tex
+++ b/manual/platform/keymap-fiiom3k.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonPower}{\btnfnt{Power}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
diff --git a/manual/platform/keymap-gigabeatfx.tex b/manual/platform/keymap-gigabeatfx.tex
index ab761661ec..b925aca12e 100644
--- a/manual/platform/keymap-gigabeatfx.tex
+++ b/manual/platform/keymap-gigabeatfx.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonPower}{\btnfnt{Power}}
 \newcommand{\ButtonMenu}{\btnfnt{Menu}}
diff --git a/manual/platform/keymap-gigabeats.tex b/manual/platform/keymap-gigabeats.tex
index 763e71c12e..0033b7ec5c 100644
--- a/manual/platform/keymap-gigabeats.tex
+++ b/manual/platform/keymap-gigabeats.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonPower}{\btnfnt{Power}}
 \newcommand{\ButtonBack}{\btnfnt{Back}}
diff --git a/manual/platform/keymap-iaudiom3.tex b/manual/platform/keymap-iaudiom3.tex
index 6daa962c25..944b238372 100644
--- a/manual/platform/keymap-iaudiom3.tex
+++ b/manual/platform/keymap-iaudiom3.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \newcommand{\ButtonLeft}{\btnfnt{Rewind}}
 \newcommand{\ButtonRight}{\btnfnt{Forward}}
 \newcommand{\ButtonUp}{\btnfnt{Volume Up}}
diff --git a/manual/platform/keymap-iaudiomx5.tex b/manual/platform/keymap-iaudiomx5.tex
index 7b0838902a..1efca01298 100644
--- a/manual/platform/keymap-iaudiomx5.tex
+++ b/manual/platform/keymap-iaudiomx5.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonLeft}{\btnfnt{Left}}
 \newcommand{\ButtonRight}{\btnfnt{Right}}
diff --git a/manual/platform/keymap-ipod1g2g.tex b/manual/platform/keymap-ipod1g2g.tex
index d3825cdb21..1d82c379bf 100644
--- a/manual/platform/keymap-ipod1g2g.tex
+++ b/manual/platform/keymap-ipod1g2g.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonLeft}{\btnfnt{Prev}}
 \newcommand{\ButtonRight}{\btnfnt{Next}}
diff --git a/manual/platform/keymap-ipod3g.tex b/manual/platform/keymap-ipod3g.tex
index 7fc7035f6a..73f2026947 100644
--- a/manual/platform/keymap-ipod3g.tex
+++ b/manual/platform/keymap-ipod3g.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonLeft}{\btnfnt{Prev}}
 \newcommand{\ButtonRight}{\btnfnt{Next}}
diff --git a/manual/platform/keymap-ipod4g.tex b/manual/platform/keymap-ipod4g.tex
index c7e663bf3b..c7054ac72e 100644
--- a/manual/platform/keymap-ipod4g.tex
+++ b/manual/platform/keymap-ipod4g.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonLeft}{\btnfnt{Prev}}
 \newcommand{\ButtonRight}{\btnfnt{Next}}
diff --git a/manual/platform/keymap-iriverh10.tex b/manual/platform/keymap-iriverh10.tex
index e0de1ecf55..d41e19a6ef 100644
--- a/manual/platform/keymap-iriverh10.tex
+++ b/manual/platform/keymap-iriverh10.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonLeft}{\btnfnt{Cancel}}
 \newcommand{\ButtonRight}{\btnfnt{Select}}
diff --git a/manual/platform/keymap-iriverh100_h300.tex b/manual/platform/keymap-iriverh100_h300.tex
index e5f1171772..083e98b2fa 100644
--- a/manual/platform/keymap-iriverh100_h300.tex
+++ b/manual/platform/keymap-iriverh100_h300.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonLeft}{\btnfnt{Left}}
 \newcommand{\ButtonRight}{\btnfnt{Right}}
diff --git a/manual/platform/keymap-mpiohd200.tex b/manual/platform/keymap-mpiohd200.tex
index a90c5b24d9..93b540c45e 100644
--- a/manual/platform/keymap-mpiohd200.tex
+++ b/manual/platform/keymap-mpiohd200.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonRew}{\btnfnt{Rewind}}
 \newcommand{\ButtonFF}{\btnfnt{Forward}}
diff --git a/manual/platform/keymap-mpiohd300.tex b/manual/platform/keymap-mpiohd300.tex
index aad9d27f8e..15aa9efd38 100644
--- a/manual/platform/keymap-mpiohd300.tex
+++ b/manual/platform/keymap-mpiohd300.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonRew}{\btnfnt{Rewind}}
 \newcommand{\ButtonFF}{\btnfnt{Forward}}
diff --git a/manual/platform/keymap-mrobe100.tex b/manual/platform/keymap-mrobe100.tex
index c9f2f59ea4..6e57b99b94 100644
--- a/manual/platform/keymap-mrobe100.tex
+++ b/manual/platform/keymap-mrobe100.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonPower}{\btnfnt{Power}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
diff --git a/manual/platform/keymap-ondavx777.tex b/manual/platform/keymap-ondavx777.tex
index bdf85a5370..0045e81622 100644
--- a/manual/platform/keymap-ondavx777.tex
+++ b/manual/platform/keymap-ondavx777.tex
@@ -1,4 +1,3 @@
-% $Id$
 \newcommand{\ButtonPower}{\btnfnt{Power}}
 
 %Button actions, standard context
diff --git a/manual/platform/keymap-rgnano.tex b/manual/platform/keymap-rgnano.tex
index 8559a9200d..230e22ce0f 100644
--- a/manual/platform/keymap-rgnano.tex
+++ b/manual/platform/keymap-rgnano.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonPower}{\btnfnt{Power}}
 \newcommand{\ButtonUp}{\btnfnt{Up}}
diff --git a/manual/platform/keymap-sa9200.tex b/manual/platform/keymap-sa9200.tex
index 6a433d1b7e..e46cb52c65 100644
--- a/manual/platform/keymap-sa9200.tex
+++ b/manual/platform/keymap-sa9200.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
 \newcommand{\ButtonLeft}{\btnfnt{Left}}
diff --git a/manual/platform/keymap-sansac200.tex b/manual/platform/keymap-sansac200.tex
index eefc170f4d..77732c8b53 100644
--- a/manual/platform/keymap-sansac200.tex
+++ b/manual/platform/keymap-sansac200.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonLeft}{\btnfnt{Left}}
 \newcommand{\ButtonRight}{\btnfnt{Right}}
diff --git a/manual/platform/keymap-sansaclip.tex b/manual/platform/keymap-sansaclip.tex
index 3e9f993eb6..89b2761dc2 100644
--- a/manual/platform/keymap-sansaclip.tex
+++ b/manual/platform/keymap-sansaclip.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonLeft}{\btnfnt{Left}}
 \newcommand{\ButtonRight}{\btnfnt{Right}}
diff --git a/manual/platform/keymap-sansae200.tex b/manual/platform/keymap-sansae200.tex
index 8cf2aaed54..46f0f955eb 100644
--- a/manual/platform/keymap-sansae200.tex
+++ b/manual/platform/keymap-sansae200.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonLeft}{\btnfnt{Left}}
 \newcommand{\ButtonRight}{\btnfnt{Right}}
diff --git a/manual/platform/keymap-sansafuze.tex b/manual/platform/keymap-sansafuze.tex
index 1ae29d8e42..779c5d8f0c 100644
--- a/manual/platform/keymap-sansafuze.tex
+++ b/manual/platform/keymap-sansafuze.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonLeft}{\btnfnt{Left}}
 \newcommand{\ButtonRight}{\btnfnt{Right}}
diff --git a/manual/platform/keymap-shanlingq1.tex b/manual/platform/keymap-shanlingq1.tex
index 4e426e1604..2bd1f49e35 100644
--- a/manual/platform/keymap-shanlingq1.tex
+++ b/manual/platform/keymap-shanlingq1.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonPower}{\btnfnt{Power}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
diff --git a/manual/platform/keymap-touchscreen.tex b/manual/platform/keymap-touchscreen.tex
index 58dbbc3ec5..c6ffaeb273 100644
--- a/manual/platform/keymap-touchscreen.tex
+++ b/manual/platform/keymap-touchscreen.tex
@@ -1,4 +1,3 @@
-% $Id: keymap-sansae200.tex 23883 2009-12-07 12:19:08Z zagor $
 
 \newcommand{\TouchTopLeft}{\btnfnt{Top-Left}}
 \newcommand{\TouchTopMiddle}{\btnfnt{Top-Middle}}
diff --git a/manual/platform/keymap-vibe500.tex b/manual/platform/keymap-vibe500.tex
index 96b4f096af..82f64b13de 100644
--- a/manual/platform/keymap-vibe500.tex
+++ b/manual/platform/keymap-vibe500.tex
@@ -1,4 +1,3 @@
-% $Id: keymap-vibe500.tex 23883 2010-03-29 12:19:08Z b0hoon $
 
 \newcommand{\ButtonPower}{\btnfnt{Power}}
 \newcommand{\ButtonMenu}{\btnfnt{Menu}}
diff --git a/manual/platform/keymap-xduoox3.tex b/manual/platform/keymap-xduoox3.tex
index da35abf9b7..823eeef863 100644
--- a/manual/platform/keymap-xduoox3.tex
+++ b/manual/platform/keymap-xduoox3.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonPrev}{\btnfnt{Prev}}
 \newcommand{\ButtonNext}{\btnfnt{Next}}
diff --git a/manual/platform/keymap-yh820.tex b/manual/platform/keymap-yh820.tex
index 9e775d7e2f..2973327667 100644
--- a/manual/platform/keymap-yh820.tex
+++ b/manual/platform/keymap-yh820.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
 \newcommand{\ButtonLeft}{\btnfnt{Left}}
diff --git a/manual/platform/keymap-yh92x.tex b/manual/platform/keymap-yh92x.tex
index f8a9aa310e..2a1fe6d717 100644
--- a/manual/platform/keymap-yh92x.tex
+++ b/manual/platform/keymap-yh92x.tex
@@ -1,4 +1,3 @@
-% $Id$
 
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
 \newcommand{\ButtonLeft}{\btnfnt{Left}}
diff --git a/manual/platform/mpiohd200.tex b/manual/platform/mpiohd200.tex
index fbb0462b40..c503b5d1d3 100644
--- a/manual/platform/mpiohd200.tex
+++ b/manual/platform/mpiohd200.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{mpiohd200}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,MPIO_HD200_PAD}
diff --git a/manual/platform/mpiohd300.tex b/manual/platform/mpiohd300.tex
index 2c22390e26..058e0b88c4 100644
--- a/manual/platform/mpiohd300.tex
+++ b/manual/platform/mpiohd300.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{mpiohd300}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,MPIO_HD300_PAD}
diff --git a/manual/platform/mrobe100.tex b/manual/platform/mrobe100.tex
index 9650467b7e..32e2b449d2 100644
--- a/manual/platform/mrobe100.tex
+++ b/manual/platform/mrobe100.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{mrobe100}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,MROBE100_PAD}
diff --git a/manual/platform/ondavx777.tex b/manual/platform/ondavx777.tex
index 4865f069fc..3060eeb19c 100644
--- a/manual/platform/ondavx777.tex
+++ b/manual/platform/ondavx777.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{ondavx777}
 \edef\UseOption{\UseOption,ONDA_VX777_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/remote-keymap-iaudio.tex b/manual/platform/remote-keymap-iaudio.tex
index 157ed0911b..3ef8dd8113 100644
--- a/manual/platform/remote-keymap-iaudio.tex
+++ b/manual/platform/remote-keymap-iaudio.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 
 \newcommand{\ButtonRCLeft}{\btnfnt{Rewind}}
 \newcommand{\ButtonRCRight}{\btnfnt{Forward}}
diff --git a/manual/platform/rgnano.tex b/manual/platform/rgnano.tex
index c17b20427c..51bebdccef 100644
--- a/manual/platform/rgnano.tex
+++ b/manual/platform/rgnano.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{rgnano}
 \edef\UseOption{\UseOption,RG_NANO_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/samsungyh820.tex b/manual/platform/samsungyh820.tex
index 6d5704bdd8..12ea2a77d4 100644
--- a/manual/platform/samsungyh820.tex
+++ b/manual/platform/samsungyh820.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{samsungyh820}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,SAMSUNG_YH820_PAD}
diff --git a/manual/platform/samsungyh920.tex b/manual/platform/samsungyh920.tex
index d817d115bd..5f1dedbd80 100644
--- a/manual/platform/samsungyh920.tex
+++ b/manual/platform/samsungyh920.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{samsungyh920}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,SAMSUNG_YH92X_PAD}
diff --git a/manual/platform/samsungyh925.tex b/manual/platform/samsungyh925.tex
index 28234990db..b57898c5ad 100644
--- a/manual/platform/samsungyh925.tex
+++ b/manual/platform/samsungyh925.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{samsungyh925}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,SAMSUNG_YH92X_PAD}
diff --git a/manual/platform/sansac200.tex b/manual/platform/sansac200.tex
index ded04c7865..3d9fd4628e 100644
--- a/manual/platform/sansac200.tex
+++ b/manual/platform/sansac200.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{c200}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,SANSA_C200_PAD}
diff --git a/manual/platform/sansac200v2.tex b/manual/platform/sansac200v2.tex
index b814486a54..119bbfa33d 100644
--- a/manual/platform/sansac200v2.tex
+++ b/manual/platform/sansac200v2.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{c200v2}
 \edef\UseOption{\UseOption,SANSA_C200_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/sansae200.tex b/manual/platform/sansae200.tex
index 4fdf7f43ba..03f8c590ae 100644
--- a/manual/platform/sansae200.tex
+++ b/manual/platform/sansae200.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{e200}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,SANSA_E200_PAD}
diff --git a/manual/platform/sansae200v2.tex b/manual/platform/sansae200v2.tex
index 508e5b612b..126a2756f0 100644
--- a/manual/platform/sansae200v2.tex
+++ b/manual/platform/sansae200v2.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{e200v2}
 \edef\UseOption{\UseOption,SANSA_E200_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/sansafuze.tex b/manual/platform/sansafuze.tex
index 6de548b3d7..8167dd925e 100644
--- a/manual/platform/sansafuze.tex
+++ b/manual/platform/sansafuze.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{fuze}
 \edef\UseOption{\UseOption,SANSA_FUZE_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/sansafuzev2.tex b/manual/platform/sansafuzev2.tex
index aeff762f80..b54884fc63 100644
--- a/manual/platform/sansafuzev2.tex
+++ b/manual/platform/sansafuzev2.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{fuzev2}
 \edef\UseOption{\UseOption,SANSA_FUZE_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/shanlingq1.tex b/manual/platform/shanlingq1.tex
index a2dc6855dc..b8bcff8b6d 100644
--- a/manual/platform/shanlingq1.tex
+++ b/manual/platform/shanlingq1.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \def\UseOption{shanlingq1}
 \edef\UseOption{\UseOption,SHANLING_Q1_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/vibe500.tex b/manual/platform/vibe500.tex
index 644e6888b4..eaa98e7d88 100644
--- a/manual/platform/vibe500.tex
+++ b/manual/platform/vibe500.tex
@@ -1,4 +1,3 @@
-% $Id: vibe500.tex 24014 2010-03-29 21:39:44Z b0hoon $ %
 \def\UseOption{vibe500}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,PBELL_VIBE500_PAD}
diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index 1c06df7fbd..7537f65b3d 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -1,4 +1,3 @@
-% $Id$
 \subsection{BrickMania}
 \screenshot{plugins/images/ss-brickmania}{BrickMania}%
 {img:brickmania}
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index 88fd4f997f..df0165138b 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Bubbles}
 \screenshot{plugins/images/ss-bubbles}{Bubbles}{img:bubbles}
 The goal of the game is to beat each level as quickly as possible by clearing
diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index e6488b286b..097ea608c3 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Calculator}
 \screenshot{plugins/images/ss-calculator}{Calculator}{img:calculator}
 
diff --git a/manual/plugins/calendar.tex b/manual/plugins/calendar.tex
index 7a561f7081..e267e8ac02 100644
--- a/manual/plugins/calendar.tex
+++ b/manual/plugins/calendar.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Calendar}
 \screenshot{plugins/images/ss-calendar}{Calendar}{img:calendar}
 This is a small and simple calendar application with memo saving function.
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index 2be90492f9..c7279e58f1 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Chess Clock}
 \screenshot{plugins/images/ss-chess_clock}{Chess Clock}{img:chessclock}
 The chess clock plugin is designed  to simulate a chess clock, but it can be
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index c6eb9272e8..67afa5aea8 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Chessbox}
 \screenshot{plugins/images/ss-chessbox}{Chessbox}{img:chessbox}
 Chessbox is a one-person chess game with computer artificial intelligence. 
diff --git a/manual/plugins/chopper.tex b/manual/plugins/chopper.tex
index 8d702d6a02..1d65874dcc 100644
--- a/manual/plugins/chopper.tex
+++ b/manual/plugins/chopper.tex
@@ -1,4 +1,3 @@
-% $Id: chopper.tex 18466 2008-09-08 18:15:06Z rmenes $ %
 \subsection{Chopper}
 \screenshot{plugins/images/ss-chopper}{Chopper}{img:chopper}
 
diff --git a/manual/plugins/codebuster.tex b/manual/plugins/codebuster.tex
index 380c5dc734..b8197540d5 100644
--- a/manual/plugins/codebuster.tex
+++ b/manual/plugins/codebuster.tex
@@ -1,4 +1,3 @@
-% $Id$
 \subsection{Codebuster}
 \screenshot{plugins/images/ss-codebuster}{Codebuster}{img:codebuster}
 
diff --git a/manual/plugins/credits.tex b/manual/plugins/credits.tex
index b1d4702311..289ce304f3 100644
--- a/manual/plugins/credits.tex
+++ b/manual/plugins/credits.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Credits}
 The credits plugin scrolls the entire list of the names of all the Rockbox
 contributors after displaying the Rockbox logo and version. This plugin is
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index 88d7677b08..8124217400 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Demystify}
 \screenshot{plugins/images/ss-demystify}{Demystify}{img:demystify}
 Demystify is a screen saver like demo.\\
diff --git a/manual/plugins/disktidy.tex b/manual/plugins/disktidy.tex
index d1b26a7d65..20fad60149 100644
--- a/manual/plugins/disktidy.tex
+++ b/manual/plugins/disktidy.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Disk Tidy}
   Disk Tidy deletes junk files commonly left behind by Windows, Linux and
   OS X after connecting your \dap{} over USB. Select the files you want to
diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex
index 55a3d9412f..a3203b9430 100644
--- a/manual/plugins/doom.tex
+++ b/manual/plugins/doom.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Doom}
 \screenshot{plugins/images/ss-doom}{Doom}{}
 This is the famous Doom game.
diff --git a/manual/plugins/fft.tex b/manual/plugins/fft.tex
index 69cbbfd8df..85b240a2b9 100644
--- a/manual/plugins/fft.tex
+++ b/manual/plugins/fft.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{FFT}
 This plugin is a basic frequency analyzer with 3 different frequency-amplitude
 plots (lines, bars, and spectrogram).
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index a66f9950ab..51bdeb5264 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Fire}
 \screenshot{plugins/images/ss-fire}{Fire}{img:fire}
 Fire is a demo displaying a fire effect.
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index 23e7088ac9..4bf5385d00 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Flipit}
 \screenshot{plugins/images/ss-flipit}{Flipit}{img:flipit}
 Flipping the colour of the token under the cursor also flips the tokens
diff --git a/manual/plugins/frotz.tex b/manual/plugins/frotz.tex
index 178ddaba23..7032ed74ef 100644
--- a/manual/plugins/frotz.tex
+++ b/manual/plugins/frotz.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{\label{ref:Frotz}Frotz}
 Frotz is a Z-Machine interpreter for playing Infocom's interactive fiction
 games, and newer games using the same format. To start a game open a
diff --git a/manual/plugins/imageviewer.tex b/manual/plugins/imageviewer.tex
index 603aadd963..046a14fbf8 100644
--- a/manual/plugins/imageviewer.tex
+++ b/manual/plugins/imageviewer.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Image Viewer}
 This plugin opens image files from the \setting{File Browser} to display them\nopt{lcd_color}{ using Rockbox's greyscale library}. Supported formats are as follows.
 
diff --git a/manual/plugins/jackpot.tex b/manual/plugins/jackpot.tex
index 754d7a6ab7..46269b0ccb 100644
--- a/manual/plugins/jackpot.tex
+++ b/manual/plugins/jackpot.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Jackpot}
 \screenshot{plugins/images/ss-jackpot}{Jackpot}{img:Jackpot}
 This is a jackpot slot machine game. At the beginning of the game you
diff --git a/manual/plugins/keybox.tex b/manual/plugins/keybox.tex
index c1183231b2..01db052d0c 100644
--- a/manual/plugins/keybox.tex
+++ b/manual/plugins/keybox.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Keybox}
 Keybox is an encrypted password storage using the ``Tiny Encryption Algorithm''
 with a key derived using md5.
diff --git a/manual/plugins/lamp.tex b/manual/plugins/lamp.tex
index 23190e62f1..8d333340ab 100644
--- a/manual/plugins/lamp.tex
+++ b/manual/plugins/lamp.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Lamp}
 Lamp is a simple plugin to use your player as a lamp (flashlight, torch).
 You get an empty screen with maximum brightness.
diff --git a/manual/plugins/logo.tex b/manual/plugins/logo.tex
index b79747cd91..087f5176d8 100644
--- a/manual/plugins/logo.tex
+++ b/manual/plugins/logo.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Logo}
 Demo showing the Rockbox logo bouncing around the screen.
 \begin{btnmap}
diff --git a/manual/plugins/lrcplayer.tex b/manual/plugins/lrcplayer.tex
index d1ff67a842..2ed0948d09 100644
--- a/manual/plugins/lrcplayer.tex
+++ b/manual/plugins/lrcplayer.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Lrcplayer}
 % \screenshot{plugins/images/ss-lrcplayer}{Lrcplayer}{}
 This plugin displays lyrics in \fname{.lrc} files (and some other formats)
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 8ca4b86e6b..1da6c16b59 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \chapter{Plugins}\label{ref:plugins}
 \opt{mpiohd200}{%
 \fixme{The manual for MPIO HD200 is incomplete. Keymap definitions for plugins are missing.}\\
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index ee68795c59..6ddfc86206 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Minesweeper}
 \screenshot{plugins/images/ss-minesweeper}{Minesweeper plugin}{img:minesweeper}
 The classic game of minesweeper.
diff --git a/manual/plugins/mosaic.tex b/manual/plugins/mosaic.tex
index 42d915aedd..32158f2887 100644
--- a/manual/plugins/mosaic.tex
+++ b/manual/plugins/mosaic.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 %
 %
 \subsection{Mosaique}
diff --git a/manual/plugins/movieplayer.tex b/manual/plugins/movieplayer.tex
index 93a64d7415..e32605a123 100644
--- a/manual/plugins/movieplayer.tex
+++ b/manual/plugins/movieplayer.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Movie Player}
 Play movies on your \dap!  In order to do this, movies must be in AVI format,
 and then converted to \fname{.RVF}, Rockbox's own video format. For more
diff --git a/manual/plugins/mpegplayer.tex b/manual/plugins/mpegplayer.tex
index 1233df9f70..d599bd06b5 100644
--- a/manual/plugins/mpegplayer.tex
+++ b/manual/plugins/mpegplayer.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{MPEG Player}
 The Mpeg Player is a video player plugin capable of playing back MPEG-1 and 
 MPEG-2 video streams with MPEG audio multiplexed into \fname{.mpg} files.
diff --git a/manual/plugins/nim.tex b/manual/plugins/nim.tex
index 10dbb08871..9d6294c5c9 100644
--- a/manual/plugins/nim.tex
+++ b/manual/plugins/nim.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Nim}
 \screenshot{plugins/images/ss-nim}{Nim}{img:Nim}
 Rules of Nim: There are 21 matches. Two players (you and the \dap{})
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 8cdb57bdab..1c623b6a72 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Oscilloscope}
 \screenshot{plugins/images/ss-oscilloscope}{Oscilloscope}{img:oscilloscope}
 
diff --git a/manual/plugins/otp.tex b/manual/plugins/otp.tex
index 5b1a29f8c2..6ab3390565 100644
--- a/manual/plugins/otp.tex
+++ b/manual/plugins/otp.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{One-Time Password Client}
 This plugin provides the ability to generate one-time passwords (OTPs)
 for authentication purposes. It implements an HMAC-based One-Time
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index e262f85a42..3cad57a14a 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Pacbox}
 \screenshot{plugins/images/ss-pacbox}{Pacbox}{img:pacbox}
 Pacbox is an emulator of the Pacman arcade machine hardware. It is a port of
diff --git a/manual/plugins/pegbox.tex b/manual/plugins/pegbox.tex
index 5cbd1690ed..df9f45558b 100644
--- a/manual/plugins/pegbox.tex
+++ b/manual/plugins/pegbox.tex
@@ -1,4 +1,3 @@
-% $Id: pegbox.tex 16693 2008-03-18 09:24:35Z roolku $ %
 \subsection{Pegbox}
 \screenshot{plugins/images/ss-pegbox}{pegbox}{img:pegbox}
 To beat each level, you must destroy all of the pegs. If two like pegs are
diff --git a/manual/plugins/pitch_detector.tex b/manual/plugins/pitch_detector.tex
index 0b9363cf6c..840d7bf82c 100644
--- a/manual/plugins/pitch_detector.tex
+++ b/manual/plugins/pitch_detector.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 
 \subsection{Pitch Detector}
 
diff --git a/manual/plugins/plasma.tex b/manual/plugins/plasma.tex
index b93ebe095c..f6670c64ee 100644
--- a/manual/plugins/plasma.tex
+++ b/manual/plugins/plasma.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Plasma}
 \screenshot{plugins/images/ss-plasma}{Plasma}{img:plasma}
 Plasma is a demo displaying a 80's style retro plasma effect.
diff --git a/manual/plugins/robotfindskitten.tex b/manual/plugins/robotfindskitten.tex
index 86be5bd600..3cd5d5989c 100644
--- a/manual/plugins/robotfindskitten.tex
+++ b/manual/plugins/robotfindskitten.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Robotfindskitten}
 \screenshot{plugins/images/ss-robotfindskitten}{Robotfindskitten}{img:robotfindskitten}
 In this game, you are robot (\#). Your job is to find kitten. This task
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index c99e0dba78..c4394bfe08 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Rockblox}
 \screenshot{plugins/images/ss-rockblox}{Rockblox}{fig:rockblox}
 Rockblox is a Rockbox version of the classic falling blocks game from Russia. 
diff --git a/manual/plugins/rockblox1d.tex b/manual/plugins/rockblox1d.tex
index df0f6480a2..8bdfb97a23 100644
--- a/manual/plugins/rockblox1d.tex
+++ b/manual/plugins/rockblox1d.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Rockblox1d}
 
 Rockblox1d is a game for people who find rockblox too hard. In this version the
diff --git a/manual/plugins/rockpaint.tex b/manual/plugins/rockpaint.tex
index e43b28d7ab..0ba0d80de6 100644
--- a/manual/plugins/rockpaint.tex
+++ b/manual/plugins/rockpaint.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Rockpaint}
 \screenshot{plugins/images/ss-rockpaint}{Rockpaint}%
 {img:Rockpaint}
diff --git a/manual/plugins/shopper.tex b/manual/plugins/shopper.tex
index b2e23e46ee..94f5aa5862 100644
--- a/manual/plugins/shopper.tex
+++ b/manual/plugins/shopper.tex
@@ -1,4 +1,3 @@
-% $Id$
 \subsection{Shopper}
 \label{ref:Shopperplugin}
 
diff --git a/manual/plugins/starfield.tex b/manual/plugins/starfield.tex
index e219859325..70faef98f2 100644
--- a/manual/plugins/starfield.tex
+++ b/manual/plugins/starfield.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Starfield}
 \screenshot{plugins/images/ss-starfield}{Starfield}{img:starfield}
 Starfield simulation (like the classic screensaver).
diff --git a/manual/plugins/theme_remove.tex b/manual/plugins/theme_remove.tex
index 6c21b11312..4f4c7766c4 100644
--- a/manual/plugins/theme_remove.tex
+++ b/manual/plugins/theme_remove.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{\label{ref:ThemeRemove}Theme Remove}
 This plugin offers a way to remove a theme. Open the \setting{Context Menu} (see \reference{ref:Contextmenu}) 
 upon a theme\fname{.cfg} file and select \setting{Open With... $\rightarrow$ theme\_remove}.
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index 7b407ab5e2..1fed67ae44 100644
--- a/manual/plugins/xobox.tex
+++ b/manual/plugins/xobox.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{Xobox}
 \screenshot{plugins/images/ss-xobox}{Xobox}{img:xobox}
 Xobox is a simple clone of the well known arcade game Qix.
diff --git a/manual/preamble.tex b/manual/preamble.tex
index 379d00173b..1974766405 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -7,7 +7,6 @@
 %                     \/            \/     \/    \/            \/
 %                                   - M A N U A L -
 %
-% $Id$
 %
 % Copyright (C) 2006 The Rockbox Manual Team
 %
diff --git a/manual/rockbox-html.cfg b/manual/rockbox-html.cfg
index 156bf4ba03..bc6ad92627 100644
--- a/manual/rockbox-html.cfg
+++ b/manual/rockbox-html.cfg
@@ -1,4 +1,3 @@
-% $Id$ %
 \Preamble{xhtml}
 \begin{document}
 \Css{%
diff --git a/manual/rockbox.tex b/manual/rockbox.tex
index 01e84018c3..6533bdb196 100644
--- a/manual/rockbox.tex
+++ b/manual/rockbox.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \input{preamble.tex}
 
 \begin{document}
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index c6443a9351..ddf632d379 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \chapter{Browsing and playing}
 \section{\label{ref:file_browser}File Browser}
 \screenshot{rockbox_interface/images/ss-file-browser}{The file browser}{}
diff --git a/manual/rockbox_interface/hotkeys.tex b/manual/rockbox_interface/hotkeys.tex
index 8fe07c5cf1..cea46afd06 100644
--- a/manual/rockbox_interface/hotkeys.tex
+++ b/manual/rockbox_interface/hotkeys.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \opt{hotkey}{
     \section{\label{ref:Hotkeys}Hotkeys}
     Hotkeys are shortcut keys for use in the \nopt{touchscreen}{\setting{File Browser},
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 70a68170a6..5b5c418792 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \chapter{\label{ref:rockbox_interface}Quick Start}
 \section{Basic Overview}
 \subsection{The \daps{} controls}
diff --git a/manual/rockbox_interface/tagcache.tex b/manual/rockbox_interface/tagcache.tex
index 99904b1927..41df4ed3ec 100644
--- a/manual/rockbox_interface/tagcache.tex
+++ b/manual/rockbox_interface/tagcache.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \section{\label{ref:database}Database}
 
 \subsection{Introduction}
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 918d62a436..76b8e178b4 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \section{\label{ref:WPS}While Playing Screen}
 The While Playing Screen (WPS) displays various pieces of information about the
 currently playing audio file.
diff --git a/manual/working_with_playlists/main.tex b/manual/working_with_playlists/main.tex
index bdb595b19c..48c348b643 100644
--- a/manual/working_with_playlists/main.tex
+++ b/manual/working_with_playlists/main.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \section{\label{ref:working_with_playlists}Working with Playlists}
 
 \subsection{Creating playlists}
diff --git a/packaging/ctru/ctru.make b/packaging/ctru/ctru.make
index 2bcd7bd50c..838ff12b90 100644
--- a/packaging/ctru/ctru.make
+++ b/packaging/ctru/ctru.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # 3ds_rules
diff --git a/tools/addtargetdir.pl b/tools/addtargetdir.pl
index bf5fe8a144..1eedecdec8 100755
--- a/tools/addtargetdir.pl
+++ b/tools/addtargetdir.pl
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # addtargetdir.pl - Adds target directory to gcc-generated dependency data
diff --git a/tools/autoconf.pl b/tools/autoconf.pl
index e7ba3e20f2..9590c9ae03 100755
--- a/tools/autoconf.pl
+++ b/tools/autoconf.pl
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # This program attempts to run configure with the correct build target
diff --git a/tools/bmp2rb.c b/tools/bmp2rb.c
index 1a10a17b49..bec7413cc9 100644
--- a/tools/bmp2rb.c
+++ b/tools/bmp2rb.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 13808ec20a..e10396dac7 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 use strict;
diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c
index 6c4e404800..f46e57173d 100644
--- a/tools/checkwps/checkwps.c
+++ b/tools/checkwps/checkwps.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Dave Chapman
  *
@@ -326,7 +325,7 @@ int main(int argc, char **argv)
      * flawed wps */
     while (argv[filearg]) {
         const char* name = argv[filearg++];
-        char *ext = strrchr(name, '.');
+        const char *ext = strrchr(name, '.');
         struct skin_stats stats;
         printf("Checking %s...\n", name);
         if (!ext)
diff --git a/tools/checkwps/checkwps.h b/tools/checkwps/checkwps.h
index fd494ce694..24fcd556d8 100644
--- a/tools/checkwps/checkwps.h
+++ b/tools/checkwps/checkwps.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
  *                     \/            \/     \/    \/            \/ 
- * $Id$
  *
  * Copyright (C) 2008 by Jonathan Gordon
  *
diff --git a/tools/configure b/tools/configure
index 800013ee25..6d798820fa 100755
--- a/tools/configure
+++ b/tools/configure
@@ -8,7 +8,7 @@
 #
 
 # global CC options for all platforms
-CCOPTS="-W -Wall -Wextra -Wundef -Os -nostdlib -ffreestanding -Wstrict-prototypes -pipe -std=gnu99 -funit-at-a-time -fno-delete-null-pointer-checks -fno-strict-overflow -fno-common"
+CCOPTS="-W -Wall -Wextra -Wundef -Os -nostdlib -ffreestanding -Wstrict-prototypes -pipe -std=gnu11 -funit-at-a-time -fno-delete-null-pointer-checks -fno-strict-overflow -fno-common"
 
 # LD options for the core
 LDOPTS=""
@@ -21,8 +21,6 @@ use_logf="#undef ROCKBOX_HAS_LOGF"
 use_bootchart="#undef DO_BOOTCHART"
 use_logf_serial="#undef LOGF_SERIAL"
 
-scriptver=`echo '$Revision$' | sed -e 's:\\$::g' -e 's/Revision: //'`
-
 rbdir="/.rockbox"
 bindir=
 libdir=
@@ -396,12 +394,14 @@ simcc () {
    ;;
 
    Darwin)
-   sigaltstack=`check_sigaltstack`
+   # FIXME: sigaltstack fails with "Operation not permitted"
+   # in make_context (firmware/asm/thread-unix.c) on latest
+   # versions of macOS (≥ 26.4). Fall back to SDL threads.
    echo "Darwin host detected"
    if $CC --version | grep -q "clang"; then
-    CC=gcc-15
-    AR=gcc-ar-15
-    CPP=cpp-15
+    CC=gcc-16
+    AR=gcc-ar-16
+    CPP=cpp-16
    fi
    LDOPTS="$LDOPTS -ldl"
    SHARED_LDFLAGS="-dynamiclib -Wl,-no_warn_duplicate_libraries"
@@ -4718,6 +4718,13 @@ if [ "$ARG_STACK_PROTECTOR" != "" ]; then
     fi
 fi
 
+# We generally want utf8proc.  Exceptions are:
+#   Bootloaders, checkwps, warble, <4MB RAM
+#   and (temporarily) imx233
+if [ "$apps" = "bootloader" -o "$app_type" = "checkwps" -o "$app_type" = "warble" -o "$memory" -lt "4" -o "$t_manufacturer" = "imx233" ]; then
+    no_utf8proc=1
+fi
+
 cat > autoconf.h.new <<EOF
 /* This header was made by configure */
 #ifndef __BUILD_AUTOCONF_H
@@ -4965,6 +4972,7 @@ export FUNKEY_SDK_PATH=${FUNKEY_SDK_PATH}
 export ANDROID_PLATFORM_VERSION=${ANDROID_PLATFORM_VERSION}
 export TOOLSET=${toolset}
 export PIPER_MODEL_DIR=${PIPER_MODEL_DIR}
+export NO_UTF8PROC=${no_utf8proc}
 $CCACHE_ARG
 $LTO_ARG
 
diff --git a/tools/convbdf.c b/tools/convbdf.c
index d452a3357c..ea848cf90a 100644
--- a/tools/convbdf.c
+++ b/tools/convbdf.c
@@ -884,7 +884,6 @@ int bdf_read_bitmaps(FILE *fp, struct font* pf)
     /* change unused width values to default char values */
     for (i=0; i<pf->size; ++i) {
         int defchar = pf->defaultchar - pf->firstchar;
-
         if (pf->offset[i] == -1)
             pf->width[i] = pf->width[defchar];
     }
@@ -1224,9 +1223,9 @@ int gen_c_source(struct font* pf, char *path)
         "   ascent: %d\n"
         "   descent: %d\n"
         "   depth: %d\n"
-        "   first char: %d (0x%02x)\n"
-        "   last char: %d (0x%02x)\n"
-        "   default char: %d (0x%02x)\n"
+        "   first char: %d (U+%06x)\n"
+        "   last char: %d (U+%06x)\n"
+        "   default char: %d (U+%06x)\n"
         "   proportional: %s\n"
         "   %s\n"
         "*/\n"
@@ -1234,6 +1233,7 @@ int gen_c_source(struct font* pf, char *path)
         "/* Font character bitmap data. */\n"
         "static const unsigned char _font_bits[] = {\n"
     };
+    int defchar = pf->defaultchar - pf->firstchar;
 
     ofp = fopen(path, "w");
     if (!ofp) {
@@ -1354,8 +1354,8 @@ int gen_c_source(struct font* pf, char *path)
             int offset = pf->offset[i];
             int offrot = pf->offrot[i];
             if (offset == -1) {
-                offset = pf->offset[pf->defaultchar - pf->firstchar];
-                offrot = pf->offrot[pf->defaultchar - pf->firstchar];
+                offset = pf->offset[defchar];
+                offrot = pf->offrot[defchar];
             }
             fprintf(ofp, "  %d,\t/* (0x%02x) */\n",
 #ifdef ROTATE
@@ -1538,6 +1538,8 @@ int gen_fnt_file(struct font* pf, char *path)
     int ofr = 0;
 #endif
 
+    int defchar = pf->defaultchar - pf->firstchar;
+
     ofp = fopen(path, "wb");
     if (!ofp) {
         print_error("Can't create %s\n", path);
@@ -1612,7 +1614,7 @@ int gen_fnt_file(struct font* pf, char *path)
         {
             int offrot = pf->offrot[i];
             if (pf->offset[i] == -1) {
-                offrot = pf->offrot[pf->defaultchar - pf->firstchar];
+                offrot = pf->offrot[defchar];
             }
             if ( pf->bits_size < MAX_FONTSIZE_FOR_16_BIT_OFFSETS )
                 writeshort(ofp, offrot);
@@ -1634,7 +1636,7 @@ int gen_fnt_file(struct font* pf, char *path)
         for (i=0; i<pf->size; ++i) {
             int offset = pf->offset[i];
             if (offset == -1) {
-                offset = pf->offset[pf->defaultchar - pf->firstchar];
+                offset = pf->offset[defchar];
             }
             writeint(ofp, offset);
         }
diff --git a/tools/convttf.c b/tools/convttf.c
index 845ea9c90a..66277f4448 100644
--- a/tools/convttf.c
+++ b/tools/convttf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonas Hurrelmann
  *
@@ -94,6 +93,7 @@ int pct                     = 0; /* display ttc table if it is not zero. */
 FT_Long         max_char    = 0x10FFFF;
 int             pixel_size  = 15;
 FT_Long         start_char  = 0;
+FT_Long         defaultchar = -1;
 FT_Long         limit_char;
 FT_Long         firstchar   = 0;
 FT_Long         lastchar;
@@ -192,8 +192,9 @@ void usage(void)
         "                               default output-file is: \n"
         "                             <font-size>-<internal postscript-name of input-file>.fnt.\n"
         "Options:\n"
-        "    -s N   Start output at character encodings >= N\n"
-        "    -l N   Limit output to character encodings <= N\n"
+        "    -s N   Start output at character encodings >= N (default is first glyph in font)\n"
+        "    -l N   Limit output to character encodings <= N (default is last glyph in font)\n"
+        "    -D N   Default character to use for those not present in font (default is first glyph)\n"
         "    -p N   Font size N in pixel (default N=15)\n"
         "    -c N   Character separation in pixel.Insert space between lines.\n"
         "    -x     Trim glyphs horizontally of nearly empty space\n"
@@ -712,7 +713,15 @@ void convttf(char* path, char* destfile, FT_Long face_index)
         if (code <= firstchar)
             firstchar = code;
     }
-    export_font.header.defaultchar = firstchar;
+
+    /* calc default char */
+    if (defaultchar < 0 ||
+        defaultchar < firstchar ||
+        defaultchar > limit_char ||
+        defaultchar > lastchar)
+        defaultchar = firstchar;
+
+    export_font.header.defaultchar = defaultchar;
     export_font.header.firstchar = firstchar;
     export_font.header.size = lastchar - firstchar + 1;
     export_font.header.nbits = idx;
@@ -764,11 +773,12 @@ void convttf(char* path, char* destfile, FT_Long face_index)
         charindex = getcharindex( face, code);
         if ( !charindex )
         {
+            FT_Long defchar = defaultchar - firstchar;
             if ( use_long_offset )
-                export_font.offset_long[code - firstchar] = export_font.offset_long[0];
+                export_font.offset_long[code - firstchar] = export_font.offset_long[defchar];
             else
-                export_font.offset[code - firstchar] = export_font.offset[0];
-            export_font.width[code - firstchar] = export_font.width[0];
+                export_font.offset[code - firstchar] = export_font.offset[defchar];
+            export_font.width[code - firstchar] = export_font.width[defchar];
             continue;
         }
 
@@ -1141,6 +1151,19 @@ void getopts(int *pac, char ***pav)
                 while (*p && *p != ' ')
                     p++;
                 break;
+            case 'D':       /* set default char*/
+                if (*p) {
+                    start_char = atol(p);
+                    while (*p && *p != ' ')
+                        p++;
+                }
+                else {
+                    av++; ac--;
+                    if (ac > 0)
+                        defaultchar = atol(av[0]);
+                }
+                break;
+
             case 'x':
                 trimming = 1;
                 while (*p && *p != ' ')
diff --git a/tools/creative.c b/tools/creative.c
index a18b56e448..3517156527 100644
--- a/tools/creative.c
+++ b/tools/creative.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/tools/creative.h b/tools/creative.h
index 857f0c4479..2a9a6a5c74 100644
--- a/tools/creative.h
+++ b/tools/creative.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/tools/database/database.make b/tools/database/database.make
index c4b2d85f2a..9238828535 100644
--- a/tools/database/database.make
+++ b/tools/database/database.make
@@ -4,13 +4,10 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id: checkwps.make 22680 2009-09-11 17:58:17Z gevaerts $
 #
 
 GCCOPTS += -g -DDEBUG -D__PCTOOL__ -DDBTOOL
 
-include $(ROOTDIR)/lib/utf8proc/utf8proc.make
-
 METADATAS := $(wildcard $(ROOTDIR)/lib/rbcodec/metadata/*.c)
 
 DATABASE_SRC = $(call preprocess, $(TOOLSDIR)/database/SOURCES) $(METADATAS)
diff --git a/tools/descramble.c b/tools/descramble.c
index e29d49d5ef..f8c43ae9b2 100644
--- a/tools/descramble.c
+++ b/tools/descramble.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg
  *
diff --git a/tools/dict2rdf.pl b/tools/dict2rdf.pl
index c9085d35ed..2337931fd2 100755
--- a/tools/dict2rdf.pl
+++ b/tools/dict2rdf.pl
@@ -6,7 +6,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2005 Tony Motakis
 #
diff --git a/tools/disktest_sysbench.sh b/tools/disktest_sysbench.sh
index 8c2f4cecad..6681ffd53a 100755
--- a/tools/disktest_sysbench.sh
+++ b/tools/disktest_sysbench.sh
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2020 William Wilgus
 ################################################################################
diff --git a/tools/functions.make b/tools/functions.make
index d3fad449bb..1f07e0d381 100644
--- a/tools/functions.make
+++ b/tools/functions.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # preprocess - run preprocessor on a file and return the result as a string
diff --git a/tools/fwpatcher/Makefile b/tools/fwpatcher/Makefile
index e11e6d21ad..496ebf7b13 100644
--- a/tools/fwpatcher/Makefile
+++ b/tools/fwpatcher/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 #value for crosscompiling on linux
diff --git a/tools/fwpatcher/iriver.c b/tools/fwpatcher/iriver.c
index a55b7cb9b9..acb0f760d1 100644
--- a/tools/fwpatcher/iriver.c
+++ b/tools/fwpatcher/iriver.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Dave Hooper
  *
diff --git a/tools/fwpatcher/iriver.h b/tools/fwpatcher/iriver.h
index 6ebb1fb3f8..7e74b79889 100644
--- a/tools/fwpatcher/iriver.h
+++ b/tools/fwpatcher/iriver.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Daniel Stenberg
  *
diff --git a/tools/fwpatcher/main.c b/tools/fwpatcher/main.c
index 5fdac29100..e1810522f6 100644
--- a/tools/fwpatcher/main.c
+++ b/tools/fwpatcher/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Thom Johansen
  *
diff --git a/tools/genlang b/tools/genlang
index 362a80abc9..3cd470d0a1 100755
--- a/tools/genlang
+++ b/tools/genlang
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2006 - 2008 by Daniel Stenberg
 #
diff --git a/tools/gigabeat.c b/tools/gigabeat.c
index a3c9b06d04..70ceae460e 100644
--- a/tools/gigabeat.c
+++ b/tools/gigabeat.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Christian Hack
  *
diff --git a/tools/gigabeat.h b/tools/gigabeat.h
index 0462f35c9c..7f0a46cf64 100644
--- a/tools/gigabeat.h
+++ b/tools/gigabeat.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Marcoen Hirschberg
  *
diff --git a/tools/gigabeats.c b/tools/gigabeats.c
index 2d2d489865..d4d8cb0c88 100644
--- a/tools/gigabeats.c
+++ b/tools/gigabeats.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Will Robertson
  *
diff --git a/tools/gigabeats.h b/tools/gigabeats.h
index 2c3e14e77d..76fd6ab107 100644
--- a/tools/gigabeats.h
+++ b/tools/gigabeats.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Marcoen Hirschberg
  *
diff --git a/tools/iriver.c b/tools/iriver.c
index dd5d607a89..b57f842fb0 100644
--- a/tools/iriver.c
+++ b/tools/iriver.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Dave Hooper
  *
diff --git a/tools/iriver.h b/tools/iriver.h
index fa8a959c4f..0b43676f60 100644
--- a/tools/iriver.h
+++ b/tools/iriver.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Daniel Stenberg
  *
diff --git a/tools/langtool.pl b/tools/langtool.pl
index bffdde2c9b..2f7a27c5d4 100755
--- a/tools/langtool.pl
+++ b/tools/langtool.pl
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/tools/mi4.c b/tools/mi4.c
index cf052be6eb..db2ad81803 100644
--- a/tools/mi4.c
+++ b/tools/mi4.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dave Chapman
  *
diff --git a/tools/mi4.h b/tools/mi4.h
index 4659e26809..c3b682176f 100644
--- a/tools/mi4.h
+++ b/tools/mi4.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dave Chapman
  *
diff --git a/tools/mk500boot.c b/tools/mk500boot.c
index 1187058091..5b89da8408 100644
--- a/tools/mk500boot.c
+++ b/tools/mk500boot.c
@@ -7,7 +7,6 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2009 by Karl Kurbjun  
- *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/tools/mkboot.c b/tools/mkboot.c
index 3996029aa3..8d2d265c03 100644
--- a/tools/mkboot.c
+++ b/tools/mkboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Linus Nielsen Feltzing
  *
diff --git a/tools/mkboot.h b/tools/mkboot.h
index ba12d1b473..b44fac5b8c 100644
--- a/tools/mkboot.h
+++ b/tools/mkboot.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Dominik Riebeling
  *
diff --git a/tools/mkmi4.sh b/tools/mkmi4.sh
index 068d7e0628..2df8c08ca4 100755
--- a/tools/mkmi4.sh
+++ b/tools/mkmi4.sh
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Purpose of this script:
 #
diff --git a/tools/mkspl-x1000.c b/tools/mkspl-x1000.c
index ed481a0149..50d7a25314 100644
--- a/tools/mkspl-x1000.c
+++ b/tools/mkspl-x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/tools/mkzenboot.c b/tools/mkzenboot.c
index c95aa232fb..b20835bd9f 100644
--- a/tools/mkzenboot.c
+++ b/tools/mkzenboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/tools/mp3info.pm b/tools/mp3info.pm
index d900777266..c31e86fcef 100644
--- a/tools/mp3info.pm
+++ b/tools/mp3info.pm
@@ -1,23 +1,33 @@
 package mp3info;
 
+# JJ: fixed bugs and stuff and added META info
+# JRF: Added support for ID3v2.4 spec-valid frame size processing (falling back to old
+#      non-spec valid frame size processing)
+#      Added support for ID3v2.4 footers.
+#      Updated text frames to correct mis-terminated frame content.
+#      Added ignoring of encrypted frames.
+#      TODO: sort out flags for compression / DLI
+
 require 5.006;
 
-use overload;
 use strict;
+use overload;
 use Carp;
+use Fcntl qw(:seek);
 
 use vars qw(
-	@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION $REVISION
+	@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION
 	@mp3_genres %mp3_genres @winamp_genres %winamp_genres $try_harder
 	@t_bitrate @t_sampling_freq @frequency_tbl %v1_tag_fields
 	@v1_tag_names %v2_tag_names %v2_to_v1_names $AUTOLOAD
 	@mp3_info_fields %rva2_channel_types
+	$debug_24 $debug_Tencoding
 );
 
 @ISA = 'Exporter';
 @EXPORT = qw(
 	set_mp3tag get_mp3tag get_mp3info remove_mp3tag
-	use_winamp_genres, use_mp3_utf8
+	use_winamp_genres
 );
 @EXPORT_OK = qw(@mp3_genres %mp3_genres use_mp3_utf8);
 %EXPORT_TAGS = (
@@ -26,9 +36,11 @@ use vars qw(
 	all	=> [@EXPORT, @EXPORT_OK]
 );
 
-# $Id$
-($REVISION) = ' $Revision$ ' =~ /\$Revision:\s+([^\s]+)/;
-$VERSION = '1.20';
+$VERSION = '1.26'; # Just adds metadata 
+
+# JRF: Whether we're debugging the ID3v2.4 support
+$debug_24 = 0;
+$debug_Tencoding = 0;
 
 =pod
 
@@ -167,19 +179,28 @@ with the C<:utf8> or C<:all> export tag.
 
 =cut
 
-my $unicode_module = eval { require Encode; require Encode::Guess };
-my $UNICODE = use_mp3_utf8($unicode_module ? 1 : 0);
+my $unicode_base_module = eval { require Encode; require Encode::Guess };
+
+my $UNICODE = use_mp3_utf8($unicode_base_module ? 1 : 0);
+
+eval { require Encode::Detect::Detector };
+
+my $unicode_detect_module = $@ ? 0 : 1;
 
 sub use_mp3_utf8 {
-	my($val) = @_;
+	my $val = shift;
+
+	$UNICODE = 0;
+
 	if ($val == 1) {
-		if ($unicode_module) {
-			$UNICODE = 1;
+
+		if ($unicode_base_module) {
+
 			$Encode::Guess::NoUTFAutoGuess = 1;
+			$UNICODE = 1;
 		}
-	} elsif ($val == 0) {
-		$UNICODE = 0;
 	}
+
 	return $UNICODE;
 }
 
@@ -255,7 +276,7 @@ sub remove_mp3tag {
 	binmode $fh;
 
 	if ($version eq 1 || $version eq 'ALL') {
-		seek $fh, -128, 2;
+		seek $fh, -128, SEEK_END;
 		my $tell = tell $fh;
 		if (<$fh> =~ /^TAG/) {
 			truncate $fh, $tell or carp "Can't truncate '$file': $!";
@@ -267,14 +288,14 @@ sub remove_mp3tag {
 		my $v2h = _get_v2head($fh);
 		if ($v2h) {
 			local $\;
-			seek $fh, 0, 2;
+			seek $fh, 0, SEEK_END;
 			my $eof = tell $fh;
 			my $off = $v2h->{tag_size};
 
 			while ($off < $eof) {
-				seek $fh, $off, 0;
+				seek $fh, $off, SEEK_SET;
 				read $fh, my($bytes), $buf;
-				seek $fh, $off - $v2h->{tag_size}, 0;
+				seek $fh, $off - $v2h->{tag_size}, SEEK_SET;
 				print $fh $bytes;
 				$off += $buf;
 			}
@@ -283,6 +304,9 @@ sub remove_mp3tag {
 				or carp "Can't truncate '$file': $!";
 			$return += $v2h->{tag_size};
 		}
+
+		# JRF: I've not written the code to strip ID3v2.4 footers.
+		#      Sorry, I'm lazy.
 	}
 
 	_close($file, $fh);
@@ -400,9 +424,9 @@ EOT
 
 	binmode $fh;
 	$oldfh = select $fh;
-	seek $fh, -128, 2;
-	# go to end of file if no tag, beginning of file if tag
-	seek $fh, (<$fh> =~ /^TAG/ ? -128 : 0), 2;
+	seek $fh, -128, SEEK_END;
+	# go to end of file if no ID3v1 tag, beginning of existing tag if tag present
+	seek $fh, (<$fh> =~ /^TAG/ ? -128 : 0), SEEK_END;
 
 	# get genre value
 	$info{GENRE} = $info{GENRE} && exists $mp3_genres{$info{GENRE}} ?
@@ -425,7 +449,7 @@ EOT
 
 =pod
 
-=item get_mp3tag (FILE [, VERSION, RAW_V2])
+=item get_mp3tag (FILE [, VERSION, RAW_V2, APE2])
 
 Returns hash reference containing tag information in MP3 file.  The keys
 returned are the same as those supplied for C<set_mp3tag>, except in the
@@ -445,6 +469,8 @@ If RAW_V2 is C<2>, the ID3v2 tag data is returned, manipulating for Unicode if
 necessary, etc.  It also takes multiple values for a given key (such as comments)
 and puts them in an arrayref.
 
+If APE is C<1>, an APE tag will be located before all other tags.
+
 If the ID3v2 version is older than ID3v2.2.0 or newer than ID3v2.4.0, it will
 not be read.
 
@@ -457,19 +483,21 @@ data (if TAGVERSION argument is C<0>, may contain two versions).
 =cut
 
 sub get_mp3tag {
-	my ($file, $ver, $raw_v2, $find_ape) = @_;
-	my ($tag, $v2h, $fh);
+	my $file     = shift;
+	my $ver      = shift || 0;
+	my $raw      = shift || 0;
+	my $find_ape = shift || 0;
+	my $fh;
 
-	my $v1    = {};
-	my $v2    = {};
-	my $ape   = {};
-	my %info  = ();
-	my @array = ();
+	my $has_v1  = 0;
+	my $has_v2  = 0;
+	my $has_ape = 0;
+	my %info    = ();
 
-	$raw_v2 ||= 0;
+	# See if a version number was passed. Make sure it's a 1 or a 2
 	$ver = !$ver ? 0 : ($ver == 2 || $ver == 1) ? $ver : 0;
 
-	if (not (defined $file && $file ne '')) {
+	if (!(defined $file && $file ne '')) {
 		$@ = "No file specified";
 		return undef;
 	}
@@ -481,13 +509,17 @@ sub get_mp3tag {
 		return undef;
 	}
 
-	if (ref $file) { # filehandle passed
+	# filehandle passed
+	if (ref $file) {
+
 		$fh = $file;
+
 	} else {
-		if (not open $fh, '<', $file) {
+
+		open($fh, $file) || do {
 			$@ = "Can't open $file: $!";
 			return undef;
-		}
+		};
 	}
 
 	binmode $fh;
@@ -496,14 +528,14 @@ sub get_mp3tag {
 	# store ReplayGain information
 	if ($find_ape) {
 
-		$ape = _parse_ape_tag($fh, $filesize, \%info);
+		$has_ape = _parse_ape_tag($fh, $filesize, \%info);
 	}
 
 	if ($ver < 2) {
 
-		$v1 = _get_v1tag($fh, \%info);
+		$has_v1 = _get_v1tag($fh, \%info);
 
-		if ($ver == 1 && !$v1) {
+		if ($ver == 1 && !$has_v1) {
 			_close($file, $fh);
 			$@ = "No ID3v1 tag found";
 			return undef;
@@ -511,37 +543,20 @@ sub get_mp3tag {
 	}
 
 	if ($ver == 2 || $ver == 0) {
-		($v2, $v2h) = _get_v2tag($fh);
+		$has_v2 = _get_v2tag($fh, $ver, $raw, \%info);
 	}
 
-	if (!$v1 && !$v2 && !$ape) {
+	if (!$has_v1 && !$has_v2 && !$has_ape) {
 		_close($file, $fh);
-		$@ = "No ID3 tag found";
+		$@ = "No ID3 or APE tag found";
 		return undef;
 	}
 
-	if (($ver == 0 || $ver == 2) && $v2) {
+	unless ($raw && $ver == 2) {
 
-		if ($raw_v2 == 1 && $ver == 2) {
-
-			%info = %$v2;
-
-			$info{'TAGVERSION'} = $v2h->{'version'};
-
-		} else {
-
-			_parse_v2tag($raw_v2, $v2, \%info);
-
-			if ($ver == 0 && $info{'TAGVERSION'}) {
-				$info{'TAGVERSION'} .= ' / ' . $v2h->{'version'};
-			} else {
-				$info{'TAGVERSION'} = $v2h->{'version'};
-			}
-		}
-	}
-
-	unless ($raw_v2 && $ver == 2) {
+		# Strip out NULLs unless we want the raw data.
 		foreach my $key (keys %info) {
+
 			if (defined $info{$key}) {
 				$info{$key} =~ s/\000+.*//g;
 				$info{$key} =~ s/\s+$//;
@@ -553,19 +568,19 @@ sub get_mp3tag {
 		}
 	}
 
-	if (keys %info && exists $info{'GENRE'} && ! defined $info{'GENRE'}) {
+	if (keys %info && !defined $info{'GENRE'}) {
 		$info{'GENRE'} = '';
 	}
 
 	_close($file, $fh);
 
-	return keys %info ? {%info} : undef;
+	return keys %info ? \%info : undef;
 }
 
 sub _get_v1tag {
 	my ($fh, $info) = @_;
 
-	seek $fh, -128, 2;
+	seek $fh, -128, SEEK_END;
 	read($fh, my $tag, 128);
 
 	if (!defined($tag) || $tag !~ /^TAG/) {
@@ -591,51 +606,69 @@ sub _get_v1tag {
 		$info->{'TAGVERSION'} = 'ID3v1';
 	}
 
-	if ($UNICODE) {
+	if (!$UNICODE) {
+		return 1;
+	}
 
-		# Save off the old suspects list, since we add
-		# iso-8859-1 below, but don't want that there
-		# for possible ID3 v2.x parsing below.
-		my $oldSuspects = $Encode::Encoding{'Guess'}->{'Suspects'};
+	# Save off the old suspects list, since we add
+	# iso-8859-1 below, but don't want that there
+	# for possible ID3 v2.x parsing below.
+	my $oldSuspects = $Encode::Encoding{'Guess'}->{'Suspects'};
 
-		for my $key (keys %{$info}) {
+	for my $key (keys %{$info}) {
 
-			next unless $info->{$key};
+		next unless $info->{$key};
 
-			# Try and guess the encoding.
-			my $value = $info->{$key};
-			my $icode = Encode::Guess->guess($value);
+		# Try and guess the encoding.
+		if ($unicode_detect_module) {
 
-			unless (ref($icode)) {
+			my $charset = Encode::Detect::Detector::detect($info->{$key}) || 'iso-8859-1';
+			my $enc     = Encode::find_encoding($charset);
 
-				# Often Latin1 bytes are
-				# stuffed into a 1.1 tag.
-				Encode::Guess->add_suspects('iso-8859-1');
+			if ($enc) {
 
-				while (length($value)) {
+				$info->{$key} = $enc->decode($info->{$key}, 0);
 
-					$icode = Encode::Guess->guess($value);
-
-					last if ref($icode);
-
-					# Remove garbage and retry
-					# (string is truncated in the
-					# middle of a multibyte char?)
-					$value =~ s/(.)$//;
-				}
+				next;
 			}
-
-			$info->{$key} = Encode::decode(ref($icode) ? $icode->name : 'iso-8859-1', $info->{$key});
 		}
 
-		Encode::Guess->set_suspects(keys %{$oldSuspects});
+		my $value = $info->{$key};
+		my $icode = Encode::Guess->guess($value);
+
+		if (!ref($icode)) {
+
+			# Often Latin1 bytes are
+			# stuffed into a 1.1 tag.
+			Encode::Guess->add_suspects('iso-8859-1');
+
+			while (length($value)) {
+
+				$icode = Encode::Guess->guess($value);
+
+				last if ref($icode);
+
+				# Remove garbage and retry
+				# (string is truncated in the
+				# middle of a multibyte char?)
+				# Changed thanks to https://rt.cpan.org/Ticket/Display.html?id=101620
+				substr($value, -1, 1, '');
+			}
+		}
+
+		$info->{$key} = Encode::decode(ref($icode) ? $icode->name : 'iso-8859-1', $info->{$key});
+		
+		# Trim any trailing nuls
+		$info->{$key} =~ s/\x00+$//g;
 	}
 
+	Encode::Guess->set_suspects(keys %{$oldSuspects});
+
 	return 1;
 }
 
 sub _parse_v2tag {
-	my ($raw_v2, $v2, $info) = @_;
+	my ($ver, $raw_v2, $v2, $info) = @_;
 
 	# Make sure any existing TXXX flags are an array.
 	# As we might need to append comments to it below.
@@ -662,7 +695,7 @@ sub _parse_v2tag {
 
 	my $hash = $raw_v2 == 2 ? { map { ($_, $_) } keys %v2_tag_names } : \%v2_to_v1_names;
 
-	for my $id (keys %$hash) {
+	for my $id (keys %{$hash}) {
 
 		next if !exists $v2->{$id};
 
@@ -725,6 +758,11 @@ sub _parse_v2tag {
 			my $pic = $v2->{$id};
 
 			# if there is more than one picture, just grab the first one.
+			# JRF: Should consider looking for either the thumbnail or the front cover,
+			#      rather than just returning the first one.
+			#      Possibly also checking that the format is actually understood,
+			#      but that's really down to the caller - we can't say whether the
+			#      format is understood here.
 			if (ref($pic) eq 'ARRAY') {
 				$pic = (@$pic)[0];
 			}
@@ -752,7 +790,7 @@ sub _parse_v2tag {
 
 			} elsif ($pic && $id eq 'APIC') {
 
-				# look for ID3 v2.3 picture
+				# look for ID3 v2.3/2.4 picture
 				my ($encoding, $format) = unpack 'C Z*', $pic;
 
 				$pic_len = length($format) + 2;
@@ -763,8 +801,8 @@ sub _parse_v2tag {
 
 					$pic_len += 1 + length($description) + 1;
 
-					# skip extra terminating null if unicode
-					if ($encoding) { $pic_len++; }
+					# skip extra terminating null if UTF-16 (encoding 1 or 2)
+					if ( $encoding == 1 || $encoding == 2 ) { $pic_len++; }
 
 					$valid_pic  = 1;
 					$pic_format = $format;
@@ -788,24 +826,7 @@ sub _parse_v2tag {
 		} else {
 			my $data1 = $v2->{$id};
 
-			# this is tricky ... if this is an arrayref,
-			# we want to only return one, so we pick the
-			# first one.  but if it is a comment, we pick
-			# the first one where the first charcter after
-			# the language is NULL and not an additional
-			# sub-comment, because that is most likely to be
-			# the user-supplied comment
-			if (ref $data1 && !$raw_v2) {
-				if ($id =~ /^COMM?$/) {
-					my($newdata) = grep /^(....\000)/, @{$data1};
-					$data1 = $newdata || $data1->[0];
-				} elsif ($id !~ /^(?:TXXX?|PRIV)$/) {
-					# We can get multiple User Defined Text frames in a mp3 file
-					$data1 = $data1->[0];
-				}
-			}
-
-			$data1 = [ $data1 ] if ! ref $data1;
+			$data1 = [ $data1 ] if ref($data1) ne 'ARRAY';
 
 			for my $data (@$data1) {
 				# TODO : this should only be done for certain frames;
@@ -817,11 +838,13 @@ sub _parse_v2tag {
 				my $desc;
 
 				# Comments & Unsyncronized Lyrics have the same format.
-				if ($id =~ /^(COM[M ]?|USLT)$/) { # space for iTunes brokenness
+				if ($id =~ /^(COM[M ]?|US?LT)$/) { # space for iTunes brokenness
 
 					$data =~ s/^(?:...)//;		# strip language
 				}
 
+				# JRF: I believe this should probably only be applied to the text frames
+				#      and not every single frame.
 				if ($UNICODE) {
 
 					if ($encoding eq "\001" || $encoding eq "\002") {  # UTF-16, UTF-16BE
@@ -845,14 +868,26 @@ sub _parse_v2tag {
 						# Only guess if it's not ascii.
 						if ($data && $data !~ /^[\x00-\x7F]+$/) {
 
-							# Try and guess the encoding, otherwise just use latin1
-							my $dec = Encode::Guess->guess($data);
+							if ($unicode_detect_module) {
+
+								my $charset = Encode::Detect::Detector::detect($data) || 'iso-8859-1';
+								my $enc     = Encode::find_encoding($charset);
+
+								if ($enc) {
+									$data = $enc->decode($data, 0);
+								}
 
-							if (ref $dec) {
-								$data = $dec->decode($data);
 							} else {
-								# Best try
-								$data = Encode::decode('iso-8859-1', $data);
+
+								# Try and guess the encoding, otherwise just use latin1
+								my $dec = Encode::Guess->guess($data);
+
+								if (ref $dec) {
+									$data = $dec->decode($data);
+								} else {
+									# Best try
+									$data = Encode::decode('iso-8859-1', $data);
+								}
 							}
 						}
 					}
@@ -864,12 +899,18 @@ sub _parse_v2tag {
 					# convert to ASCII per best-effort
 					my $pat;
 					if ($data =~ s/^\xFF\xFE//) {
+						# strip additional BOMs as seen in COM(M?) and TXX(X?)
+						$data = join ("",map { ( /^(..)$/ && ! /(\xFF\xFE)/ )? $_: "" } (split /(..)/, $data));
 						$pat = 'v';
 					} elsif ($data =~ s/^\xFE\xFF//) {
+						# strip additional BOMs as seen in COM(M?) and TXX(X?)
+						$data = join ("",map { ( /^(..)$/ && ! /(\xFF\xFE)/ )? $_: "" } (split /(..)/, $data));
 						$pat = 'n';
 					}
 
 					if ($pat) {
+						# strip additional 0s
+						$data = join ("",map { ( /^(..)$/ && ! /(\x00\x00)/ )? $_: "" } (split /(..)/, $data));
 						$data = pack 'C*', map {
 							(chr =~ /[[:ascii:]]/ && chr =~ /[[:print:]]/)
 								? $_
@@ -880,13 +921,18 @@ sub _parse_v2tag {
 
 				# We do this after decoding so we could be certain we're dealing
 				# with 8-bit text.
-				if ($id =~ /^(COM[M ]?|USLT)$/) { # space for iTunes brokenness
+				if ($id =~ /^(COM[M ]?|US?LT)$/) { # space for iTunes brokenness
 
 					$data =~ s/^(.*?)\000//;	# strip up to first NULL(s),
 									# for sub-comments (TODO:
 									# handle all comment data)
 					$desc = $1;
 
+					if ($encoding eq "\001" || $encoding eq "\002") {
+
+						$data =~ s/^\x{feff}//;
+					}
+
 				} elsif ($id =~ /^TCON?$/) {
 
 					my ($index, $name);
@@ -913,12 +959,27 @@ sub _parse_v2tag {
 
 						my @genres = ();
 
-						while ($data =~ s/^ \( (\d+) \)\000?//x) {
+						while ($data =~ s/^ \( (\d+) \)//x) {
 
-							push @genres, $mp3_genres[$1];
+							# The indexes might have a refinement
+							# not sure why one wouldn't just use
+							# the proper genre in the first place..
+							if ($data =~ s/^ ( [^\(]\D+ ) ( \000 | \( | \Z)/$2/x) {
+
+								push @genres, $1;
+
+							} else {
+
+								push @genres, $mp3_genres[$1];
+							}
 						}
 
 						$data = \@genres;
+
+					} elsif ($data =~ /^[^\000]+\000/) {
+
+						# name genres separated by nulls.
+						$data = [ split /\000/, $data ];
 					}
 
 					# Text based genres will fall through.
@@ -927,10 +988,52 @@ sub _parse_v2tag {
 					} elsif (defined $index) {
 						$data = $mp3_genres[$index];
 					}
+
+					# Collapse single genres down, as we may have another tag.
+					if ($data && ref($data) eq 'ARRAY' && scalar @$data == 1) {
+
+						$data = $data->[0];
+					}
+
+				} elsif ($id =~ /^T...?$/ && $id ne 'TXXX') {
+					
+					# In ID3v2.4 there's a slight content change for text fields.
+					#      They can contain multiple values which are nul terminated
+					#      within the frame. We ONLY want to split these into multiple
+					#      array values if they didn't request raw values (1).
+					#        raw_v2 = 0 => parse simply
+					#        raw_v2 = 1 => don't parse
+					#        raw_v2 = 2 => do split into arrayrefs
+					
+					# Strip off any trailing NULs, which would indicate an empty
+					# field and cause an array with no elements to be created.
+					$data =~ s/\x00+$//;
+
+					
+					if ($data =~ /\x00/ && ($raw_v2 == 2 || $raw_v2 == 0))
+					{
+						# There are embedded nuls in the string, which means an ID3v2.4
+						# multi-value frame. And they wanted arrays rather than simple
+						# values.
+						# Strings are already UTF-8, so any double nuls from 16 bit
+						# characters will have already been reduced to single nuls.
+						$data = [ split /\000/, $data ];
+					}
 				}
 
-				if ($raw_v2 == 2 && $desc) {
-					$data = { $desc => $data };
+				if ($desc)
+				{
+					# It's a frame with a description, so we may need to construct a hash
+					# for the data, rather than an array.
+					if ($raw_v2 == 2) {
+
+						$data = { $desc => $data };
+
+					} elsif ($desc =~ /^iTun/) {
+
+						# leave iTunes tags alone.
+						$data = join(' ', $desc, $data);
+					}
 				}
 
 				if ($raw_v2 == 2 && exists $info->{$hash->{$id}}) {
@@ -947,6 +1050,13 @@ sub _parse_v2tag {
 					if ($id eq 'TXXX') {
 
 						my ($key, $val) = split(/\0/, $data);
+
+						# Some programs - such as FB2K leave a UTF-16 BOM on the value
+						if ($encoding eq "\001" || $encoding eq "\002") {
+
+							$val =~ s/^\x{feff}//;
+						}
+
 						$info->{uc($key)} = $val;
 
 					} elsif ($id eq 'PRIV') {
@@ -956,7 +1066,38 @@ sub _parse_v2tag {
 
 					} else {
 
-						$info->{$hash->{$id}} = $data;
+						my $key = $hash->{$id};
+
+						# If we have multiple values
+						# for the same key - turn them
+						# into an array ref.
+						if ($ver == 2 && $info->{$key} && !ref($info->{$key})) {
+
+							if (ref($data) eq "ARRAY") {
+							
+								$info->{$key} = [ $info->{$key}, @$data ];
+							} else {
+							
+								my $old = delete $info->{$key};
+							
+								@{$info->{$key}} = ($old, $data);
+							}
+
+						} elsif ($ver == 2 && ref($info->{$key}) eq 'ARRAY') {
+							
+							if (ref($data) eq "ARRAY") {
+
+								push @{$info->{$key}}, @$data;
+
+							} else {
+
+								push @{$info->{$key}}, $data;
+							}
+
+						} else {
+
+							$info->{$key} = $data;
+						}
 					}
 				}
 			}
@@ -965,26 +1106,113 @@ sub _parse_v2tag {
 }
 
 sub _get_v2tag {
-	my($fh) = @_;
+	my ($fh, $ver, $raw, $info, $start) = @_;
+	my $eof;
+	my $gotanyv2 = 0;
+
+	# First we need to check the end of the file for any footer
+
+	seek $fh, -128, SEEK_END;
+	$eof = (tell $fh) + 128;
+
+	# go to end of file if no ID3v1 tag, beginning of existing tag if tag present
+	if (<$fh> =~ /^TAG/) {
+		$eof -= 128;
+	}
+
+	seek $fh, $eof, SEEK_SET;
+	# print STDERR "Checking for footer at $eof\n";
+
+	if (my $v2f = _get_v2foot($fh)) {
+		$eof -= $v2f->{tag_size};
+		# We have a ID3v2.4 footer. Must read it.
+		$gotanyv2 |= (_get_v2tagdata($fh, $ver, $raw, $info, $eof) ? 2 : 0);
+	}
+
+	# Now read any ID3v2 header
+	$gotanyv2 |= (_get_v2tagdata($fh, $ver, $raw, $info, $start) ? 1 : 0);
+
+	# Because we've merged the entries it makes sense to trim any duplicated
+	# values - for example if there's a footer and a header that contain the same
+	# data then this results in every entry being an array containing two
+	# identical values.
+	for my $name (keys %{$info})
+	{
+	  # Note: We must not sort these elements to do the comparison because that
+	  #       changes the order in which they are claimed to appear. Whilst this
+	  #       probably isn't important, it may matter for default display - for
+	  #       example a lyric should be shown by default with the first entry
+	  #       in the tag in the case where the user has not specified a language
+	  #       preference. If we sorted the array it would destroy that order.
+	  # This is a longwinded way of checking for duplicates and only writing the
+	  # first element - we check the array for duplicates and clear all subsequent
+	  # entries which are duplicates of earlier ones.
+	  if (ref $info->{$name} eq 'ARRAY')
+	  {
+	    my @array = ();
+	    my ($i, $o);
+	    my @chk = @{$info->{$name}};
+	    for $i ( 0..$#chk )
+	    {
+	      my $ielement = $chk[$i];
+	      if (defined $ielement)
+	      {
+	        for $o ( ($i+1)..$#chk )
+	        {
+	          $chk[$o] = undef if (defined $o && defined $chk[$o] && ($ielement eq $chk[$o]));
+	        }
+	        push @array, $ielement;
+	      }
+	    }
+	    # We may have reduced the array to a single element. If so, just assign
+	    # a regular scalar instead of the array.
+	    if ($#array == 0)
+	    { 
+	      $info->{$name} = $array[0];
+	    }
+	    else
+	    { 
+	      $info->{$name} = \@array;
+	    }
+	  }
+	}
+
+	return $gotanyv2;
+}
+
+# $has_v2 = &_get_v2tagdata($filehandle, $ver, $raw, $info, $startinfile);
+# $info is a hash reference which will be updated with the new ID3v2 details
+# if the updated bit is set, and set to the new details if the updated bit
+# is clear.
+# If undefined, $startinfile will be treated as 0 (see _get_v2head).
+# $v2h is a reference to a hash of the frames present within the tag.
+# Any frames which are repeated within the tag (eg USLT with different
+# languages) will be supplied as an array rather than a scalar. All client
+# code needs to be aware that any frame may be duplicated.
+sub _get_v2tagdata {
+	my($fh, $ver, $raw, $info, $start) = @_;
 	my($off, $end, $myseek, $v2, $v2h, $hlen, $num, $wholetag);
 
 	$v2 = {};
-	$v2h = _get_v2head($fh) or return;
+	$v2h = _get_v2head($fh, $start) or return 0;
 
 	if ($v2h->{major_version} < 2) {
 		carp "This is $v2h->{version}; " .
 		     "ID3v2 versions older than ID3v2.2.0 not supported\n"
 		     if $^W;
-		return;
+		return 0;
 	}
 
 	# use syncsafe bytes if using version 2.4
-	# my $bytesize = ($v2h->{major_version} > 3) ? 128 : 256;
+	my $id3v2_4_frame_size_broken = 0;
+	my $bytesize = ($v2h->{major_version} > 3) ? 128 : 256;
 
 	# alas, that's what the spec says, but iTunes and others don't syncsafe
 	# the length, which breaks MP3 files with v2.4 tags longer than 128 bytes,
 	# like every image file.
-	my $bytesize = 256;
+	# Because we should not break the spec conformant files due to
+	# spec-inconformant programs, we first try the correct form and if the
+	# data looks wrong we revert to broken behaviour.
 
 	if ($v2h->{major_version} == 2) {
 		$hlen = 6;
@@ -997,70 +1225,308 @@ sub _get_v2tag {
 	$off = $v2h->{ext_header_size} + 10;
 	$end = $v2h->{tag_size} + 10; # should we read in the footer too?
 
-	seek $fh, $v2h->{offset}, 0;
+	# JRF: If the format was ID3v2.2 and the compression bit was set, then we can't
+	#      actually read the content because there are no defined compression schemes
+	#      for ID3v2.2. Perform no more processing, and return failure because we
+	#      cannot read anything.
+	return 0 if ($v2h->{major_version} == 2 && $v2h->{compression});
+
+	# JRF: If the update flag is set then the input data is the same as that which was
+	#      passed in. ID3v2.4 section 3.2.
+	if ($v2h->{update}) {
+		$v2 = $info;
+	}
+
+	# Bug 8939, Trying to read past the end of the file may crash on win32 
+	my $size = -s $fh;
+	if ( $v2h->{offset} + $end > $size ) {
+		$end -= $v2h->{offset} + $end - $size;
+	}
+
+	seek $fh, $v2h->{offset}, SEEK_SET;
 	read $fh, $wholetag, $end;
 
+	# JRF: The discrepency between ID3v2.3 and ID3v2.4 is that :
+	#          2.3: unsync flag indicates that unsync is used on the entire tag
+	#          2.4: unsync flag indicates that all frames have the unsync bit set
+	#      In 2.4 this means that the size of the frames which have the unsync bit
+	#      set will be the unsync'd size (section 4. in the ID3v2.4.0 structure
+	#      specification).
+	#      This means that when processing 2.4 files we should perform all the
+	#      unsynchronisation processing at the frame level, not the tag level.
+	#      The tag unsync bit is redundant (IMO).
+	if ($v2h->{major_version} == 4) {
+		$v2h->{unsync} = 0
+	}
+
 	$wholetag =~ s/\xFF\x00/\xFF/gs if $v2h->{unsync};
 
+	# JRF: If we /knew/ there would be something special in the tag which meant
+	#      that the ID3v2.4 frame size was broken we could check it here. If,
+	#      for example, the iTunes files had the word 'iTunes' somewhere in the
+	#      tag and we knew that it was broken for versions below 3.145 (which is
+	#      a number I just picked out of the air), then we could do something like this :
+	# if ($v2h->{major_version} == 4) &&
+	#    $wholetag =~ /iTunes ([0-9]+\.[0-9]+)/ &&
+	#    $1 < 3.145)
+	# {
+	#   $id3v2_4_frame_size_broken = 1;
+	# }
+	# However I have not included this because I don't have examples of broken
+	# files - and in any case couldn't guarentee I'd get it right.
+
 	$myseek = sub {
+		return unless $wholetag;
+		
 		my $bytes = substr($wholetag, $off, $hlen);
-		return unless $bytes =~ /^([A-Z0-9]{$num})/
-			|| ($num == 4 && $bytes =~ /^(COM )/);  # stupid iTunes
-		my($id, $size) = ($1, $hlen);
+
+		# iTunes is stupid and sticks ID3v2.2 3 byte frames in a
+		# ID3v2.3 or 2.4 header. Ignore tags with a space in them.
+		if ($bytes !~ /^([A-Z0-9\? ]{$num})/) {
+			return;
+		}
+
+		my ($id, $size) = ($1, $hlen);
 		my @bytes = reverse unpack "C$num", substr($bytes, $num, $num);
 
 		for my $i (0 .. ($num - 1)) {
 			$size += $bytes[$i] * $bytesize ** $i;
 		}
 
+		# JRF: Now provide the fall back for the broken ID3v2.4 frame size
+		#      (which will persist for subsequent frames if detected).
+
+		#      Part 1: If the frame size cannot be valid according to the
+		#              specification (or if it would be larger than the tag
+		#              size allows).
+		if ($v2h->{major_version}==4 && 
+		    $id3v2_4_frame_size_broken == 0 && # we haven't detected brokenness yet
+		    ((($bytes[0] | $bytes[1] | $bytes[2] | $bytes[3]) & 0x80) != 0 || # 0-bits set in size
+		     $off + $size > $end)  # frame size would excede the tag end
+		    )
+		{
+		  # The frame is definately not correct for the specification, so drop to
+		  # broken frame size system instead.
+		  $bytesize = 128;
+		  $size -= $hlen; # hlen has alread been added, so take that off again
+		  $size = (($size & 0x0000007f)) | 
+		          (($size & 0x00003f80)<<1) |
+		          (($size & 0x001fc000)<<2) |
+		          (($size & 0x0fe00000)<<3); # convert spec to non-spec sizes
+
+		  $size += $hlen; # and re-add header len so that the entire frame's size is known
+
+		  $id3v2_4_frame_size_broken = 1;
+
+		  print "Frame size cannot be valid ID3v2.4 (part 1); reverting to broken behaviour\n" if ($debug_24);
+
+		}
+
+		#      Part 2: If the frame size would result in the following frame being
+		#              invalid.
+		if ($v2h->{major_version}==4 && 
+		    $id3v2_4_frame_size_broken == 0 && # we haven't detected brokenness yet
+		    $size > 0x80+$hlen && # ignore frames that are too short to ever be wrong
+		    $off + $size < $end)
+		{
+
+		  print "Frame size might not be valid ID3v2.4 (part 2); checking for following frame validity\n" if ($debug_24);
+
+		  my $morebytes = substr($wholetag, $off+$size, 4);
+
+		  if (! ($morebytes =~ /^([A-Z0-9]{4})/ || $morebytes =~ /^\x00{4}/) ) {
+
+		    # The next tag cannot be valid because its name is wrong, which means that
+		    # either the size must be invalid or the next frame truely is broken.
+		    # Either way, we can try to reduce the size to see.
+		    my $retrysize;
+
+		    print "  following frame isn't valid using spec\n" if ($debug_24);
+
+		    $retrysize = $size - $hlen; # remove already added header length
+		    $retrysize = (($retrysize & 0x0000007f)) | 
+		                 (($retrysize & 0x00003f80)<<1) |
+		                 (($retrysize & 0x001fc000)<<2) |
+		                 (($retrysize & 0x0fe00000)<<3); # convert spec to non-spec sizes
+
+		    $retrysize += $hlen; # and re-add header len so that the entire frame's size is known
+
+		    if (length($wholetag) >= ($off+$retrysize+4)) {
+
+		    	$morebytes = substr($wholetag, $off+$retrysize, 4);
+
+		    } else {
+
+		    	$morebytes = '';
+		    }
+
+		    if (! ($morebytes =~ /^([A-Z0-9]{4})/ ||
+		           $morebytes =~ /^\x00{4}/ ||
+		           $off + $retrysize > $end) )
+		    {
+		      # With the retry at the smaller size, the following frame still isn't valid
+		      # so the only thing we can assume is that this frame is just broken beyond
+		      # repair. Give up right now - there's no way we can recover.
+		      print "  and isn't valid using broken-spec support; giving up\n" if ($debug_24);
+		      return;
+		    }
+		    
+		    print "  but is fine with broken-spec support; reverting to broken behaviour\n" if ($debug_24);
+		    
+		    # We're happy that the non-spec size looks valid to lead us to the next frame.
+		    # We might be wrong, generating false-positives, but that's really what you
+		    # get for trying to handle applications that don't handle the spec properly -
+		    # use something that isn't broken.
+		    # (this is a copy of the recovery code in part 1)
+		    $size = $retrysize;
+		    $bytesize = 128;
+		    $id3v2_4_frame_size_broken = 1;
+
+		  } else {
+
+		    print "  looks like valid following frame; keeping spec behaviour\n" if ($debug_24);
+
+		  }
+		}
+
 		my $flags = {};
-		if ($v2h->{major_version} > 3) {
+
+		# JRF: was > 3, but that's not true; future versions may be incompatible
+		if ($v2h->{major_version} == 4) {
 			my @bits = split //, unpack 'B16', substr($bytes, 8, 2);
+			$flags->{frame_zlib}         = $bits[12]; # JRF: need to know about compressed
+			$flags->{frame_encrypt}      = $bits[13]; # JRF: ... and encrypt
 			$flags->{frame_unsync}       = $bits[14];
 			$flags->{data_len_indicator} = $bits[15];
 		}
 
-		return($id, $size, $flags);
+		# JRF: version 3 was in a different order
+		elsif ($v2h->{major_version} == 3) {
+			my @bits = split //, unpack 'B16', substr($bytes, 8, 2);
+			$flags->{frame_zlib}         = $bits[8]; # JRF: need to know about compressed
+			$flags->{data_len_indicator} = $bits[8]; # JRF:   and compression implies the DLI is present
+			$flags->{frame_encrypt}      = $bits[9]; # JRF: ... and encrypt
+		}
+
+		return ($id, $size, $flags);
 	};
 
 	while ($off < $end) {
-		my($id, $size, $flags) = &$myseek or last;
+		my ($id, $size, $flags) = &$myseek or last;
+		my ($hlenextra) = 0;
 
-		my $bytes = substr($wholetag, $off+$hlen, $size-$hlen);
+		# NOTE: Wrong; the encrypt comes after the DLI. maybe.
+		# JRF: Encrypted frames need to be decrypted first
+		if ($flags->{frame_encrypt}) {
+
+			my ($encypt_method) = substr($wholetag, $off+$hlen+$hlenextra, 1);
+
+			$hlenextra++;
+
+			# We don't actually know how to decrypt anything, so we'll just skip the entire frame.
+			$off += $size;
+
+			next;
+		}
+
+		my $bytes = substr($wholetag, $off+$hlen+$hlenextra, $size-$hlen-$hlenextra);
 
 		my $data_len;
 		if ($flags->{data_len_indicator}) {
 			$data_len = 0;
+
 			my @data_len_bytes = reverse unpack 'C4', substr($bytes, 0, 4);
+
 			$bytes = substr($bytes, 4);
+
 		        for my $i (0..3) {
 				$data_len += $data_len_bytes[$i] * 128 ** $i;
 		        }
 		}
 
+		print "got $id, length " . length($bytes) . " frameunsync: ".$flags->{frame_unsync}." tag unsync: ".$v2h->{unsync} ."\n" if ($debug_24);
+
 		# perform frame-level unsync if needed (skip if already done for whole tag)
 		$bytes =~ s/\xFF\x00/\xFF/gs if $flags->{frame_unsync} && !$v2h->{unsync};
 
+		# JRF: Decompress now if compressed.
+		#      (FIXME: Not implemented yet)
+
 		# if we know the data length, sanity check it now.
 		if ($flags->{data_len_indicator} && defined $data_len) {
-		        carp "Size mismatch on $id\n" unless $data_len == length($bytes);
+		        carp("Size mismatch on $id\n") unless $data_len == length($bytes);
+		}
+
+		# JRF: Apply small sanity check on text elements - they must end with :
+		#        a 0 if they are ISO8859-1
+		#        0,0 if they are unicode
+		# (This is handy because it can be caught by the 'duplicate elements'
+		# in array checks)
+		# There is a question in my mind whether I should be doing this here - it
+		# is introducing knowledge of frame content format into the raw reader
+		# which is not a good idea. But if the frames are broken we at least
+		# recover.
+		if (($v2h->{major_version} == 3 || $v2h->{major_version} == 4) && $id =~ /^T/) {
+
+			my $encoding = substr($bytes, 0, 1);
+		  
+			# Both these cases are candidates for providing some warning, I feel.
+			# ISO-8859-1 or UTF-8 $bytes
+			if (($encoding eq "\x00" || $encoding eq "\x03") && $bytes !~ /\x00$/) { 
+
+				$bytes .= "\x00"; 
+				print "Text frame $id has malformed ISO-8859-1/UTF-8 content\n" if ($debug_Tencoding);
+
+			# # UTF-16, UTF-16BE
+			} elsif ( ($encoding eq "\x01" || $encoding eq "\x02") && $bytes !~ /\x00\x00$/) { 
+
+				$bytes .= "\x00\x00";
+				print "Text frame $id has malformed UTF-16/UTF-16BE content\n" if ($debug_Tencoding);
+
+			} else {
+
+				# Other encodings cannot be fixed up (we don't know how 'cos they're not defined).
+			}
 		}
 
 		if (exists $v2->{$id}) {
+
 			if (ref $v2->{$id} eq 'ARRAY') {
 				push @{$v2->{$id}}, $bytes;
 			} else {
 				$v2->{$id} = [$v2->{$id}, $bytes];
 			}
+
 		} else {
+
 			$v2->{$id} = $bytes;
 		}
+
 		$off += $size;
 	}
 
-	return($v2, $v2h);
-}
+	if (($ver == 0 || $ver == 2) && $v2) {
 
+		if ($raw == 1 && $ver == 2) {
+
+			%$info = %$v2;
+
+			$info->{'TAGVERSION'} = $v2h->{'version'};
+
+		} else {
+
+			_parse_v2tag($ver, $raw, $v2, $info);
+
+			if ($ver == 0 && $info->{'TAGVERSION'}) {
+				$info->{'TAGVERSION'} .= ' / ' . $v2h->{'version'};
+			} else {
+				$info->{'TAGVERSION'} = $v2h->{'version'};
+			}
+		}
+	}
+
+	return 1;
+}
 
 =pod
 
@@ -1105,15 +1571,17 @@ sub get_mp3info {
 		$@ = "No file specified";
 		return undef;
 	}
-
-	if (not -s $file) {
-		$@ = "File is empty";
-		return undef;
-	}
+	
+	my $size = -s $file;
 
 	if (ref $file) { # filehandle passed
 		$fh = $file;
 	} else {
+		if ( !$size ) {
+			$@ = "File is empty";
+			return undef;
+		}
+		
 		if (not open $fh, '<', $file) {
 			$@ = "Can't open $file: $!";
 			return undef;
@@ -1129,15 +1597,19 @@ sub get_mp3info {
 	}
 
 	binmode $fh;
-	seek $fh, $off, 0;
+	seek $fh, $off, SEEK_SET;
 	read $fh, $byte, 4;
 
-	if ($off == 0) {
-		if (my $v2h = _get_v2head($fh)) {
-			$tot += $off += $v2h->{tag_size};
-			seek $fh, $off, 0;
-			read $fh, $byte, 4;
+	if (my $v2h = _get_v2head($fh)) {
+		$tot += $off += $v2h->{tag_size};
+		
+		if ( $off > $size - 10 ) {
+			# Invalid v2 tag size
+			$off = 0;
 		}
+		
+		seek $fh, $off, SEEK_SET;
+		read $fh, $byte, 4;
 	}
 
 	$h = _get_head($byte);
@@ -1148,7 +1620,7 @@ sub get_mp3info {
 
 		# do only one read - it's _much_ faster
 		$off++;
-		seek $fh, $off, 0;
+		seek $fh, $off, SEEK_SET;
 		read $fh, $byte, $tot;
 		 
 		my $i;
@@ -1177,24 +1649,34 @@ sub get_mp3info {
 			return undef;
 		}
 	}
+	
+	$h->{offset} = $off;
 
-	my $vbr = _get_vbr($fh, $h, \$off);
-
-	seek $fh, 0, 2;
+	my $vbr  = _get_vbr($fh, $h, \$off);
+	my $lame = _get_lame($fh, $h, \$off);
+	
+	seek $fh, 0, SEEK_END;
 	$eof = tell $fh;
-	seek $fh, -128, 2;
+	seek $fh, -128, SEEK_END;
 	$eof -= 128 if <$fh> =~ /^TAG/ ? 1 : 0;
 
+	# JRF: Check for an ID3v2.4 footer and if present, remove it from
+	#      the size.
+	seek($fh, $eof, SEEK_SET);
+
+	if (my $v2f = _get_v2foot($fh)) {
+		$eof -= $v2f->{tag_size};
+	}
+
 	_close($file, $fh);
 
 	$h->{size} = $eof - $off;
-	$h->{offset} = $off;
 
-	return _get_info($h, $vbr);
+	return _get_info($h, $vbr, $lame);
 }
 
 sub _get_info {
-	my($h, $vbr) = @_;
+	my($h, $vbr, $lame) = @_;
 	my $i;
 
 	# No bitrate or sample rate? Something's wrong.
@@ -1202,26 +1684,30 @@ sub _get_info {
 		return {};
 	}
 
-	$i->{VERSION}	= $h->{IDR} == 2 ? 2 : $h->{IDR} == 3 ? 1 :
-				$h->{IDR} == 0 ? 2.5 : 0;
+	$i->{VERSION}	= $h->{IDR} == 2 ? 2 : $h->{IDR} == 3 ? 1 : $h->{IDR} == 0 ? 2.5 : 0;
 	$i->{LAYER}	= 4 - $h->{layer};
-	$i->{VBR}	= defined $vbr ? 1 : 0;
+
+	if (ref($vbr) eq 'HASH' and $vbr->{is_vbr} == 1) {
+		$i->{VBR} = 1;
+	} else {
+		$i->{VBR} = 0;
+	}
 
 	$i->{COPYRIGHT}	= $h->{copyright} ? 1 : 0;
 	$i->{PADDING}	= $h->{padding_bit} ? 1 : 0;
 	$i->{STEREO}	= $h->{mode} == 3 ? 0 : 1;
 	$i->{MODE}	= $h->{mode};
 
-	$i->{SIZE}	= $vbr && $vbr->{bytes} ? $vbr->{bytes} : $h->{size};
+	$i->{SIZE}	= $i->{VBR} == 1 && $vbr->{bytes} ? $vbr->{bytes} : $h->{size};
 	$i->{OFFSET}	= $h->{offset};
 
 	my $mfs		= $h->{fs} / ($h->{ID} ? 144000 : 72000);
-	$i->{FRAMES}	= int($vbr && $vbr->{frames}
+	$i->{FRAMES}	= int($i->{VBR} == 1 && $vbr->{frames}
 				? $vbr->{frames}
 				: $i->{SIZE} / ($h->{bitrate} / $mfs)
 			  );
 
-	if ($vbr) {
+	if ($i->{VBR} == 1) {
 		$i->{VBR_SCALE}	= $vbr->{scale} if $vbr->{scale};
 		$h->{bitrate}	= $i->{SIZE} / $i->{FRAMES} * $mfs;
 		if (not $h->{bitrate}) {
@@ -1243,6 +1729,10 @@ sub _get_info {
 	# should we just return if ! FRAMES?
 	$i->{FRAME_LENGTH}	= int($h->{size} / $i->{FRAMES}) if $i->{FRAMES};
 	$i->{FREQUENCY}		= $frequency_tbl[3 * $h->{IDR} + $h->{sampling_freq}];
+	
+	if ($lame) {
+		$i->{LAME} = $lame;
+	}
 
 	return $i;
 }
@@ -1307,15 +1797,16 @@ sub _vbr_seek {
 	my $bytes = shift;
 	my $n     = shift || 4;
 
-	seek $fh, $$off, 0;
+	seek $fh, $$off, SEEK_SET;
 	read $fh, $$bytes, $n;
 
 	$$off += $n;
 }
 
 sub _get_vbr {
-	my($fh, $h, $roff) = @_;
-	my($off, $bytes, @bytes, %vbr);
+	my ($fh, $h, $roff) = @_;
+	my ($off, $bytes, @bytes);
+	my %vbr = (is_vbr => 0);
 
 	$off = $$roff;
 
@@ -1328,68 +1819,133 @@ sub _get_vbr {
 	}
 
 	_vbr_seek($fh, \$off, \$bytes);
-	return unless $bytes eq 'Xing';
 
-	_vbr_seek($fh, \$off, \$bytes);
-	$vbr{flags} = _unpack_head($bytes);
+	if ($bytes =~ /(?:Xing|Info)/) {
+		# Info is CBR
+		$vbr{is_vbr} = 1 if $bytes =~ /Xing/;
 
-	if ($vbr{flags} & 1) {
 		_vbr_seek($fh, \$off, \$bytes);
-		$vbr{frames} = _unpack_head($bytes);
-	}
+		$vbr{flags} = _unpack_head($bytes);
+	
+		if ($vbr{flags} & 1) {
+			_vbr_seek($fh, \$off, \$bytes);
+			$vbr{frames} = _unpack_head($bytes);
+		}
+	
+		if ($vbr{flags} & 2) {
+			_vbr_seek($fh, \$off, \$bytes);
+			$vbr{bytes} = _unpack_head($bytes);
+		}
+	
+		if ($vbr{flags} & 4) {
+			_vbr_seek($fh, \$off, \$bytes, 100);
+			# Not used right now ...
+			#$vbr{toc} = _unpack_head($bytes);
+		}
+	
+		if ($vbr{flags} & 8) { # (quality ind., 0=best 100=worst)
+			_vbr_seek($fh, \$off, \$bytes);
+			$vbr{scale} = _unpack_head($bytes);
+		} else {
+			$vbr{scale} = -1;
+		}
 
-	if ($vbr{flags} & 2) {
+		$$roff = $off;
+	} elsif ($bytes =~ /(?:VBRI)/) {
+		$vbr{is_vbr} = 1;
+		
+		# Fraunhofer encoder uses VBRI format
+		# start with quality factor at position 8
+		_vbr_seek($fh, \$off, \$bytes, 4);
+		_vbr_seek($fh, \$off, \$bytes, 2);
+		$vbr{scale} = unpack('l', pack('L', unpack('n', $bytes)));
+
+		# Then Bytes, as position 10
 		_vbr_seek($fh, \$off, \$bytes);
 		$vbr{bytes} = _unpack_head($bytes);
-	}
 
-	if ($vbr{flags} & 4) {
-		_vbr_seek($fh, \$off, \$bytes, 100);
-# Not used right now ...
-#		$vbr{toc} = _unpack_head($bytes);
-	}
-
-	if ($vbr{flags} & 8) { # (quality ind., 0=best 100=worst)
+		# Finally Frames at position 14
 		_vbr_seek($fh, \$off, \$bytes);
-		$vbr{scale} = _unpack_head($bytes);
-	} else {
-		$vbr{scale} = -1;
+		$vbr{frames} = _unpack_head($bytes);
+
+		$$roff = $off;
 	}
 
-	$$roff = $off;
 	return \%vbr;
 }
 
+# Read LAME info tag
+# http://gabriel.mp3-tech.org/mp3infotag.html
+sub _get_lame {
+	my($fh, $h, $roff) = @_;
+	
+	my($off, $bytes, @bytes, %lame);
+
+	$off = $$roff;
+	
+	# Encode version, 9 bytes
+	_vbr_seek($fh, \$off, \$bytes, 9);
+	$lame{encoder_version} = $bytes;
+
+	return unless $bytes =~ /^LAME/;
+
+	# There's some stuff here but it's not too useful
+	_vbr_seek($fh, \$off, \$bytes, 12);
+	
+	# Encoder delays (used for gapless decoding)
+	_vbr_seek($fh, \$off, \$bytes, 3);
+	my $bin = unpack 'B*', $bytes;
+	$lame{start_delay} = unpack('N', pack('B32', substr('0' x 32 . substr($bin, 0, 12), -32)));
+	$lame{end_padding} = unpack('N', pack('B32', substr('0' x 32 . substr($bin, 12, 12), -32)));
+	
+	return \%lame;
+}
+
+# _get_v2head(file handle, start offset in file);
+# The start offset can be used to check ID3v2 headers anywhere
+# in the MP3 (eg for 'update' frames).
 sub _get_v2head {
 	my $fh = $_[0] or return;
-	my($v2h, $bytes, @bytes);
-	$v2h->{offset} = 0;
+
+	my $v2h = {
+		'offset'   => $_[1] || 0,
+		'tag_size' => 0,
+	};
 
 	# check first three bytes for 'ID3'
-	seek $fh, 0, 0;
-	read $fh, $bytes, 3;
+	seek($fh, $v2h->{offset}, SEEK_SET);
+	read($fh, my $header, 10);
 
-	# TODO: add support for tags at the end of the file
-	if ($bytes eq 'RIF' || $bytes eq 'FOR') {
-		_find_id3_chunk($fh, $bytes) or return;
-		$v2h->{offset} = tell $fh;
-		read $fh, $bytes, 3;
+	my $tag = substr($header, 0, 3);
+
+	# (Note: Footers are dealt with in v2foot)
+	if ($v2h->{offset} == 0) {
+
+		# JRF: Only check for special headers if we're at the start of the file.
+		if ($tag eq 'RIF' || $tag eq 'FOR') {
+			_find_id3_chunk($fh, $tag) or return;
+			$v2h->{offset} = tell $fh;
+
+			read($fh, $header, 10);
+			$tag = substr($header, 0, 3);
+		}
 	}
 
-	return unless $bytes eq 'ID3';
+	return if $tag ne 'ID3';
 
 	# get version
-	read $fh, $bytes, 2;
-	$v2h->{version} = sprintf "ID3v2.%d.%d",
-		@$v2h{qw[major_version minor_version]} =
-			unpack 'c2', $bytes;
+	my ($major, $minor, $flags) = unpack ("x3CCC", $header);
+
+	$v2h->{version} = sprintf("ID3v2.%d.%d", $major, $minor);
+	$v2h->{major_version} = $major;
+	$v2h->{minor_version} = $minor;
 
 	# get flags
-	read $fh, $bytes, 1;
-	my @bits = split //, unpack 'b8', $bytes;
+	my @bits = split(//, unpack('b8', pack('v', $flags)));
+
 	if ($v2h->{major_version} == 2) {
 		$v2h->{unsync}       = $bits[7];
-		$v2h->{compression}  = $bits[8];
+		$v2h->{compression}  = $bits[6]; # Should be ignored - no defined form
 		$v2h->{ext_header}   = 0;
 		$v2h->{experimental} = 0;
 	} else {
@@ -1400,8 +1956,132 @@ sub _get_v2head {
 	}
 
 	# get ID3v2 tag length from bytes 7-10
-	$v2h->{tag_size} = 10;	# include ID3v2 header size
+	my $rawsize = substr($header, 6, 4);
+
+	for my $b (unpack('C4', $rawsize)) {
+
+		$v2h->{tag_size} = ($v2h->{tag_size} << 7) + $b;
+	}
+
+	$v2h->{tag_size} += 10;	# include ID3v2 header size
 	$v2h->{tag_size} += 10 if $v2h->{footer};
+
+	# JRF: I think this is done wrongly - this should be part of the main frame,
+	#      and therefore under ID3v2.3 it's subject to unsynchronisation
+	#      (ID3v2.3, section 3.2).
+	#      FIXME.
+
+	# get extended header size (2.3/2.4 only)
+	$v2h->{ext_header_size} = 0;
+
+	if ($v2h->{ext_header}) {
+		my $filesize = -s $fh;
+
+		read $fh, my $bytes, 4;
+		my @bytes = reverse unpack 'C4', $bytes;
+
+		# use syncsafe bytes if using version 2.4
+		my $bytesize = ($v2h->{major_version} > 3) ? 128 : 256;
+		for my $i (0..3) {
+			$v2h->{ext_header_size} += $bytes[$i] * $bytesize ** $i;
+		}
+
+		# Bug 4486
+		# Don't try to read past the end of the file if we have a
+		# bogus extended header size.
+		if (($v2h->{ext_header_size} - 10 ) > -s $fh) {
+
+			return $v2h;
+		}
+
+		# Read the extended header
+		my $ext_data;
+		if ($v2h->{major_version} == 3) {
+			# On ID3v2.3 the extended header size excludes the whole header
+			read $fh, $bytes, 6 + $v2h->{ext_header_size};
+			my @bits = split //, unpack 'b16', substr $bytes, 0, 2;
+			$v2h->{crc_present}      = $bits[15];
+			my $padding_size;
+			for my $i (0..3) {
+
+				if (defined $bytes[2 + $i]) {
+					$padding_size += $bytes[2 + $i] * $bytesize ** $i;
+				}
+			}
+			$ext_data = substr $bytes, 6, $v2h->{ext_header_size} - $padding_size;
+		}
+		elsif ($v2h->{major_version} == 4) {
+			# On ID3v2.4, the extended header size includes the whole header
+			read $fh, $bytes, $v2h->{ext_header_size} - 4;
+			my @bits = split //, unpack 'b8', substr $bytes, 5, 1;
+			$v2h->{update}           = $bits[6];
+			$v2h->{crc_present}      = $bits[5];
+			$v2h->{tag_restrictions} = $bits[4];
+			$ext_data = substr $bytes, 2, $v2h->{ext_header_size} - 6;
+		}
+
+		# JRF: I'm not actually working out what the CRC or the tag
+		#      restrictions are just yet. It doesn't seem to be
+		#      all that worthwhile.
+		# However, if this is implemented...
+		#    Under ID3v2.3, the CRC is not sync-safe (4 bytes).
+		#    Under ID3v2.4, the CRC is sync-safe (5 bytes, excluding the flag data
+		#      length)
+		#    Under ID3v2.4, every flag byte that's set is given a flag data byte
+		#      in the extended data area, the first byte of which is the size of
+		#      the flag data (see ID3v2.4 section 3.2).
+	}
+
+	return $v2h;
+}
+
+# JRF: We assume that we have seeked to the expected EOF (ie start of the ID3v1 tag)
+#      The 'offset' value will hold the start of the ID3v1 header (NOT the footer)
+#      The 'tag_size' value will hold the entire tag size, including the footer.
+sub _get_v2foot {
+	my $fh = $_[0] or return;
+	my($v2h, $bytes, @bytes);
+	my $eof;
+
+	$eof = tell $fh;
+
+	# check first three bytes for 'ID3'
+	seek $fh, $eof-10, SEEK_SET; # back 10 bytes for footer
+	read $fh, $bytes, 3;
+
+	return undef unless $bytes eq '3DI';
+
+	# get version
+	read $fh, $bytes, 2;
+	$v2h->{version} = sprintf "ID3v2.%d.%d",
+		@$v2h{qw[major_version minor_version]} =
+			unpack 'c2', $bytes;
+
+	# get flags
+	read $fh, $bytes, 1;
+	my @bits = split //, unpack 'b8', $bytes;
+	if ($v2h->{major_version} != 4) {
+		# JRF: This should never happen - only v4 tags should have footers.
+		#      Think about raising some warnings or something ?
+		# print STDERR "Invalid ID3v2 footer version number\n";
+	} else {
+		$v2h->{unsync}       = $bits[7];
+		$v2h->{ext_header}   = $bits[6];
+		$v2h->{experimental} = $bits[5];
+		$v2h->{footer}       = $bits[4];
+		if (!$v2h->{footer})
+		{
+		  # JRF: This is an invalid footer marker; it doesn't make sense
+		  #      for the footer to not be marked as the tag having a footer
+		  #      so strictly it's an invalid tag.
+		  #      A warning might be nice, but for now we'll ignore.
+		  # print STDERR "Warning: Footer doesn't have footer bit set\n";
+		}
+	}
+
+	# get ID3v2 tag length from bytes 7-10
+	$v2h->{tag_size} = 10;  # include ID3v2 header size
+	$v2h->{tag_size} += 10; # always account for the footer
 	read $fh, $bytes, 4;
 	@bytes = reverse unpack 'C4', $bytes;
 	foreach my $i (0 .. 3) {
@@ -1409,42 +2089,56 @@ sub _get_v2head {
 		$v2h->{tag_size} += $bytes[$i] * 128 ** $i;
 	}
 
-	# get extended header size
-	$v2h->{ext_header_size} = 0;
-	if ($v2h->{ext_header}) {
-		read $fh, $bytes, 4;
-		@bytes = reverse unpack 'C4', $bytes;
+	# Note that there are no extended header details on the footer; it's
+	# just a copy of it so that clients can seek backward to find the
+	# footer's start.
 
-		# use syncsafe bytes if using version 2.4
-		my $bytesize = ($v2h->{major_version} > 3) ? 128 : 256;
-		for my $i (0..3) {
-			$v2h->{ext_header_size} += $bytes[$i] * $bytesize ** $i;
-		}
+	$v2h->{offset} = $eof - $v2h->{tag_size};
+
+	# Just to be really sure, read the start of the ID3v2.4 header here.
+	seek $fh, $v2h->{offset}, 0; # SEEK_SET
+	read $fh, $bytes, 3;
+	if ($bytes ne "ID3") {
+	  # Not really an ID3v2.4 tag header; a warning would be nice but ignore
+	  # for now.
+	  # print STDERR "Invalid ID3v2 footer (header check) at " . $v2h->{offset} . "\n";
+	  return undef;
 	}
 
+	# We could check more of the header. I'm not sure it's really worth it
+	# right now but at some point in the future checking the details match
+	# would be nice.
+
 	return $v2h;
-}
+  
+};
 
 sub _find_id3_chunk {
 	my($fh, $filetype) = @_;
-	my($bytes, $size, $tag, $pat, $mat);
+	my($bytes, $size, $tag, $pat, @mat);
 
-	read $fh, $bytes, 1;
+	# CHANGE 10616 introduced a read optimization in _get_v2head:
+	#  10 bytes are read, not 3, so reading one here hoping to get the last letter of the
+	#  tag is a bad idea, as it always fails...
+	
+#	read $fh, $bytes, 1;
 	if ($filetype eq 'RIF') {  # WAV
-		return 0 if $bytes ne 'F';
+#		return 0 if $bytes ne 'F';
 		$pat = 'a4V';
-		$mat = 'id3 ';
+		@mat = ('id3 ', 'ID32');
 	} elsif ($filetype eq 'FOR') { # AIFF
-		return 0 if $bytes ne 'M';
+#		return 0 if $bytes ne 'M';
 		$pat = 'a4N';
-		$mat = 'ID3 ';
+		@mat = ('ID3 ', 'ID32');
 	}
-	seek $fh, 12, 0;  # skip to the first chunk
+	seek $fh, 12, SEEK_SET;  # skip to the first chunk
 
 	while ((read $fh, $bytes, 8) == 8) {
 		($tag, $size)  = unpack $pat, $bytes;
-		return 1 if $tag eq $mat;
-		seek $fh, $size, 1;
+		for my $mat ( @mat ) {
+			return 1 if $tag eq $mat;
+		}
+		seek $fh, $size, SEEK_CUR;
 	}
 
 	return 0;
@@ -1456,7 +2150,7 @@ sub _unpack_head {
 
 sub _grab_int_16 {
         my $data  = shift;
-        my $value = unpack('s',substr($$data,0,2));
+        my $value = unpack('s', pack('S', unpack('n',substr($$data,0,2))));
         $$data    = substr($$data,2);
         return $value;
 }
@@ -1475,44 +2169,91 @@ sub _grab_int_32 {
         return $value;
 }
 
+# From getid3 - lyrics
+# 
+# Just get the size and offset, so the APE tag can be parsed.
+sub _parse_lyrics3_tag {
+	my ($fh, $filesize, $info) = @_;
+
+	# end - ID3v1 - LYRICSEND - [Lyrics3size]
+	seek($fh, (0 - 128 - 9 - 6), SEEK_END);
+	read($fh, my $lyrics3_id3v1, 128 + 9 + 6);
+
+	my $lyrics3_lsz = substr($lyrics3_id3v1,  0,   6); # Lyrics3size
+	my $lyrics3_end = substr($lyrics3_id3v1,  6,   9); # LYRICSEND or LYRICS200
+	my $id3v1_tag   = substr($lyrics3_id3v1, 15, 128); # ID3v1
+
+	my ($lyrics3_size, $lyrics3_offset, $lyrics3_version);
+
+	# Lyrics3v1, ID3v1, no APE
+	if ($lyrics3_end eq 'LYRICSEND') {
+
+		$lyrics3_size    = 5100;
+		$lyrics3_offset  = $filesize - 128 - $lyrics3_size;
+		$lyrics3_version = 1;
+
+	} elsif ($lyrics3_end eq 'LYRICS200') {
+
+		# Lyrics3v2, ID3v1, no APE
+		# LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
+		$lyrics3_size    = $lyrics3_lsz + 6 + length('LYRICS200');
+		$lyrics3_offset  = $filesize - 128 - $lyrics3_size;
+		$lyrics3_version = 2;
+
+	} elsif (substr(reverse($lyrics3_id3v1), 0, 9) eq 'DNESCIRYL') {
+
+		# Lyrics3v1, no ID3v1, no APE
+		$lyrics3_size    = 5100;
+		$lyrics3_offset  = $filesize - $lyrics3_size;
+		$lyrics3_version = 1;
+		$lyrics3_offset  = $filesize - $lyrics3_size;
+
+	} elsif (substr(reverse($lyrics3_id3v1), 0, 9) eq '002SCIRYL') {
+
+		# Lyrics3v2, no ID3v1, no APE
+		# LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200' > 15 = 6 + strlen('LYRICS200')
+		$lyrics3_size    = reverse(substr(reverse($lyrics3_id3v1), 9, 6)) + 15;
+		$lyrics3_offset  = $filesize - $lyrics3_size;
+		$lyrics3_version = 2;
+	}
+
+	return $lyrics3_offset;
+}
+
 sub _parse_ape_tag {
 	my ($fh, $filesize, $info) = @_;
 
-	my $ape_tag_id = 'APETAGEX';
-
-	seek $fh, -256, 2;
-	read($fh, my $tag, 256);
-	my $pre_tag = substr($tag, 0, 128, '');
-
-	# Try and bail early if there's no ape tag.
-	if (substr($pre_tag, 96, 8) ne $ape_tag_id && substr($tag, 96, 8) ne $ape_tag_id) {
-
-		seek($fh, 0, 0);
-		return 0;
-	}
-
+	my $ape_tag_id          = 'APETAGEX';
 	my $id3v1_tag_size      = 128;
 	my $ape_tag_header_size = 32;
 	my $lyrics3_tag_size    = 10;
 	my $tag_offset_start    = 0;
 	my $tag_offset_end      = 0;
 
-	seek($fh, (0 - $id3v1_tag_size - $ape_tag_header_size - $lyrics3_tag_size), 2);
+	if (my $offset = _parse_lyrics3_tag($fh, $filesize, $info)) {
 
-	read($fh, my $ape_footer_id3v1, $id3v1_tag_size + $ape_tag_header_size + $lyrics3_tag_size);
+		seek($fh, $offset - $ape_tag_header_size, SEEK_SET);
+		$tag_offset_end = $offset;
 
-	if (substr($ape_footer_id3v1, (length($ape_footer_id3v1) - $id3v1_tag_size - $ape_tag_header_size), 8) eq $ape_tag_id) {
+	} else {
 
-		$tag_offset_end = $filesize - $id3v1_tag_size;
+		seek($fh, (0 - $id3v1_tag_size - $ape_tag_header_size - $lyrics3_tag_size), SEEK_END);
 
-	} elsif (substr($ape_footer_id3v1, (length($ape_footer_id3v1) - $ape_tag_header_size), 8) eq $ape_tag_id) {
+		read($fh, my $ape_footer_id3v1, $id3v1_tag_size + $ape_tag_header_size + $lyrics3_tag_size);
 
-		$tag_offset_end = $filesize;
+		if (substr($ape_footer_id3v1, (length($ape_footer_id3v1) - $id3v1_tag_size - $ape_tag_header_size), 8) eq $ape_tag_id) {
+
+			$tag_offset_end = $filesize - $id3v1_tag_size;
+
+		} elsif (substr($ape_footer_id3v1, (length($ape_footer_id3v1) - $ape_tag_header_size), 8) eq $ape_tag_id) {
+
+			$tag_offset_end = $filesize;
+		}
+
+		seek($fh, $tag_offset_end - $ape_tag_header_size, SEEK_SET);
 	}
 
-	seek($fh, $tag_offset_end - $ape_tag_header_size, 0);
-
-	read($fh, my $ape_footer_data, 32);
+	read($fh, my $ape_footer_data, $ape_tag_header_size);
 
 	my $ape_footer = _parse_ape_header_or_footer($ape_footer_data);
 
@@ -1522,7 +2263,7 @@ sub _parse_ape_tag {
 
 		if ($ape_footer->{'flags'}->{'header'}) {
 
-			seek($fh, ($tag_offset_end - $ape_footer->{'tag_size'} - $ape_tag_header_size), 0);
+			seek($fh, ($tag_offset_end - $ape_footer->{'tag_size'} - $ape_tag_header_size), SEEK_SET);
 
 			$tag_offset_start = tell($fh);
 
@@ -1532,29 +2273,41 @@ sub _parse_ape_tag {
 
 			$tag_offset_start = $tag_offset_end - $ape_footer->{'tag_size'};
 
-			seek($fh, $tag_offset_start, 0);
+			seek($fh, $tag_offset_start, SEEK_SET);
 
 			read($fh, $ape_tag_data, $ape_footer->{'tag_size'});
 		}
 
 		my $ape_header_data = substr($ape_tag_data, 0, $ape_tag_header_size, '');
 		my $ape_header      = _parse_ape_header_or_footer($ape_header_data);
-
-		for (my $c = 0; $c < $ape_header->{'tag_items'}; $c++) {
 		
-			# Loop through the tag items
-			my $tag_len   = _grab_int_32(\$ape_tag_data);
-			my $tag_flags = _grab_int_32(\$ape_tag_data);
+		if ( defined $ape_header->{'version'} ) {
+			if ( $ape_header->{'version'} == 2000 ) {
+				$info->{'TAGVERSION'} = 'APEv2';
+			}
+			else {
+				$info->{'TAGVERSION'} = 'APEv1';
+			}
+		}
 
-			$ape_tag_data =~ s/^(.*?)\0//;
+		if (defined $ape_header->{'tag_items'} && $ape_header->{'tag_items'} =~ /^\d+$/) {
 
-			my $tag_item_key = uc($1 || 'UNKNOWN');
+			for (my $c = 0; $c < $ape_header->{'tag_items'}; $c++) {
+			
+				# Loop through the tag items
+				my $tag_len   = _grab_int_32(\$ape_tag_data);
+				my $tag_flags = _grab_int_32(\$ape_tag_data);
 
-			$info->{$tag_item_key} = substr($ape_tag_data, 0, $tag_len, '');
+				$ape_tag_data =~ s/^(.*?)\0//;
+
+				my $tag_item_key = uc($1 || 'UNKNOWN');
+
+				$info->{$tag_item_key} = substr($ape_tag_data, 0, $tag_len, '');
+			}
 		}
 	}
 
-	seek($fh, 0, 0);
+	seek($fh, 0, SEEK_SET);
 
 	return 1;
 }
@@ -2077,6 +2830,7 @@ Tony Bowden,
 Tom Brown,
 Sergio Camarena,
 Chris Dawson,
+Kevin Deane-Freeman,
 Anthony DiSante,
 Luke Drumm,
 Kyle Farrell,
@@ -2084,6 +2838,7 @@ Jeffrey Friedl,
 brian d foy,
 Ben Gertzfield,
 Brian Goodwin,
+Andy Grundman,
 Todd Hanneken,
 Todd Harris,
 Woodrow Hill,
@@ -2121,12 +2876,12 @@ Ronan Waide,
 Andy Waite,
 Ken Williams,
 Ben Winslow,
-Meng Weng Wong.
-
+Meng Weng Wong,
+Justin Fletcher.
 
 =head1 CURRENT AUTHOR 
 
-Dan Sully E<lt>dan | at | slimdevices.comE<gt> & Slim Devices, Inc.
+Dan Sully E<lt>daniel | at | cpan.orgE<gt> & Logitech.
 
 =head1 AUTHOR EMERITUS
 
@@ -2134,7 +2889,7 @@ Chris Nandor E<lt>pudge@pobox.comE<gt>, http://pudge.net/
 
 =head1 COPYRIGHT AND LICENSE 
 
-Copyright (c) 2006 Dan Sully & Slim Devices, Inc. All rights reserved. 
+Copyright (c) 2006-2008 Dan Sully & Logitech. All rights reserved. 
 
 Copyright (c) 1998-2005 Chris Nandor. All rights reserved. 
 
@@ -2145,7 +2900,7 @@ the same terms as Perl itself.
 
 =over 4
 
-=item Slim Devices
+=item Logitech/Slim Devices
 
 	http://www.slimdevices.com/
 
diff --git a/tools/mr500.c b/tools/mr500.c
index ed2ea6d4eb..1c995dcd6f 100644
--- a/tools/mr500.c
+++ b/tools/mr500.c
@@ -9,7 +9,6 @@
  *   Copyright (C) 2009 by Karl Kurbjun
  *      based on work by Shirour:
  *          http://www.mrobe.org/forum/viewtopic.php?f=6&t=2176
- *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/tools/mr500.h b/tools/mr500.h
index f9a651f923..43ad88aacf 100644
--- a/tools/mr500.h
+++ b/tools/mr500.h
@@ -7,7 +7,6 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2009 by Karl Kurbjun 
- *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/tools/ovl_offset.pl b/tools/ovl_offset.pl
index 12777582cd..440606bbd1 100755
--- a/tools/ovl_offset.pl
+++ b/tools/ovl_offset.pl
@@ -1,35 +1,39 @@
 #!/usr/bin/perl
 
 # Calculate the highest possible location for an overlay based
-# on a reference map file (.refmap)
+# on a reference ELF file (.refelf)
+# Reads plugin_load_end_addr and plugin_ram_end symbols from the ELF
+# via nm, then computes the overlay offset.
 
-sub map_scan {
+sub main {
     # The buflib handle table is a few hundred bytes, just before
     # the plugin buffer. We assume it's never more than 1024 bytes.
     # If this assumption is wrong, overlay loading will fail.
     my $max_handle_table_size = 1024;
-    my ($map) = @_;
-    my $ramstart = -1, $ramsize = -1, $startaddr = -1, $endaddr = -1;
-    open (MAP, "<$map");
-    while (<MAP>) {
-        if ($_ =~ /^PLUGIN_RAM +0x([0-9a-f]+) +0x([0-9a-f]+)$/) {
-            $ramstart = hex($1);
-            $ramsize = hex($2);
+
+    my ($elf) = @_;
+    my $ram_end = -1;
+    my $load_end = -1;
+
+    open (NM, "nm $elf |") or die "Cannot run nm on $elf: $!\n";
+    while (<NM>) {
+        if ($_ =~ /^([0-9a-fA-F]+)\s+\S+\s+plugin_ram_end$/) {
+            $ram_end = hex($1);
         }
-        elsif ($_ =~ / +0x([0-9a-f]+) +_?plugin_start_addr = ./) {
-            $startaddr = hex($1);
-        }
-        elsif ($_ =~ / +0x([0-9a-f]+) +_?plugin_load_end_addr = ./) {
-            $endaddr = hex($1);
+        elsif ($_ =~ /^([0-9a-fA-F]+)\s+\S+\s+plugin_load_end_addr$/) {
+            $load_end = hex($1);
         }
     }
-    close (MAP);
-    if ($ramstart < 0 || $ramsize < 0 || $startaddr < 0 || $endaddr < 0
-        || $ramstart != $startaddr) {
-        printf "Could not analyze map file.\n";
+    close(NM);
+
+    if ($ram_end < 0 || $load_end < 0) {
+        printf STDERR "Could not read symbols from $elf\n";
+        printf STDERR "  plugin_ram_end: %s\n", $ram_end < 0 ? "not found" : sprintf("0x%x", $ram_end);
+        printf STDERR "  plugin_load_end_addr: %s\n", $load_end < 0 ? "not found" : sprintf("0x%x", $load_end);
         exit 1;
     }
-    return $ramstart + $ramsize - $endaddr - $max_handle_table_size;
+
+    return ($ram_end - $load_end - $max_handle_table_size) & ~0xf;
 }
 
-printf map_scan($ARGV[0]) & ~0xf;
+printf main($ARGV[0]);
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile
index 7df505ed38..0713ef7044 100644
--- a/tools/rbspeex/Makefile
+++ b/tools/rbspeex/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 ifndef V
diff --git a/tools/rdf2binary.c b/tools/rdf2binary.c
index 36c4f464bd..1d35e69d2a 100644
--- a/tools/rdf2binary.c
+++ b/tools/rdf2binary.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Miika Pekkarinen
  *
diff --git a/tools/root.make b/tools/root.make
index b1659e7da4..11540a0a39 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 include $(TOOLSDIR)/functions.make
@@ -96,6 +95,10 @@ ifndef APP_TYPE
   endif
 endif
 
+ifeq (,$(NO_UTF8PROC))
+  include $(ROOTDIR)/lib/utf8proc/utf8proc.make
+endif
+
 ifeq (,$(findstring checkwps,$(APP_TYPE)))
   include $(ROOTDIR)/lib/fixedpoint/fixedpoint.make
 endif
@@ -128,14 +131,6 @@ else # core
   include $(APPSDIR)/apps.make
   include $(ROOTDIR)/lib/rbcodec/rbcodec.make
 
-  # bootloaders don't get utf8proc
-  ifeq (,$(findstring checkwps,$(APP_TYPE)))
-    IS_GREATER := $(shell [ $(MEMORYSIZE) -gt 2 ] && echo true || echo false)
-    ifeq ($(IS_GREATER),true)
-      include $(ROOTDIR)/lib/utf8proc/utf8proc.make
-    endif
-  endif
-
   ifeq ($(ENABLEDPLUGINS),yes)
     include $(APPSDIR)/plugins/bitmaps/pluginbitmaps.make
     include $(APPSDIR)/plugins/plugins.make
@@ -178,10 +173,11 @@ else # core
   endif
 
   ifneq (,$(findstring rgnano, $(MODELNAME)))
-	include $(ROOTDIR)/packaging/rgnano/rgnano.make
+   include $(ROOTDIR)/packaging/rgnano/rgnano.make
   endif
+
   ifneq (,$(findstring ctru, $(APP_TYPE)))
-  include $(ROOTDIR)/packaging/ctru/ctru.make
+    include $(ROOTDIR)/packaging/ctru/ctru.make
   endif
 
 endif # bootloader
diff --git a/tools/sapi_voice.vbs b/tools/sapi_voice.vbs
index 515252f8b3..f39be986d0 100644
--- a/tools/sapi_voice.vbs
+++ b/tools/sapi_voice.vbs
@@ -5,7 +5,6 @@
 '   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 '   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 '                     \/            \/     \/    \/            \/
-' $Id$
 '
 ' Copyright (C) 2007 Steve Bavin, Jens Arnold, Mesar Hameed
 '
diff --git a/tools/scramble.c b/tools/scramble.c
index 2ec8cfb7b5..85879e40f3 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 - 2007 by Björn Stenberg
  *
diff --git a/tools/telechips.c b/tools/telechips.c
index acb15b8b14..f1f67e224a 100644
--- a/tools/telechips.c
+++ b/tools/telechips.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Telechips firmware checksum support for scramble
  *
diff --git a/tools/telechips.h b/tools/telechips.h
index 6550af70d0..d170f29e3a 100644
--- a/tools/telechips.h
+++ b/tools/telechips.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/tools/tools.make b/tools/tools.make
index 5fd8e80cc3..c3d8c33dff 100644
--- a/tools/tools.make
+++ b/tools/tools.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 TOOLSCFLAGS := -O -g -W -Wall -Wshadow -pedantic -I$(ROOTDIR)/tools
diff --git a/tools/ucl/Makefile b/tools/ucl/Makefile
index f22a862cb6..5e47214e7c 100644
--- a/tools/ucl/Makefile
+++ b/tools/ucl/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 CFLAGS+= -O2 -Iinclude
 
diff --git a/tools/ucl/acc/ACC_LICENSE b/tools/ucl/acc/ACC_LICENSE
new file mode 100644
index 0000000000..b4951ab753
--- /dev/null
+++ b/tools/ucl/acc/ACC_LICENSE
@@ -0,0 +1,340 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/tools/ucl/acc/acc.h b/tools/ucl/acc/acc.h
new file mode 100644
index 0000000000..9286b9bff8
--- /dev/null
+++ b/tools/ucl/acc/acc.h
@@ -0,0 +1,94 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+/*
+ * Possible configuration values:
+ *
+ *   ACC_CONFIG_NO_HEADER
+ *   ACC_CONFIG_HEADER          if given, then use this as <config.h>
+ *   ACC_CONFIG_INCLUDE         include path to acc_ files
+ *
+ *   ACC_CONFIG_PREFER___INT64  [acc_type.h]
+ */
+
+
+#ifndef __ACC_H_INCLUDED
+#define __ACC_H_INCLUDED 1
+
+#define ACC_VERSION     20040715L
+
+#if !defined(ACC_CONFIG_INCLUDE)
+#  define ACC_CONFIG_INCLUDE(file)     file
+#endif
+
+
+#if defined(__CYGWIN32__) && !defined(__CYGWIN__)
+#  define __CYGWIN__ __CYGWIN32__
+#endif
+#if defined(__IBMCPP__) && !defined(__IBMC__)
+#  define __IBMC__ __IBMCPP__
+#endif
+#if defined(__ICL) && defined(_WIN32) && !defined(__INTEL_COMPILER)
+#  define __INTEL_COMPILER __ICL
+#endif
+
+#if 1 && defined(__INTERIX) && defined(__GNUC__) && !defined(_ALL_SOURCE)
+#  define _ALL_SOURCE 1
+#endif
+
+/* disable pedantic warnings for undefined preprocessing symbols */
+#if defined(__INTEL_COMPILER) && defined(__linux__)
+#  pragma warning(disable: 193)
+#endif
+#if defined(__KEIL__) && defined(__C166__)
+#  pragma warning disable = 322
+#elif 0 && defined(__C251__)
+#  pragma warning disable = 322
+#endif
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__)
+#  if (_MSC_VER >= 1300)
+#    pragma warning(disable: 4668)
+#  endif
+#endif
+#if 0 && defined(__WATCOMC__)
+#  if (__WATCOMC__ < 1060)
+#    pragma warning 203 9
+#  endif
+#endif
+
+
+#include <limits.h>
+#include ACC_CONFIG_INCLUDE("acc_init.h")
+#include ACC_CONFIG_INCLUDE("acc_os.h")
+#include ACC_CONFIG_INCLUDE("acc_cc.h")
+#include ACC_CONFIG_INCLUDE("acc_arch.h")
+#include ACC_CONFIG_INCLUDE("acc_mm.h")
+#include ACC_CONFIG_INCLUDE("acc_defs.h")
+
+#if defined(ACC_CONFIG_NO_HEADER)
+#elif defined(ACC_CONFIG_HEADER)
+#  include ACC_CONFIG_HEADER
+#else
+#  include ACC_CONFIG_INCLUDE("acc_auto.h")
+#endif
+
+#include ACC_CONFIG_INCLUDE("acc_type.h")
+
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_arch.h b/tools/ucl/acc/acc_arch.h
new file mode 100644
index 0000000000..8f83583f6c
--- /dev/null
+++ b/tools/ucl/acc/acc_arch.h
@@ -0,0 +1,124 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+/*
+ * CPU architecture - exactly one of:
+ *
+ *   ACC_ARCH_UNKNOWN       [default]
+ *   ACC_ARCH_ALPHA
+ *   ACC_ARCH_AMD64         aka x86-64 or ia32e
+ *   ACC_ARCH_C166
+ *   ACC_ARCH_IA16          Intel Architecture (8088, 8086, 80186, 80286)
+ *   ACC_ARCH_IA32          Intel Architecture (80386+)
+ *   ACC_ARCH_IA64          Intel Architecture (Itanium)
+ *   ACC_ARCH_M68K          Motorola 680x0
+ *   ACC_ARCH_MCS251
+ *   ACC_ARCH_MCS51
+ *   ACC_ARCH_PPC64         Power PC
+ *   ACC_ARCH_SPARC64
+ *
+ * Optionally define one of:
+ *   ACC_ENDIAN_LITTLE_ENDIAN
+ *   ACC_ENDIAN_BIG_ENDIAN
+ *
+ * Note that this list is not exhaustive - actually we only really care
+ * about architectures which allow unaligned memory access at reasonable
+ * speed (for the moment this means IA16, IA32 and AMD64).
+ */
+
+#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
+#  define ACC_ARCH_IA16             1
+#  define ACC_INFO_ARCH             "ia16"
+#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
+#  define ACC_ARCH_AMD64            1
+#  define ACC_INFO_ARCH             "amd64"
+#elif (UINT_MAX <= ACC_0xffffL) && defined(__AVR__)
+#  define ACC_ARCH_AVR              1
+#  define ACC_INFO_ARCH             "avr"
+#elif (UINT_MAX == ACC_0xffffL) && defined(__C166__)
+#  define ACC_ARCH_C166             1
+#  define ACC_INFO_ARCH             "c166"
+#elif (UINT_MAX == ACC_0xffffL) && defined(__C251__)
+#  define ACC_ARCH_MCS251           1
+#  define ACC_INFO_ARCH             "mcs-251"
+#elif (UINT_MAX == ACC_0xffffL) && defined(__C51__)
+#  define ACC_ARCH_MCS51            1
+#  define ACC_INFO_ARCH             "mcs-51"
+#elif defined(__386__) || defined(__i386__) || defined(__i386) || defined(_M_IX86) || defined(_M_I386)
+#  define ACC_ARCH_IA32             1
+#  define ACC_INFO_ARCH             "ia32"
+#elif (ACC_CC_ZORTECHC && defined(__I86__))
+#  define ACC_ARCH_IA32             1
+#  define ACC_INFO_ARCH             "ia32"
+#elif defined(__ia64__) || defined(__ia64) || defined(_M_IA64)
+#  define ACC_ARCH_IA64             1
+#  define ACC_INFO_ARCH             "ia64"
+#elif (ACC_OS_DOS32 && ACC_CC_HIGHC) && defined(_I386)
+#  define ACC_ARCH_IA32             1
+#  define ACC_INFO_ARCH             "ia32"
+#elif (ACC_OS_DOS32 || ACC_OS_OS2)
+#  error "missing define for CPU architecture"
+#elif (ACC_OS_WIN32)
+#  error "missing define for CPU architecture"
+#elif (ACC_OS_WIN64)
+/* #  error "missing define for CPU architecture" */
+#elif (ACC_OS_TOS) || defined(__m68000__)
+#  define ACC_ARCH_M68K             1
+#  define ACC_INFO_ARCH             "m68k"
+#elif defined(__alpha__) || defined(__alpha)
+#  define ACC_ARCH_ALPHA            1
+#  define ACC_INFO_ARCH             "alpha"
+#elif defined(__ppc64__) || defined(__ppc64)
+#  define ACC_ARCH_PPC64            1
+#  define ACC_INFO_ARCH             "ppc64"
+#elif defined(__sparc64__) || defined(__sparc64)
+#  define ACC_ARCH_SPARC64          1
+#  define ACC_INFO_ARCH             "sparc64"
+#else
+#  define ACC_ARCH_UNKNOWN          1
+#  define ACC_INFO_ARCH             "unknown"
+#endif
+
+
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA16 || ACC_ARCH_IA32)
+#  define ACC_ENDIAN_LITTLE_ENDIAN  1
+#  define ACC_INFO_ENDIAN           "little-endian"
+#elif (ACC_ARCH_M68K)
+#  define ACC_ENDIAN_BIG_ENDIAN     1
+#  define ACC_INFO_ENDIAN           "big-endian"
+#endif
+
+
+#if (ACC_ARCH_IA16)
+#  if (UINT_MAX != ACC_0xffffL)
+#    error "this should not happen"
+#  endif
+#  if (ULONG_MAX != ACC_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#endif
+#if (ACC_ARCH_IA32)
+#  if (UINT_MAX != ACC_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#  if (ULONG_MAX != ACC_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#endif
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_auto.h b/tools/ucl/acc/acc_auto.h
new file mode 100644
index 0000000000..a201b9de7c
--- /dev/null
+++ b/tools/ucl/acc/acc_auto.h
@@ -0,0 +1,660 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+/*
+ * Possible configuration values:
+ *
+ *   ACC_CONFIG_AUTO_NO_HEADERS
+ *   ACC_CONFIG_AUTO_NO_FUNCTIONS
+ *   ACC_CONFIG_AUTO_NO_SIZES
+ */
+
+
+/*************************************************************************
+// Checks for <stdint.h>
+**************************************************************************/
+
+#if !defined(ACC_CONFIG_AUTO_NO_HEADERS)
+
+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
+#  if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
+#    define HAVE_STDINT_H 1
+#  endif
+#elif defined(__dietlibc__)
+#  undef HAVE_STDINT_H /* incomplete */
+#elif (ACC_CC_BORLANDC) && (__BORLANDC__ >= 0x560)
+#  undef HAVE_STDINT_H /* broken & incomplete */
+#elif (ACC_CC_DMC) && (__DMC__ >= 0x825)
+#  define HAVE_STDINT_H 1
+#endif
+
+#if HAVE_STDINT_H
+#  include <stdint.h>
+#endif
+
+#endif /* !defined(ACC_CONFIG_AUTO_NO_HEADERS) */
+
+
+/*************************************************************************
+// Checks for header files
+**************************************************************************/
+
+#if !defined(ACC_CONFIG_AUTO_NO_HEADERS)
+
+#define STDC_HEADERS 1
+
+#define HAVE_ASSERT_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_DIRENT_H 1
+#define HAVE_ERRNO_H 1
+#define HAVE_FCNTL_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_SETJMP_H 1
+#define HAVE_SIGNAL_H 1
+#define HAVE_STDARG_H 1
+#define HAVE_STDDEF_H 1
+#define HAVE_STDIO_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_TIME_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_UTIME_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TYPES_H 1
+
+#undef HAVE_ALLOCA_H
+#undef HAVE_CONIO_H
+#undef HAVE_DIRECT_H
+#undef HAVE_DOS_H
+#undef HAVE_IO_H
+#undef HAVE_SHARE_H
+#undef HAVE_STDINT_H
+#undef HAVE_STRINGS_H
+#undef HAVE_SYS_UTIME_H
+
+
+#if (ACC_OS_POSIX)
+#  define HAVE_STRINGS_H 1
+#  if (ACC_OS_POSIX_FREEBSD || ACC_OS_POSIX_MACOSX || ACC_OS_POSIX_OPENBSD)
+#    undef HAVE_MALLOC_H /* deprecated */
+#  elif (ACC_OS_POSIX_HPUX || ACC_OS_POSIX_INTERIX)
+#    define HAVE_ALLOCA_H 1
+#  endif
+#  if (ACC_OS_POSIX_MACOSX && ACC_CC_MWERKS) && defined(__MSL__)
+     /* FIXME ??? */
+#    undef HAVE_SYS_TIME_H
+#    undef HAVE_SYS_TYPES_H
+#  endif
+#elif (ACC_OS_CYGWIN)
+#  define HAVE_IO_H 1
+#elif (ACC_OS_EMX)
+#  define HAVE_ALLOCA_H 1
+#  define HAVE_IO_H 1
+#elif (ACC_OS_TOS && ACC_CC_GNUC)
+#  if !defined(__MINT__)
+#    undef HAVE_MALLOC_H
+#  endif
+#elif (ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
+#  undef HAVE_DIRENT_H
+#  undef HAVE_FCNTL_H
+#  undef HAVE_MALLOC_H
+#  undef HAVE_MEMORY_H
+#  undef HAVE_UNISTD_H
+#  undef HAVE_UTIME_H
+#  undef HAVE_SYS_STAT_H
+#  undef HAVE_SYS_TIME_H
+#  undef HAVE_SYS_TYPES_H
+#endif
+
+
+/* DOS, OS/2 & Windows */
+#if (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
+
+#define HAVE_CONIO_H 1
+#define HAVE_DIRECT_H 1
+#define HAVE_DOS_H 1
+#define HAVE_IO_H 1
+#define HAVE_SHARE_H 1
+
+#if (ACC_CC_AZTECC)
+#  undef HAVE_CONIO_H
+#  undef HAVE_DIRECT_H
+#  undef HAVE_DIRENT_H
+#  undef HAVE_MALLOC_H
+#  undef HAVE_SHARE_H
+#  undef HAVE_UNISTD_H
+#  undef HAVE_UTIME_H
+#  undef HAVE_SYS_STAT_H
+#  undef HAVE_SYS_TIME_H
+#  undef HAVE_SYS_TYPES_H
+#elif (ACC_CC_BORLANDC)
+#  undef HAVE_UNISTD_H
+#  undef HAVE_SYS_TIME_H
+#  if (ACC_OS_WIN32 || ACC_OS_WIN64)
+#    undef HAVE_DIRENT_H /* pulls in <windows.h>; use <dir.h> instead */
+#  endif
+#  if (__BORLANDC__ < 0x0400)
+#    undef HAVE_DIRENT_H
+#    undef HAVE_UTIME_H
+#  endif
+#elif (ACC_CC_DMC)
+#  undef HAVE_DIRENT_H /* not working */
+#  undef HAVE_UNISTD_H /* not working */
+#  define HAVE_SYS_DIRENT_H 1
+#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
+#elif (ACC_OS_DOS32 && ACC_CC_HIGHC)
+#  define HAVE_ALLOCA_H 1
+#  undef HAVE_DIRENT_H
+#  undef HAVE_UNISTD_H
+#elif (ACC_CC_IBMC && ACC_OS_OS2)
+#  undef HAVE_DOS_H
+#  undef HAVE_DIRENT_H
+#  undef HAVE_UNISTD_H
+#  undef HAVE_UTIME_H
+#  undef HAVE_SYS_TIME_H
+#  define HAVE_SYS_UTIME_H 1
+#elif (ACC_CC_INTELC || ACC_CC_MSC)
+#  undef HAVE_DIRENT_H
+#  undef HAVE_UNISTD_H
+#  undef HAVE_UTIME_H
+#  undef HAVE_SYS_TIME_H
+#  define HAVE_SYS_UTIME_H 1
+#elif (ACC_CC_LCC)
+#  undef HAVE_DIRENT_H
+#  undef HAVE_DOS_H
+#  undef HAVE_SYS_TIME_H
+#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__MINGW32__)
+#  undef HAVE_UTIME_H
+#  define HAVE_SYS_UTIME_H 1
+#elif (ACC_OS_WIN32 && ACC_CC_MWERKS) && defined(__MSL__)
+#  define HAVE_ALLOCA_H 1
+#  undef HAVE_DOS_H
+#  undef HAVE_SHARE_H
+#  undef HAVE_SYS_TIME_H
+#elif (ACC_CC_NDPC)
+#  undef HAVE_DIRENT_H
+#  undef HAVE_DOS_H
+#  undef HAVE_UNISTD_H
+#  undef HAVE_UTIME_H
+#  undef HAVE_SYS_TIME_H
+#elif (ACC_CC_PACIFICC)
+#  undef HAVE_DIRECT_H
+#  undef HAVE_DIRENT_H
+#  undef HAVE_FCNTL_H
+#  undef HAVE_IO_H
+#  undef HAVE_MALLOC_H
+#  undef HAVE_MEMORY_H
+#  undef HAVE_SHARE_H
+#  undef HAVE_UNISTD_H
+#  undef HAVE_UTIME_H
+#  undef HAVE_SYS_STAT_H
+#  undef HAVE_SYS_TIME_H
+#  undef HAVE_SYS_TYPES_H
+#elif (ACC_OS_WIN32 && ACC_CC_PELLESC)
+#  undef HAVE_DIRENT_H
+#  undef HAVE_DOS_H
+#  undef HAVE_MALLOC_H
+#  undef HAVE_SHARE_H
+#  undef HAVE_UNISTD_H
+#  undef HAVE_UTIME_H
+#  undef HAVE_SYS_TIME_H
+#  if (__POCC__ < 280)
+#  else
+#    define HAVE_SYS_UTIME_H 1
+#  endif
+#elif (ACC_OS_WIN32 && ACC_CC_PGI) && defined(__MINGW32__)
+#  undef HAVE_UTIME_H
+#  define HAVE_SYS_UTIME_H 1
+#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
+#elif (ACC_CC_SYMANTECC)
+#  undef HAVE_DIRENT_H /* opendir() not implemented in libc */
+#  undef HAVE_UNISTD_H /* not working */
+#  if (__SC__ < 0x700)
+#    undef HAVE_UTIME_H
+#    undef HAVE_SYS_TIME_H
+#  endif
+#elif (ACC_CC_TOPSPEEDC)
+#  undef HAVE_DIRENT_H
+#  undef HAVE_UNISTD_H
+#  undef HAVE_UTIME_H
+#  undef HAVE_SYS_STAT_H
+#  undef HAVE_SYS_TIME_H
+#  undef HAVE_SYS_TYPES_H
+#elif (ACC_CC_TURBOC)
+#  undef HAVE_UNISTD_H
+#  undef HAVE_SYS_TIME_H
+#  undef HAVE_SYS_TYPES_H /* useless */
+#  if (ACC_OS_WIN32 || ACC_OS_WIN64)
+#    undef HAVE_DIRENT_H /* pulls in <windows.h>; use <dir.h> instead */
+#  endif
+#  if (__TURBOC__ < 0x0200)
+#    undef HAVE_SIGNAL_H /* not working */
+#  endif
+#  if (__TURBOC__ < 0x0400)
+#    undef HAVE_DIRECT_H
+#    undef HAVE_DIRENT_H
+#    undef HAVE_MALLOC_H
+#    undef HAVE_MEMORY_H
+#    undef HAVE_UTIME_H
+#  endif
+#elif (ACC_CC_WATCOMC)
+#  undef HAVE_DIRENT_H
+#  undef HAVE_UTIME_H
+#  undef HAVE_SYS_TIME_H
+#  define HAVE_SYS_UTIME_H 1
+#  if (__WATCOMC__ < 950)
+#    undef HAVE_UNISTD_H
+#  endif
+#elif (ACC_CC_ZORTECHC)
+#  undef HAVE_DIRENT_H
+#  undef HAVE_MEMORY_H
+#  undef HAVE_UNISTD_H
+#  undef HAVE_UTIME_H
+#  undef HAVE_SYS_TIME_H
+#endif
+
+#endif /* DOS, OS/2 & Windows */
+
+
+#if (HAVE_SYS_TIME_H && HAVE_TIME_H)
+#  define TIME_WITH_SYS_TIME 1
+#endif
+
+#endif /* !defined(ACC_CONFIG_AUTO_NO_HEADERS) */
+
+
+/*************************************************************************
+// Checks for library functions
+**************************************************************************/
+
+#if !defined(ACC_CONFIG_AUTO_NO_FUNCTIONS)
+
+#define HAVE_ACCESS 1
+#define HAVE_ALLOCA 1
+#define HAVE_ATEXIT 1
+#define HAVE_ATOI 1
+#define HAVE_ATOL 1
+#define HAVE_CHMOD 1
+#define HAVE_CHOWN 1
+#define HAVE_CTIME 1
+#define HAVE_DIFFTIME 1
+#define HAVE_FILENO 1
+#define HAVE_FSTAT 1
+#define HAVE_GETTIMEOFDAY 1
+#define HAVE_GMTIME 1
+#define HAVE_LOCALTIME 1
+#define HAVE_LONGJMP 1
+#define HAVE_LSTAT 1
+#define HAVE_MEMCMP 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MEMSET 1
+#define HAVE_MKTIME 1
+#define HAVE_QSORT 1
+#define HAVE_RAISE 1
+#define HAVE_SETJMP 1
+#define HAVE_SIGNAL 1
+#define HAVE_SNPRINTF 1
+#define HAVE_STAT 1
+#define HAVE_STRCHR 1
+#define HAVE_STRDUP 1
+#define HAVE_STRERROR 1
+#define HAVE_STRFTIME 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_TIME 1
+#define HAVE_UMASK 1
+#define HAVE_UTIME 1
+#define HAVE_VSNPRINTF 1
+
+#if (ACC_OS_BEOS || ACC_OS_CYGWIN || ACC_OS_POSIX || ACC_OS_QNX)
+#  define HAVE_STRCASECMP 1
+#  define HAVE_STRNCASECMP 1
+#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
+#  define HAVE_STRCASECMP 1
+#  define HAVE_STRNCASECMP 1
+#else
+#  define HAVE_STRICMP 1
+#  define HAVE_STRNICMP 1
+#endif
+
+
+#if (ACC_OS_POSIX)
+#  if (ACC_CC_TINYC)
+#    undef HAVE_ALLOCA
+#  elif defined(__dietlibc__)
+#  endif
+#  if (ACC_OS_POSIX_MACOSX && ACC_CC_MWERKS) && defined(__MSL__)
+     /* FIXME ??? */
+#    undef HAVE_CHOWN
+#    undef HAVE_LSTAT
+#  endif
+#elif (ACC_OS_CYGWIN)
+#  if (ACC_CC_GNUC < 0x025a00ul)
+#    undef HAVE_GETTIMEOFDAY
+#    undef HAVE_LSTAT
+#  endif
+#  if (ACC_CC_GNUC < 0x025f00ul)
+#    undef HAVE_SNPRINTF
+#    undef HAVE_VSNPRINTF
+#  endif
+#elif (ACC_OS_EMX)
+#  undef HAVE_CHOWN
+#  undef HAVE_LSTAT
+#elif (ACC_OS_TOS && ACC_CC_GNUC)
+#  if !defined(__MINT__)
+#    undef HAVE_SNPRINTF
+#    undef HAVE_VSNPRINTF
+#  endif
+#elif (ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
+#  undef HAVE_ALLOCA
+#  undef HAVE_ACCESS
+#  undef HAVE_CHMOD
+#  undef HAVE_CHOWN
+#  undef HAVE_FSTAT
+#  undef HAVE_GETTIMEOFDAY
+#  undef HAVE_LSTAT
+#  undef HAVE_SNPRINTF
+#  undef HAVE_UMASK
+#  undef HAVE_UTIME
+#  undef HAVE_VSNPRINTF
+#endif
+
+
+/* DOS, OS/2 & Windows */
+#if (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
+
+#undef HAVE_CHOWN
+#undef HAVE_GETTIMEOFDAY
+#undef HAVE_LSTAT
+#undef HAVE_UMASK
+
+#if (ACC_CC_AZTECC)
+#  undef HAVE_ALLOCA
+#  undef HAVE_DIFFTIME /* difftime() is in the math library */
+#  undef HAVE_FSTAT
+#  undef HAVE_STRDUP /* missing in 5.2a */
+#  undef HAVE_SNPRINTF
+#  undef HAVE_UTIME /* struct utimbuf is missing */
+#  undef HAVE_VSNPRINTF
+#elif (ACC_CC_BORLANDC)
+#  if (__BORLANDC__ < 0x0400)
+#    undef HAVE_ALLOCA
+#    undef HAVE_UTIME
+#  endif
+#  if ((__BORLANDC__ < 0x0410) && ACC_OS_WIN16)
+#    undef HAVE_ALLOCA
+#  endif
+#  if (__BORLANDC__ < 0x0550)
+#    undef HAVE_SNPRINTF
+#    undef HAVE_VSNPRINTF
+#  endif
+#elif (ACC_CC_DMC)
+#  if (ACC_OS_WIN16)
+#    undef HAVE_ALLOCA
+#  endif
+#  define snprintf _snprintf
+#  define vsnprintf _vsnprintf
+#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
+#  undef HAVE_SNPRINTF
+#  undef HAVE_VSNPRINTF
+#elif (ACC_OS_DOS32 && ACC_CC_HIGHC)
+#  undef HAVE_SNPRINTF
+#  undef HAVE_VSNPRINTF
+#elif (ACC_CC_IBMC)
+#  undef HAVE_SNPRINTF
+#  undef HAVE_VSNPRINTF
+#elif (ACC_CC_INTELC)
+#  define snprintf _snprintf
+#  define vsnprintf _vsnprintf
+#elif (ACC_CC_LCC)
+#  define utime _utime
+#elif (ACC_CC_MSC)
+#  if (_MSC_VER < 600)
+#    undef HAVE_STRFTIME
+#  endif
+#  if (_MSC_VER < 700)
+#    undef HAVE_SNPRINTF
+#    undef HAVE_VSNPRINTF
+#  else
+#    define snprintf _snprintf
+#    define vsnprintf _vsnprintf
+#  endif
+#  if ((_MSC_VER < 800) && ACC_OS_WIN16)
+#    undef HAVE_ALLOCA
+#  endif
+#  if (ACC_ARCH_IA16) && defined(__cplusplus)
+#    undef HAVE_LONGJMP
+#    undef HAVE_SETJMP
+#  endif
+#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__MINGW32__)
+#  if (ACC_CC_GNUC < 0x025f00ul)
+#    undef HAVE_SNPRINTF
+#    undef HAVE_VSNPRINTF
+#  else
+#    define snprintf _snprintf
+#    define vsnprintf _vsnprintf
+#  endif
+#elif (ACC_OS_WIN32 && ACC_CC_MWERKS) && defined(__MSL__)
+#  if (__MSL__ < 0x8000ul)
+#    undef HAVE_CHMOD /* <unix.h> which in turn pulls in <windows.h> */
+#  endif
+#elif (ACC_CC_NDPC)
+#  undef HAVE_ALLOCA
+#  undef HAVE_SNPRINTF
+#  undef HAVE_STRNICMP
+#  undef HAVE_UTIME
+#  undef HAVE_VSNPRINTF
+#  if defined(__cplusplus)
+#    undef HAVE_STAT
+#  endif
+#elif (ACC_CC_PACIFICC)
+#  undef HAVE_ACCESS
+#  undef HAVE_ALLOCA
+#  undef HAVE_CHMOD
+#  undef HAVE_DIFFTIME
+#  undef HAVE_FSTAT
+#  undef HAVE_MKTIME
+#  undef HAVE_RAISE
+#  undef HAVE_SNPRINTF
+#  undef HAVE_STRFTIME
+#  undef HAVE_UTIME
+#  undef HAVE_VSNPRINTF
+#elif (ACC_OS_WIN32 && ACC_CC_PELLESC)
+#  if (__POCC__ < 280)
+#    define alloca _alloca
+#    undef HAVE_UTIME
+#  endif
+#elif (ACC_OS_WIN32 && ACC_CC_PGI) && defined(__MINGW32__)
+#  define snprintf _snprintf
+#  define vsnprintf _vsnprintf
+#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
+#  undef HAVE_SNPRINTF
+#  undef HAVE_VSNPRINTF
+#elif (ACC_CC_SYMANTECC)
+#  if (ACC_OS_WIN16 && (ACC_MM_MEDIUM || ACC_MM_LARGE || ACC_MM_HUGE))
+#    undef HAVE_ALLOCA
+#  endif
+#  if (__SC__ < 0x600)
+#    undef HAVE_SNPRINTF
+#    undef HAVE_VSNPRINTF
+#  else
+#    define snprintf _snprintf
+#    define vsnprintf _vsnprintf
+#  endif
+#  if (__SC__ < 0x700)
+#    undef HAVE_DIFFTIME /* difftime() is broken */
+#    undef HAVE_UTIME /* struct utimbuf is missing */
+#  endif
+#elif (ACC_CC_TOPSPEEDC)
+#  undef HAVE_SNPRINTF
+#  undef HAVE_VSNPRINTF
+#elif (ACC_CC_TURBOC)
+#  undef HAVE_ALLOCA
+#  undef HAVE_SNPRINTF
+#  undef HAVE_VSNPRINTF
+#  if (__TURBOC__ < 0x0200)
+#    undef HAVE_RAISE
+#    undef HAVE_SIGNAL
+#  endif
+#  if (__TURBOC__ < 0x0295)
+#    undef HAVE_MKTIME
+#    undef HAVE_STRFTIME
+#  endif
+#  if (__TURBOC__ < 0x0400)
+#    undef HAVE_UTIME
+#  endif
+#elif (ACC_CC_WATCOMC)
+#  if (__WATCOMC__ < 1100)
+#    undef HAVE_SNPRINTF
+#    undef HAVE_VSNPRINTF
+#  elif (__WATCOMC__ < 1200)
+#    define snprintf _snprintf
+#    define vsnprintf _vsnprintf
+#  endif
+#elif (ACC_CC_ZORTECHC)
+#  if (ACC_OS_WIN16 && (ACC_MM_MEDIUM || ACC_MM_LARGE || ACC_MM_HUGE))
+#    undef HAVE_ALLOCA
+#  endif
+#  undef HAVE_DIFFTIME /* difftime() is broken */
+#  undef HAVE_SNPRINTF
+#  undef HAVE_UTIME /* struct utimbuf is missing */
+#  undef HAVE_VSNPRINTF
+#endif
+
+#endif /* DOS, OS/2 & Windows */
+
+
+#endif /* !defined(ACC_CONFIG_AUTO_NO_FUNCTIONS) */
+
+
+/*************************************************************************
+// Checks for sizes
+**************************************************************************/
+
+#if !defined(ACC_CONFIG_AUTO_NO_SIZES)
+
+#define SIZEOF_SHORT            (__ACC_SHORT_BIT / 8)
+#define SIZEOF_INT              (__ACC_INT_BIT / 8)
+#define SIZEOF_LONG             (__ACC_LONG_BIT / 8)
+
+#if (ACC_OS_WIN64) /* LLP64 programming model */
+#  define SIZEOF_PTRDIFF_T      8
+#  define SIZEOF_SIZE_T         8
+#  define SIZEOF_VOID_P         8
+#elif (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
+#  define SIZEOF_SIZE_T         2
+#  if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
+#    define SIZEOF_VOID_P       2
+#  elif (ACC_MM_COMPACT || ACC_MM_LARGE || ACC_MM_HUGE)
+#    define SIZEOF_VOID_P       4
+#  else
+#    error "ACC_MM"
+#  endif
+#  if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
+#    define SIZEOF_PTRDIFF_T    2
+#  elif (ACC_MM_COMPACT || ACC_MM_LARGE)
+#    if (ACC_CC_BORLANDC || ACC_CC_TURBOC)
+#      define SIZEOF_PTRDIFF_T  4
+#    else
+#      define SIZEOF_PTRDIFF_T  2
+#    endif
+#  elif (ACC_MM_HUGE)
+#    define SIZEOF_PTRDIFF_T    4
+#  else
+#    error "ACC_MM"
+#  endif
+#elif (ACC_ARCH_AVR || ACC_ARCH_C166 || ACC_ARCH_MCS51 || ACC_ARCH_MCS251)
+#  define SIZEOF_PTRDIFF_T      2
+#  define SIZEOF_SIZE_T         2
+#  define SIZEOF_VOID_P         2
+#else
+#  define SIZEOF_PTRDIFF_T      SIZEOF_LONG
+#  define SIZEOF_SIZE_T         SIZEOF_LONG
+#  define SIZEOF_VOID_P         SIZEOF_LONG
+#endif
+
+#if !defined(SIZEOF_CHAR_P) && (SIZEOF_VOID_P > 0)
+#  define SIZEOF_CHAR_P         SIZEOF_VOID_P
+#endif
+
+
+#if ((SIZEOF_LONG) > 0 && (SIZEOF_LONG) < 8)
+#if (ACC_ARCH_IA16 && ACC_CC_DMC)
+#elif (ACC_CC_GNUC)
+#  define SIZEOF_LONG_LONG          8
+#  define SIZEOF_UNSIGNED_LONG_LONG 8
+#elif ((ACC_OS_WIN32 || ACC_OS_WIN64) && ACC_CC_MSC && (_MSC_VER >= 1400))
+#  define SIZEOF_LONG_LONG          8
+#  define SIZEOF_UNSIGNED_LONG_LONG 8
+#elif (ACC_OS_WIN64)
+#  define SIZEOF___INT64            8
+#  define SIZEOF_UNSIGNED___INT64   8
+#elif (ACC_ARCH_IA32 && (ACC_CC_DMC))
+#  define SIZEOF_LONG_LONG          8
+#  define SIZEOF_UNSIGNED_LONG_LONG 8
+#elif (ACC_ARCH_IA32 && (ACC_CC_SYMANTECC && (__SC__ >= 0x700)))
+#  define SIZEOF_LONG_LONG          8
+#  define SIZEOF_UNSIGNED_LONG_LONG 8
+#elif (ACC_ARCH_IA32 && (ACC_CC_INTELC && defined(__linux__)))
+#  define SIZEOF_LONG_LONG          8
+#  define SIZEOF_UNSIGNED_LONG_LONG 8
+#elif (ACC_ARCH_IA32 && (ACC_CC_MWERKS || ACC_CC_PELLESC || ACC_CC_PGI))
+#  define SIZEOF_LONG_LONG          8
+#  define SIZEOF_UNSIGNED_LONG_LONG 8
+#elif (ACC_ARCH_IA32 && (ACC_CC_INTELC || ACC_CC_MSC))
+#  define SIZEOF___INT64            8
+#  define SIZEOF_UNSIGNED___INT64   8
+#elif (ACC_ARCH_IA32 && (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0520)))
+   /* INFO: unsigned __int64 is somewhat broken in 0x0520; fixed in 0x0530 */
+#  define SIZEOF___INT64            8
+#  define SIZEOF_UNSIGNED___INT64   8
+#elif (ACC_ARCH_IA32 && (ACC_CC_WATCOMC && (__WATCOMC__ >= 1100)))
+#  define SIZEOF___INT64            8
+#  define SIZEOF_UNSIGNED___INT64   8
+#elif (ACC_CC_WATCOMC && defined(_INTEGRAL_MAX_BITS) && (_INTEGRAL_MAX_BITS == 64))
+#  define SIZEOF___INT64            8
+#  define SIZEOF_UNSIGNED___INT64   8
+#elif 1 && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#  define SIZEOF_LONG_LONG          8
+#  define SIZEOF_UNSIGNED_LONG_LONG 8
+#endif
+#endif
+
+#if defined(__cplusplus) && defined(ACC_CC_GNUC)
+#  if (ACC_CC_GNUC < 0x020800ul)
+#    undef SIZEOF_LONG_LONG
+#    undef SIZEOF_UNSIGNED_LONG_LONG
+#  endif
+#endif
+
+#endif /* !defined(ACC_CONFIG_AUTO_NO_SIZES) */
+
+
+/*************************************************************************
+// misc
+**************************************************************************/
+
+#if defined(HAVE_SIGNAL) && !defined(RETSIGTYPE)
+#  define RETSIGTYPE void
+#endif
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_cc.h b/tools/ucl/acc/acc_cc.h
new file mode 100644
index 0000000000..547631c188
--- /dev/null
+++ b/tools/ucl/acc/acc_cc.h
@@ -0,0 +1,143 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+/*
+ * C/C++ Compiler - exactly one of:
+ *
+ *   ACC_CC_UNKNOWN         [default]
+ *   ACC_CC_GNUC
+ *   ...
+ */
+
+#if defined(CIL) && defined(_GNUCC) && defined(__GNUC__)
+#  define ACC_CC_CILLY          1
+#  define ACC_INFO_CC           "Cilly"
+#  define ACC_INFO_CCVER        "unknown"
+#elif defined(__INTEL_COMPILER)
+#  define ACC_CC_INTELC         1
+#  define ACC_INFO_CC           "Intel C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__INTEL_COMPILER)
+#elif defined(__POCC__)
+#  define ACC_CC_PELLESC        1
+#  define ACC_INFO_CC           "Pelles C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__POCC__)
+#elif defined(__GNUC__) && defined(__VERSION__)
+#  if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__)
+#    define ACC_CC_GNUC         (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100 + __GNUC_PATCHLEVEL__)
+#  elif defined(__GNUC_MINOR__)
+#    define ACC_CC_GNUC         (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100)
+#  else
+#    define ACC_CC_GNUC         (__GNUC__ * 0x10000L)
+#  endif
+#  define ACC_INFO_CC           "gcc"
+#  define ACC_INFO_CCVER        __VERSION__
+#elif defined(__AZTEC_C__)
+#  define ACC_CC_AZTECC         1
+#  define ACC_INFO_CC           "Aztec C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__AZTEC_C__)
+#elif defined(__BORLANDC__)
+#  define ACC_CC_BORLANDC       1
+#  define ACC_INFO_CC           "Borland C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__BORLANDC__)
+#elif defined(__DMC__)
+#  define ACC_CC_DMC            1
+#  define ACC_INFO_CC           "Digital Mars C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__DMC__)
+#elif defined(__DECC)
+#  define ACC_CC_DECC           1
+#  define ACC_INFO_CC           "DEC C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__DECC)
+#elif defined(__HIGHC__)
+#  define ACC_CC_HIGHC          1
+#  define ACC_INFO_CC           "MetaWare High C"
+#  define ACC_INFO_CCVER        "unknown"
+#elif defined(__IBMC__)
+#  define ACC_CC_IBMC           1
+#  define ACC_INFO_CC           "IBM C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__IBMC__)
+#elif defined(__KEIL__) && defined(__C166__)
+#  define ACC_CC_KEILC          1
+#  define ACC_INFO_CC           "Keil C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__C166__)
+#elif defined(__LCC__)
+#  define ACC_CC_LCC            1
+#  define ACC_INFO_CC           "lcc"
+#  define ACC_INFO_CCVER        "unknown"
+#elif defined(_MSC_VER)
+#  define ACC_CC_MSC            1
+#  define ACC_INFO_CC           "Microsoft C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(_MSC_VER)
+#elif defined(__MWERKS__)
+#  define ACC_CC_MWERKS         1
+#  define ACC_INFO_CC           "Metrowerks C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__MWERKS__)
+#elif (defined(__NDPC__) || defined(__NDPX__)) && defined(__i386)
+#  define ACC_CC_NDPC           1
+#  define ACC_INFO_CC           "Microway NDP C"
+#  define ACC_INFO_CCVER        "unknown"
+#elif defined(__PACIFIC__)
+#  define ACC_CC_PACIFICC       1
+#  define ACC_INFO_CC           "Pacific C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__PACIFIC__)
+#elif defined(__PGI) && (defined(__linux__) || defined(__WIN32__))
+#  define ACC_CC_PGI            1
+#  define ACC_INFO_CC           "Portland Group PGI C"
+#  define ACC_INFO_CCVER        "unknown"
+#elif defined(__PUREC__)
+#  define ACC_CC_PUREC          1
+#  define ACC_INFO_CC           "Pure C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__PUREC__)
+#elif defined(__SC__)
+#  define ACC_CC_SYMANTECC      1
+#  define ACC_INFO_CC           "Symantec C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__SC__)
+#elif defined(__SUNPRO_C)
+#  define ACC_CC_SUNPROC        1
+#  define ACC_INFO_CC           "Sun C"
+#  define ACC_INFO_CCVER        "unknown"
+#elif defined(__TINYC__)
+#  define ACC_CC_TINYC          1
+#  define ACC_INFO_CC           "Tiny C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__TINYC__)
+#elif defined(__TSC__)
+#  define ACC_CC_TOPSPEEDC      1
+#  define ACC_INFO_CC           "TopSpeed C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__TSC__)
+#elif defined(__WATCOMC__)
+#  define ACC_CC_WATCOMC        1
+#  define ACC_INFO_CC           "Watcom C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__WATCOMC__)
+#elif defined(__TURBOC__)
+#  define ACC_CC_TURBOC         1
+#  define ACC_INFO_CC           "Turbo C"
+#  define ACC_INFO_CCVER        ACC_CPP_MACRO_EXPAND(__TURBOC__)
+#elif defined(__ZTC__)
+#  define ACC_CC_ZORTECHC       1
+#  define ACC_INFO_CC           "Zortech C"
+#  if (__ZTC__ == 0x310)
+#    define ACC_INFO_CCVER      "0x310"
+#  else
+#    define ACC_INFO_CCVER      ACC_CPP_MACRO_EXPAND(__ZTC__)
+#  endif
+#else
+#  define ACC_CC_UNKNOWN        1
+#  define ACC_INFO_CC           "unknown"
+#  define ACC_INFO_CCVER        "unknown"
+#endif
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_chk.ch b/tools/ucl/acc/acc_chk.ch
new file mode 100644
index 0000000000..9c0ecc23e1
--- /dev/null
+++ b/tools/ucl/acc/acc_chk.ch
@@ -0,0 +1,455 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+#if !defined(ACCCHK_ASSERT)
+#  define ACCCHK_ASSERT(expr)   ACC_COMPILE_TIME_ASSERT(expr)
+#endif
+
+/* compile-time sign */
+#if !defined(ACCCHK_ASSERT_SIGN_T)
+#  define ACCCHK_ASSERT_SIGN_T(type,relop) \
+        ACCCHK_ASSERT( (type) (-1)       relop  (type) 0 ) \
+        ACCCHK_ASSERT( (type) (~(type)0) relop  (type) 0 ) \
+        ACCCHK_ASSERT( (type) (~(type)0) ==     (type) (-1) )
+#endif
+
+#if !defined(ACCCHK_IS_SIGNED_T)
+#  define ACCCHK_ASSERT_IS_SIGNED_T(type)       ACCCHK_ASSERT_SIGN_T(type,<)
+#endif
+
+#if !defined(ACCCHK_IS_UNSIGNED_T)
+#  if (ACC_BROKEN_INTEGRAL_PROMOTION)
+#    define ACCCHK_ASSERT_IS_UNSIGNED_T(type) \
+        ACCCHK_ASSERT( (type) (-1) > (type) 0 )
+#  else
+#    define ACCCHK_ASSERT_IS_UNSIGNED_T(type)   ACCCHK_ASSERT_SIGN_T(type,>)
+#  endif
+#endif
+
+
+/*************************************************************************
+// check preprocessor
+**************************************************************************/
+
+#if (ACC_0xffffffffL - ACC_UINT32L_C(4294967294) != 1)
+#  error "preprocessor error 1"
+#endif
+#if (ACC_0xffffffffL - ACC_UINT32L_C(0xfffffffd) != 2)
+#  error "preprocessor error 2"
+#endif
+
+
+#define ACCCHK_VAL  1
+#define ACCCHK_TMP1 ACCCHK_VAL
+#undef ACCCHK_VAL
+#define ACCCHK_VAL  2
+#define ACCCHK_TMP2 ACCCHK_VAL
+#if (ACCCHK_TMP1 != 2)
+#  error "preprocessor error 3a"
+#endif
+#if (ACCCHK_TMP2 != 2)
+#  error "preprocessor error 3b"
+#endif
+#undef ACCCHK_VAL
+#if (ACCCHK_TMP2)
+#  error "preprocessor error 3c"
+#endif
+#if (ACCCHK_TMP2 + 0 != 0)
+#  error "preprocessor error 3d"
+#endif
+#undef ACCCHK_TMP1
+#undef ACCCHK_TMP2
+
+
+/*************************************************************************
+// check basic arithmetics
+**************************************************************************/
+
+    ACCCHK_ASSERT(1 == 1)
+
+    ACCCHK_ASSERT(__ACC_INT_MAX(2) == 1)
+    ACCCHK_ASSERT(__ACC_INT_MAX(8) == 127)
+    ACCCHK_ASSERT(__ACC_INT_MAX(16) == 32767)
+
+    ACCCHK_ASSERT(__ACC_UINT_MAX(2) == 3)
+    ACCCHK_ASSERT(__ACC_UINT_MAX(16) == 0xffffU)
+    ACCCHK_ASSERT(__ACC_UINT_MAX(32) == 0xffffffffUL)
+#if !defined(ACC_BROKEN_INTEGRAL_PROMOTION)
+    ACCCHK_ASSERT(__ACC_UINT_MAX(__ACC_INT_BIT) == ~(0u))
+    ACCCHK_ASSERT(__ACC_UINT_MAX(__ACC_LONG_BIT) == ~(0ul))
+#endif
+
+
+/*************************************************************************
+// check basic types
+**************************************************************************/
+
+    ACCCHK_ASSERT_IS_SIGNED_T(signed char)
+    ACCCHK_ASSERT_IS_UNSIGNED_T(unsigned char)
+    ACCCHK_ASSERT(sizeof(signed char) == sizeof(char))
+    ACCCHK_ASSERT(sizeof(unsigned char) == sizeof(char))
+    ACCCHK_ASSERT(sizeof(char) == 1)
+#if (ACC_CC_CILLY)
+    /* CIL is broken */
+#else
+    ACCCHK_ASSERT(sizeof(char) == sizeof((char)0))
+#endif
+#if defined(__cplusplus)
+    ACCCHK_ASSERT(sizeof('\0') == sizeof(char))
+#else
+#  if (ACC_CC_DMC)
+    /* Digital Mars C is broken */
+#  else
+    ACCCHK_ASSERT(sizeof('\0') == sizeof(int))
+#  endif
+#endif
+#if defined(acc_alignof)
+    ACCCHK_ASSERT(acc_alignof(char) == 1)
+    ACCCHK_ASSERT(acc_alignof(signed char) == 1)
+    ACCCHK_ASSERT(acc_alignof(unsigned char) == 1)
+#endif
+
+    ACCCHK_ASSERT_IS_SIGNED_T(short)
+    ACCCHK_ASSERT_IS_UNSIGNED_T(unsigned short)
+    ACCCHK_ASSERT(sizeof(short) == sizeof(unsigned short))
+    ACCCHK_ASSERT(sizeof(short) >= 2)
+    ACCCHK_ASSERT(sizeof(short) >= sizeof(char))
+#if (ACC_CC_CILLY)
+    /* CIL is broken */
+#else
+    ACCCHK_ASSERT(sizeof(short) == sizeof((short)0))
+#endif
+#if (SIZEOF_SHORT > 0)
+    ACCCHK_ASSERT(sizeof(short) == SIZEOF_SHORT)
+#endif
+
+    ACCCHK_ASSERT_IS_SIGNED_T(int)
+    ACCCHK_ASSERT_IS_UNSIGNED_T(unsigned int)
+    ACCCHK_ASSERT(sizeof(int) == sizeof(unsigned int))
+    ACCCHK_ASSERT(sizeof(int) >= 2)
+    ACCCHK_ASSERT(sizeof(int) >= sizeof(short))
+    ACCCHK_ASSERT(sizeof(int) == sizeof(0))
+    ACCCHK_ASSERT(sizeof(int) == sizeof((int)0))
+#if (SIZEOF_INT > 0)
+    ACCCHK_ASSERT(sizeof(int) == SIZEOF_INT)
+#endif
+
+    ACCCHK_ASSERT_IS_SIGNED_T(long)
+    ACCCHK_ASSERT_IS_UNSIGNED_T(unsigned long)
+    ACCCHK_ASSERT(sizeof(long) == sizeof(unsigned long))
+    ACCCHK_ASSERT(sizeof(long) >= 4)
+    ACCCHK_ASSERT(sizeof(long) >= sizeof(int))
+    ACCCHK_ASSERT(sizeof(long) == sizeof(0L))
+    ACCCHK_ASSERT(sizeof(long) == sizeof((long)0))
+#if (SIZEOF_LONG > 0)
+    ACCCHK_ASSERT(sizeof(long) == SIZEOF_LONG)
+#endif
+
+    ACCCHK_ASSERT_IS_UNSIGNED_T(size_t)
+    ACCCHK_ASSERT(sizeof(size_t) >= sizeof(int))
+    ACCCHK_ASSERT(sizeof(size_t) == sizeof(sizeof(0))) /* sizeof() returns size_t */
+#if (SIZEOF_SIZE_T > 0)
+    ACCCHK_ASSERT(sizeof(size_t) == SIZEOF_SIZE_T)
+#endif
+
+    ACCCHK_ASSERT_IS_SIGNED_T(ptrdiff_t)
+    ACCCHK_ASSERT(sizeof(ptrdiff_t) >= sizeof(int))
+    ACCCHK_ASSERT(sizeof(ptrdiff_t) >= sizeof(size_t))
+#if !defined(ACC_BROKEN_SIZEOF)
+    ACCCHK_ASSERT(sizeof(ptrdiff_t) == sizeof((char*)0 - (char*)0))
+# if (ACC_HAVE_MM_HUGE_PTR)
+    ACCCHK_ASSERT(4 == sizeof((char __huge*)0 - (char __huge*)0))
+# endif
+#endif
+#if (SIZEOF_PTRDIFF_T > 0)
+    ACCCHK_ASSERT(sizeof(ptrdiff_t) == SIZEOF_PTRDIFF_T)
+#endif
+
+    ACCCHK_ASSERT(sizeof(void*) >= sizeof(char*))
+#if (SIZEOF_VOID_P > 0)
+    ACCCHK_ASSERT(sizeof(void*) == SIZEOF_VOID_P)
+#endif
+#if (SIZEOF_CHAR_P > 0)
+    ACCCHK_ASSERT(sizeof(char*) == SIZEOF_CHAR_P)
+#endif
+#if (ACC_HAVE_MM_HUGE_PTR)
+    ACCCHK_ASSERT(4 == sizeof(void __huge*))
+    ACCCHK_ASSERT(4 == sizeof(char __huge*))
+#endif
+
+
+/*************************************************************************
+// check arithmetics
+**************************************************************************/
+
+    ACCCHK_ASSERT((((1u  << 15) + 1) >> 15) == 1)
+    ACCCHK_ASSERT((((1ul << 31) + 1) >> 31) == 1)
+
+#if (ACC_CC_TURBOC && (__TURBOC__ < 0x0150))
+    /* TC 1.0 bug, probably due to ACC_BROKEN_INTEGRAL_PROMOTION ?? */
+#else
+    ACCCHK_ASSERT((1   << (8*SIZEOF_INT-1)) < 0)
+#endif
+    ACCCHK_ASSERT((1u  << (8*SIZEOF_INT-1)) > 0)
+
+    ACCCHK_ASSERT((1l  << (8*SIZEOF_LONG-1)) < 0)
+    ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0)
+
+#if defined(acc_int32e_t)
+    ACCCHK_ASSERT(sizeof(acc_int32e_t) == 4)
+    ACCCHK_ASSERT(sizeof(acc_int32e_t) == SIZEOF_ACC_INT32E_T)
+    ACCCHK_ASSERT(sizeof(acc_uint32e_t) == 4)
+    ACCCHK_ASSERT(sizeof(acc_int32e_t) == sizeof(acc_uint32e_t))
+
+    ACCCHK_ASSERT_IS_SIGNED_T(acc_int32e_t)
+    ACCCHK_ASSERT(((( (acc_int32e_t)1 << 30) + 1) >> 30) == 1)
+    ACCCHK_ASSERT(((( ACC_INT32E_C(1) << 30) + 1) >> 30) == 1)
+
+    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_uint32e_t)
+    ACCCHK_ASSERT(((( (acc_uint32e_t)1 << 31) + 1) >> 31) == 1)
+    ACCCHK_ASSERT(((( ACC_UINT32E_C(1) << 31) + 1) >> 31) == 1)
+
+    ACCCHK_ASSERT( (acc_int32e_t) (1 + ~(acc_int32e_t)0) == 0)
+#if defined(ACCCHK_CONFIG_PEDANTIC)
+    /* compiler may warn about overflow */
+    ACCCHK_ASSERT( (acc_uint32e_t)(1 + ~(acc_uint32e_t)0) == 0)
+#endif /* ACCCHK_CONFIG_PEDANTIC */
+
+#if (SIZEOF_ACC_INT32E_T < SIZEOF_INT)
+    ACCCHK_ASSERT(sizeof(ACC_INT32E_C(0)) == sizeof(int))
+    ACCCHK_ASSERT(sizeof(ACC_UINT32E_C(0)) == sizeof(int))
+#else
+    ACCCHK_ASSERT(sizeof(ACC_INT32E_C(0)) == SIZEOF_ACC_INT32E_T)
+    ACCCHK_ASSERT(sizeof(ACC_UINT32E_C(0)) == SIZEOF_ACC_INT32E_T)
+#endif
+    ACCCHK_ASSERT((ACC_INT32E_C(1)  << (8*SIZEOF_ACC_INT32E_T-1)) < 0)
+    ACCCHK_ASSERT((ACC_UINT32E_C(1) << (8*SIZEOF_ACC_INT32E_T-1)) > 0)
+    ACCCHK_ASSERT((ACC_INT32E_C(1)  << (int)(8*sizeof(ACC_INT32E_C(1))-1)) < 0)
+    ACCCHK_ASSERT((ACC_UINT32E_C(1) << (int)(8*sizeof(ACC_UINT32E_C(1))-1)) > 0)
+    ACCCHK_ASSERT(ACC_INT32E_C(2147483647)      > 0)
+    ACCCHK_ASSERT(ACC_INT32E_C(-2147483647) -1  < 0)
+    ACCCHK_ASSERT(ACC_UINT32E_C(4294967295)     > 0)
+    ACCCHK_ASSERT(ACC_UINT32E_C(4294967295) == ACC_0xffffffffL)
+#endif
+
+
+    ACCCHK_ASSERT(sizeof(acc_int32l_t) >= sizeof(int))
+#if defined(acc_int32e_t)
+    ACCCHK_ASSERT(sizeof(acc_int32l_t) >= sizeof(acc_int32e_t))
+#endif
+
+    ACCCHK_ASSERT(sizeof(acc_int32l_t) >= 4)
+    ACCCHK_ASSERT(sizeof(acc_int32l_t) == SIZEOF_ACC_INT32L_T)
+    ACCCHK_ASSERT(sizeof(acc_uint32l_t) >= 4)
+    ACCCHK_ASSERT(sizeof(acc_int32l_t) == sizeof(acc_uint32l_t))
+
+    ACCCHK_ASSERT_IS_SIGNED_T(acc_int32l_t)
+    ACCCHK_ASSERT(((( (acc_int32l_t)1 << 30) + 1) >> 30) == 1)
+    ACCCHK_ASSERT(((( ACC_INT32L_C(1) << 30) + 1) >> 30) == 1)
+
+    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_uint32l_t)
+    ACCCHK_ASSERT(((( (acc_uint32l_t)1 << 31) + 1) >> 31) == 1)
+    ACCCHK_ASSERT(((( ACC_UINT32L_C(1) << 31) + 1) >> 31) == 1)
+
+#if (SIZEOF_ACC_INT32L_T < SIZEOF_INT)
+    ACCCHK_ASSERT(sizeof(ACC_INT32L_C(0)) == sizeof(int))
+    ACCCHK_ASSERT(sizeof(ACC_UINT32L_C(0)) == sizeof(int))
+#else
+    ACCCHK_ASSERT(sizeof(ACC_INT32L_C(0)) == SIZEOF_ACC_INT32L_T)
+    ACCCHK_ASSERT(sizeof(ACC_UINT32L_C(0)) == SIZEOF_ACC_INT32L_T)
+#endif
+    ACCCHK_ASSERT((ACC_INT32L_C(1)  << (8*SIZEOF_ACC_INT32L_T-1)) < 0)
+    ACCCHK_ASSERT((ACC_UINT32L_C(1) << (8*SIZEOF_ACC_INT32L_T-1)) > 0)
+    ACCCHK_ASSERT((ACC_INT32L_C(1)  << (int)(8*sizeof(ACC_INT32L_C(1))-1)) < 0)
+    ACCCHK_ASSERT((ACC_UINT32L_C(1) << (int)(8*sizeof(ACC_UINT32L_C(1))-1)) > 0)
+    ACCCHK_ASSERT(ACC_INT32L_C(2147483647)      > 0)
+    ACCCHK_ASSERT(ACC_INT32L_C(-2147483647) -1  < 0)
+    ACCCHK_ASSERT(ACC_UINT32L_C(4294967295)     > 0)
+    ACCCHK_ASSERT(ACC_UINT32L_C(4294967295) == ACC_0xffffffffL)
+
+
+    ACCCHK_ASSERT(sizeof(acc_int32f_t) >= sizeof(int))
+#if defined(acc_int32e_t)
+    ACCCHK_ASSERT(sizeof(acc_int32f_t) >= sizeof(acc_int32e_t))
+#endif
+    ACCCHK_ASSERT(sizeof(acc_int32f_t) >= sizeof(acc_int32l_t))
+
+    ACCCHK_ASSERT(sizeof(acc_int32f_t) >= 4)
+    ACCCHK_ASSERT(sizeof(acc_int32f_t) >= sizeof(acc_int32l_t))
+    ACCCHK_ASSERT(sizeof(acc_int32f_t) == SIZEOF_ACC_INT32F_T)
+    ACCCHK_ASSERT(sizeof(acc_uint32f_t) >= 4)
+    ACCCHK_ASSERT(sizeof(acc_uint32f_t) >= sizeof(acc_uint32l_t))
+    ACCCHK_ASSERT(sizeof(acc_int32f_t) == sizeof(acc_uint32f_t))
+
+    ACCCHK_ASSERT_IS_SIGNED_T(acc_int32f_t)
+    ACCCHK_ASSERT(((( (acc_int32f_t)1 << 30) + 1) >> 30) == 1)
+    ACCCHK_ASSERT(((( ACC_INT32F_C(1) << 30) + 1) >> 30) == 1)
+
+    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_uint32f_t)
+    ACCCHK_ASSERT(((( (acc_uint32f_t)1 << 31) + 1) >> 31) == 1)
+    ACCCHK_ASSERT(((( ACC_UINT32F_C(1) << 31) + 1) >> 31) == 1)
+
+#if (SIZEOF_ACC_INT32F_T < SIZEOF_INT)
+    ACCCHK_ASSERT(sizeof(ACC_INT32F_C(0)) == sizeof(int))
+    ACCCHK_ASSERT(sizeof(ACC_UINT32F_C(0)) == sizeof(int))
+#else
+    ACCCHK_ASSERT(sizeof(ACC_INT32F_C(0)) == SIZEOF_ACC_INT32F_T)
+    ACCCHK_ASSERT(sizeof(ACC_UINT32F_C(0)) == SIZEOF_ACC_INT32F_T)
+#endif
+    ACCCHK_ASSERT((ACC_INT32F_C(1)  << (8*SIZEOF_ACC_INT32F_T-1)) < 0)
+    ACCCHK_ASSERT((ACC_UINT32F_C(1) << (8*SIZEOF_ACC_INT32F_T-1)) > 0)
+    ACCCHK_ASSERT((ACC_INT32F_C(1)  << (int)(8*sizeof(ACC_INT32F_C(1))-1)) < 0)
+    ACCCHK_ASSERT((ACC_UINT32F_C(1) << (int)(8*sizeof(ACC_UINT32F_C(1))-1)) > 0)
+    ACCCHK_ASSERT(ACC_INT32F_C(2147483647)      > 0)
+    ACCCHK_ASSERT(ACC_INT32F_C(-2147483647) -1  < 0)
+    ACCCHK_ASSERT(ACC_UINT32F_C(4294967295)     > 0)
+    ACCCHK_ASSERT(ACC_UINT32F_C(4294967295) == ACC_0xffffffffL)
+
+
+#if defined(acc_int64l_t)
+    ACCCHK_ASSERT(sizeof(acc_int64l_t) >= 8)
+    ACCCHK_ASSERT(sizeof(acc_int64l_t) == SIZEOF_ACC_INT64L_T)
+    ACCCHK_ASSERT(sizeof(acc_uint64l_t) >= 8)
+    ACCCHK_ASSERT(sizeof(acc_int64l_t) == sizeof(acc_uint64l_t))
+
+    ACCCHK_ASSERT_IS_SIGNED_T(acc_int64l_t)
+    ACCCHK_ASSERT(((( (acc_int64l_t)1 << 62) + 1) >> 62) == 1)
+    ACCCHK_ASSERT(((( ACC_INT64L_C(1) << 62) + 1) >> 62) == 1)
+
+#if (ACC_CC_BORLANDC && (__BORLANDC__ < 0x0530))
+    /* Borland C is broken */
+#else
+    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_uint64l_t)
+    ACCCHK_ASSERT(ACC_UINT64L_C(18446744073709551615)     > 0)
+#endif
+    ACCCHK_ASSERT(((( (acc_uint64l_t)1 << 63) + 1) >> 63) == 1)
+    ACCCHK_ASSERT(((( ACC_UINT64L_C(1) << 63) + 1) >> 63) == 1)
+
+#if defined(ACCCHK_CONFIG_PEDANTIC)
+#if (ACC_CC_BORLANDC && (__BORLANDC__ < 0x0560))
+    /* Borland C is broken */
+#elif (SIZEOF_ACC_INT64L_T < SIZEOF_INT)
+    ACCCHK_ASSERT(sizeof(ACC_INT64L_C(0)) == sizeof(int))
+    ACCCHK_ASSERT(sizeof(ACC_UINT64L_C(0)) == sizeof(int))
+#else
+    ACCCHK_ASSERT(sizeof(ACC_INT64L_C(0)) == SIZEOF_ACC_INT64L_T)
+    ACCCHK_ASSERT(sizeof(ACC_UINT64L_C(0)) == SIZEOF_ACC_INT64L_T)
+#endif
+#endif /* ACCCHK_CONFIG_PEDANTIC */
+    ACCCHK_ASSERT((ACC_INT64L_C(1)  << (8*SIZEOF_ACC_INT64L_T-1)) < 0)
+    ACCCHK_ASSERT((ACC_UINT64L_C(1) << (8*SIZEOF_ACC_INT64L_T-1)) > 0)
+#if (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020600ul))
+    /* avoid pedantic warning */
+    ACCCHK_ASSERT(ACC_INT64L_C(9223372036854775807)       > ACC_INT64L_C(0))
+#else
+    ACCCHK_ASSERT(ACC_INT64L_C(9223372036854775807)       > 0)
+#endif
+    ACCCHK_ASSERT(ACC_INT64L_C(-9223372036854775807) - 1  < 0)
+
+    ACCCHK_ASSERT( ACC_INT64L_C(9223372036854775807) % 2147483629l  == 721)
+    ACCCHK_ASSERT( ACC_INT64L_C(9223372036854775807) % 2147483647l  == 1)
+    ACCCHK_ASSERT(ACC_UINT64L_C(9223372036854775807) % 2147483629ul == 721)
+    ACCCHK_ASSERT(ACC_UINT64L_C(9223372036854775807) % 2147483647ul == 1)
+#endif /* acc_int64l_t */
+
+
+    ACCCHK_ASSERT_IS_SIGNED_T(acc_intptr_t)
+    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_uintptr_t)
+    ACCCHK_ASSERT(sizeof(acc_intptr_t) >= sizeof(void *))
+    ACCCHK_ASSERT(sizeof(acc_intptr_t) == SIZEOF_ACC_INTPTR_T)
+    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(acc_uintptr_t))
+
+
+/*************************************************************************
+// check memory model ACC_MM
+**************************************************************************/
+
+#if (ACC_MM_FLAT)
+#if 0
+    /* this is not a valid assumption -- disabled */
+    ACCCHK_ASSERT(sizeof(void*) == sizeof(void (*)(void)))
+#endif
+#endif
+
+#if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
+    ACCCHK_ASSERT(sizeof(void*) == 2)
+    ACCCHK_ASSERT(sizeof(ptrdiff_t) == 2)
+#elif (ACC_MM_COMPACT || ACC_MM_LARGE || ACC_MM_HUGE)
+    ACCCHK_ASSERT(sizeof(void*) == 4)
+#endif
+#if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_COMPACT)
+    ACCCHK_ASSERT(sizeof(void (*)(void)) == 2)
+#elif (ACC_MM_MEDIUM || ACC_MM_LARGE || ACC_MM_HUGE)
+    ACCCHK_ASSERT(sizeof(void (*)(void)) == 4)
+#endif
+
+
+/*************************************************************************
+// check ACC_ARCH and ACC_OS
+**************************************************************************/
+
+#if (ACC_ARCH_IA16)
+    ACCCHK_ASSERT(sizeof(size_t) == 2)
+    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
+#elif (ACC_ARCH_IA32 || ACC_ARCH_M68K)
+    ACCCHK_ASSERT(sizeof(size_t) == 4)
+    ACCCHK_ASSERT(sizeof(ptrdiff_t) == 4)
+    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
+#elif (ACC_ARCH_AMD64 || ACC_ARCH_IA64)
+    ACCCHK_ASSERT(sizeof(size_t) == 8)
+    ACCCHK_ASSERT(sizeof(ptrdiff_t) == 8)
+    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
+#endif
+
+#if (ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_WIN32)
+    ACCCHK_ASSERT(sizeof(size_t) == 4)
+    ACCCHK_ASSERT(sizeof(ptrdiff_t) == 4)
+    ACCCHK_ASSERT(sizeof(void (*)(void)) == 4)
+#elif (ACC_OS_WIN64)
+    ACCCHK_ASSERT(sizeof(size_t) == 8)
+    ACCCHK_ASSERT(sizeof(ptrdiff_t) == 8)
+    ACCCHK_ASSERT(sizeof(void (*)(void)) == 8)
+#endif
+
+
+/*************************************************************************
+// check promotion rules
+**************************************************************************/
+
+#if (ACC_CC_NDPC)
+    /* NDP C is broken */
+#else
+    /* check that the compiler correctly casts signed to unsigned */
+    ACCCHK_ASSERT( (int) ((unsigned char) ((signed char) -1)) == 255)
+#endif
+
+#if (ACC_CC_KEILC)
+    /* Keil C is broken */
+#elif (ACC_CC_NDPC)
+    /* NDP C is broken */
+#elif !defined(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1)
+    /* check that the compiler correctly promotes integrals */
+    ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
+#endif
+
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_chkr.ch b/tools/ucl/acc/acc_chkr.ch
new file mode 100644
index 0000000000..e070f2ede3
--- /dev/null
+++ b/tools/ucl/acc/acc_chkr.ch
@@ -0,0 +1,126 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+#if !defined(__ACCCHKR_FUNCNAME)
+#  define __ACCCHKR_FUNCNAME(f) accchkr_ ## f
+#endif
+
+
+
+#if !defined(ACCCHKR_ASSERT)
+
+#if 0 || defined(ACCCHKR_CONFIG_DEBUG)
+
+#include <stdio.h>
+static int __ACCCHKR_FUNCNAME(assert_fail)(const char* s, unsigned l)
+{
+    fprintf(stderr, "ACCCHKR assertion failed in line %u: `%s'\n", l, s);
+    return 0;
+}
+#define ACCCHKR_ASSERT(expr)    ((expr) ? 1 : __ACCCHKR_FUNCNAME(assert_fail)(#expr,__LINE__))
+
+#else
+
+#define ACCCHKR_ASSERT(expr)    ((expr) ? 1 : 0)
+
+#endif
+
+#endif
+
+
+
+/* avoid inlining */
+static int __ACCCHKR_FUNCNAME(schedule_insns_bug)(void);
+static int __ACCCHKR_FUNCNAME(strength_reduce_bug)(int*);
+
+
+/*************************************************************************
+// main entry
+**************************************************************************/
+
+static int __ACCCHKR_FUNCNAME(check)(int r)
+{
+#if defined(ACC_ENDIAN_BIG_ENDIAN)
+    {
+        union { long l; unsigned char c[sizeof(long)]; } u;
+        u.l = 0; u.c[sizeof(long)-1] = 0x80;
+        r &= ACCCHKR_ASSERT(u.l == 128);
+        u.l = 0; u.c[0] = 0x80;
+        r &= ACCCHKR_ASSERT(u.l < 0);
+        ACC_UNUSED(u);
+    }
+#endif
+#if defined(ACC_ENDIAN_LITTLE_ENDIAN)
+    {
+        union { long l; unsigned char c[sizeof(long)]; } u;
+        u.l = 0; u.c[0] = 0x80;
+        r &= ACCCHKR_ASSERT(u.l == 128);
+        u.l = 0; u.c[sizeof(long)-1] = 0x80;
+        r &= ACCCHKR_ASSERT(u.l < 0);
+        ACC_UNUSED(u);
+    }
+#endif
+
+    /* check for the gcc schedule-insns optimization bug */
+    if (r == 1)
+    {
+        r &= ACCCHKR_ASSERT(!__ACCCHKR_FUNCNAME(schedule_insns_bug()));
+    }
+
+    /* check for the gcc strength-reduce optimization bug */
+    if (r == 1)
+    {
+        static int x[3];
+        static unsigned xn = 3;
+        register unsigned j;
+
+        for (j = 0; j < xn; j++)
+            x[j] = (int)j - 3;
+        r &= ACCCHKR_ASSERT(!__ACCCHKR_FUNCNAME(strength_reduce_bug(x)));
+    }
+
+    return r;
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+static int __ACCCHKR_FUNCNAME(schedule_insns_bug)(void)
+{
+    const int a[] = {1, 2, 0}; const int* b;
+    b = a; return (*b) ? 0 : 1;
+}
+
+
+static int __ACCCHKR_FUNCNAME(strength_reduce_bug)(int* x)
+{
+#if 0 && (ACC_CC_DMC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
+    ACC_UNUSED(x); return 0;
+#else
+    return x[0] != -3 || x[1] != -2 || x[2] != -1;
+#endif
+}
+
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_cxx.h b/tools/ucl/acc/acc_cxx.h
new file mode 100644
index 0000000000..ef1dbf09c8
--- /dev/null
+++ b/tools/ucl/acc/acc_cxx.h
@@ -0,0 +1,157 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#ifndef __ACC_CXX_H_INCLUDED
+#define __ACC_CXX_H_INCLUDED 1
+#if defined(__cplusplus)
+
+
+/*************************************************************************
+// exception specification
+//   ACC_CXX_NOTHROW
+**************************************************************************/
+
+#if defined(ACC_CXX_NOTHROW)
+#elif (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020800ul))
+#elif (ACC_CC_BORLANDC && (__BORLANDC__ < 0x0450))
+#elif (ACC_CC_HIGHC)
+#elif (ACC_CC_MSC && (_MSC_VER < 1100))
+#elif (ACC_CC_NDPC)
+#elif (ACC_CC_TURBOC)
+#elif (ACC_CC_WATCOMC && !defined(_CPPUNWIND))
+#elif (ACC_CC_ZORTECHC)
+#else
+#  define ACC_CXX_NOTHROW   throw()
+#endif
+
+#if !defined(ACC_CXX_NOTHROW)
+#  define ACC_CXX_NOTHROW
+#endif
+
+
+/*************************************************************************
+// disable dynamic allocation of an object - private helpers
+//   __ACC_CXX_DO_NEW
+//   __ACC_CXX_DO_DELETE
+**************************************************************************/
+
+#if defined(__ACC_CXX_DO_NEW)
+#elif (ACC_CC_NDPC || ACC_CC_PGI)
+#  define __ACC_CXX_DO_NEW          { return 0; }
+#else
+#  define __ACC_CXX_DO_NEW          ;
+#endif
+
+
+/* need an implementation in case a class has virtual members */
+#if defined(__ACC_CXX_DO_DELETE)
+#elif (ACC_CC_BORLANDC || ACC_CC_TURBOC)
+#  define __ACC_CXX_DO_DELETE       { }
+#else
+#  define __ACC_CXX_DO_DELETE       ACC_CXX_NOTHROW { }
+#endif
+
+
+/*************************************************************************
+// disable dynamic allocation of an object
+//   ACC_CXX_DISABLE_NEW_DELETE
+**************************************************************************/
+
+/*
+#undef __ACC_CXX_HAVE_ARRAY_NEW
+#undef __ACC_CXX_HAVE_PLACEMENT_NEW
+#undef __ACC_CXX_HAVE_PLACEMENT_DELETE
+*/
+
+#if (ACC_CC_BORLANDC && (__BORLANDC__ < 0x0450))
+#elif (ACC_CC_MSC && ACC_MM_HUGE)
+#  define ACC_CXX_DISABLE_NEW_DELETE private:
+#elif (ACC_CC_MSC && (_MSC_VER < 1100))
+#elif (ACC_CC_NDPC)
+#elif (ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
+#elif (ACC_CC_TURBOC)
+#elif (ACC_CC_WATCOMC && (__WATCOMC__ < 1100))
+#else
+#  define __ACC_CXX_HAVE_ARRAY_NEW 1
+#endif
+
+#if (__ACC_CXX_HAVE_ARRAY_NEW)
+#  define __ACC_CXX_HAVE_PLACEMENT_NEW 1
+#endif
+
+#if (__ACC_CXX_HAVE_PLACEMENT_NEW)
+#  if (ACC_CC_GNUC >= 0x030000ul)
+#    define __ACC_CXX_HAVE_PLACEMENT_DELETE 1
+#  elif (ACC_CC_INTELC)
+#    define __ACC_CXX_HAVE_PLACEMENT_DELETE 1
+#  elif (ACC_CC_MSC && (_MSC_VER >= 1200))
+#    define __ACC_CXX_HAVE_PLACEMENT_DELETE 1
+#  elif (ACC_CC_PGI)
+#    define __ACC_CXX_HAVE_PLACEMENT_DELETE 1
+#  endif
+#endif
+
+
+#if defined(ACC_CXX_DISABLE_NEW_DELETE)
+#elif defined(new) || defined(delete)
+#  define ACC_CXX_DISABLE_NEW_DELETE private:
+#elif (ACC_CC_GNUC && (ACC_CC_GNUC < 0x025b00ul))
+#  define ACC_CXX_DISABLE_NEW_DELETE private:
+#elif  (ACC_CC_HIGHC)
+#  define ACC_CXX_DISABLE_NEW_DELETE private:
+#elif !defined(__ACC_CXX_HAVE_ARRAY_NEW)
+   /* for old compilers use `protected' instead of `private' */
+#  define ACC_CXX_DISABLE_NEW_DELETE \
+        protected: static void operator delete(void*) __ACC_CXX_DO_DELETE \
+        protected: static void* operator new(size_t) __ACC_CXX_DO_NEW \
+        private:
+#else
+#  define ACC_CXX_DISABLE_NEW_DELETE \
+        protected: static void operator delete(void*) __ACC_CXX_DO_DELETE \
+                   static void operator delete[](void*) __ACC_CXX_DO_DELETE \
+        private:   static void* operator new(size_t)  __ACC_CXX_DO_NEW \
+                   static void* operator new[](size_t) __ACC_CXX_DO_NEW
+#endif
+
+
+/*************************************************************************
+// Assist the compiler by defining a unique location for vtables and RTTI.
+// Every class which has virtual member functions or derives from a class
+// with virtual members should put this macro at the very top of its
+// class declaration.
+//   ACC_CXX_TRIGGER_FUNCTION
+**************************************************************************/
+
+#if defined(ACC_CXX_TRIGGER_FUNCTION)
+#else
+#  define ACC_CXX_TRIGGER_FUNCTION \
+        protected: virtual const void* acc_cxx_trigger_function() const; \
+        private:
+#endif
+
+#if defined(ACC_CXX_TRIGGER_FUNCTION_IMPL)
+#else
+#  define ACC_CXX_TRIGGER_FUNCTION_IMPL(klass) \
+        const void* klass::acc_cxx_trigger_function() const { return 0; }
+#endif
+
+
+#endif /* __cplusplus */
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_defs.h b/tools/ucl/acc/acc_defs.h
new file mode 100644
index 0000000000..7dbdbb1fff
--- /dev/null
+++ b/tools/ucl/acc/acc_defs.h
@@ -0,0 +1,193 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+/***********************************************************************
+// acc_alignof() / acc_inline
+************************************************************************/
+
+#if (ACC_CC_CILLY || ACC_CC_GNUC || ACC_CC_PGI)
+#  define acc_alignof(e)        __alignof__(e)
+#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 700))
+#  define acc_alignof(e)        __alignof__(e)
+#elif (ACC_CC_MSC && (_MSC_VER >= 1300))
+#  define acc_alignof(e)        __alignof(e)
+#endif
+
+#if (ACC_CC_TURBOC && (__TURBOC__ <= 0x0295))
+#elif defined(__cplusplus)
+#  define acc_inline            inline
+#elif (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0550))
+#  define acc_inline            __inline
+#elif (ACC_CC_CILLY || ACC_CC_GNUC || ACC_CC_PGI)
+#  define acc_inline            __inline__
+#elif (ACC_CC_DMC)
+#  define acc_inline            __inline
+#elif (ACC_CC_INTELC)
+#  define acc_inline            __inline
+#elif (ACC_CC_MSC && (_MSC_VER >= 900))
+#  define acc_inline            __inline
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#  define acc_inline            inline
+#endif
+
+
+/***********************************************************************
+// ACC_UNUSED / ACC_UNUSED_FUNC
+************************************************************************/
+
+#if !defined(ACC_UNUSED)
+#  if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
+#    define ACC_UNUSED(var)         ((void) &var)
+#  elif (ACC_CC_BORLANDC || ACC_CC_HIGHC || ACC_CC_NDPC || ACC_CC_TURBOC)
+#    define ACC_UNUSED(var)         if (&var) ; else
+#  elif (ACC_CC_MSC && (_MSC_VER < 900))
+#    define ACC_UNUSED(var)         if (&var) ; else
+#  elif (ACC_CC_GNUC)
+#    define ACC_UNUSED(var)         ((void) var)
+#  elif (ACC_CC_KEILC)
+#    define ACC_UNUSED(var)
+#  else
+#    define ACC_UNUSED(var)         ((void) &var)
+#  endif
+#endif
+#if !defined(ACC_UNUSED_FUNC)
+#  if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
+#    define ACC_UNUSED_FUNC(func)   ((void) func)
+#  elif (ACC_CC_BORLANDC || ACC_CC_NDPC || ACC_CC_TURBOC)
+#    define ACC_UNUSED_FUNC(func)   if (func) ; else
+#  elif (ACC_CC_GNUC == 0x030400ul) && defined(__llvm__)
+#    define ACC_UNUSED_FUNC(func)   ((void) &func)
+#  elif (ACC_CC_MSC && (_MSC_VER < 900))
+#    define ACC_UNUSED_FUNC(func)   if (func) ; else
+#  elif (ACC_CC_MSC)
+#    define ACC_UNUSED_FUNC(func)   ((void) &func)
+#  elif (ACC_CC_KEILC)
+#    define ACC_UNUSED_FUNC(func)
+#  else
+#    define ACC_UNUSED_FUNC(func)   ((void) func)
+#  endif
+#endif
+
+
+/***********************************************************************
+// compile-time-assertions
+************************************************************************/
+
+/* This can be put into a header file but may get ignored by some compilers. */
+#if !defined(ACC_COMPILE_TIME_ASSERT_HEADER)
+#  if (ACC_CC_AZTECC || ACC_CC_ZORTECHC)
+#    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-!(e)];
+#  elif (ACC_CC_DMC || ACC_CC_SYMANTECC)
+#    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1u-2*!(e)];
+#  elif (ACC_CC_TURBOC && (__TURBOC__ == 0x0295))
+#    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-!(e)];
+#  else
+//#    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-2*!(e)];
+#    define ACC_COMPILE_TIME_ASSERT_HEADER(e)
+#  endif
+#endif
+
+/* This must appear within a function body. */
+#if !defined(ACC_COMPILE_TIME_ASSERT)
+#  if (ACC_CC_AZTECC)
+#    define ACC_COMPILE_TIME_ASSERT(e)  {typedef int __acc_cta_t[1-!(e)];}
+#  elif (ACC_CC_DMC || ACC_CC_PACIFICC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
+#    define ACC_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
+#  elif (ACC_CC_MSC && (_MSC_VER < 900))
+#    define ACC_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
+#  elif (ACC_CC_TURBOC && (__TURBOC__ == 0x0295))
+#    define ACC_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
+#  else
+//#    define ACC_COMPILE_TIME_ASSERT(e)  {typedef int __acc_cta_t[1-2*!(e)];}
+#    define ACC_COMPILE_TIME_ASSERT(e)
+#  endif
+#endif
+
+
+/***********************************************************************
+// macros
+************************************************************************/
+
+#if !defined(__ACC_UINT_MAX)
+#  define __ACC_INT_MAX(b)      ((((1l  << ((b)-2)) - 1l)  * 2l)  + 1l)
+#  define __ACC_UINT_MAX(b)     ((((1ul << ((b)-1)) - 1ul) * 2ul) + 1ul)
+#endif
+
+
+/***********************************************************************
+// get sizes of builtin integral types from <limits.h>
+************************************************************************/
+
+#if !defined(__ACC_SHORT_BIT)
+#  if (USHRT_MAX == ACC_0xffffL)
+#    define __ACC_SHORT_BIT     16
+#  elif (USHRT_MAX == ACC_0xffffffffL)
+#    define __ACC_SHORT_BIT     32
+#  elif (USHRT_MAX == __ACC_UINT_MAX(64))
+#    define __ACC_SHORT_BIT     64
+#  elif (USHRT_MAX == __ACC_UINT_MAX(128))
+#    define __ACC_SHORT_BIT     128
+#  else
+#    error "check your compiler installation: USHRT_MAX"
+#  endif
+#endif
+
+#if !defined(__ACC_INT_BIT)
+#  if (UINT_MAX == ACC_0xffffL)
+#    define __ACC_INT_BIT       16
+#  elif (UINT_MAX == ACC_0xffffffffL)
+#    define __ACC_INT_BIT       32
+#  elif (UINT_MAX == __ACC_UINT_MAX(64))
+#    define __ACC_INT_BIT       64
+#  elif (UINT_MAX == __ACC_UINT_MAX(128))
+#    define __ACC_INT_BIT       128
+#  else
+#    error "check your compiler installation: UINT_MAX"
+#  endif
+#endif
+
+#if !defined(__ACC_LONG_BIT)
+#  if (ULONG_MAX == ACC_0xffffffffL)
+#    define __ACC_LONG_BIT      32
+#  elif (ULONG_MAX == __ACC_UINT_MAX(64))
+#    define __ACC_LONG_BIT      64
+#  elif (ULONG_MAX == __ACC_UINT_MAX(128))
+#    define __ACC_LONG_BIT      128
+#  else
+#    error "check your compiler installation: ULONG_MAX"
+#  endif
+#endif
+
+
+/***********************************************************************
+// acc_auto.h supplements
+************************************************************************/
+
+#if (ACC_OS_CYGWIN || (ACC_OS_EMX && defined(__RSXNT__)) || ACC_OS_WIN32 || ACC_OS_WIN64)
+#  if (ACC_CC_WATCOMC && (__WATCOMC__ < 1000))
+#  elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
+     /* ancient pw32 version */
+#  elif ((ACC_OS_CYGWIN || defined(__MINGW32__)) && (ACC_CC_GNUC && (ACC_CC_GNUC < 0x025f00ul)))
+     /* ancient cygwin/mingw version */
+#  else
+#    define ACC_HAVE_WINDOWS_H 1
+#  endif
+#endif
+
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_incd.h b/tools/ucl/acc/acc_incd.h
new file mode 100644
index 0000000000..97c7bb8a46
--- /dev/null
+++ b/tools/ucl/acc/acc_incd.h
@@ -0,0 +1,67 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#ifndef __ACC_INCD_H_INCLUDED
+#define __ACC_INCD_H_INCLUDED 1
+
+/* default system includes */
+/* see Autoconf:
+ *   headers.m4, _AC_INCLUDES_DEFAULT_REQUIREMENTS ac_includes_default
+ */
+
+#include <stdio.h>
+#if defined(HAVE_TIME_H) && defined(__MSL__) && defined(__cplusplus)
+# include <time.h>
+#endif
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_ince.h b/tools/ucl/acc/acc_ince.h
new file mode 100644
index 0000000000..9a0a081f70
--- /dev/null
+++ b/tools/ucl/acc/acc_ince.h
@@ -0,0 +1,87 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#ifndef __ACC_INCE_H_INCLUDED
+#define __ACC_INCE_H_INCLUDED 1
+
+/* extra system includes */
+
+#if defined(HAVE_STDARG_H)
+#  include <stdarg.h>
+#endif
+#if defined(HAVE_CTYPE_H)
+#  include <ctype.h>
+#endif
+#if defined(HAVE_ERRNO_H)
+#  include <errno.h>
+#endif
+#if defined(HAVE_MALLOC_H)
+#  include <malloc.h>
+#endif
+#if defined(HAVE_ALLOCA_H)
+#  include <alloca.h>
+#endif
+#if defined(HAVE_FCNTL_H)
+#  include <fcntl.h>
+#endif
+#if defined(HAVE_DIRENT_H)
+#  include <dirent.h>
+#endif
+#if defined(HAVE_SETJMP_H)
+#  include <setjmp.h>
+#endif
+#if defined(HAVE_SIGNAL_H)
+#  include <signal.h>
+#endif
+#if defined(TIME_WITH_SYS_TIME)
+#  include <sys/time.h>
+#  include <time.h>
+#elif defined(HAVE_TIME_H)
+#  include <time.h>
+#endif
+#if defined(HAVE_UTIME_H)
+#  include <utime.h>
+#elif defined(HAVE_SYS_UTIME_H)
+#  include <sys/utime.h>
+#endif
+
+/* DOS, OS/2 & Windows */
+#if defined(HAVE_IO_H)
+#  include <io.h>
+#endif
+#if defined(HAVE_DOS_H)
+#  include <dos.h>
+#endif
+#if defined(HAVE_DIRECT_H)
+#  include <direct.h>
+#endif
+#if defined(HAVE_SHARE_H)
+#  include <share.h>
+#endif
+#if defined(ACC_CC_NDPC)
+#  include <os.h>
+#endif
+
+/* TOS */
+#if defined(__TOS__) && (defined(__PUREC__) || defined(__TURBOC__))
+#  include <ext.h>
+#endif
+
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_inci.h b/tools/ucl/acc/acc_inci.h
new file mode 100644
index 0000000000..1cfcd45c7c
--- /dev/null
+++ b/tools/ucl/acc/acc_inci.h
@@ -0,0 +1,103 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#ifndef __ACC_INCI_H_INCLUDED
+#define __ACC_INCI_H_INCLUDED 1
+
+
+/*************************************************************************
+// internal system includes
+**************************************************************************/
+
+#if (ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
+#  include <tos.h>
+#elif (ACC_HAVE_WINDOWS_H)
+#  if 1 && !defined(WIN32_LEAN_AND_MEAN)
+#    define WIN32_LEAN_AND_MEAN 1
+#  endif
+#  if 1 && !defined(_WIN32_WINNT)
+     /* Restrict to a subset of Windows NT 4.0 header files */
+#    define _WIN32_WINNT 0x0400
+#  endif
+#  include <windows.h>
+#  if (ACC_CC_BORLANDC || ACC_CC_TURBOC)
+#    include <dir.h>
+#  endif
+#elif (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_WIN16)
+#  if (ACC_CC_AZTECC)
+#    include <model.h>
+#    include <stat.h>
+#  elif (ACC_CC_BORLANDC || ACC_CC_TURBOC)
+#    include <alloc.h>
+#    include <dir.h>
+#  elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
+#    include <sys/exceptn.h>
+#  elif (ACC_CC_PACIFICC)
+#    include <unixio.h>
+#    include <stat.h>
+#    include <sys.h>
+#  elif (ACC_CC_WATCOMC)
+#    include <i86.h>
+#  endif
+#elif (ACC_OS_OS216)
+#  if (ACC_CC_WATCOMC)
+#    include <i86.h>
+#  endif
+#endif
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
+#  if defined(FP_OFF)
+#    define ACC_FP_OFF(x)   FP_OFF(x)
+#  elif defined(_FP_OFF)
+#    define ACC_FP_OFF(x)   _FP_OFF(x)
+#  else
+#    define ACC_FP_OFF(x)   (((const unsigned __far*)&(x))[0])
+#  endif
+#  if defined(FP_SEG)
+#    define ACC_FP_SEG(x)   FP_SEG(x)
+#  elif defined(_FP_SEG)
+#    define ACC_FP_SEG(x)   _FP_SEG(x)
+#  else
+#    define ACC_FP_SEG(x)   (((const unsigned __far*)&(x))[1])
+#  endif
+#  if defined(MK_FP)
+#    define ACC_MK_FP(s,o)  MK_FP(s,o)
+#  elif defined(_MK_FP)
+#    define ACC_MK_FP(s,o)  _MK_FP(s,o)
+#  else
+#    define ACC_MK_FP(s,o)  ((void __far*)(((unsigned long)(s)<<16)+(unsigned)(o)))
+#  endif
+#  if 0
+#    undef ACC_FP_OFF
+#    undef ACC_FP_SEG
+#    undef ACC_MK_FP
+#    define ACC_FP_OFF(x)   (((const unsigned __far*)&(x))[0])
+#    define ACC_FP_SEG(x)   (((const unsigned __far*)&(x))[1])
+#    define ACC_MK_FP(s,o)  ((void __far*)(((unsigned long)(s)<<16)+(unsigned)(o)))
+#  endif
+#endif
+
+
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_init.h b/tools/ucl/acc/acc_init.h
new file mode 100644
index 0000000000..cc15aec99b
--- /dev/null
+++ b/tools/ucl/acc/acc_init.h
@@ -0,0 +1,237 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+
+/***********************************************************************
+// preprocessor
+************************************************************************/
+
+/* workaround for preprocessor bugs in some compilers */
+#if 0
+#define ACC_0xffffL             0xfffful
+#define ACC_0xffffffffL         0xfffffffful
+#else
+#define ACC_0xffffL             65535ul
+#define ACC_0xffffffffL         4294967295ul
+#endif
+
+/* some things we cannot work around */
+#if (ACC_0xffffL == ACC_0xffffffffL)
+#  error "your preprocessor is broken 1"
+#endif
+#if (16ul * 16384ul != 262144ul)
+#  error "your preprocessor is broken 2"
+#endif
+#if 0
+#if (32767 >= 4294967295ul)
+#  error "your preprocessor is broken 3"
+#endif
+#if (65535u >= 4294967295ul)
+#  error "your preprocessor is broken 4"
+#endif
+#endif
+
+
+/***********************************************************************
+// try to detect specific compilers
+************************************************************************/
+
+#if (UINT_MAX == ACC_0xffffL)
+#if defined(__ZTC__) && defined(__I86__) && !defined(__OS2__)
+#  if !defined(MSDOS)
+#    define MSDOS 1
+#  endif
+#  if !defined(_MSDOS)
+#    define _MSDOS 1
+#  endif
+#elif defined(__VERSION) && defined(MB_LEN_MAX)
+#  if (__VERSION == 520) && (MB_LEN_MAX == 1)
+#    if !defined(__AZTEC_C__)
+#      define __AZTEC_C__ __VERSION
+#    endif
+#    if !defined(__DOS__)
+#      define __DOS__ 1
+#    endif
+#  endif
+#endif
+#endif
+
+
+/***********************************************************************
+// fix incorrect and missing stuff
+************************************************************************/
+
+/* Microsoft C does not correctly define ptrdiff_t for
+ * the 16-bit huge memory model.
+ */
+#if defined(_MSC_VER) && defined(M_I86HM) && (UINT_MAX == ACC_0xffffL)
+#  define ptrdiff_t long
+#  define _PTRDIFF_T_DEFINED
+#endif
+
+
+/* Fix old compiler versions. */
+#if (UINT_MAX == ACC_0xffffL)
+#  undef __ACC_RENAME_A
+#  undef __ACC_RENAME_B
+#  if defined(__AZTEC_C__) && defined(__DOS__)
+#    define __ACC_RENAME_A 1
+#  elif defined(_MSC_VER) && defined(MSDOS)
+#    if (_MSC_VER < 600)
+#      define __ACC_RENAME_A 1
+#    elif (_MSC_VER < 700)
+#      define __ACC_RENAME_B 1
+#    endif
+#  elif defined(__TSC__) && defined(__OS2__)
+#    define __ACC_RENAME_A 1
+#  elif defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0410)
+#    define __ACC_RENAME_A 1
+#  elif defined(__PACIFIC__) && defined(DOS)
+#    if !defined(__far)
+#      define __far far
+#    endif
+#    if !defined(__near)
+#      define __near near
+#    endif
+#  endif
+#  if defined(__ACC_RENAME_A)
+#    if !defined(__cdecl)
+#      define __cdecl cdecl
+#    endif
+#    if !defined(__far)
+#      define __far far
+#    endif
+#    if !defined(__huge)
+#      define __huge huge
+#    endif
+#    if !defined(__near)
+#      define __near near
+#    endif
+#    if !defined(__pascal)
+#      define __pascal pascal
+#    endif
+#    if !defined(__huge)
+#      define __huge huge
+#    endif
+#  elif defined(__ACC_RENAME_B)
+#    if !defined(__cdecl)
+#      define __cdecl _cdecl
+#    endif
+#    if !defined(__far)
+#      define __far _far
+#    endif
+#    if !defined(__huge)
+#      define __huge _huge
+#    endif
+#    if !defined(__near)
+#      define __near _near
+#    endif
+#    if !defined(__pascal)
+#      define __pascal _pascal
+#    endif
+#  elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__)
+#    if !defined(__cdecl)
+#      define __cdecl cdecl
+#    endif
+#    if !defined(__pascal)
+#      define __pascal pascal
+#    endif
+#  endif
+#  undef __ACC_RENAME_A
+#  undef __ACC_RENAME_B
+#endif
+
+
+#if (UINT_MAX == ACC_0xffffL)
+#if defined(__AZTEC_C__) && defined(__DOS__)
+#  define ACC_BROKEN_CDECL_ALT_SYNTAX 1
+#elif defined(_MSC_VER) && defined(MSDOS)
+#  if (_MSC_VER < 600)
+#    define ACC_BROKEN_INTEGRAL_CONSTANTS 1
+#  endif
+#  if (_MSC_VER < 700)
+#    define ACC_BROKEN_INTEGRAL_PROMOTION 1
+#    define ACC_BROKEN_SIZEOF 1
+#  endif
+#elif defined(__PACIFIC__) && defined(DOS)
+#  define ACC_BROKEN_INTEGRAL_CONSTANTS 1
+#elif defined(__TURBOC__) && defined(__MSDOS__)
+#  if (__TURBOC__ < 0x0150)
+#    define ACC_BROKEN_CDECL_ALT_SYNTAX 1
+#    define ACC_BROKEN_INTEGRAL_CONSTANTS 1
+#    define ACC_BROKEN_INTEGRAL_PROMOTION 1
+#  endif
+#  if (__TURBOC__ < 0x0200)
+#    define ACC_BROKEN_SIZEOF 1
+#  endif
+#  if (__TURBOC__ < 0x0400) && defined(__cplusplus)
+#    define ACC_BROKEN_CDECL_ALT_SYNTAX 1
+#  endif
+#elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__)
+#  define ACC_BROKEN_CDECL_ALT_SYNTAX 1
+#  define ACC_BROKEN_SIZEOF 1
+#endif
+#endif
+#if defined(__WATCOMC__) && (__WATCOMC__ < 900)
+#  define ACC_BROKEN_INTEGRAL_CONSTANTS 1
+#endif
+
+
+/***********************************************************************
+// ANSI C preprocessor macros (cpp)
+************************************************************************/
+
+#define ACC_CPP_STRINGIZE(x)            #x
+#define ACC_CPP_MACRO_EXPAND(x)         ACC_CPP_STRINGIZE(x)
+
+/* concatenate */
+#define ACC_CPP_CONCAT2(a,b)            a ## b
+#define ACC_CPP_CONCAT3(a,b,c)          a ## b ## c
+#define ACC_CPP_CONCAT4(a,b,c,d)        a ## b ## c ## d
+#define ACC_CPP_CONCAT5(a,b,c,d,e)      a ## b ## c ## d ## e
+
+/* expand and concatenate (by using one level of indirection) */
+#define ACC_CPP_ECONCAT2(a,b)           ACC_CPP_CONCAT2(a,b)
+#define ACC_CPP_ECONCAT3(a,b,c)         ACC_CPP_CONCAT3(a,b,c)
+#define ACC_CPP_ECONCAT4(a,b,c,d)       ACC_CPP_CONCAT4(a,b,c,d)
+#define ACC_CPP_ECONCAT5(a,b,c,d,e)     ACC_CPP_CONCAT5(a,b,c,d,e)
+
+
+/***********************************************************************
+// stdc macros
+************************************************************************/
+
+#if defined(__cplusplus)
+#  undef __STDC_CONSTANT_MACROS
+#  undef __STDC_LIMIT_MACROS
+#  define __STDC_CONSTANT_MACROS 1
+#  define __STDC_LIMIT_MACROS 1
+#endif
+
+
+/***********************************************************************
+// misc macros
+************************************************************************/
+
+#if defined(__cplusplus)
+#  define ACC_EXTERN_C extern "C"
+#else
+#  define ACC_EXTERN_C extern
+#endif
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_lib.ch b/tools/ucl/acc/acc_lib.ch
new file mode 100644
index 0000000000..c1c16f4de1
--- /dev/null
+++ b/tools/ucl/acc/acc_lib.ch
@@ -0,0 +1,61 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+
+#if !defined(ACC_VERSION)
+#  if defined ACC_CONFIG_INCLUDE
+#    include ACC_CONFIG_INCLUDE("acc.h")
+#  else
+#    include "acc.h"
+#  endif
+#endif
+#ifndef __ACC_INCD_H_INCLUDED
+#  include ACC_CONFIG_INCLUDE("acc_incd.h")
+#endif
+#ifndef __ACC_INCE_H_INCLUDED
+#  include ACC_CONFIG_INCLUDE("acc_ince.h")
+#endif
+#ifndef __ACC_INCI_H_INCLUDED
+#  include ACC_CONFIG_INCLUDE("acc_inci.h")
+#endif
+#ifndef __ACC_LIB_H_INCLUDED
+#  include ACC_CONFIG_INCLUDE("acc_lib.h")
+#endif
+
+
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+#include ACC_CONFIG_INCLUDE("acclib/bele.ch")
+#include ACC_CONFIG_INCLUDE("acclib/hmemcpy.ch")
+#include ACC_CONFIG_INCLUDE("acclib/hstring.ch")
+#include ACC_CONFIG_INCLUDE("acclib/halloc.ch")
+#include ACC_CONFIG_INCLUDE("acclib/dosalloc.ch")
+#include ACC_CONFIG_INCLUDE("acclib/hfread.ch")
+#include ACC_CONFIG_INCLUDE("acclib/hread.ch")
+#include ACC_CONFIG_INCLUDE("acclib/opendir.ch")
+#include ACC_CONFIG_INCLUDE("acclib/rand.ch")
+#include ACC_CONFIG_INCLUDE("acclib/misc.ch")
+
+#if 0
+/* modules which use floating point are not included by default */
+#include ACC_CONFIG_INCLUDE("acclib/uclock.ch")
+#endif
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_lib.h b/tools/ucl/acc/acc_lib.h
new file mode 100644
index 0000000000..0b48e75638
--- /dev/null
+++ b/tools/ucl/acc/acc_lib.h
@@ -0,0 +1,526 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#ifndef __ACC_LIB_H_INCLUDED
+#define __ACC_LIB_H_INCLUDED 1
+
+
+#if !defined(__ACCLIB_FUNCNAME)
+#  define __ACCLIB_FUNCNAME(f)  f
+#endif
+#if !defined(ACCLIB_EXTERN)
+#  define ACCLIB_EXTERN(r,f)    extern r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+#if !defined(__ACCLIB_CONST_CAST_RETURN)
+#if (ACC_CC_GNUC)
+#  define __ACCLIB_CONST_CAST_RETURN(type,var) \
+        { union { type a; const type b; } u; u.b = (var); return u.a; }
+#else
+#  define __ACCLIB_CONST_CAST_RETURN(type,var) return (type) (var);
+#endif
+#endif
+
+
+#if (ACC_OS_WIN64)
+#  define acclib_handle_t       acc_int64l_t
+#  define acclib_uhandle_t      acc_uint64l_t
+#elif (ACC_ARCH_IA32 && ACC_CC_MSC && (_MSC_VER >= 1300))
+   typedef __w64 long           acclib_handle_t;
+   typedef __w64 unsigned long  acclib_uhandle_t;
+#  define acclib_handle_t       acclib_handle_t
+#  define acclib_uhandle_t      acclib_uhandle_t
+#else
+#  define acclib_handle_t       long
+#  define acclib_uhandle_t      unsigned long
+#endif
+
+
+/*************************************************************************
+// wrap <ctype.h>
+**************************************************************************/
+
+#if 0
+ACCLIB_EXTERN(int, acc_ascii_digit)   (int);
+ACCLIB_EXTERN(int, acc_ascii_islower) (int);
+ACCLIB_EXTERN(int, acc_ascii_isupper) (int);
+ACCLIB_EXTERN(int, acc_ascii_tolower) (int);
+ACCLIB_EXTERN(int, acc_ascii_toupper) (int);
+ACCLIB_EXTERN(int, acc_ascii_utolower) (int);
+ACCLIB_EXTERN(int, acc_ascii_utoupper) (int);
+#endif
+
+#define acc_ascii_isdigit(c)    (((unsigned)(c) - 48) < 10)
+#define acc_ascii_islower(c)    (((unsigned)(c) - 97) < 26)
+#define acc_ascii_isupper(c)    (((unsigned)(c) - 65) < 26)
+#define acc_ascii_tolower(c)    ((int)(c) + (acc_ascii_isupper(c) << 5))
+#define acc_ascii_toupper(c)    ((int)(c) - (acc_ascii_islower(c) << 5))
+
+#define acc_ascii_utolower(c)   acc_ascii_tolower((unsigned char)(c))
+#define acc_ascii_utoupper(c)   acc_ascii_toupper((unsigned char)(c))
+
+
+/*************************************************************************
+// huge pointer layer
+**************************************************************************/
+
+#ifndef acc_hsize_t
+#if (ACC_HAVE_MM_HUGE_PTR)
+#  define acc_hsize_t  unsigned long
+#  define acc_hvoid_p  void __huge *
+#  define acc_hchar_p  char __huge *
+#  define acc_hchar_pp char __huge * __huge *
+#  define acc_hbyte_p  unsigned char __huge *
+#else
+#  define acc_hsize_t  size_t
+#  define acc_hvoid_p  void *
+#  define acc_hchar_p  char *
+#  define acc_hchar_pp char **
+#  define acc_hbyte_p  unsigned char *
+#endif
+#endif
+#ifndef ACC_FILE_P
+#define ACC_FILE_P FILE *
+#endif
+
+/* halloc */
+ACCLIB_EXTERN(acc_hvoid_p, acc_halloc) (acc_hsize_t);
+ACCLIB_EXTERN(void, acc_hfree) (acc_hvoid_p);
+
+/* dos_alloc */
+#if (ACC_OS_DOS16 || ACC_OS_OS216)
+ACCLIB_EXTERN(void __far*, acc_dos_alloc) (unsigned long);
+ACCLIB_EXTERN(int, acc_dos_free) (void __far*);
+#endif
+
+/* string */
+ACCLIB_EXTERN(int, acc_hmemcmp) (const acc_hvoid_p, const acc_hvoid_p, acc_hsize_t);
+ACCLIB_EXTERN(acc_hvoid_p, acc_hmemcpy) (acc_hvoid_p, const acc_hvoid_p, acc_hsize_t);
+ACCLIB_EXTERN(acc_hvoid_p, acc_hmemmove) (acc_hvoid_p, const acc_hvoid_p, acc_hsize_t);
+ACCLIB_EXTERN(acc_hvoid_p, acc_hmemset) (acc_hvoid_p, int, acc_hsize_t);
+
+/* string */
+ACCLIB_EXTERN(acc_hsize_t, acc_hstrlen) (const acc_hchar_p);
+ACCLIB_EXTERN(int, acc_hstrcmp) (const acc_hchar_p, const acc_hchar_p);
+ACCLIB_EXTERN(int, acc_hstrncmp)(const acc_hchar_p, const acc_hchar_p, acc_hsize_t);
+ACCLIB_EXTERN(int, acc_ascii_hstricmp) (const acc_hchar_p, const acc_hchar_p);
+ACCLIB_EXTERN(int, acc_ascii_hstrnicmp)(const acc_hchar_p, const acc_hchar_p, acc_hsize_t);
+ACCLIB_EXTERN(int, acc_ascii_hmemicmp) (const acc_hvoid_p, const acc_hvoid_p, acc_hsize_t);
+ACCLIB_EXTERN(acc_hchar_p, acc_hstrstr) (const acc_hchar_p, const acc_hchar_p);
+ACCLIB_EXTERN(acc_hchar_p, acc_ascii_hstristr) (const acc_hchar_p, const acc_hchar_p);
+ACCLIB_EXTERN(acc_hvoid_p, acc_hmemmem) (const acc_hvoid_p, acc_hsize_t, const acc_hvoid_p, acc_hsize_t);
+ACCLIB_EXTERN(acc_hvoid_p, acc_ascii_hmemimem) (const acc_hvoid_p, acc_hsize_t, const acc_hvoid_p, acc_hsize_t);
+ACCLIB_EXTERN(acc_hchar_p, acc_hstrcpy) (acc_hchar_p, const acc_hchar_p);
+ACCLIB_EXTERN(acc_hchar_p, acc_hstrcat) (acc_hchar_p, const acc_hchar_p);
+ACCLIB_EXTERN(acc_hsize_t, acc_hstrlcpy) (acc_hchar_p, const acc_hchar_p, acc_hsize_t);
+ACCLIB_EXTERN(acc_hsize_t, acc_hstrlcat) (acc_hchar_p, const acc_hchar_p, acc_hsize_t);
+ACCLIB_EXTERN(int, acc_hstrscpy) (acc_hchar_p, const acc_hchar_p, acc_hsize_t);
+ACCLIB_EXTERN(int, acc_hstrscat) (acc_hchar_p, const acc_hchar_p, acc_hsize_t);
+ACCLIB_EXTERN(acc_hchar_p, acc_hstrccpy) (acc_hchar_p, const acc_hchar_p, int);
+ACCLIB_EXTERN(acc_hvoid_p, acc_hmemccpy) (acc_hvoid_p, const acc_hvoid_p, int, acc_hsize_t);
+ACCLIB_EXTERN(acc_hchar_p, acc_hstrchr)  (const acc_hchar_p, int);
+ACCLIB_EXTERN(acc_hchar_p, acc_hstrrchr) (const acc_hchar_p, int);
+ACCLIB_EXTERN(acc_hchar_p, acc_ascii_hstrichr) (const acc_hchar_p, int);
+ACCLIB_EXTERN(acc_hchar_p, acc_ascii_hstrrichr) (const acc_hchar_p, int);
+ACCLIB_EXTERN(acc_hvoid_p, acc_hmemchr)  (const acc_hvoid_p, int, acc_hsize_t);
+ACCLIB_EXTERN(acc_hvoid_p, acc_hmemrchr) (const acc_hvoid_p, int, acc_hsize_t);
+ACCLIB_EXTERN(acc_hvoid_p, acc_ascii_hmemichr) (const acc_hvoid_p, int, acc_hsize_t);
+ACCLIB_EXTERN(acc_hvoid_p, acc_ascii_hmemrichr) (const acc_hvoid_p, int, acc_hsize_t);
+ACCLIB_EXTERN(acc_hsize_t, acc_hstrspn)  (const acc_hchar_p, const acc_hchar_p);
+ACCLIB_EXTERN(acc_hsize_t, acc_hstrrspn) (const acc_hchar_p, const acc_hchar_p);
+ACCLIB_EXTERN(acc_hsize_t, acc_hstrcspn)  (const acc_hchar_p, const acc_hchar_p);
+ACCLIB_EXTERN(acc_hsize_t, acc_hstrrcspn) (const acc_hchar_p, const acc_hchar_p);
+ACCLIB_EXTERN(acc_hchar_p, acc_hstrpbrk)  (const acc_hchar_p, const acc_hchar_p);
+ACCLIB_EXTERN(acc_hchar_p, acc_hstrrpbrk) (const acc_hchar_p, const acc_hchar_p);
+ACCLIB_EXTERN(acc_hchar_p, acc_hstrsep)  (acc_hchar_pp, const acc_hchar_p);
+ACCLIB_EXTERN(acc_hchar_p, acc_hstrrsep) (acc_hchar_pp, const acc_hchar_p);
+ACCLIB_EXTERN(acc_hchar_p, acc_ascii_hstrlwr) (acc_hchar_p);
+ACCLIB_EXTERN(acc_hchar_p, acc_ascii_hstrupr) (acc_hchar_p);
+ACCLIB_EXTERN(acc_hvoid_p, acc_ascii_hmemlwr) (acc_hvoid_p, acc_hsize_t);
+ACCLIB_EXTERN(acc_hvoid_p, acc_ascii_hmemupr) (acc_hvoid_p, acc_hsize_t);
+
+/* stdio */
+ACCLIB_EXTERN(acc_hsize_t, acc_hfread) (ACC_FILE_P, acc_hvoid_p, acc_hsize_t);
+ACCLIB_EXTERN(acc_hsize_t, acc_hfwrite) (ACC_FILE_P, const acc_hvoid_p, acc_hsize_t);
+
+/* io */
+#if (ACC_HAVE_MM_HUGE_PTR)
+ACCLIB_EXTERN(long, acc_hread) (int, acc_hvoid_p, long);
+ACCLIB_EXTERN(long, acc_hwrite) (int, const acc_hvoid_p, long);
+#endif
+ACCLIB_EXTERN(long, acc_safe_hread) (int, acc_hvoid_p, long);
+ACCLIB_EXTERN(long, acc_safe_hwrite) (int, const acc_hvoid_p, long);
+
+
+/*************************************************************************
+// wrap filename limits
+**************************************************************************/
+
+/* maximum length of full pathname (excl. '\0') */
+#if !defined(ACC_FN_PATH_MAX)
+#if (ACC_OS_DOS16 || ACC_OS_WIN16)
+#  define ACC_FN_PATH_MAX   143
+#elif (ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN32 || ACC_OS_WIN64)
+#  define ACC_FN_PATH_MAX   259
+#elif (ACC_OS_TOS)
+#  define ACC_FN_PATH_MAX   259
+#endif
+#endif
+#if !defined(ACC_FN_PATH_MAX)
+   /* arbitrary limit for acclib implementation */
+#  define ACC_FN_PATH_MAX   1024
+#endif
+
+/* maximum length of a filename (a single path component) (excl. '\0') */
+#if !defined(ACC_FN_NAME_MAX)
+#if (ACC_OS_DOS16 || ACC_OS_WIN16)
+#  define ACC_FN_NAME_MAX   12
+#elif (ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
+#  define ACC_FN_NAME_MAX   12
+#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
+#elif (ACC_OS_DOS32)
+#  define ACC_FN_NAME_MAX   12
+#endif
+#endif
+#if !defined(ACC_FN_NAME_MAX)
+#  define ACC_FN_NAME_MAX   ACC_FN_PATH_MAX
+#endif
+
+
+#define ACC_FNMATCH_NOESCAPE        1
+#define ACC_FNMATCH_PATHNAME        2
+#define ACC_FNMATCH_PATHSTAR        4
+#define ACC_FNMATCH_PERIOD          8
+#define ACC_FNMATCH_ASCII_CASEFOLD  16
+ACCLIB_EXTERN(int, acc_fnmatch) (const acc_hchar_p, const acc_hchar_p, int);
+
+
+/*************************************************************************
+// wrap <dirent.h>
+**************************************************************************/
+
+#undef __ACCLIB_USE_OPENDIR
+#if (HAVE_DIRENT_H || ACC_CC_WATCOMC)
+#  define __ACCLIB_USE_OPENDIR 1
+#  if (ACC_OS_DOS32 && defined(__BORLANDC__))
+#  elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
+#  elif (ACC_OS_OS2 || ACC_OS_OS216)
+#  elif (ACC_OS_TOS && ACC_CC_GNUC)
+#  elif (ACC_OS_WIN32 && !defined(ACC_HAVE_WINDOWS_H))
+#  elif (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_TOS || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
+#    undef __ACCLIB_USE_OPENDIR
+#  endif
+#endif
+
+
+typedef struct
+{
+#if defined(__ACCLIB_USE_OPENDIR)
+    void *u_dirp; /* private */
+# if (ACC_CC_WATCOMC)
+    unsigned short f_time;
+    unsigned short f_date;
+    unsigned long f_size;
+# endif
+    char f_name[ACC_FN_NAME_MAX+1];
+#elif (ACC_OS_WIN32 || ACC_OS_WIN64)
+    acclib_handle_t u_handle; /* private */
+    unsigned f_attr;
+    unsigned f_size_low;
+    unsigned f_size_high;
+    char f_name[ACC_FN_NAME_MAX+1];
+#elif (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_TOS || ACC_OS_WIN16)
+    char u_dta[21]; /* private */
+    unsigned char f_attr;
+    unsigned short f_time;
+    unsigned short f_date;
+    unsigned short f_size_low;
+    unsigned short f_size_high;
+    char f_name[ACC_FN_NAME_MAX+1];
+    char u_dirp; /* private */
+#else
+    void *u_dirp; /* private */
+    char f_name[ACC_FN_NAME_MAX+1];
+#endif
+} acc_dir_t;
+
+#ifndef acc_dir_p
+#define acc_dir_p acc_dir_t *
+#endif
+
+ACCLIB_EXTERN(int, acc_opendir)  (acc_dir_p, const char*);
+ACCLIB_EXTERN(int, acc_readdir)  (acc_dir_p);
+ACCLIB_EXTERN(int, acc_closedir) (acc_dir_p);
+
+
+/*************************************************************************
+// wrap misc
+**************************************************************************/
+
+#if (ACC_CC_GNUC) && (defined(__CYGWIN__) || defined(__MINGW32__))
+#  define acc_alloca(x)     __builtin_alloca((x))
+#elif (ACC_CC_BORLANDC) && defined(__linux__)
+  /* FIXME: alloca does not work */
+#elif (HAVE_ALLOCA)
+#  define acc_alloca(x)     alloca((x))
+#endif
+
+#if (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
+#  define acc_stackavail()  stackavail()
+#elif (ACC_ARCH_IA16 && ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0410))
+#  define acc_stackavail()  stackavail()
+#elif (ACC_ARCH_IA16 && ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0400))
+#  if (ACC_OS_WIN16) && (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
+#  else
+#    define acc_stackavail()  stackavail()
+#  endif
+#elif ((ACC_ARCH_IA16 || ACC_ARCH_IA32) && (ACC_CC_DMC || ACC_CC_SYMANTECC))
+#  define acc_stackavail()  stackavail()
+#elif ((ACC_ARCH_IA16) && ACC_CC_MSC && (_MSC_VER >= 700))
+#  define acc_stackavail()  _stackavail()
+#elif ((ACC_ARCH_IA16) && ACC_CC_MSC)
+#  define acc_stackavail()  stackavail()
+#elif ((ACC_ARCH_IA16 || ACC_ARCH_IA32) && ACC_CC_TURBOC && (__TURBOC__ >= 0x0450))
+#  define acc_stackavail()  stackavail()
+#elif (ACC_ARCH_IA16 && ACC_CC_TURBOC && (__TURBOC__ >= 0x0400))
+   ACC_EXTERN_C size_t __cdecl stackavail(void);
+#  define acc_stackavail()  stackavail()
+#elif ((ACC_ARCH_IA16 || ACC_ARCH_IA32) && (ACC_CC_WATCOMC))
+#  define acc_stackavail()  stackavail()
+#elif (ACC_ARCH_IA16 && ACC_CC_ZORTECHC)
+#  define acc_stackavail()  _chkstack()
+#endif
+
+ACCLIB_EXTERN(acclib_handle_t, acc_get_osfhandle) (int);
+ACCLIB_EXTERN(int, acc_isatty) (int);
+ACCLIB_EXTERN(int, acc_mkdir) (const char*, unsigned);
+ACCLIB_EXTERN(int, acc_response) (int*, char***);
+ACCLIB_EXTERN(int, acc_set_binmode) (int, int);
+
+ACCLIB_EXTERN(acc_int32l_t, acc_muldiv32) (acc_int32l_t, acc_int32l_t, acc_int32l_t);
+ACCLIB_EXTERN(acc_uint32l_t, acc_umuldiv32) (acc_uint32l_t, acc_uint32l_t, acc_uint32l_t);
+
+ACCLIB_EXTERN(void, acc_wildargv) (int*, char***);
+
+
+/*************************************************************************
+// uclock (real, i.e. "wall" clock)
+**************************************************************************/
+
+#if defined(acc_int32e_t)
+ACCLIB_EXTERN(int, acc_tsc_read) (acc_uint32e_t*);
+ACCLIB_EXTERN(int, acc_tsc_read_add) (acc_uint32e_t*);
+#endif
+
+
+typedef struct { /* all private */
+    acclib_handle_t h;
+    int mode;
+#if (ACC_HAVE_WINDOWS_H) && defined(acc_int64l_t)
+    double qpf;
+#endif
+} acc_uclock_handle_t;
+
+typedef struct { /* all private */
+    union {
+        acc_uint32l_t t32;
+#if !(ACC_OS_DOS16 || ACC_OS_WIN16)
+        double td;
+#  if defined(acc_int64l_t)
+        acc_int64l_t t64;
+#  endif
+#endif
+    } ticks;
+#if (ACC_HAVE_WINDOWS_H) && defined(acc_int64l_t)
+    acc_int64l_t qpc;
+#endif
+} acc_uclock_t;
+
+#ifndef acc_uclock_handle_p
+#define acc_uclock_handle_p acc_uclock_handle_t *
+#endif
+#ifndef acc_uclock_p
+#define acc_uclock_p acc_uclock_t *
+#endif
+
+ACCLIB_EXTERN(int, acc_uclock_open)  (acc_uclock_handle_p);
+ACCLIB_EXTERN(int, acc_uclock_close) (acc_uclock_handle_p);
+ACCLIB_EXTERN(void, acc_uclock_read) (acc_uclock_handle_p, acc_uclock_p);
+ACCLIB_EXTERN(double, acc_uclock_get_elapsed) (acc_uclock_handle_p, const acc_uclock_p, const acc_uclock_p);
+
+
+/*************************************************************************
+// performance counters (virtual clock)
+**************************************************************************/
+
+#if defined(acc_int64l_t)
+
+typedef struct { /* all private */
+    void* h;
+    unsigned cpu_type, cpu_features, cpu_khz, cpu_nrctrs;
+    const char* cpu_name;
+} acc_perfctr_handle_t;
+
+typedef struct {
+    acc_uint64l_t tsc;
+#if (ACC_OS_POSIX_LINUX)
+    acc_uint64l_t pmc[18];
+#else
+    acc_uint64l_t pmc[1];
+#endif
+} acc_perfctr_clock_t;
+
+#ifndef acc_perfctr_handle_p
+#define acc_perfctr_handle_p acc_perfctr_handle_t *
+#endif
+#ifndef acc_perfctr_clock_p
+#define acc_perfctr_clock_p acc_perfctr_clock_t *
+#endif
+
+ACCLIB_EXTERN(int, acc_perfctr_open)  (acc_perfctr_handle_p);
+ACCLIB_EXTERN(int, acc_perfctr_close) (acc_perfctr_handle_p);
+ACCLIB_EXTERN(void, acc_perfctr_read) (acc_perfctr_handle_p, acc_perfctr_clock_p);
+ACCLIB_EXTERN(double, acc_perfctr_get_elapsed) (acc_perfctr_handle_p, const acc_perfctr_clock_p, const acc_perfctr_clock_p);
+ACCLIB_EXTERN(double, acc_perfctr_get_elapsed_tsc) (acc_perfctr_handle_p, acc_uint64l_t);
+
+#endif
+
+
+/*************************************************************************
+// Big Endian / Little Endian
+**************************************************************************/
+
+ACCLIB_EXTERN(unsigned, acc_get_be16) (const acc_hvoid_p);
+ACCLIB_EXTERN(acc_uint32l_t, acc_get_be24) (const acc_hvoid_p);
+ACCLIB_EXTERN(acc_uint32l_t, acc_get_be32) (const acc_hvoid_p);
+ACCLIB_EXTERN(void, acc_set_be16) (acc_hvoid_p, unsigned);
+ACCLIB_EXTERN(void, acc_set_be24) (acc_hvoid_p, acc_uint32l_t);
+ACCLIB_EXTERN(void, acc_set_be32) (acc_hvoid_p, acc_uint32l_t);
+ACCLIB_EXTERN(unsigned, acc_get_le16) (const acc_hvoid_p);
+ACCLIB_EXTERN(acc_uint32l_t, acc_get_le24) (const acc_hvoid_p);
+ACCLIB_EXTERN(acc_uint32l_t, acc_get_le32) (const acc_hvoid_p);
+ACCLIB_EXTERN(void, acc_set_le16) (acc_hvoid_p, unsigned);
+ACCLIB_EXTERN(void, acc_set_le24) (acc_hvoid_p, acc_uint32l_t);
+ACCLIB_EXTERN(void, acc_set_le32) (acc_hvoid_p, acc_uint32l_t);
+#if defined(acc_uint64l_t)
+ACCLIB_EXTERN(acc_uint64l_t, acc_get_be64) (const acc_hvoid_p);
+ACCLIB_EXTERN(void, acc_set_be64) (acc_hvoid_p, acc_uint64l_t);
+ACCLIB_EXTERN(acc_uint64l_t, acc_get_le64) (const acc_hvoid_p);
+ACCLIB_EXTERN(void, acc_set_le64) (acc_hvoid_p, acc_uint64l_t);
+#endif
+
+/* inline versions */
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
+#  define ACC_GET_LE16(p)       (* (const unsigned short *) (p))
+#  define ACC_GET_LE32(p)       (* (const acc_uint32e_t *) (p))
+#  define ACC_SET_LE16(p,v)     (* (unsigned short *) (p) = (unsigned short) (v))
+#  define ACC_SET_LE32(p,v)     (* (acc_uint32e_t *) (p) = (acc_uint32e_t) (v))
+#endif
+#if (ACC_ARCH_AMD64)
+#  define ACC_GET_LE64(p)       (* (const acc_uint64l_t *) (p))
+#  define ACC_SET_LE64(p,v)     (* (acc_uint64l_t *) (p) = (acc_uint64l_t) (v))
+#endif
+
+
+/*************************************************************************
+// getopt
+**************************************************************************/
+
+typedef struct {
+    const char* name;
+    int has_arg;
+    int* flag;
+    int val;
+} acc_getopt_longopt_t;
+#ifndef acc_getopt_longopt_p
+#define acc_getopt_longopt_p acc_getopt_longopt_t *
+#endif
+
+typedef struct {
+    int go_argc;
+    char** go_argv;
+    const char* go_shortopts;
+    const acc_getopt_longopt_p longopts;
+#if (ACC_BROKEN_CDECL_ALT_SYNTAX)
+    int __acc_cdecl_va (*go_error)(const char *, ...);
+#else
+    int (__acc_cdecl_va *go_error)(const char *, ...);
+#endif
+} acc_getopt_t;
+#ifndef acc_getopt_p
+#define acc_getopt_p acc_getopt_t *
+#endif
+
+ACCLIB_EXTERN(void, acc_getopt_init) (acc_getopt_p);
+ACCLIB_EXTERN(int, acc_getopt) (acc_getopt_p);
+ACCLIB_EXTERN(void, acc_getopt_close)(acc_getopt_p);
+
+
+/*************************************************************************
+// rand
+**************************************************************************/
+
+typedef struct { /* all private */
+    acc_uint32l_t seed;
+} acc_rand31_t;
+#ifndef acc_rand31_p
+#define acc_rand31_p acc_rand31_t *
+#endif
+ACCLIB_EXTERN(void, acc_srand31) (acc_rand31_p, acc_uint32l_t);
+ACCLIB_EXTERN(acc_uint32l_t, acc_rand31) (acc_rand31_p);
+
+#if defined(acc_uint64l_t)
+typedef struct { /* all private */
+    acc_uint64l_t seed;
+} acc_rand48_t;
+#ifndef acc_rand48_p
+#define acc_rand48_p acc_rand48_t *
+#endif
+ACCLIB_EXTERN(void, acc_srand48) (acc_rand48_p, acc_uint32l_t);
+ACCLIB_EXTERN(acc_uint32l_t, acc_rand48) (acc_rand48_p);
+ACCLIB_EXTERN(acc_uint32l_t, acc_rand48_r32) (acc_rand48_p);
+#endif
+
+#if defined(acc_uint64l_t)
+typedef struct { /* all private */
+    acc_uint64l_t seed;
+} acc_rand64_t;
+#ifndef acc_rand64_p
+#define acc_rand64_p acc_rand64_t *
+#endif
+ACCLIB_EXTERN(void, acc_srand64) (acc_rand64_p, acc_uint64l_t);
+ACCLIB_EXTERN(acc_uint32l_t, acc_rand64) (acc_rand64_p);
+ACCLIB_EXTERN(acc_uint32l_t, acc_rand64_r32) (acc_rand64_p);
+#endif
+
+typedef struct { /* all private */
+    unsigned n;
+    acc_uint32l_t s[624];
+} acc_randmt_t;
+#ifndef acc_randmt_p
+#define acc_randmt_p acc_randmt_t *
+#endif
+ACCLIB_EXTERN(void, acc_srandmt) (acc_randmt_p, acc_uint32l_t);
+ACCLIB_EXTERN(acc_uint32l_t, acc_randmt) (acc_randmt_p);
+ACCLIB_EXTERN(acc_uint32l_t, acc_randmt_r32) (acc_randmt_p);
+
+
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_mm.h b/tools/ucl/acc/acc_mm.h
new file mode 100644
index 0000000000..4f1e38185f
--- /dev/null
+++ b/tools/ucl/acc/acc_mm.h
@@ -0,0 +1,199 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+/*
+ * Memory Model - exactly one of:
+ *
+ *   ACC_MM_FLAT            [default]
+ *   ACC_MM_TINY
+ *   ACC_MM_SMALL
+ *   ACC_MM_MEDIUM
+ *   ACC_MM_COMPACT
+ *   ACC_MM_LARGE
+ *   ACC_MM_HUGE
+ */
+
+#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
+
+#if (UINT_MAX != ACC_0xffffL)
+#  error "this should not happen"
+#endif
+#if defined(__TINY__) || defined(M_I86TM) || defined(_M_I86TM)
+#  define ACC_MM_TINY           1
+#elif defined(__HUGE__) || defined(_HUGE_) || defined(M_I86HM) || defined(_M_I86HM)
+#  define ACC_MM_HUGE           1
+#elif defined(__SMALL__) || defined(M_I86SM) || defined(_M_I86SM) || defined(SMALL_MODEL)
+#  define ACC_MM_SMALL          1
+#elif defined(__MEDIUM__) || defined(M_I86MM) || defined(_M_I86MM)
+#  define ACC_MM_MEDIUM         1
+#elif defined(__COMPACT__) || defined(M_I86CM) || defined(_M_I86CM)
+#  define ACC_MM_COMPACT        1
+#elif defined(__LARGE__) || defined(M_I86LM) || defined(_M_I86LM) || defined(LARGE_MODEL)
+#  define ACC_MM_LARGE          1
+#elif (ACC_CC_AZTECC)
+#  if defined(_LARGE_CODE) && defined(_LARGE_DATA)
+#    define ACC_MM_LARGE        1
+#  elif defined(_LARGE_CODE)
+#    define ACC_MM_MEDIUM       1
+#  elif defined(_LARGE_DATA)
+#    define ACC_MM_COMPACT      1
+#  else
+#    define ACC_MM_SMALL        1
+#  endif
+#elif (ACC_CC_ZORTECHC && defined(__VCM__))
+#  define ACC_MM_LARGE          1
+#else
+#  error "unknown memory model"
+#endif
+
+
+/* ACC_HAVE_MM_HUGE_PTR   ... working __huge pointers
+ * ACC_HAVE_MM_HUGE_ARRAY ... char __huge x[256*1024L] works */
+#define ACC_HAVE_MM_HUGE_PTR        1
+#define ACC_HAVE_MM_HUGE_ARRAY      1
+
+#if (ACC_MM_TINY)
+#  undef ACC_HAVE_MM_HUGE_ARRAY
+#endif
+
+#if (ACC_CC_AZTECC || ACC_CC_PACIFICC || ACC_CC_ZORTECHC)
+#  undef ACC_HAVE_MM_HUGE_PTR
+#  undef ACC_HAVE_MM_HUGE_ARRAY
+#elif (ACC_CC_DMC || ACC_CC_SYMANTECC)
+#  undef ACC_HAVE_MM_HUGE_ARRAY
+#elif (ACC_CC_MSC && defined(_QC))
+#  undef ACC_HAVE_MM_HUGE_ARRAY
+#  if (_MSC_VER < 600)
+#    undef ACC_HAVE_MM_HUGE_PTR
+#  endif
+#elif (ACC_CC_TURBOC && (__TURBOC__ < 0x0295))
+#  undef ACC_HAVE_MM_HUGE_ARRAY
+#elif (ACC_CC_WATCOMC && (__WATCOMC__ >= 1200))
+   /* pointer arithmetics with __huge arrays seems broken in OpenWatcom 1.x */
+#  undef ACC_HAVE_MM_HUGE_ARRAY
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0200))
+   extern void __near __cdecl _AHSHIFT(void);
+#  define ACC_MM_AHSHIFT      ((unsigned) _AHSHIFT)
+#elif (ACC_CC_DMC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
+   extern void __near __cdecl _AHSHIFT(void);
+#  define ACC_MM_AHSHIFT      ((unsigned) _AHSHIFT)
+#elif (ACC_CC_MSC || ACC_CC_TOPSPEEDC)
+   extern void __near __cdecl _AHSHIFT(void);
+#  define ACC_MM_AHSHIFT      ((unsigned) _AHSHIFT)
+#elif (ACC_CC_TURBOC && (__TURBOC__ >= 0x0295))
+   extern void __near __cdecl _AHSHIFT(void);
+#  define ACC_MM_AHSHIFT      ((unsigned) _AHSHIFT)
+#elif ((ACC_CC_AZTECC || ACC_CC_PACIFICC || ACC_CC_TURBOC) && ACC_OS_DOS16)
+#  define ACC_MM_AHSHIFT      12
+#elif (ACC_CC_WATCOMC)
+   extern unsigned char _HShift;
+#  define ACC_MM_AHSHIFT      ((unsigned) _HShift)
+#else
+#  error "FIXME - implement ACC_MM_AHSHIFT"
+#endif
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+
+#elif (ACC_ARCH_C166)
+#if !defined(__MODEL__)
+#  error "FIXME - C166 __MODEL__"
+#elif ((__MODEL__) == 0)
+#  define ACC_MM_SMALL          1
+#elif ((__MODEL__) == 1)
+#  define ACC_MM_SMALL          1
+#elif ((__MODEL__) == 2)
+#  define ACC_MM_LARGE          1
+#elif ((__MODEL__) == 3)
+#  define ACC_MM_TINY           1
+#elif ((__MODEL__) == 4)
+#  define ACC_MM_XTINY          1
+#elif ((__MODEL__) == 5)
+#  define ACC_MM_XSMALL         1
+#else
+#  error "FIXME - C166 __MODEL__"
+#endif
+
+
+#elif (ACC_ARCH_MCS251)
+#if !defined(__MODEL__)
+#  error "FIXME - MCS251 __MODEL__"
+#elif ((__MODEL__) == 0)
+#  define ACC_MM_SMALL          1
+#elif ((__MODEL__) == 2)
+#  define ACC_MM_LARGE          1
+#elif ((__MODEL__) == 3)
+#  define ACC_MM_TINY           1
+#elif ((__MODEL__) == 4)
+#  define ACC_MM_XTINY          1
+#elif ((__MODEL__) == 5)
+#  define ACC_MM_XSMALL         1
+#else
+#  error "FIXME - MCS251 __MODEL__"
+#endif
+
+
+#elif (ACC_ARCH_MCS51)
+#if !defined(__MODEL__)
+#  error "FIXME - MCS51 __MODEL__"
+#elif ((__MODEL__) == 1)
+#  define ACC_MM_SMALL          1
+#elif ((__MODEL__) == 2)
+#  define ACC_MM_LARGE          1
+#elif ((__MODEL__) == 3)
+#  define ACC_MM_TINY           1
+#elif ((__MODEL__) == 4)
+#  define ACC_MM_XTINY          1
+#elif ((__MODEL__) == 5)
+#  define ACC_MM_XSMALL         1
+#else
+#  error "FIXME - MCS51 __MODEL__"
+#endif
+
+#else
+
+#  define ACC_MM_FLAT           1
+
+#endif
+
+
+#if (ACC_MM_FLAT)
+#  define ACC_INFO_MM           "flat"
+#elif (ACC_MM_TINY)
+#  define ACC_INFO_MM           "tiny"
+#elif (ACC_MM_SMALL)
+#  define ACC_INFO_MM           "small"
+#elif (ACC_MM_MEDIUM)
+#  define ACC_INFO_MM           "medium"
+#elif (ACC_MM_COMPACT)
+#  define ACC_INFO_MM           "compact"
+#elif (ACC_MM_LARGE)
+#  define ACC_INFO_MM           "large"
+#elif (ACC_MM_HUGE)
+#  define ACC_INFO_MM           "huge"
+#else
+#  error "unknown memory model"
+#endif
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_os.h b/tools/ucl/acc/acc_os.h
new file mode 100644
index 0000000000..e52442152a
--- /dev/null
+++ b/tools/ucl/acc/acc_os.h
@@ -0,0 +1,203 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+/*
+ * Operating System - exactly one of:
+ *
+ *   ACC_OS_POSIX           [default]
+ *   ACC_OS_AMIGAOS
+ *   ACC_OS_BEOS
+ *   ACC_OS_CYGWIN          hybrid WIN32 and POSIX
+ *   ACC_OS_DOS16           16-bit DOS (segmented memory model)
+ *   ACC_OS_DOS32
+ *   ACC_OS_EMX             hybrid OS/2, DOS32, WIN32 (with RSX) and POSIX
+ *   ACC_OS_MACCLASSIC      Macintosh Classic
+ *   ACC_OS_PALMOS
+ *   ACC_OS_OS2             OS/2
+ *   ACC_OS_OS216           16-bit OS/2 1.x (segmented memory model)
+ *   ACC_OS_QNX
+ *   ACC_OS_RISCOS
+ *   ACC_OS_TOS             Atari TOS / MiNT
+ *   ACC_OS_VMS
+ *   ACC_OS_WIN16           16-bit Windows 3.x (segmented memory model)
+ *   ACC_OS_WIN32
+ *   ACC_OS_WIN64           64-bit Windows (LLP64 programming model)
+ */
+
+
+#if defined(__CYGWIN__) && defined(__GNUC__)
+#  define ACC_OS_CYGWIN         1
+#  define ACC_INFO_OS           "cygwin"
+#elif defined(__EMX__) && defined(__GNUC__)
+#  define ACC_OS_EMX            1
+#  define ACC_INFO_OS           "emx"
+#elif defined(__BEOS__)
+#  define ACC_OS_BEOS           1
+#  define ACC_INFO_OS           "beos"
+#elif defined(__QNX__)
+#  define ACC_OS_QNX            1
+#  define ACC_INFO_OS           "qnx"
+#elif defined(__BORLANDC__) && defined(__DPMI32__) && (__BORLANDC__ >= 0x0460)
+#  define ACC_OS_DOS32          1
+#  define ACC_INFO_OS           "dos32"
+#elif defined(__BORLANDC__) && defined(__DPMI16__)
+#  define ACC_OS_DOS16          1
+#  define ACC_INFO_OS           "dos16"
+#elif defined(__ZTC__) && defined(DOS386)
+#  define ACC_OS_DOS32          1
+#  define ACC_INFO_OS           "dos32"
+#elif defined(__OS2__) || defined(__OS2V2__)
+#  if (UINT_MAX == ACC_0xffffL)
+#    define ACC_OS_OS216        1
+#    define ACC_INFO_OS         "os216"
+#  elif (UINT_MAX == ACC_0xffffffffL)
+#    define ACC_OS_OS2          1
+#    define ACC_INFO_OS         "os2"
+#  else
+#    error "check your limits.h header"
+#  endif
+#elif defined(__WIN64__) || defined(_WIN64) || defined(WIN64)
+#  define ACC_OS_WIN64          1
+#  define ACC_INFO_OS           "win64"
+#elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WINDOWS_386__)
+#  define ACC_OS_WIN32          1
+#  define ACC_INFO_OS           "win32"
+#elif defined(__MWERKS__) && defined(__INTEL__)
+#  define ACC_OS_WIN32          1
+#  define ACC_INFO_OS           "win32"
+#elif defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
+#  if (UINT_MAX == ACC_0xffffL)
+#    define ACC_OS_WIN16        1
+#    define ACC_INFO_OS         "win16"
+#  elif (UINT_MAX == ACC_0xffffffffL)
+#    define ACC_OS_WIN32        1
+#    define ACC_INFO_OS         "win32"
+#  else
+#    error "check your limits.h header"
+#  endif
+#elif defined(__DOS__) || defined(__MSDOS__) || defined(_MSDOS) || defined(MSDOS) || (defined(__PACIFIC__) && defined(DOS))
+#  if (UINT_MAX == ACC_0xffffL)
+#    define ACC_OS_DOS16        1
+#    define ACC_INFO_OS         "dos16"
+#  elif (UINT_MAX == ACC_0xffffffffL)
+#    define ACC_OS_DOS32        1
+#    define ACC_INFO_OS         "dos32"
+#  else
+#    error "check your limits.h header"
+#  endif
+#elif defined(__WATCOMC__)
+#  if defined(__NT__) && (UINT_MAX == ACC_0xffffL)
+     /* wcl: NT host defaults to DOS target */
+#    define ACC_OS_DOS16        1
+#    define ACC_INFO_OS         "dos16"
+#  elif defined(__NT__) && (__WATCOMC__ < 1100)
+     /* wcl386: Watcom C 11 defines _WIN32 */
+#    define ACC_OS_WIN32        1
+#    define ACC_INFO_OS         "win32"
+#  else
+#    error "please specify a target using the -bt compiler option"
+#  endif
+#elif defined(__palmos__)
+#  if (UINT_MAX == ACC_0xffffL)
+#    define ACC_OS_PALMOS       1
+#    define ACC_INFO_OS         "palmos"
+#  else
+#    error "check your limits.h header"
+#  endif
+#elif defined(__TOS__) || defined(__atarist__)
+#  define ACC_OS_TOS            1
+#  define ACC_INFO_OS           "tos"
+#elif defined(macintosh) && !defined(__ppc__)
+#  define ACC_OS_MACCLASSIC     1
+#  define ACC_INFO_OS           "macclassic"
+#elif defined(__VMS)
+#  define ACC_OS_VMS            1
+#  define ACC_INFO_OS           "vms"
+#else
+#  define ACC_OS_POSIX          1
+#  define ACC_INFO_OS           "posix"
+#endif
+
+
+#if (ACC_OS_POSIX)
+#  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
+#    define ACC_OS_POSIX_AIX        1
+#    define ACC_INFO_OS_POSIX       "aix"
+#  elif defined(__FreeBSD__)
+#    define ACC_OS_POSIX_FREEBSD    1
+#    define ACC_INFO_OS_POSIX       "freebsd"
+#  elif defined(__hpux__) || defined(__hpux)
+#    define ACC_OS_POSIX_HPUX       1
+#    define ACC_INFO_OS_POSIX       "hpux"
+#  elif defined(__INTERIX)
+#    define ACC_OS_POSIX_INTERIX    1
+#    define ACC_INFO_OS_POSIX       "interix"
+#  elif defined(__IRIX__) || defined(__irix__)
+#    define ACC_OS_POSIX_IRIX       1
+#    define ACC_INFO_OS_POSIX       "irix"
+#  elif defined(__linux__) || defined(__linux)
+#    define ACC_OS_POSIX_LINUX      1
+#    define ACC_INFO_OS_POSIX       "linux"
+#  elif defined(__APPLE__) || defined(__MACOS__)
+#    define ACC_OS_POSIX_MACOSX     1
+#    define ACC_INFO_OS_POSIX       "macosx"
+#  elif defined(__NetBSD__)
+#    define ACC_OS_POSIX_NETBSD     1
+#    define ACC_INFO_OS_POSIX       "netbsd"
+#  elif defined(__OpenBSD__)
+#    define ACC_OS_POSIX_OPENBSD    1
+#    define ACC_INFO_OS_POSIX       "openbsd"
+#  elif defined(__osf__)
+#    define ACC_OS_POSIX_OSF        1
+#    define ACC_INFO_OS_POSIX       "osf"
+#  elif defined(__solaris__) || defined(__sun)
+#    if defined(__SVR4) || defined(__svr4__)
+#      define ACC_OS_POSIX_SOLARIS  1
+#      define ACC_INFO_OS_POSIX     "solaris"
+#    else
+#      define ACC_OS_POSIX_SUNOS    1
+#      define ACC_INFO_OS_POSIX     "sunos"
+#    endif
+#  elif defined(__ultrix__) || defined(__ultrix)
+#    define ACC_OS_POSIX_ULTRIX     1
+#    define ACC_INFO_OS_POSIX       "ultrix"
+#  else
+#    define ACC_OS_POSIX_UNKNOWN    1
+#    define ACC_INFO_OS_POSIX       "unknown"
+#  endif
+#endif
+
+
+#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
+#  if (UINT_MAX != ACC_0xffffL)
+#    error "this should not happen"
+#  endif
+#  if (ULONG_MAX != ACC_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#endif
+#if (ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_WIN32 || ACC_OS_WIN64)
+#  if (UINT_MAX != ACC_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#  if (ULONG_MAX != ACC_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#endif
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acc_type.h b/tools/ucl/acc/acc_type.h
new file mode 100644
index 0000000000..c11ff272cc
--- /dev/null
+++ b/tools/ucl/acc/acc_type.h
@@ -0,0 +1,321 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+/***********************************************************************
+//
+************************************************************************/
+
+#if (ACC_CC_GNUC >= 0x020800ul)     /* 2.8.0 */
+#  define __acc_gnuc_extension__ __extension__
+#else
+#  define __acc_gnuc_extension__
+#endif
+
+#if (SIZEOF_LONG_LONG > 0)
+__acc_gnuc_extension__ typedef long long acc_llong_t;
+#endif
+#if (SIZEOF_UNSIGNED_LONG_LONG > 0)
+__acc_gnuc_extension__ typedef unsigned long long acc_ullong_t;
+#endif
+
+#if (!(SIZEOF_SHORT > 0 && SIZEOF_INT > 0 && SIZEOF_LONG > 0))
+#  error "missing defines for sizes"
+#endif
+#if (!(SIZEOF_PTRDIFF_T > 0 && SIZEOF_SIZE_T > 0 && SIZEOF_VOID_P > 0 && SIZEOF_CHAR_P > 0))
+#  error "missing defines for sizes"
+#endif
+
+
+/***********************************************************************
+// some <stdint.h> types:
+//   required: least & fast: acc_int32l_t, acc_int32f_t
+//   optional: exact32 acc_int32e_t
+//   optional: least64 acc_int64l_t
+************************************************************************/
+
+/* acc_int32e_t is int32_t in <stdint.h> terminology */
+#if !defined(acc_int32e_t)
+#if (SIZEOF_INT == 4)
+#  define acc_int32e_t          int
+#  define acc_uint32e_t         unsigned int
+#  define ACC_INT32E_C(c)       c
+#  define ACC_UINT32E_C(c)      c##U
+#elif (SIZEOF_LONG == 4)
+#  define acc_int32e_t          long int
+#  define acc_uint32e_t         unsigned long int
+#  define ACC_INT32E_C(c)       c##L
+#  define ACC_UINT32E_C(c)      c##UL
+#elif (SIZEOF_SHORT == 4)
+#  define acc_int32e_t          short int
+#  define acc_uint32e_t         unsigned short int
+#  define ACC_INT32E_C(c)       c
+#  define ACC_UINT32E_C(c)      c##U
+#elif (SIZEOF_LONG_LONG == 4 && SIZEOF_UNSIGNED_LONG_LONG == 4)
+#  define acc_int32e_t          acc_llong_t
+#  define acc_uint32e_t         acc_ullong_t
+#  define ACC_INT32E_C(c)       c##LL
+#  define ACC_UINT32E_C(c)      c##ULL
+#elif (SIZEOF___INT32 == 4 && SIZEOF_UNSIGNED___INT32 == 4)
+#  define acc_int32e_t          __int32
+#  define acc_uint32e_t         unsigned __int32
+#  if (SIZEOF_INT > 4)
+#    define ACC_INT32E_C(c)     c
+#    define ACC_UINT32E_C(c)    c##U
+#  elif (SIZEOF_LONG > 4)
+#    define ACC_INT32E_C(c)     c##L
+#    define ACC_UINT32E_C(c)    c##UL
+#  else
+#    define ACC_INT32E_C(c)     c##i32
+#    define ACC_UINT32E_C(c)    c##ui32
+#  endif
+#else
+  /* no exact 32-bit integral type on this machine */
+#endif
+#endif
+#if defined(acc_int32e_t)
+#  define SIZEOF_ACC_INT32E_T   4
+#endif
+
+
+/* acc_int32l_t is int_least32_t in <stdint.h> terminology */
+#if !defined(acc_int32l_t)
+#if defined(acc_int32e_t)
+#  define acc_int32l_t          acc_int32e_t
+#  define acc_uint32l_t         acc_uint32e_t
+#  define ACC_INT32L_C(c)       ACC_INT32E_C(c)
+#  define ACC_UINT32L_C(c)      ACC_UINT32E_C(c)
+#  define SIZEOF_ACC_INT32L_T   SIZEOF_ACC_INT32E_T
+#elif (SIZEOF_INT > 4)
+#  define acc_int32l_t          int
+#  define acc_uint32l_t         unsigned int
+#  define ACC_INT32L_C(c)       c
+#  define ACC_UINT32L_C(c)      c##U
+#  define SIZEOF_ACC_INT32L_T   SIZEOF_INT
+#elif (SIZEOF_LONG > 4)
+#  define acc_int32l_t          long int
+#  define acc_uint32l_t         unsigned long int
+#  define ACC_INT32L_C(c)       c##L
+#  define ACC_UINT32L_C(c)      c##UL
+#  define SIZEOF_ACC_INT32L_T   SIZEOF_LONG
+#else
+#  error "acc_int32l_t"
+#endif
+#endif
+
+
+/* acc_int32f_t is int_fast32_t in <stdint.h> terminology */
+#if !defined(acc_int32f_t)
+#if (SIZEOF_INT >= 4)
+#  define acc_int32f_t          int
+#  define acc_uint32f_t         unsigned int
+#  define ACC_INT32F_C(c)       c
+#  define ACC_UINT32F_C(c)      c##U
+#  define SIZEOF_ACC_INT32F_T   SIZEOF_INT
+#elif (SIZEOF_LONG >= 4)
+#  define acc_int32f_t          long int
+#  define acc_uint32f_t         unsigned long int
+#  define ACC_INT32F_C(c)       c##L
+#  define ACC_UINT32F_C(c)      c##UL
+#  define SIZEOF_ACC_INT32F_T   SIZEOF_LONG
+#elif defined(acc_int32e_t)
+#  define acc_int32f_t          acc_int32e_t
+#  define acc_uint32f_t         acc_uint32e_t
+#  define ACC_INT32F_C(c)       ACC_INT32E_C(c)
+#  define ACC_UINT32F_C(c)      ACC_UINT32E_C(c)
+#  define SIZEOF_ACC_INT32F_T   SIZEOF_ACC_INT32E_T
+#else
+#  error "acc_int32f_t"
+#endif
+#endif
+
+
+/* acc_int64l_t is int_least64_t in <stdint.h> terminology */
+#if !defined(acc_int64l_t)
+#if (SIZEOF___INT64 >= 8 && SIZEOF_UNSIGNED___INT64 >= 8)
+#  if (ACC_CC_BORLANDC) && !defined(ACC_CONFIG_PREFER___INT64)
+#    define ACC_CONFIG_PREFER___INT64 1
+#  endif
+#endif
+#if (SIZEOF_INT >= 8)
+#  define acc_int64l_t          int
+#  define acc_uint64l_t         unsigned int
+#  define ACC_INT64L_C(c)       c
+#  define ACC_UINT64L_C(c)      c##U
+#  define SIZEOF_ACC_INT64L_T   SIZEOF_INT
+#elif (SIZEOF_LONG >= 8)
+#  define acc_int64l_t          long int
+#  define acc_uint64l_t         unsigned long int
+#  define ACC_INT64L_C(c)       c##L
+#  define ACC_UINT64L_C(c)      c##UL
+#  define SIZEOF_ACC_INT64L_T   SIZEOF_LONG
+#elif (SIZEOF_LONG_LONG >= 8 && SIZEOF_UNSIGNED_LONG_LONG >= 8) && !defined(ACC_CONFIG_PREFER___INT64)
+#  define acc_int64l_t          acc_llong_t
+#  define acc_uint64l_t         acc_ullong_t
+#  if (ACC_CC_BORLANDC)
+#    define ACC_INT64L_C(c)     ((c) + 0ll)
+#    define ACC_UINT64L_C(c)    ((c) + 0ull)
+#  else
+#    define ACC_INT64L_C(c)     c##LL
+#    define ACC_UINT64L_C(c)    c##ULL
+#  endif
+#  define SIZEOF_ACC_INT64L_T   SIZEOF_LONG_LONG
+#elif (SIZEOF___INT64 >= 8 && SIZEOF_UNSIGNED___INT64 >= 8)
+#  define acc_int64l_t          __int64
+#  define acc_uint64l_t         unsigned __int64
+#  if (ACC_CC_BORLANDC)
+#    define ACC_INT64L_C(c)     ((c) + 0i64)
+#    define ACC_UINT64L_C(c)    ((c) + 0ui64)
+#  else
+#    define ACC_INT64L_C(c)     c##i64
+#    define ACC_UINT64L_C(c)    c##ui64
+#  endif
+#  define SIZEOF_ACC_INT64L_T   SIZEOF___INT64
+#else
+  /* no least 64-bit integral type on this machine */
+#endif
+#endif
+
+
+#if !defined(acc_intptr_t)
+#if (ACC_ARCH_IA32 && ACC_CC_MSC && (_MSC_VER >= 1300))
+   typedef __w64 int            acc_intptr_t;
+   typedef __w64 unsigned int   acc_uintptr_t;
+#  define acc_intptr_t          acc_intptr_t
+#  define acc_uintptr_t         acc_uintptr_t
+#  define SIZEOF_ACC_INTPTR_T   SIZEOF_INT
+#elif (SIZEOF_INT >= SIZEOF_VOID_P)
+#  define acc_intptr_t          int
+#  define acc_uintptr_t         unsigned int
+#  define SIZEOF_ACC_INTPTR_T   SIZEOF_INT
+#elif (SIZEOF_LONG >= SIZEOF_VOID_P)
+#  define acc_intptr_t          long
+#  define acc_uintptr_t         unsigned long
+#  define SIZEOF_ACC_INTPTR_T   SIZEOF_LONG
+#elif (SIZEOF_ACC_INT64L_T >= SIZEOF_VOID_P)
+#  define acc_intptr_t          acc_int64l_t
+#  define acc_uintptr_t         acc_uint64l_t
+#  define SIZEOF_ACC_INTPTR_T   SIZEOF_ACC_INT64L_T
+#else
+#  error "acc_intptr_t"
+#endif
+#endif
+
+
+/* workaround for broken compilers */
+#if (ACC_BROKEN_INTEGRAL_CONSTANTS)
+#  undef ACC_INT32E_C
+#  undef ACC_UINT32E_C
+#  undef ACC_INT32L_C
+#  undef ACC_UINT32L_C
+#  undef ACC_INT32F_C
+#  undef ACC_UINT32F_C
+#  if (SIZEOF_INT == 4)
+#    define ACC_INT32E_C(c)     ((c) + 0)
+#    define ACC_UINT32E_C(c)    ((c) + 0U)
+#    define ACC_INT32L_C(c)     ((c) + 0)
+#    define ACC_UINT32L_C(c)    ((c) + 0U)
+#    define ACC_INT32F_C(c)     ((c) + 0)
+#    define ACC_UINT32F_C(c)    ((c) + 0U)
+#  elif (SIZEOF_LONG == 4)
+#    define ACC_INT32E_C(c)     ((c) + 0L)
+#    define ACC_UINT32E_C(c)    ((c) + 0UL)
+#    define ACC_INT32L_C(c)     ((c) + 0L)
+#    define ACC_UINT32L_C(c)    ((c) + 0UL)
+#    define ACC_INT32F_C(c)     ((c) + 0L)
+#    define ACC_UINT32F_C(c)    ((c) + 0UL)
+#  else
+#    error "integral constants"
+#  endif
+#endif
+
+
+/***********************************************************************
+// calling conventions
+************************************************************************/
+
+#if (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
+#  if (ACC_CC_GNUC || ACC_CC_HIGHC || ACC_CC_NDPC || ACC_CC_PACIFICC)
+#  elif (ACC_CC_DMC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
+#    define __acc_cdecl                 __cdecl
+#    define __acc_cdecl_atexit
+#    define __acc_cdecl_main            __cdecl
+#    if (ACC_OS_OS2 && (ACC_CC_DMC || ACC_CC_SYMANTECC))
+#      define __acc_cdecl_qsort         __pascal
+#    elif (ACC_OS_OS2 && (ACC_CC_ZORTECHC))
+#      define __acc_cdecl_qsort         _stdcall
+#    else
+#      define __acc_cdecl_qsort         __cdecl
+#    endif
+#  elif (ACC_CC_WATCOMC)
+#    define __acc_cdecl                 __cdecl
+#  else
+#    define __acc_cdecl                 __cdecl
+#    define __acc_cdecl_atexit          __cdecl
+#    define __acc_cdecl_main            __cdecl
+#    define __acc_cdecl_qsort           __cdecl
+#  endif
+#  if (ACC_CC_GNUC || ACC_CC_HIGHC || ACC_CC_NDPC || ACC_CC_PACIFICC || ACC_CC_WATCOMC)
+#  elif (ACC_OS_OS2 && (ACC_CC_DMC || ACC_CC_SYMANTECC))
+#    define __acc_cdecl_sighandler      __pascal
+#  elif (ACC_OS_OS2 && (ACC_CC_ZORTECHC))
+#    define __acc_cdecl_sighandler      _stdcall
+#  elif (ACC_CC_MSC && (_MSC_VER >= 1400)) && defined(_M_CEE_PURE)
+#    define __acc_cdecl_sighandler      __clrcall
+#  elif (ACC_CC_MSC && (_MSC_VER >= 600 && _MSC_VER < 700))
+#    if defined(_DLL)
+#      define __acc_cdecl_sighandler    _far _cdecl _loadds
+#    elif defined(_MT)
+#      define __acc_cdecl_sighandler    _far _cdecl
+#    else
+#      define __acc_cdecl_sighandler    _cdecl
+#    endif
+#  else
+#    define __acc_cdecl_sighandler      __cdecl
+#  endif
+#elif (ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
+#  define __acc_cdecl                   cdecl
+#endif
+
+#if !defined(__acc_cdecl)
+#  define __acc_cdecl
+#endif
+#if !defined(__acc_cdecl_atexit)
+#  define __acc_cdecl_atexit
+#endif
+#if !defined(__acc_cdecl_main)
+#  define __acc_cdecl_main
+#endif
+#if !defined(__acc_cdecl_qsort)
+#  define __acc_cdecl_qsort
+#endif
+#if !defined(__acc_cdecl_sighandler)
+#  define __acc_cdecl_sighandler
+#endif
+#if !defined(__acc_cdecl_va)
+#  define __acc_cdecl_va                __acc_cdecl
+#endif
+
+#if (ACC_BROKEN_CDECL_ALT_SYNTAX)
+typedef void __acc_cdecl_sighandler (*acc_sighandler_t)(int);
+#elif defined(RETSIGTYPE)
+typedef RETSIGTYPE (__acc_cdecl_sighandler *acc_sighandler_t)(int);
+#else
+typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(int);
+#endif
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/bele.ch b/tools/ucl/acc/acclib/bele.ch
new file mode 100644
index 0000000000..32eb21a488
--- /dev/null
+++ b/tools/ucl/acc/acclib/bele.ch
@@ -0,0 +1,250 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_BELE_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+/*************************************************************************
+// be16 / be24 / be32
+**************************************************************************/
+
+ACCLIB_PUBLIC(unsigned, acc_get_be16) (const acc_hvoid_p p)
+{
+    const acc_hbyte_p b = (const acc_hbyte_p) p;
+    return ((unsigned)b[1]) | ((unsigned)b[0] << 8);
+}
+
+ACCLIB_PUBLIC(acc_uint32l_t, acc_get_be24) (const acc_hvoid_p p)
+{
+    const acc_hbyte_p b = (const acc_hbyte_p) p;
+    return ((acc_uint32l_t)b[2]) | ((acc_uint32l_t)b[1] << 8) | ((acc_uint32l_t)b[0] << 16);
+}
+
+ACCLIB_PUBLIC(acc_uint32l_t, acc_get_be32) (const acc_hvoid_p p)
+{
+    const acc_hbyte_p b = (const acc_hbyte_p) p;
+    return ((acc_uint32l_t)b[3]) | ((acc_uint32l_t)b[2] << 8) | ((acc_uint32l_t)b[1] << 16) | ((acc_uint32l_t)b[0] << 24);
+}
+
+
+
+ACCLIB_PUBLIC(void, acc_set_be16) (acc_hvoid_p p, unsigned v)
+{
+    acc_hbyte_p b = (acc_hbyte_p) p;
+    b[1] = (unsigned char) ((v >>  0) & 0xff);
+    b[0] = (unsigned char) ((v >>  8) & 0xff);
+}
+
+ACCLIB_PUBLIC(void, acc_set_be24) (acc_hvoid_p p, acc_uint32l_t v)
+{
+    acc_hbyte_p b = (acc_hbyte_p) p;
+    b[2] = (unsigned char) ((v >>  0) & 0xff);
+    b[1] = (unsigned char) ((v >>  8) & 0xff);
+    b[0] = (unsigned char) ((v >> 16) & 0xff);
+}
+
+ACCLIB_PUBLIC(void, acc_set_be32) (acc_hvoid_p p, acc_uint32l_t v)
+{
+    acc_hbyte_p b = (acc_hbyte_p) p;
+    b[3] = (unsigned char) ((v >>  0) & 0xff);
+    b[2] = (unsigned char) ((v >>  8) & 0xff);
+    b[1] = (unsigned char) ((v >> 16) & 0xff);
+    b[0] = (unsigned char) ((v >> 24) & 0xff);
+}
+
+
+
+ACCLIB_PUBLIC(unsigned, acc_get_le16) (const acc_hvoid_p p)
+{
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
+    return (* (const unsigned short *) (p));
+#else
+    const acc_hbyte_p b = (const acc_hbyte_p) p;
+    return ((unsigned)b[0]) | ((unsigned)b[1] << 8);
+#endif
+}
+
+ACCLIB_PUBLIC(acc_uint32l_t, acc_get_le24) (const acc_hvoid_p p)
+{
+    const acc_hbyte_p b = (const acc_hbyte_p) p;
+    return ((acc_uint32l_t)b[0]) | ((acc_uint32l_t)b[1] << 8) | ((acc_uint32l_t)b[2] << 16);
+}
+
+ACCLIB_PUBLIC(acc_uint32l_t, acc_get_le32) (const acc_hvoid_p p)
+{
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
+    return (* (const acc_uint32e_t *) (p));
+#else
+    const acc_hbyte_p b = (const acc_hbyte_p) p;
+    return ((acc_uint32l_t)b[0]) | ((acc_uint32l_t)b[1] << 8) | ((acc_uint32l_t)b[2] << 16) | ((acc_uint32l_t)b[3] << 24);
+#endif
+}
+
+
+/*************************************************************************
+// le16 / le24 / le32
+**************************************************************************/
+
+ACCLIB_PUBLIC(void, acc_set_le16) (acc_hvoid_p p, unsigned v)
+{
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
+    (* (unsigned short *) (p) = (unsigned short) (v));
+#else
+    acc_hbyte_p b = (acc_hbyte_p) p;
+    b[0] = (unsigned char) ((v >>  0) & 0xff);
+    b[1] = (unsigned char) ((v >>  8) & 0xff);
+#endif
+}
+
+ACCLIB_PUBLIC(void, acc_set_le24) (acc_hvoid_p p, acc_uint32l_t v)
+{
+    acc_hbyte_p b = (acc_hbyte_p) p;
+    b[0] = (unsigned char) ((v >>  0) & 0xff);
+    b[1] = (unsigned char) ((v >>  8) & 0xff);
+    b[2] = (unsigned char) ((v >> 16) & 0xff);
+}
+
+ACCLIB_PUBLIC(void, acc_set_le32) (acc_hvoid_p p, acc_uint32l_t v)
+{
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
+    (* (acc_uint32e_t *) (p) = (acc_uint32e_t) (v));
+#else
+    acc_hbyte_p b = (acc_hbyte_p) p;
+    b[0] = (unsigned char) ((v >>  0) & 0xff);
+    b[1] = (unsigned char) ((v >>  8) & 0xff);
+    b[2] = (unsigned char) ((v >> 16) & 0xff);
+    b[3] = (unsigned char) ((v >> 24) & 0xff);
+#endif
+}
+
+
+/*************************************************************************
+// be64
+**************************************************************************/
+
+#if defined(acc_uint64l_t)
+
+ACCLIB_PUBLIC(acc_uint64l_t, acc_get_be64) (const acc_hvoid_p p)
+{
+    const acc_hbyte_p b = (const acc_hbyte_p) p;
+#if (SIZEOF_LONG >= 8) || (SIZEOF_SIZE_T >= 8)
+    return ((acc_uint64l_t)b[7]) | ((acc_uint64l_t)b[6] << 8) | ((acc_uint64l_t)b[5] << 16) | ((acc_uint64l_t)b[4] << 24) | ((acc_uint64l_t)b[3] << 32) | ((acc_uint64l_t)b[2] << 40) | ((acc_uint64l_t)b[1] << 48) | ((acc_uint64l_t)b[0] << 56);
+#else
+    acc_uint32l_t v0, v1;
+    v1 = ((acc_uint32l_t)b[3]) | ((acc_uint32l_t)b[2] << 8) | ((acc_uint32l_t)b[1] << 16) | ((acc_uint32l_t)b[0] << 24);
+    b += 4;
+    v0 = ((acc_uint32l_t)b[3]) | ((acc_uint32l_t)b[2] << 8) | ((acc_uint32l_t)b[1] << 16) | ((acc_uint32l_t)b[0] << 24);
+    return ((acc_uint64l_t)v0) | ((acc_uint64l_t)v1 << 32);
+#endif
+}
+
+ACCLIB_PUBLIC(void, acc_set_be64) (acc_hvoid_p p, acc_uint64l_t v)
+{
+    acc_hbyte_p b = (acc_hbyte_p) p;
+#if (SIZEOF_LONG >= 8) || (SIZEOF_SIZE_T >= 8)
+    b[7] = (unsigned char) ((v >>  0) & 0xff);
+    b[6] = (unsigned char) ((v >>  8) & 0xff);
+    b[5] = (unsigned char) ((v >> 16) & 0xff);
+    b[4] = (unsigned char) ((v >> 24) & 0xff);
+    b[3] = (unsigned char) ((v >> 32) & 0xff);
+    b[2] = (unsigned char) ((v >> 40) & 0xff);
+    b[1] = (unsigned char) ((v >> 48) & 0xff);
+    b[0] = (unsigned char) ((v >> 56) & 0xff);
+#else
+    acc_uint32l_t x;
+    x = (acc_uint32l_t) (v >>  0);
+    b[7] = (unsigned char) ((x >>  0) & 0xff);
+    b[6] = (unsigned char) ((x >>  8) & 0xff);
+    b[5] = (unsigned char) ((x >> 16) & 0xff);
+    b[4] = (unsigned char) ((x >> 24) & 0xff);
+    x = (acc_uint32l_t) (v >> 32);
+    b[3] = (unsigned char) ((x >>  0) & 0xff);
+    b[2] = (unsigned char) ((x >>  8) & 0xff);
+    b[1] = (unsigned char) ((x >> 16) & 0xff);
+    b[0] = (unsigned char) ((x >> 24) & 0xff);
+#endif
+}
+
+#endif /* acc_uint64l_t */
+
+
+/*************************************************************************
+// le64
+**************************************************************************/
+
+#if defined(acc_uint64l_t)
+
+ACCLIB_PUBLIC(acc_uint64l_t, acc_get_le64) (const acc_hvoid_p p)
+{
+#if (ACC_ARCH_AMD64)
+    return (* (const acc_uint64l_t *) (p));
+#elif (ACC_ARCH_IA32)
+    const acc_uint32e_t* b = (const acc_uint32e_t*) p;
+    return ((acc_uint64l_t)b[0]) | ((acc_uint64l_t)b[1] << 32);
+#elif (SIZEOF_LONG >= 8) || (SIZEOF_SIZE_T >= 8)
+    const acc_hbyte_p b = (const acc_hbyte_p) p;
+    return ((acc_uint64l_t)b[0]) | ((acc_uint64l_t)b[1] << 8) | ((acc_uint64l_t)b[2] << 16) | ((acc_uint64l_t)b[3] << 24) | ((acc_uint64l_t)b[4] << 32) | ((acc_uint64l_t)b[5] << 40) | ((acc_uint64l_t)b[6] << 48) | ((acc_uint64l_t)b[7] << 56);
+#else
+    const acc_hbyte_p b = (const acc_hbyte_p) p;
+    acc_uint32l_t v0, v1;
+    v0 = ((acc_uint32l_t)b[0]) | ((acc_uint32l_t)b[1] << 8) | ((acc_uint32l_t)b[2] << 16) | ((acc_uint32l_t)b[3] << 24);
+    b += 4;
+    v1 = ((acc_uint32l_t)b[0]) | ((acc_uint32l_t)b[1] << 8) | ((acc_uint32l_t)b[2] << 16) | ((acc_uint32l_t)b[3] << 24);
+    return ((acc_uint64l_t)v0) | ((acc_uint64l_t)v1 << 32);
+#endif
+}
+
+ACCLIB_PUBLIC(void, acc_set_le64) (acc_hvoid_p p, acc_uint64l_t v)
+{
+#if (ACC_ARCH_AMD64)
+    (* (acc_uint64l_t *) (p)) = v;
+#elif (ACC_ARCH_IA32)
+    (((acc_uint32e_t *)(p))[0] = (acc_uint32e_t) (v >>  0));
+    (((acc_uint32e_t *)(p))[1] = (acc_uint32e_t) (v >> 32));
+#elif (SIZEOF_LONG >= 8) || (SIZEOF_SIZE_T >= 8)
+    acc_hbyte_p b = (acc_hbyte_p) p;
+    b[0] = (unsigned char) ((v >>  0) & 0xff);
+    b[1] = (unsigned char) ((v >>  8) & 0xff);
+    b[2] = (unsigned char) ((v >> 16) & 0xff);
+    b[3] = (unsigned char) ((v >> 24) & 0xff);
+    b[4] = (unsigned char) ((v >> 32) & 0xff);
+    b[5] = (unsigned char) ((v >> 40) & 0xff);
+    b[6] = (unsigned char) ((v >> 48) & 0xff);
+    b[7] = (unsigned char) ((v >> 56) & 0xff);
+#else
+    acc_hbyte_p b = (acc_hbyte_p) p;
+    acc_uint32l_t x;
+    x = (acc_uint32l_t) (v >>  0);
+    b[0] = (unsigned char) ((x >>  0) & 0xff);
+    b[1] = (unsigned char) ((x >>  8) & 0xff);
+    b[2] = (unsigned char) ((x >> 16) & 0xff);
+    b[3] = (unsigned char) ((x >> 24) & 0xff);
+    x = (acc_uint32l_t) (v >> 32);
+    b[4] = (unsigned char) ((x >>  0) & 0xff);
+    b[5] = (unsigned char) ((x >>  8) & 0xff);
+    b[6] = (unsigned char) ((x >> 16) & 0xff);
+    b[7] = (unsigned char) ((x >> 24) & 0xff);
+#endif
+}
+
+#endif /* acc_uint64l_t */
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/dosalloc.ch b/tools/ucl/acc/acclib/dosalloc.ch
new file mode 100644
index 0000000000..0c43a909ab
--- /dev/null
+++ b/tools/ucl/acc/acclib/dosalloc.ch
@@ -0,0 +1,106 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_DOSALLOC_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+#if (ACC_OS_OS216)
+ACC_EXTERN_C unsigned short __far __pascal DosAllocHuge(unsigned short, unsigned short, unsigned short __far *, unsigned short, unsigned short);
+ACC_EXTERN_C unsigned short __far __pascal DosFreeSeg(unsigned short);
+#endif
+
+
+/***********************************************************************
+// dos_alloc
+************************************************************************/
+
+#if (ACC_OS_DOS16 || ACC_OS_WIN16)
+#if !defined(ACC_CC_AZTECC)
+
+ACCLIB_PUBLIC(void __far*, acc_dos_alloc) (unsigned long size)
+{
+    void __far* p = 0;
+    union REGS ri, ro;
+
+    if ((long)size <= 0)
+        return p;
+    size = (size + 15) >> 4;
+    if (size > 0xffffu)
+        return p;
+    ri.x.ax = 0x4800;
+    ri.x.bx = (unsigned short) size;
+    int86(0x21, &ri, &ro);
+    if ((ro.x.cflag & 1) == 0)  /* if carry flag not set */
+        p = (void __far*) ACC_MK_FP(ro.x.ax, 0);
+    return p;
+}
+
+
+ACCLIB_PUBLIC(int, acc_dos_free) (void __far* p)
+{
+    union REGS ri, ro;
+    struct SREGS rs;
+
+    if (!p)
+        return 0;
+    if (ACC_FP_OFF(p) != 0)
+        return -1;
+    segread(&rs);
+    ri.x.ax = 0x4900;
+    rs.es = ACC_FP_SEG(p);
+    int86x(0x21, &ri, &ro, &rs);
+    if (ro.x.cflag & 1)         /* if carry flag set */
+        return -1;
+    return 0;
+}
+
+#endif
+#endif
+
+
+#if (ACC_OS_OS216)
+
+ACCLIB_PUBLIC(void __far*, acc_dos_alloc) (unsigned long size)
+{
+    void __far* p = 0;
+    unsigned short sel = 0;
+
+    if ((long)size <= 0)
+        return p;
+    if (DosAllocHuge((unsigned short)(size >> 16), (unsigned short)size, &sel, 0, 0) == 0)
+        p = (void __far*) ACC_MK_FP(sel, 0);
+    return p;
+}
+
+ACCLIB_PUBLIC(int, acc_dos_free) (void __far* p)
+{
+    if (!p)
+        return 0;
+    if (ACC_FP_OFF(p) != 0)
+        return -1;
+    if (DosFreeSeg(ACC_FP_SEG(p)) != 0)
+        return -1;
+    return 0;
+}
+
+#endif
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/fnmatch.ch b/tools/ucl/acc/acclib/fnmatch.ch
new file mode 100644
index 0000000000..8e22122fd0
--- /dev/null
+++ b/tools/ucl/acc/acclib/fnmatch.ch
@@ -0,0 +1,123 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_FNMATCH_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+typedef struct {
+    const acc_hbyte_p s;
+    const acc_hbyte_p s_start;
+    int f;
+    int f_escape;
+    int f_casefold;
+} acc_fnmatch_internal_t;
+
+
+static int __ACCLIB_FUNCNAME(acc_fnmatch_internal) (const acc_hbyte_p p, acc_fnmatch_internal_t* a)
+{
+    const acc_hbyte_p s = a->s;
+    int f_pathname = (a->f & (ACC_FNMATCH_PATHNAME | ACC_FNMATCH_PATHSTAR));
+
+    while (*p) {
+        switch (*p) {
+        case '?': case '[':
+            if (*s == 0) return 0;
+            if (*s == '/' && f_pathname) return 0;
+            if (*s == '.' && (a->f & ACC_FNMATCH_PERIOD) && (s == a->s_start || (f_pathname && s[-1] == '/'))) return 0;
+            if (*p == '?') break;
+            {
+            int r = 0, fail = 0; unsigned char last = 0;
+            if (*++p == '^' || *p == '!')
+                fail = 1, ++p;
+            do {
+                switch (*p) {
+                case 0:
+                    return -1;
+                case '-':
+                    if (last == 0 || p[1] == ']') goto acc_label_default;
+                    if (a->f_escape && p[1] == '\\') ++p;
+                    if (*++p == 0) return -1;
+                    if (!a->f_casefold && last <= *s && *s <= *p) r = 1;
+                    else if (a->f_casefold && acc_ascii_tolower(last) <= acc_ascii_tolower(*s) && acc_ascii_tolower(*s) <= acc_ascii_tolower(*p)) r = 1;
+                    last = 0;
+                    continue;
+                /* TODO: implement sets like [:alpha:] ??? */
+                case '\\':
+                    if (a->f_escape && *++p == 0) return -1;
+                default: acc_label_default:
+                    if (*s == *p) r = 1;
+                    else if (a->f_casefold && acc_ascii_tolower(*s) == acc_ascii_tolower(*p)) r = 1;
+                    break;
+                }
+                last = *p;
+            } while (*++p != ']');
+            if (r == fail)
+                return 0;
+            break;
+        }
+        case '*':
+            while (*++p == '*') if (a->f & ACC_FNMATCH_PATHSTAR) f_pathname = 0;
+            if (*s == '.' && (a->f & ACC_FNMATCH_PERIOD) && (s == a->s_start || (f_pathname && s[-1] == '/'))) return 0;
+            if (*p == 0) {
+                if (f_pathname) while (*s) if (*s++ == '/') return 0;
+                return 1;
+            }
+            for ( ; *s; ++s) {
+                int r;
+                a->s = s; r = __ACCLIB_FUNCNAME(acc_fnmatch_internal)(p, a);
+                switch (r) {
+                case 0:  if (*s == '/' && f_pathname) return 2; break;
+                case 2:  if (!f_pathname) break;
+                default: return r;
+                }
+            }
+            return 0;
+        case '\\':
+            if (a->f_escape && *++p == 0) return -1;
+        default:
+            if (*s == *p) break;
+            if (a->f_casefold && acc_ascii_tolower(*s) == acc_ascii_tolower(*p)) break;
+            return 0;
+        }
+        ++p, ++s;
+    }
+    return *s == 0;
+}
+
+
+ACCLIB_PUBLIC(int, acc_fnmatch) (const acc_hchar_p p, const acc_hchar_p s, int flags)
+{
+    int r;
+    acc_fnmatch_internal_t args;
+    args.s = args.s_start = (const acc_hbyte_p) s;
+    args.f = flags;
+    args.f_escape = !(flags & ACC_FNMATCH_NOESCAPE);
+    args.f_casefold = (flags & ACC_FNMATCH_ASCII_CASEFOLD);
+    r = __ACCLIB_FUNCNAME(acc_fnmatch_internal)((const acc_hbyte_p)p, &args);
+    if (r < 0) return r;
+    return r != 1;
+}
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/getopt.ch b/tools/ucl/acc/acclib/getopt.ch
new file mode 100644
index 0000000000..cb26794b8c
--- /dev/null
+++ b/tools/ucl/acc/acclib/getopt.ch
@@ -0,0 +1,46 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_GETOPT_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+ACCLIB_PUBLIC(void, acc_getopt_init) (acc_getopt_p go)
+{
+    memset(po, 0, sizeof(*po));
+}
+
+
+ACCLIB_PUBLIC(void, acc_getopt_close) (acc_getopt_p go)
+{
+    memset(po, 0, sizeof(*po));
+}
+
+
+ACCLIB_PUBLIC(int, acc_getopt) (acc_getopt_p go)
+{
+}
+
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/halloc.ch b/tools/ucl/acc/acclib/halloc.ch
new file mode 100644
index 0000000000..a1005863b0
--- /dev/null
+++ b/tools/ucl/acc/acclib/halloc.ch
@@ -0,0 +1,157 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_HALLOC_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+#if (ACC_HAVE_MM_HUGE_PTR)
+#if 1 && (ACC_OS_DOS16 && defined(BLX286))
+#  define __ACCLIB_HALLOC_USE_DAH 1
+#elif 1 && (ACC_OS_DOS16 && defined(DOSX286))
+#  define __ACCLIB_HALLOC_USE_DAH 1
+#elif 1 && (ACC_OS_OS216)
+#  define __ACCLIB_HALLOC_USE_DAH 1
+#elif 1 && (ACC_OS_WIN16)
+#  define __ACCLIB_HALLOC_USE_GA 1
+#elif 1 && (ACC_OS_DOS16) && (ACC_CC_BORLANDC) && defined(__DPMI16__)
+#  define __ACCLIB_HALLOC_USE_GA 1
+#endif
+#endif
+
+
+#if (__ACCLIB_HALLOC_USE_DAH)
+#if 0 && (ACC_OS_OS216)
+#include <os2.h>
+#else
+ACC_EXTERN_C unsigned short __far __pascal DosAllocHuge(unsigned short, unsigned short, unsigned short __far *, unsigned short, unsigned short);
+ACC_EXTERN_C unsigned short __far __pascal DosFreeSeg(unsigned short);
+#endif
+#endif
+
+#if (__ACCLIB_HALLOC_USE_GA)
+#if 0
+#define STRICT 1
+#include <windows.h>
+#else
+ACC_EXTERN_C const void __near* __far __pascal GlobalAlloc(unsigned, unsigned long);
+ACC_EXTERN_C const void __near* __far __pascal GlobalFree(const void __near*);
+ACC_EXTERN_C unsigned long __far __pascal GlobalHandle(unsigned);
+ACC_EXTERN_C void __far* __far __pascal GlobalLock(const void __near*);
+ACC_EXTERN_C int __far __pascal GlobalUnlock(const void __near*);
+#endif
+#endif
+
+
+/***********************************************************************
+// halloc
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_halloc) (acc_hsize_t size)
+{
+    acc_hvoid_p p = 0;
+
+    if (size <= 0)
+        return p;
+
+#if 0 && defined(__palmos__)
+    p = MemPtrNew(size);
+#elif !defined(ACC_HAVE_MM_HUGE_PTR)
+    if (size < (size_t) -1)
+        p = malloc((size_t) size);
+#else
+    if ((long)size <= 0)
+        return p;
+{
+#if (__ACCLIB_HALLOC_USE_DAH)
+    unsigned short sel = 0;
+    if (DosAllocHuge((unsigned short)(size >> 16), (unsigned short)size, &sel, 0, 0) == 0)
+        p = (acc_hvoid_p) ACC_MK_FP(sel, 0);
+#elif (__ACCLIB_HALLOC_USE_GA)
+    const void __near* h = GlobalAlloc(2, size);
+    if (h) {
+        p = GlobalLock(h);
+        if (p && ACC_FP_OFF(p) != 0) {
+            GlobalUnlock(h);
+            p = 0;
+        }
+        if (!p)
+            GlobalFree(h);
+    }
+#elif (ACC_CC_MSC && (_MSC_VER >= 700))
+    p = _halloc(size, 1);
+#elif (ACC_CC_MSC || ACC_CC_WATCOMC)
+    p = halloc(size, 1);
+#elif (ACC_CC_DMC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
+    p = farmalloc(size);
+#elif (ACC_CC_BORLANDC || ACC_CC_TURBOC)
+    p = farmalloc(size);
+#elif defined(ACC_CC_AZTECC)
+    p = lmalloc(size);
+#else
+    if (size < (size_t) -1)
+        p = malloc((size_t) size);
+#endif
+}
+#endif
+
+    return p;
+}
+
+
+ACCLIB_PUBLIC(void, acc_hfree) (acc_hvoid_p p)
+{
+    if (!p)
+        return;
+
+#if 0 && defined(__palmos__)
+    MemPtrFree(p);
+#elif !defined(ACC_HAVE_MM_HUGE_PTR)
+    free(p);
+#else
+#if (__ACCLIB_HALLOC_USE_DAH)
+    if (ACC_FP_OFF(p) == 0)
+        DosFreeSeg((unsigned short) ACC_FP_SEG(p));
+#elif (__ACCLIB_HALLOC_USE_GA)
+    if (ACC_FP_OFF(p) == 0) {
+        const void __near* h = (const void __near*) (unsigned) GlobalHandle(ACC_FP_SEG(p));
+        if (h) {
+            GlobalUnlock(h);
+            GlobalFree(h);
+        }
+    }
+#elif (ACC_CC_MSC && (_MSC_VER >= 700))
+    _hfree(p);
+#elif (ACC_CC_MSC || ACC_CC_WATCOMC)
+    hfree(p);
+#elif (ACC_CC_DMC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
+    farfree((void __far*) p);
+#elif (ACC_CC_BORLANDC || ACC_CC_TURBOC)
+    farfree((void __far*) p);
+#elif defined(ACC_CC_AZTECC)
+    lfree(p);
+#else
+    free(p);
+#endif
+#endif
+}
+
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/hfread.ch b/tools/ucl/acc/acclib/hfread.ch
new file mode 100644
index 0000000000..2ccde9d058
--- /dev/null
+++ b/tools/ucl/acc/acclib/hfread.ch
@@ -0,0 +1,114 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_HFREAD_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+/***********************************************************************
+// huge pointer layer - stdio.h
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hsize_t, acc_hfread) (ACC_FILE_P fp, acc_hvoid_p buf, acc_hsize_t size)
+{
+#if (ACC_HAVE_MM_HUGE_PTR)
+#if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
+#define __ACCLIB_REQUIRE_HMEMCPY_CH 1
+    unsigned char tmp[512];
+    acc_hsize_t l = 0;
+
+    while (l < size)
+    {
+        size_t n = size - l > sizeof(tmp) ? sizeof(tmp) : (size_t) (size - l);
+        n = fread(tmp, 1, n, fp);
+        if (n == 0)
+            break;
+        __ACCLIB_FUNCNAME(acc_hmemcpy)((acc_hbyte_p)buf + l, tmp, (acc_hsize_t)n);
+        l += n;
+    }
+    return l;
+#elif (ACC_MM_COMPACT || ACC_MM_LARGE || ACC_MM_HUGE)
+    acc_hbyte_p b = (acc_hbyte_p) buf;
+    acc_hsize_t l = 0;
+
+    while (l < size)
+    {
+        size_t n;
+        n = ACC_FP_OFF(b); n = (n <= 1) ? 0x8000u : (0u - n);
+        if ((acc_hsize_t) n > size - l)
+            n = (size_t) (size - l);
+        n = fread((void __far*)b, 1, n, fp);
+        if (n == 0)
+            break;
+        b += n; l += n;
+    }
+    return l;
+#else
+#  error "unknown memory model"
+#endif
+#else
+    return fread(buf, 1, size, fp);
+#endif
+}
+
+
+ACCLIB_PUBLIC(acc_hsize_t, acc_hfwrite) (ACC_FILE_P fp, const acc_hvoid_p buf, acc_hsize_t size)
+{
+#if (ACC_HAVE_MM_HUGE_PTR)
+#if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
+#define __ACCLIB_REQUIRE_HMEMCPY_CH 1
+    unsigned char tmp[512];
+    acc_hsize_t l = 0;
+
+    while (l < size)
+    {
+        size_t n = size - l > sizeof(tmp) ? sizeof(tmp) : (size_t) (size - l);
+        __ACCLIB_FUNCNAME(acc_hmemcpy)(tmp, (const acc_hbyte_p)buf + l, (acc_hsize_t)n);
+        n = fwrite(tmp, 1, n, fp);
+        if (n == 0)
+            break;
+        l += n;
+    }
+    return l;
+#elif (ACC_MM_COMPACT || ACC_MM_LARGE || ACC_MM_HUGE)
+    const acc_hbyte_p b = (const acc_hbyte_p) buf;
+    acc_hsize_t l = 0;
+
+    while (l < size)
+    {
+        size_t n;
+        n = ACC_FP_OFF(b); n = (n <= 1) ? 0x8000u : (0u - n);
+        if ((acc_hsize_t) n > size - l)
+            n = (size_t) (size - l);
+        n = fwrite((void __far*)b, 1, n, fp);
+        if (n == 0)
+            break;
+        b += n; l += n;
+    }
+    return l;
+#else
+#  error "unknown memory model"
+#endif
+#else
+    return fwrite(buf, 1, size, fp);
+#endif
+}
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/hmemcpy.ch b/tools/ucl/acc/acclib/hmemcpy.ch
new file mode 100644
index 0000000000..3fcca99dbc
--- /dev/null
+++ b/tools/ucl/acc/acclib/hmemcpy.ch
@@ -0,0 +1,111 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_HMEMCPY_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+/***********************************************************************
+// memcmp, memcpy, memmove, memset
+************************************************************************/
+
+ACCLIB_PUBLIC(int, acc_hmemcmp) (const acc_hvoid_p s1, const acc_hvoid_p s2, acc_hsize_t len)
+{
+#if (ACC_HAVE_MM_HUGE_PTR) || !defined(HAVE_MEMCMP)
+    const acc_hbyte_p p1 = (const acc_hbyte_p) s1;
+    const acc_hbyte_p p2 = (const acc_hbyte_p) s2;
+
+    if (len > 0) do
+    {
+        int d = *p1 - *p2;
+        if (d != 0)
+            return d;
+        p1++; p2++;
+    } while (--len > 0);
+    return 0;
+#else
+    return memcmp(s1, s2, len);
+#endif
+}
+
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_hmemcpy) (acc_hvoid_p dest, const acc_hvoid_p src, acc_hsize_t len)
+{
+#if (ACC_HAVE_MM_HUGE_PTR) || !defined(HAVE_MEMCPY)
+    acc_hbyte_p p1 = (acc_hbyte_p) dest;
+    const acc_hbyte_p p2 = (const acc_hbyte_p) src;
+
+    if (len <= 0 || p1 == p2)
+        return dest;
+    do
+        *p1++ = *p2++;
+    while (--len > 0);
+    return dest;
+#else
+    return memcpy(dest, src, len);
+#endif
+}
+
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_hmemmove) (acc_hvoid_p dest, const acc_hvoid_p src, acc_hsize_t len)
+{
+#if (ACC_HAVE_MM_HUGE_PTR) || !defined(HAVE_MEMMOVE)
+    acc_hbyte_p p1 = (acc_hbyte_p) dest;
+    const acc_hbyte_p p2 = (const acc_hbyte_p) src;
+
+    if (len <= 0 || p1 == p2)
+        return dest;
+
+    if (p1 < p2)
+    {
+        do
+            *p1++ = *p2++;
+        while (--len > 0);
+    }
+    else
+    {
+        p1 += len;
+        p2 += len;
+        do
+            *--p1 = *--p2;
+        while (--len > 0);
+    }
+    return dest;
+#else
+    return memmove(dest, src, len);
+#endif
+}
+
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_hmemset) (acc_hvoid_p s, int c, acc_hsize_t len)
+{
+#if (ACC_HAVE_MM_HUGE_PTR) || !defined(HAVE_MEMSET)
+    acc_hbyte_p p = (acc_hbyte_p) s;
+
+    if (len > 0) do
+        *p++ = (unsigned char) c;
+    while (--len > 0);
+    return s;
+#else
+    return memset(s, c, len);
+#endif
+}
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/hread.ch b/tools/ucl/acc/acclib/hread.ch
new file mode 100644
index 0000000000..349a8af354
--- /dev/null
+++ b/tools/ucl/acc/acclib/hread.ch
@@ -0,0 +1,118 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_HREAD_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+/***********************************************************************
+// huge pointer layer - read/write
+************************************************************************/
+
+#if (ACC_HAVE_MM_HUGE_PTR)
+
+ACCLIB_PUBLIC(long, acc_hread) (int fd, acc_hvoid_p buf, long size)
+{
+#if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
+#define __ACCLIB_REQUIRE_HMEMCPY_CH 1
+    unsigned char tmp[512];
+    long l = 0;
+
+    while (l < size)
+    {
+        int n = size - l > (long)sizeof(tmp) ? (int) sizeof(tmp) : (int) (size - l);
+        n = read(fd, tmp, n);
+        if (n == 0)
+            break;
+        if (n < 0)
+            return -1;
+        __ACCLIB_FUNCNAME(acc_hmemcpy)((acc_hbyte_p)buf + l, tmp, (acc_hsize_t)n);
+        l += n;
+    }
+    return l;
+#elif (ACC_MM_COMPACT || ACC_MM_LARGE || ACC_MM_HUGE)
+    acc_hbyte_p b = (acc_hbyte_p) buf;
+    long l = 0;
+
+    while (l < size)
+    {
+        unsigned n;
+        n = ACC_FP_OFF(b); n = (n <= 1) ? 0x8000u : (0u - n);
+        if ((long) n > size - l)
+            n = (unsigned) (size - l);
+        n = read(fd, (void __far*)b, n);
+        if (n == 0)
+            break;
+        if (n == (unsigned)-1)
+            return -1;
+        b += n; l += n;
+    }
+    return l;
+#else
+#  error "unknown memory model"
+#endif
+}
+
+
+ACCLIB_PUBLIC(long, acc_hwrite) (int fd, const acc_hvoid_p buf, long size)
+{
+#if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
+#define __ACCLIB_REQUIRE_HMEMCPY_CH 1
+    unsigned char tmp[512];
+    long l = 0;
+
+    while (l < size)
+    {
+        int n = size - l > (long)sizeof(tmp) ? (int) sizeof(tmp) : (int) (size - l);
+        __ACCLIB_FUNCNAME(acc_hmemcpy)(tmp, (const acc_hbyte_p)buf + l, (acc_hsize_t)n);
+        n = write(fd, tmp, n);
+        if (n == 0)
+            break;
+        if (n < 0)
+            return -1;
+        l += n;
+    }
+    return l;
+#elif (ACC_MM_COMPACT || ACC_MM_LARGE || ACC_MM_HUGE)
+    const acc_hbyte_p b = (const acc_hbyte_p) buf;
+    long l = 0;
+
+    while (l < size)
+    {
+        unsigned n;
+        n = ACC_FP_OFF(b); n = (n <= 1) ? 0x8000u : (0u - n);
+        if ((long) n > size - l)
+            n = (unsigned) (size - l);
+        n = write(fd, (void __far*)b, n);
+        if (n == 0)
+            break;
+        if (n == (unsigned)-1)
+            return -1;
+        b += n; l += n;
+    }
+    return l;
+#else
+#  error "unknown memory model"
+#endif
+}
+
+#endif /* #if (ACC_HAVE_MM_HUGE_PTR) */
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/hsread.ch b/tools/ucl/acc/acclib/hsread.ch
new file mode 100644
index 0000000000..cf7b5260fd
--- /dev/null
+++ b/tools/ucl/acc/acclib/hsread.ch
@@ -0,0 +1,97 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_HSREAD_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+/***********************************************************************
+// huge pointer layer - safe read/write
+// handles partial pipe writes and interrupted system calls
+************************************************************************/
+
+ACCLIB_PUBLIC(long, acc_safe_hread) (int fd, acc_hvoid_p buf, long size)
+{
+    acc_hbyte_p b = (acc_hbyte_p) buf;
+    long l = 0;
+    int saved_errno;
+
+    saved_errno = errno;
+    while (l < size)
+    {
+        long n = size - l;
+#if (ACC_HAVE_MM_HUGE_PTR)
+#  define __ACCLIB_REQUIRE_HREAD_CH 1
+        errno = 0; n = acc_hread(fd, b, n);
+#elif (ACC_OS_DOS32) && defined(__DJGPP__)
+        errno = 0; n = _read(fd, b, n);
+#else
+        errno = 0; n = read(fd, b, n);
+#endif
+        if (n == 0)
+            break;
+        if (n < 0) {
+#if defined(EINTR)
+            if (errno == (EINTR)) continue;
+#endif
+            if (errno == 0) errno = 1;
+            return l;
+        }
+        b += n; l += n;
+    }
+    errno = saved_errno;
+    return l;
+}
+
+
+ACCLIB_PUBLIC(long, acc_safe_hwrite) (int fd, const acc_hvoid_p buf, long size)
+{
+    const acc_hbyte_p b = (const acc_hbyte_p) buf;
+    long l = 0;
+    int saved_errno;
+
+    saved_errno = errno;
+    while (l < size)
+    {
+        long n = size - l;
+#if (ACC_HAVE_MM_HUGE_PTR)
+#  define __ACCLIB_REQUIRE_HREAD_CH 1
+        errno = 0; n = acc_hwrite(fd, b, n);
+#elif (ACC_OS_DOS32) && defined(__DJGPP__)
+        errno = 0; n = _write(fd, b, n);
+#else
+        errno = 0; n = write(fd, b, n);
+#endif
+        if (n == 0)
+            break;
+        if (n < 0) {
+#if defined(EINTR)
+            if (errno == (EINTR)) continue;
+#endif
+            if (errno == 0) errno = 1;
+            return l;
+        }
+        b += n; l += n;
+    }
+    errno = saved_errno;
+    return l;
+}
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/hstring.ch b/tools/ucl/acc/acclib/hstring.ch
new file mode 100644
index 0000000000..41b23423a9
--- /dev/null
+++ b/tools/ucl/acc/acclib/hstring.ch
@@ -0,0 +1,566 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_HSTRING_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+/***********************************************************************
+// strlen
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hsize_t, acc_hstrlen) (const acc_hchar_p s)
+{
+    /* TODO: which one is the fastest generic version? */
+#if 1
+    const acc_hchar_p start = s; while (*s) ++s;
+    return (acc_hsize_t) (s - start);
+#elif 1
+    acc_hsize_t n = 0; while (*s) ++s, ++n; return n;
+#elif 1
+    acc_hsize_t n = 0; while (s[n]) ++n; return n;
+#endif
+}
+
+
+/***********************************************************************
+// strcmp, strncmp, ascii_stricmp, ascii_strnicmp, ascii_memicmp
+************************************************************************/
+
+ACCLIB_PUBLIC(int, acc_hstrcmp) (const acc_hchar_p p, const acc_hchar_p s)
+{
+    for ( ; *p; ++p, ++s) {
+        if (*p != *s)
+            break;
+    }
+    return (unsigned char)*p - (unsigned char)*s;
+}
+
+
+ACCLIB_PUBLIC(int, acc_hstrncmp) (const acc_hchar_p p, const acc_hchar_p s, acc_hsize_t n)
+{
+    for ( ; *p && n > 0; ++p, ++s, --n) {
+        if (*p != *s)
+            break;
+    }
+    return (unsigned char)*p - (unsigned char)*s;
+}
+
+
+ACCLIB_PUBLIC(int, acc_ascii_hstricmp) (const acc_hchar_p p, const acc_hchar_p s)
+{
+    for ( ; *p; ++p, ++s) {
+        if (*p != *s) {
+            int d = acc_ascii_utolower(*p) - acc_ascii_utolower(*s);
+            if (d != 0)
+                return d;
+        }
+    }
+    return acc_ascii_utolower(*p) - acc_ascii_utolower(*s);
+}
+
+
+ACCLIB_PUBLIC(int, acc_ascii_hstrnicmp) (const acc_hchar_p p, const acc_hchar_p s, acc_hsize_t n)
+{
+    for ( ; *p && n > 0; ++p, ++s, --n) {
+        if (*p != *s) {
+            int d = acc_ascii_utolower(*p) - acc_ascii_utolower(*s);
+            if (d != 0)
+                return d;
+        }
+    }
+    return acc_ascii_utolower(*p) - acc_ascii_utolower(*s);
+}
+
+
+ACCLIB_PUBLIC(int, acc_ascii_hmemicmp) (const acc_hvoid_p pp, const acc_hvoid_p ss, acc_hsize_t n)
+{
+    const acc_hbyte_p p = (const acc_hbyte_p) pp;
+    const acc_hbyte_p s = (const acc_hbyte_p) ss;
+    for ( ; n > 0; ++p, ++s, --n) {
+        if (*p != *s) {
+            int d = acc_ascii_utolower(*p) - acc_ascii_utolower(*s);
+            if (d != 0)
+                return d;
+        }
+    }
+    return acc_ascii_utolower(*p) - acc_ascii_utolower(*s);
+}
+
+
+/***********************************************************************
+// strstr, ascii_stristr, memmem, ascii_memimem
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_hstrstr) (const acc_hchar_p p, const acc_hchar_p s)
+{
+    acc_hsize_t pn = __ACCLIB_FUNCNAME(acc_hstrlen)(p);
+    acc_hsize_t sn = __ACCLIB_FUNCNAME(acc_hstrlen)(s);
+    return (acc_hchar_p) __ACCLIB_FUNCNAME(acc_hmemmem)(p, pn, s, sn);
+}
+
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_ascii_hstristr) (const acc_hchar_p p, const acc_hchar_p s)
+{
+    acc_hsize_t pn = __ACCLIB_FUNCNAME(acc_hstrlen)(p);
+    acc_hsize_t sn = __ACCLIB_FUNCNAME(acc_hstrlen)(s);
+    return (acc_hchar_p) __ACCLIB_FUNCNAME(acc_ascii_hmemimem)(p, pn, s, sn);
+}
+
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_hmemmem) (const acc_hvoid_p p, acc_hsize_t pn, const acc_hvoid_p s, acc_hsize_t sn)
+{
+#define __ACCLIB_REQUIRE_HMEMCPY_CH 1
+    if (sn == 0) __ACCLIB_CONST_CAST_RETURN(acc_hvoid_p, p)
+    for ( ; pn >= sn; --pn) {
+        if (__ACCLIB_FUNCNAME(acc_hmemcmp)(p, s, sn) == 0)
+            __ACCLIB_CONST_CAST_RETURN(acc_hvoid_p, p)
+        p = (const acc_hbyte_p)p + 1;
+    }
+    return (acc_hvoid_p) 0;
+}
+
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_ascii_hmemimem) (const acc_hvoid_p p, acc_hsize_t pn, const acc_hvoid_p s, acc_hsize_t sn)
+{
+    if (sn == 0) __ACCLIB_CONST_CAST_RETURN(acc_hvoid_p, p)
+    for ( ; pn >= sn; --pn) {
+        if (__ACCLIB_FUNCNAME(acc_ascii_hmemicmp)(p, s, sn) == 0)
+            __ACCLIB_CONST_CAST_RETURN(acc_hvoid_p, p)
+        p = (const acc_hbyte_p)p + 1;
+    }
+    return (acc_hvoid_p) 0;
+}
+
+
+/***********************************************************************
+// strcpy, strcat
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_hstrcpy) (acc_hchar_p d, const acc_hchar_p s)
+{
+    acc_hchar_p dest = d;
+    while ((*d = *s) != 0) {
+        ++d; ++s;
+    }
+    return dest;
+}
+
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_hstrcat) (acc_hchar_p d, const acc_hchar_p s)
+{
+    acc_hchar_p dest = d;
+    while (*d) ++d;
+    while ((*d = *s) != 0) {
+        ++d; ++s;
+    }
+    return dest;
+}
+
+
+/***********************************************************************
+// strlcpy, strlcat
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hsize_t, acc_hstrlcpy) (acc_hchar_p d, const acc_hchar_p s, acc_hsize_t size)
+{
+    acc_hsize_t n = 0;
+    if (n != size) {
+        do {
+            if ((*d = *s) == 0) return n;
+            ++d; ++s; ++n;
+        } while (n != size);
+        d[-1] = 0;
+    }
+    while (*s) ++s, ++n;
+    return n;
+}
+
+
+ACCLIB_PUBLIC(acc_hsize_t, acc_hstrlcat) (acc_hchar_p d, const acc_hchar_p s, acc_hsize_t size)
+{
+    acc_hsize_t n = 0;
+    while (*d && n != size) ++d, ++n;
+    if (n != size) {
+        do {
+            if ((*d = *s) == 0) return n;
+            ++d; ++s; ++n;
+        } while (n != size);
+        d[-1] = 0;
+    }
+    while (*s) ++s, ++n;
+    return n;
+}
+
+
+/***********************************************************************
+// strscpy, strscat
+// (same as strlcpy/strlcat, but just return -1 in case of failure)
+************************************************************************/
+
+ACCLIB_PUBLIC(int, acc_hstrscpy) (acc_hchar_p d, const acc_hchar_p s, acc_hsize_t size)
+{
+    acc_hsize_t n = 0;
+    if (n != size) {
+        do {
+            if ((*d = *s) == 0) return 0;
+            ++d; ++s; ++n;
+        } while (n != size);
+        d[-1] = 0;
+    }
+    return -1;
+}
+
+
+ACCLIB_PUBLIC(int, acc_hstrscat) (acc_hchar_p d, const acc_hchar_p s, acc_hsize_t size)
+{
+    acc_hsize_t n = 0;
+    while (*d && n != size) ++d, ++n;
+    if (n != size) {
+        do {
+            if ((*d = *s) == 0) return 0;
+            ++d; ++s; ++n;
+        } while (n != size);
+        d[-1] = 0;
+    }
+    return -1;
+}
+
+
+/***********************************************************************
+// strccpy, memccpy
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_hstrccpy) (acc_hchar_p d, const acc_hchar_p s, int c)
+{
+    for (;;) {
+        if ((*d = *s) == 0) break;
+        if (*d++ == (char) c) return d;
+        ++s;
+    }
+    return (acc_hchar_p) 0;
+}
+
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_hmemccpy) (acc_hvoid_p d, const acc_hvoid_p s, int c, acc_hsize_t n)
+{
+    acc_hbyte_p a = (acc_hbyte_p) d;
+    const acc_hbyte_p p = (const acc_hbyte_p) s;
+    const acc_hbyte_p e = (const acc_hbyte_p) s + n;
+    while (p != e) {
+        if ((*a++ = *p++) == (unsigned char) c)
+            return a;
+    }
+    return (acc_hvoid_p) 0;
+}
+
+
+/***********************************************************************
+// strchr, strrchr, ascii_strichr, ascii_strrichr
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_hstrchr) (const acc_hchar_p s, int c)
+{
+    for ( ; *s; ++s) {
+        if (*s == (char) c)
+            __ACCLIB_CONST_CAST_RETURN(acc_hchar_p, s)
+    }
+    if ((char) c == 0) __ACCLIB_CONST_CAST_RETURN(acc_hchar_p, s)
+    return (acc_hchar_p) 0;
+}
+
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_hstrrchr) (const acc_hchar_p s, int c)
+{
+    const acc_hchar_p start = s;
+    while (*s) ++s;
+    if ((char) c == 0) __ACCLIB_CONST_CAST_RETURN(acc_hchar_p, s)
+    for (;;) {
+        if (s == start) break; --s;
+        if (*s == (char) c)
+            __ACCLIB_CONST_CAST_RETURN(acc_hchar_p, s)
+    }
+    return (acc_hchar_p) 0;
+}
+
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_ascii_hstrichr) (const acc_hchar_p s, int c)
+{
+    c = acc_ascii_utolower(c);
+    for ( ; *s; ++s) {
+        if (acc_ascii_utolower(*s) == c)
+            __ACCLIB_CONST_CAST_RETURN(acc_hchar_p, s)
+    }
+    if (c == 0) __ACCLIB_CONST_CAST_RETURN(acc_hchar_p, s)
+    return (acc_hchar_p) 0;
+}
+
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_ascii_hstrrichr) (const acc_hchar_p s, int c)
+{
+    const acc_hchar_p start = s;
+    c = acc_ascii_utolower(c);
+    while (*s) ++s;
+    if (c == 0) __ACCLIB_CONST_CAST_RETURN(acc_hchar_p, s)
+    for (;;) {
+        if (s == start) break; --s;
+        if (acc_ascii_utolower(*s) == c)
+            __ACCLIB_CONST_CAST_RETURN(acc_hchar_p, s)
+    }
+    return (acc_hchar_p) 0;
+}
+
+
+/***********************************************************************
+// memchr, memrchr, ascii_memichr, ascii_memrichr
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_hmemchr) (const acc_hvoid_p s, int c, acc_hsize_t n)
+{
+    const acc_hbyte_p p = (const acc_hbyte_p) s;
+    const acc_hbyte_p e = (const acc_hbyte_p) s + n;
+    while (p != e) {
+        if (*p == (unsigned char) c)
+            __ACCLIB_CONST_CAST_RETURN(acc_hvoid_p, p)
+        ++p;
+    }
+    return (acc_hvoid_p) 0;
+}
+
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_hmemrchr) (const acc_hvoid_p s, int c, acc_hsize_t n)
+{
+    const acc_hbyte_p p = (const acc_hbyte_p) s + n;
+    const acc_hbyte_p e = (const acc_hbyte_p) s;
+    while (p != e) {
+        --p;
+        if (*p == (unsigned char) c)
+            __ACCLIB_CONST_CAST_RETURN(acc_hvoid_p, p)
+    }
+    return (acc_hvoid_p) 0;
+}
+
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_ascii_hmemichr) (const acc_hvoid_p s, int c, acc_hsize_t n)
+{
+    const acc_hbyte_p p = (const acc_hbyte_p) s;
+    const acc_hbyte_p e = (const acc_hbyte_p) s + n;
+    c = acc_ascii_utolower(c);
+    while (p != e) {
+        if (acc_ascii_utolower(*p) == c)
+            __ACCLIB_CONST_CAST_RETURN(acc_hvoid_p, p)
+        ++p;
+    }
+    return (acc_hvoid_p) 0;
+}
+
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_ascii_hmemrichr) (const acc_hvoid_p s, int c, acc_hsize_t n)
+{
+    const acc_hbyte_p p = (const acc_hbyte_p) s + n;
+    const acc_hbyte_p e = (const acc_hbyte_p) s;
+    c = acc_ascii_utolower(c);
+    while (p != e) {
+        --p;
+        if (acc_ascii_utolower(*p) == c)
+            __ACCLIB_CONST_CAST_RETURN(acc_hvoid_p, p)
+    }
+    return (acc_hvoid_p) 0;
+}
+
+
+/***********************************************************************
+// strspn, strrspn
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hsize_t, acc_hstrspn) (const acc_hchar_p s, const acc_hchar_p accept)
+{
+    acc_hsize_t n = 0;
+    for ( ; *s; ++s) {
+        const acc_hchar_p a;
+        for (a = accept; *a; ++a)
+            if (*s == *a)
+                goto acc_label_next;
+        break;
+    acc_label_next:
+        ++n;
+    }
+    return n;
+}
+
+
+ACCLIB_PUBLIC(acc_hsize_t, acc_hstrrspn) (const acc_hchar_p s, const acc_hchar_p accept)
+{
+    acc_hsize_t n = 0;
+    const acc_hchar_p start = s;
+    while (*s) ++s;
+    for (;;) {
+        const acc_hchar_p a;
+        if (s == start) break; --s;
+        for (a = accept; *a; ++a)
+            if (*s == *a)
+                goto acc_label_next;
+        break;
+    acc_label_next:
+        ++n;
+    }
+    return n;
+}
+
+
+/***********************************************************************
+// strcspn, strrcspn
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hsize_t, acc_hstrcspn) (const acc_hchar_p s, const acc_hchar_p reject)
+{
+    acc_hsize_t n = 0;
+    for ( ; *s; ++s, ++n) {
+        const acc_hchar_p r;
+        for (r = reject; *r; ++r)
+            if (*s == *r)
+                return n;
+    }
+    return n;
+}
+
+
+ACCLIB_PUBLIC(acc_hsize_t, acc_hstrrcspn) (const acc_hchar_p s, const acc_hchar_p reject)
+{
+    acc_hsize_t n = 0;
+    const acc_hchar_p start = s;
+    while (*s) ++s;
+    for ( ; ; ++n) {
+        const acc_hchar_p r;
+        if (s == start) break; --s;
+        for (r = reject; *r; ++r)
+            if (*s == *r)
+                return n;
+    }
+    return n;
+}
+
+
+/***********************************************************************
+// strpbrk, strrpbrk
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_hstrpbrk) (const acc_hchar_p s, const acc_hchar_p accept)
+{
+    for ( ; *s; ++s) {
+        const acc_hchar_p a;
+        for (a = accept; *a; ++a) {
+            if (*s == *a)
+                __ACCLIB_CONST_CAST_RETURN(acc_hchar_p, s)
+        }
+    }
+    return (acc_hchar_p) 0;
+}
+
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_hstrrpbrk) (const acc_hchar_p s, const acc_hchar_p accept)
+{
+    const acc_hchar_p start = s;
+    while (*s) ++s;
+    for (;;) {
+        const acc_hchar_p a;
+        if (s == start) break; --s;
+        for (a = accept; *a; ++a) {
+            if (*s == *a)
+                __ACCLIB_CONST_CAST_RETURN(acc_hchar_p, s)
+        }
+    }
+    return (acc_hchar_p) 0;
+}
+
+
+/***********************************************************************
+// strsep, strrsep
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_hstrsep) (acc_hchar_pp ss, const acc_hchar_p delim)
+{
+    acc_hchar_p s = *ss;
+    if (s) {
+        acc_hchar_p p = __ACCLIB_FUNCNAME(acc_hstrpbrk)(s, delim);
+        if (p) *p++ = 0;
+        *ss = p;
+    }
+    return s;
+}
+
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_hstrrsep) (acc_hchar_pp ss, const acc_hchar_p delim)
+{
+    acc_hchar_p s = *ss;
+    if (s) {
+        acc_hchar_p p = __ACCLIB_FUNCNAME(acc_hstrrpbrk)(s, delim);
+        if (p) {
+            *p++ = 0;
+            return p;
+        }
+        *ss = (acc_hchar_p) 0;
+    }
+    return s;
+}
+
+
+/***********************************************************************
+// ascii_strlwr, ascii_strupr, ascii_memlwr, ascii_memupr
+************************************************************************/
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_ascii_hstrlwr) (acc_hchar_p s)
+{
+    acc_hbyte_p p = (acc_hbyte_p) s;
+    for ( ; *p; ++p)
+        *p = (unsigned char) acc_ascii_utolower(*p);
+    return s;
+}
+
+
+ACCLIB_PUBLIC(acc_hchar_p, acc_ascii_hstrupr) (acc_hchar_p s)
+{
+    acc_hbyte_p p = (acc_hbyte_p) s;
+    for ( ; *p; ++p)
+        *p = (unsigned char) acc_ascii_utoupper(*p);
+    return s;
+}
+
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_ascii_hmemlwr) (acc_hvoid_p s, acc_hsize_t n)
+{
+    acc_hbyte_p p = (acc_hbyte_p) s;
+    acc_hbyte_p e = (acc_hbyte_p) s + n;
+    for ( ; p != e; ++p)
+        *p = (unsigned char) acc_ascii_utolower(*p);
+    return s;
+}
+
+
+ACCLIB_PUBLIC(acc_hvoid_p, acc_ascii_hmemupr) (acc_hvoid_p s, acc_hsize_t n)
+{
+    acc_hbyte_p p = (acc_hbyte_p) s;
+    acc_hbyte_p e = (acc_hbyte_p) s + n;
+    for ( ; p != e; ++p)
+        *p = (unsigned char) acc_ascii_utoupper(*p);
+    return s;
+}
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/misc.ch b/tools/ucl/acc/acclib/misc.ch
new file mode 100644
index 0000000000..e0275eccd3
--- /dev/null
+++ b/tools/ucl/acc/acclib/misc.ch
@@ -0,0 +1,199 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_MISC_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+/*************************************************************************
+// wrap misc
+**************************************************************************/
+
+ACCLIB_PUBLIC(acclib_handle_t, acc_get_osfhandle) (int fd)
+{
+    if (fd < 0)
+        return -1;
+#if (ACC_OS_CYGWIN)
+    return get_osfhandle(fd);
+#elif (ACC_OS_EMX && defined(__RSXNT__))
+    return -1; /* FIXME */
+#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
+    return -1; /* FIXME */
+#elif (ACC_OS_WIN32 || ACC_OS_WIN64)
+# if (ACC_CC_PELLESC && (__POCC__ < 280))
+    return -1; /* FIXME */
+# elif (ACC_CC_WATCOMC && (__WATCOMC__ < 1000))
+    return -1; /* FIXME */
+# elif (ACC_CC_WATCOMC && (__WATCOMC__ < 1100))
+    return _os_handle(fd);
+# else
+    return _get_osfhandle(fd);
+# endif
+#else
+    return fd;
+#endif
+}
+
+
+ACCLIB_PUBLIC(int, acc_set_binmode) (int fd, int binary)
+{
+#if (ACC_OS_TOS && defined(__MINT__))
+    FILE* fp; int old_binary;
+    if (fd == STDIN_FILENO) fp = stdin;
+    else if (fd == STDOUT_FILENO) fp = stdout;
+    else if (fd == STDERR_FILENO) fp = stderr;
+    else return -1;
+    old_binary = fp->__mode.__binary;
+    __set_binmode(fp, binary ? 1 : 0);
+    return old_binary ? 1 : 0;
+#elif (ACC_OS_TOS)
+    ACC_UNUSED(fd); ACC_UNUSED(binary);
+    return -1; /* FIXME */
+#elif (ACC_OS_DOS16 && (ACC_CC_AZTECC || ACC_CC_PACIFICC))
+    ACC_UNUSED(fd); ACC_UNUSED(binary);
+    return -1; /* FIXME */
+#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
+    int r; unsigned old_flags = __djgpp_hwint_flags;
+    ACC_COMPILE_TIME_ASSERT(O_BINARY > 0)
+    ACC_COMPILE_TIME_ASSERT(O_TEXT > 0)
+    if (fd < 0) return -1;
+    r = setmode(fd, binary ? O_BINARY : O_TEXT);
+    if ((old_flags & 1u) != (__djgpp_hwint_flags & 1u))
+        __djgpp_set_ctrl_c(!(old_flags & 1));
+    if (r == -1) return -1;
+    return (r & O_TEXT) ? 0 : 1;
+#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
+    if (fd < 0) return -1;
+    ACC_UNUSED(binary);
+    return 1;
+#elif (ACC_OS_DOS32 && ACC_CC_HIGHC)
+    FILE* fp; int r;
+    if (fd == fileno(stdin)) fp = stdin;
+    else if (fd == fileno(stdout)) fp = stdout;
+    else if (fd == fileno(stderr)) fp = stderr;
+    else return -1;
+    r = _setmode(fp, binary ? _BINARY : _TEXT);
+    if (r == -1) return -1;
+    return (r & _BINARY) ? 1 : 0;
+#elif (ACC_OS_WIN32 && ACC_CC_MWERKS) && defined(__MSL__)
+    ACC_UNUSED(fd); ACC_UNUSED(binary);
+    return -1; /* FIXME */
+#elif (ACC_OS_CYGWIN && (ACC_CC_GNUC < 0x025a00ul))
+    ACC_UNUSED(fd); ACC_UNUSED(binary);
+    return -1; /* FIXME */
+#elif (ACC_OS_CYGWIN || ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
+    int r;
+#if !defined(ACC_CC_ZORTECHC)
+    ACC_COMPILE_TIME_ASSERT(O_BINARY > 0)
+#endif
+    ACC_COMPILE_TIME_ASSERT(O_TEXT > 0)
+    if (fd < 0) return -1;
+    r = setmode(fd, binary ? O_BINARY : O_TEXT);
+    if (r == -1) return -1;
+    return (r & O_TEXT) ? 0 : 1;
+#else
+    if (fd < 0) return -1;
+    ACC_UNUSED(binary);
+    return 1;
+#endif
+}
+
+
+ACCLIB_PUBLIC(int, acc_isatty) (int fd)
+{
+    /* work around library implementations that think that
+     * any character device like `nul' is a tty */
+    if (fd < 0)
+        return 0;
+#if (ACC_OS_DOS16 && !defined(ACC_CC_AZTECC))
+    {
+        union REGS ri, ro;
+        ri.x.ax = 0x4400; ri.x.bx = fd;
+        int86(0x21, &ri, &ro);
+        if ((ro.x.cflag & 1) == 0)  /* if carry flag not set */
+            if ((ro.x.ax & 0x83) != 0x83)
+                return 0;
+    }
+#elif (ACC_OS_DOS32 && ACC_CC_WATCOMC)
+    {
+        union REGS ri, ro;
+        ri.w.ax = 0x4400; ri.w.bx = (unsigned short) fd;
+        int386(0x21, &ri, &ro);
+        if ((ro.w.cflag & 1) == 0)  /* if carry flag not set */
+            if ((ro.w.ax & 0x83) != 0x83)
+                return 0;
+    }
+#elif (ACC_HAVE_WINDOWS_H)
+    {
+        acclib_handle_t h = __ACCLIB_FUNCNAME(acc_get_osfhandle)(fd);
+        if ((HANDLE)h != INVALID_HANDLE_VALUE)
+        {
+            DWORD d = 0;
+            if (GetConsoleMode((HANDLE)h, &d) == 0)
+                return 0;   /* GetConsoleMode failed -> not a tty */
+        }
+    }
+#endif
+    return (isatty(fd)) ? 1 : 0;
+}
+
+
+ACCLIB_PUBLIC(int, acc_mkdir) (const char* name, unsigned mode)
+{
+#if (ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
+    ACC_UNUSED(mode);
+    return Dcreate(name);
+#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
+    return mkdir(name, mode);
+#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
+    return mkdir(name, mode);
+#elif (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
+    ACC_UNUSED(mode);
+# if (ACC_CC_HIGHC || ACC_CC_PACIFICC)
+    return mkdir((char*) name);
+# else
+    return mkdir(name);
+# endif
+#else
+    return mkdir(name, mode);
+#endif
+}
+
+
+ACCLIB_PUBLIC(acc_int32l_t, acc_muldiv32) (acc_int32l_t a, acc_int32l_t b, acc_int32l_t x)
+{
+    acc_int32l_t r = 0;
+    if (x == 0) return x;
+    /* FIXME */
+    ACC_UNUSED(a); ACC_UNUSED(b);
+    return r;
+}
+
+
+ACCLIB_PUBLIC(acc_uint32l_t, acc_umuldiv32) (acc_uint32l_t a, acc_uint32l_t b, acc_uint32l_t x)
+{
+    acc_uint32l_t r = 0;
+    if (x == 0) return x;
+    /* FIXME */
+    ACC_UNUSED(a); ACC_UNUSED(b);
+    return r;
+}
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/opendir.ch b/tools/ucl/acc/acclib/opendir.ch
new file mode 100644
index 0000000000..0168ed9944
--- /dev/null
+++ b/tools/ucl/acc/acclib/opendir.ch
@@ -0,0 +1,255 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_OPENDIR_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+/*************************************************************************
+// wrap <dirent.h>
+**************************************************************************/
+
+#if !defined(__ACCLIB_USE_OPENDIR)
+#if (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_TOS || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
+
+static int __ACCLIB_FUNCNAME(acc_opendir_init)(acc_dir_p f, const char* path, char* buf, size_t bufsize)
+{
+    size_t l; char* p;
+    f->f_name[0] = 0; buf[0] = 0;
+    l = strlen(path);
+    if (l == 0 || bufsize <= 4 || l >= bufsize - 4)
+        return -1;
+    strcpy(buf, path); p = buf + l;
+    if (p[-1] == ':' || p[-1] == '\\' || p[-1] == '/')
+        strcpy(p, "*.*");
+    else
+        strcpy(p, "\\*.*");
+    return 0;
+}
+
+#endif
+#endif
+
+
+#if defined(__ACCLIB_USE_OPENDIR)
+
+ACCLIB_PUBLIC(int, acc_opendir) (acc_dir_p f, const char* path)
+{
+    f->u_dirp = opendir(path);
+    if (!f->u_dirp)
+        return -2;
+    return __ACCLIB_FUNCNAME(acc_readdir)(f);
+}
+
+ACCLIB_PUBLIC(int, acc_readdir) (acc_dir_p f)
+{
+    const struct dirent* dp;
+    f->f_name[0] = 0;
+    if (!f->u_dirp)
+        return -1;
+    dp = (const struct dirent*) readdir((DIR*) f->u_dirp);
+    if (!dp)
+        return -1;
+    if (!dp->d_name[0] || strlen(dp->d_name) >= sizeof(f->f_name))
+        return -1;
+    strcpy(f->f_name, dp->d_name);
+#if (ACC_CC_WATCOMC)
+    ACC_COMPILE_TIME_ASSERT(sizeof(f->f_name) >= sizeof(dp->d_name))
+    f->f_time = dp->d_time;
+    f->f_date = dp->d_date;
+    f->f_size = dp->d_size;
+#endif
+    return 0;
+}
+
+ACCLIB_PUBLIC(int, acc_closedir) (acc_dir_p f)
+{
+    int r = -1;
+    if (f->u_dirp)
+        r = closedir((DIR*) f->u_dirp);
+    f->u_dirp = 0;
+    return r;
+}
+
+
+#elif (ACC_OS_WIN32 || ACC_OS_WIN64)
+
+ACCLIB_PUBLIC(int, acc_opendir) (acc_dir_p f, const char* path)
+{
+    WIN32_FIND_DATAA d;
+    HANDLE h;
+    if (__ACCLIB_FUNCNAME(acc_opendir_init)(f, path, f->f_name, sizeof(f->f_name)) != 0)
+        return -1;
+    h = FindFirstFileA(f->f_name, &d);
+    f->f_name[0] = 0;
+    if ((f->u_handle = (acclib_handle_t) h) == -1)
+        return -1;
+    if (!d.cFileName[0] || strlen(d.cFileName) >= sizeof(f->f_name))
+        return -1;
+    strcpy(f->f_name, d.cFileName);
+    f->f_attr = d.dwFileAttributes;
+    f->f_size_high = d.nFileSizeHigh;
+    f->f_size_low = d.nFileSizeLow;
+    return 0;
+}
+
+ACCLIB_PUBLIC(int, acc_readdir) (acc_dir_p f)
+{
+    WIN32_FIND_DATAA d;
+    f->f_name[0] = 0;
+    if (f->u_handle == -1 || FindNextFileA((HANDLE) f->u_handle, &d) == 0)
+        return -1;
+    if (!d.cFileName[0] || strlen(d.cFileName) >= sizeof(f->f_name))
+        return -1;
+    strcpy(f->f_name, d.cFileName);
+    f->f_attr = d.dwFileAttributes;
+    f->f_size_high = d.nFileSizeHigh;
+    f->f_size_low = d.nFileSizeLow;
+    return 0;
+}
+
+ACCLIB_PUBLIC(int, acc_closedir) (acc_dir_p f)
+{
+    int r = -1;
+    if (f->u_handle != -1)
+        r = FindClose((HANDLE) f->u_handle);
+    f->u_handle = -1;
+    return r;
+}
+
+
+#elif (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_WIN16)
+
+ACCLIB_PUBLIC(int, acc_opendir) (acc_dir_p f, const char* path)
+{
+    char tmp[ACC_FN_PATH_MAX+1];
+    int r;
+    f->u_dirp = 0;
+    if (__ACCLIB_FUNCNAME(acc_opendir_init)(f, path, tmp, sizeof(tmp)) != 0)
+        return -1;
+#if (ACC_CC_AZTECC || ACC_CC_PACIFICC)
+    r = -1;
+#elif (ACC_CC_BORLANDC || ACC_CC_TURBOC)
+    r = findfirst(tmp, (struct ffblk*) f->u_dta, FA_HIDDEN|FA_SYSTEM|FA_RDONLY|FA_DIREC);
+#else
+    r = _dos_findfirst(tmp, _A_HIDDEN|_A_SYSTEM|_A_RDONLY|_A_SUBDIR, (struct find_t*) f->u_dta);
+#endif
+    if (r != 0) f->f_name[0] = 0;
+    if (!f->f_name[0]) return -1;
+    f->u_dirp = 1;
+    return 0;
+}
+
+ACCLIB_PUBLIC(int, acc_readdir) (acc_dir_p f)
+{
+    int r;
+    f->f_name[0] = 0;
+    if (!f->u_dirp)
+        return -1;
+#if (ACC_CC_AZTECC || ACC_CC_PACIFICC)
+    r = -1;
+#elif (ACC_CC_BORLANDC || ACC_CC_TURBOC)
+    r = findnext((struct ffblk*) f->u_dta);
+#else
+    r = _dos_findnext((struct find_t*) f->u_dta);
+#endif
+    if (r != 0) f->f_name[0] = 0;
+    if (!f->f_name[0]) return -1;
+    return 0;
+}
+
+ACCLIB_PUBLIC(int, acc_closedir) (acc_dir_p f)
+{
+    ACC_COMPILE_TIME_ASSERT(sizeof(*f) == 44);
+    f->f_name[0] = 0;
+    f->u_dirp = 0;
+    return 0;
+}
+
+
+#elif (ACC_OS_TOS)
+
+ACCLIB_PUBLIC(int, acc_opendir) (acc_dir_p f, const char* path)
+{
+    char tmp[ACC_FN_PATH_MAX+1];
+    int r;
+    DTA* olddta;
+    f->u_dirp = 0;
+    if (__ACCLIB_FUNCNAME(acc_opendir_init)(f, path, tmp, sizeof(tmp)) != 0)
+        return -1;
+    olddta = Fgetdta();
+    Fsetdta((DTA*) f->u_dta);
+    r = Fsfirst(tmp, FA_HIDDEN|FA_SYSTEM|FA_READONLY|FA_SUBDIR);
+    Fsetdta(olddta);
+    if (r != 0) f->f_name[0] = 0;
+    if (!f->f_name[0]) return -1;
+    f->u_dirp = 1;
+    return 0;
+}
+
+ACCLIB_PUBLIC(int, acc_readdir) (acc_dir_p f)
+{
+    int r;
+    DTA* olddta;
+    f->f_name[0] = 0;
+    if (!f->u_dirp)
+        return -1;
+    olddta = Fgetdta();
+    Fsetdta((DTA*) f->u_dta);
+    r = Fsnext();
+    Fsetdta(olddta);
+    if (r != 0) f->f_name[0] = 0;
+    if (!f->f_name[0]) return -1;
+    return 0;
+}
+
+ACCLIB_PUBLIC(int, acc_closedir) (acc_dir_p f)
+{
+    ACC_COMPILE_TIME_ASSERT(sizeof(*f) == 44);
+    f->f_name[0] = 0;
+    f->u_dirp = 0;
+    return 0;
+}
+
+
+#else
+
+ACCLIB_PUBLIC(int, acc_opendir) (acc_dir_p f, const char* path)
+{
+    ACC_UNUSED(path);
+    f->f_name[0] = 0;
+    return -3;
+}
+
+ACCLIB_PUBLIC(int, acc_readdir) (acc_dir_p f)
+{
+    f->f_name[0] = 0;
+    return -1;
+}
+
+ACCLIB_PUBLIC(int, acc_closedir) (acc_dir_p f)
+{
+    f->u_dirp = 0;
+    return -1;
+}
+
+#endif
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/perfctr.ch b/tools/ucl/acc/acclib/perfctr.ch
new file mode 100644
index 0000000000..2bc18f476d
--- /dev/null
+++ b/tools/ucl/acc/acclib/perfctr.ch
@@ -0,0 +1,157 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_PERFCTR_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+#if (ACC_OS_POSIX_LINUX)
+/* see http://user.it.uu.se/~mikpe/linux/perfctr/ */
+#if defined(__cplusplus)
+extern "C" {
+#include <libperfctr.h>
+}
+#else
+#include <libperfctr.h>
+#endif
+#endif
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+ACCLIB_PUBLIC(int, acc_perfctr_open) (acc_perfctr_handle_p h)
+{
+    memset(h, 0, sizeof(*h));
+#if (ACC_OS_POSIX_LINUX)
+    {
+    struct vperfctr* handle;
+    struct perfctr_info info;
+    struct vperfctr_control control;
+    struct perfctr_cpu_control* const cc = &control.cpu_control;
+    /* open */
+    handle = vperfctr_open();
+    if (!handle) goto error;
+    /* get info */
+    if (vperfctr_info(handle, &info) < 0) goto error;
+    h->cpu_type = info.cpu_type;
+    h->cpu_features = info.cpu_features;
+    h->cpu_khz = info.cpu_khz;
+    h->cpu_nrctrs = perfctr_info_nrctrs(&info);
+    h->cpu_name = perfctr_info_cpu_name(&info);
+    /* setup control */
+    memset(&control, 0, sizeof(control));
+    switch (h->cpu_type) {
+#if (ACC_ARCH_IA32)
+    case PERFCTR_X86_WINCHIP_C6:
+    case PERFCTR_X86_WINCHIP_2:
+        break;      /* no working TSC available */
+    case PERFCTR_X86_AMD_K7:
+#endif
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
+    case PERFCTR_X86_AMD_K8:
+    case PERFCTR_X86_AMD_K8C:
+        cc->tsc_on = 1; cc->nractrs = 2;
+        /* event 0xC0 (RETIRED_INSNS), count at CPL > 0, Enable */
+        cc->pmc_map[0] = 0;
+        cc->evntsel[0] = 0xC0 | (1 << 16) | (1 << 22);
+        /* event 0xC1 (RETIRED_OPS), count at CPL > 0, Enable */
+        cc->pmc_map[1] = 1;
+        cc->evntsel[1] = 0xC1 | (1 << 16) | (1 << 22);
+        break;
+#endif
+    default:
+        cc->tsc_on = 1;
+        break;
+    }
+    if (cc->nractrs > h->cpu_nrctrs) cc->nractrs = h->cpu_nrctrs;
+    if (vperfctr_control(handle, &control) < 0) goto error;
+    /* success */
+    h->h = (void*) handle;
+    return 0;
+error:
+    if (handle) {
+        vperfctr_stop(handle);
+        vperfctr_close(handle);
+    }
+    }
+#endif
+    return -1;
+}
+
+
+ACCLIB_PUBLIC(int, acc_perfctr_close) (acc_perfctr_handle_p h)
+{
+    if (h->h) {
+#if (ACC_OS_POSIX_LINUX)
+        struct vperfctr* handle = (struct vperfctr*) h->h;
+        vperfctr_stop(handle);
+        vperfctr_close(handle);
+#endif
+        h->h = 0;
+    }
+    return 0;
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+ACCLIB_PUBLIC(void, acc_perfctr_read) (acc_perfctr_handle_p h, acc_perfctr_clock_p c)
+{
+    if (h->h) {
+#if (ACC_OS_POSIX_LINUX)
+        struct vperfctr* handle = (struct vperfctr*) h->h;
+        vperfctr_read_ctrs(handle, (struct perfctr_sum_ctrs*) c);
+#else
+        memset(c, 0, sizeof(*c));
+#endif
+    } else
+        memset(c, 0, sizeof(*c));
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+ACCLIB_PUBLIC(double, acc_perfctr_get_elapsed) (acc_perfctr_handle_p h, const acc_perfctr_clock_p start, const acc_perfctr_clock_p stop)
+{
+#if (ACC_OS_POSIX_LINUX)
+    acc_uint64l_t tsc = stop->tsc - start->tsc;
+    return ((double)tsc / h->cpu_khz) / 1000.0;
+#else
+    ACC_UNUSED(h); ACC_UNUSED(start); ACC_UNUSED(stop); return 0;
+#endif
+}
+
+
+ACCLIB_PUBLIC(double, acc_perfctr_get_elapsed_tsc) (acc_perfctr_handle_p h, acc_uint64l_t tsc)
+{
+#if (ACC_OS_POSIX_LINUX)
+    return ((double)tsc / h->cpu_khz) / 1000.0;
+#else
+    ACC_UNUSED(h); ACC_UNUSED(tsc); return 0;
+#endif
+}
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/rand.ch b/tools/ucl/acc/acclib/rand.ch
new file mode 100644
index 0000000000..7fb5ea0b50
--- /dev/null
+++ b/tools/ucl/acc/acclib/rand.ch
@@ -0,0 +1,135 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_RAND_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+/*************************************************************************
+// some linear congruential pseudo random number generators (PRNG)
+**************************************************************************/
+
+ACCLIB_PUBLIC(void, acc_srand31) (acc_rand31_p r, acc_uint32l_t seed)
+{
+    r->seed = seed & ACC_UINT32L_C(0xffffffff);
+}
+
+ACCLIB_PUBLIC(acc_uint32l_t, acc_rand31) (acc_rand31_p r)
+{
+    r->seed = r->seed * ACC_UINT32L_C(1103515245) + 12345;
+    r->seed &= ACC_UINT32L_C(0x7fffffff);
+    return r->seed;
+}
+
+
+#if defined(acc_uint64l_t)
+
+ACCLIB_PUBLIC(void, acc_srand48) (acc_rand48_p r, acc_uint32l_t seed)
+{
+    r->seed = seed & ACC_UINT32L_C(0xffffffff);
+    r->seed <<= 16; r->seed |= 0x330e;
+}
+
+ACCLIB_PUBLIC(acc_uint32l_t, acc_rand48) (acc_rand48_p r)
+{
+    r->seed = r->seed * ACC_UINT64L_C(25214903917) + 11;
+    r->seed &= ACC_UINT64L_C(0xffffffffffff);
+    return (acc_uint32l_t) (r->seed >> 17);
+}
+
+ACCLIB_PUBLIC(acc_uint32l_t, acc_rand48_r32) (acc_rand48_p r)
+{
+    r->seed = r->seed * ACC_UINT64L_C(25214903917) + 11;
+    r->seed &= ACC_UINT64L_C(0xffffffffffff);
+    return (acc_uint32l_t) (r->seed >> 16);
+}
+
+#endif /* acc_uint64l_t */
+
+
+#if defined(acc_uint64l_t)
+
+ACCLIB_PUBLIC(void, acc_srand64) (acc_rand64_p r, acc_uint64l_t seed)
+{
+    r->seed = seed & ACC_UINT64L_C(0xffffffffffffffff);
+}
+
+ACCLIB_PUBLIC(acc_uint32l_t, acc_rand64) (acc_rand64_p r)
+{
+    r->seed = r->seed * ACC_UINT64L_C(6364136223846793005) + 1;
+#if (SIZEOF_ACC_INT64L_T > 8)
+    r->seed &= ACC_UINT64L_C(0xffffffffffffffff);
+#endif
+    return (acc_uint32l_t) (r->seed >> 33);
+}
+
+ACCLIB_PUBLIC(acc_uint32l_t, acc_rand64_r32) (acc_rand64_p r)
+{
+    r->seed = r->seed * ACC_UINT64L_C(6364136223846793005) + 1;
+#if (SIZEOF_ACC_INT64L_T > 8)
+    r->seed &= ACC_UINT64L_C(0xffffffffffffffff);
+#endif
+    return (acc_uint32l_t) (r->seed >> 32);
+}
+
+#endif /* acc_uint64l_t */
+
+
+/*************************************************************************
+// mersenne twister PRNG
+**************************************************************************/
+
+ACCLIB_PUBLIC(void, acc_srandmt) (acc_randmt_p r, acc_uint32l_t seed)
+{
+    unsigned i = 0;
+    do {
+        r->s[i++] = (seed &= ACC_UINT32L_C(0xffffffff));
+        seed ^= seed >> 30;
+        seed = seed * ACC_UINT32L_C(0x6c078965) + i;
+    } while (i != 624);
+    r->n = i;
+}
+
+ACCLIB_PUBLIC(acc_uint32l_t, acc_randmt) (acc_randmt_p r)
+{
+    return (__ACCLIB_FUNCNAME(acc_randmt_r32)(r)) >> 1;
+}
+
+ACCLIB_PUBLIC(acc_uint32l_t, acc_randmt_r32) (acc_randmt_p r)
+{
+    acc_uint32l_t v;
+    if (r->n == 624) {
+        int i = 0, j;
+        r->n = 0;
+        do {
+            j = i - 623; if (j < 0) j += 624;
+            v = (r->s[i] & ACC_UINT32L_C(0x80000000)) ^ (r->s[j] & ACC_UINT32L_C(0x7fffffff));
+            j = i - 227; if (j < 0) j += 624;
+            r->s[i] = r->s[j] ^ (v >> 1);
+            if (v & 1) r->s[i] ^= ACC_UINT32L_C(0x9908b0df);
+        } while (++i != 624);
+    }
+    v = r->s[r->n++];
+    v ^= v >> 11; v ^= (v & ACC_UINT32L_C(0x013a58ad)) << 7;
+    v ^= (v & ACC_UINT32L_C(0x0001df8c)) << 15; v ^= v >> 18;
+    return v;
+}
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/rdtsc.ch b/tools/ucl/acc/acclib/rdtsc.ch
new file mode 100644
index 0000000000..9e1e74fa9f
--- /dev/null
+++ b/tools/ucl/acc/acclib/rdtsc.ch
@@ -0,0 +1,116 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_RDTSC_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+#if defined(acc_int32e_t)
+
+
+#if ((ACC_ARCH_AMD64 || ACC_ARCH_IA32) && ACC_CC_GNUC)
+#  if (ACC_CC_GNUC >= 0x020000ul)
+#    define __ACCLIB_RDTSC_REGS : : "r" (t) : "cc", "memory", "eax", "edx"
+#  else
+#    define __ACCLIB_RDTSC_REGS : : "r" (t) : "ax", "dx"
+#  endif
+#elif (ACC_ARCH_IA32 && ACC_CC_INTELC) && defined(__linux__)
+#  define __ACCLIB_RDTSC_REGS   : : "r" (t) : "memory", "eax", "edx"
+#endif
+
+
+/*************************************************************************
+// read TSC
+**************************************************************************/
+
+ACCLIB_PUBLIC(int, acc_tsc_read) (acc_uint32e_t* t)
+{
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32) && defined(__ACCLIB_RDTSC_REGS)
+    __asm__ __volatile__(
+        "clc \n" ".byte 0x0f, 0x31\n"
+        "movl %%eax,(%0)\n" "movl %%edx,4(%0)\n"
+        __ACCLIB_RDTSC_REGS
+    );
+    return 0;
+#elif (ACC_ARCH_IA32 && (ACC_OS_DOS32 || ACC_OS_WIN32) && (ACC_CC_DMC || ACC_CC_INTELC || ACC_CC_MSC || ACC_CC_PELLESC))
+    ACC_UNUSED(t);
+    __asm {
+        mov ecx, t
+        clc
+#  if (ACC_CC_MSC && (_MSC_VER < 1200))
+        _emit 0x0f
+        _emit 0x31
+#  else
+        rdtsc
+#  endif
+        mov [ecx], eax
+        mov [ecx+4], edx
+    }
+    return 0;
+#else
+    t[0] = t[1] = 0;
+    return -1;
+#endif
+}
+
+
+/*************************************************************************
+// read and add TSC
+**************************************************************************/
+
+ACCLIB_PUBLIC(int, acc_tsc_read_add) (acc_uint32e_t* t)
+{
+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32) && defined(__ACCLIB_RDTSC_REGS)
+    __asm__ __volatile__(
+        "clc \n" ".byte 0x0f, 0x31\n"
+        "addl %%eax,(%0)\n" "adcl $0,%%edx\n" "addl %%edx,4(%0)\n"
+        __ACCLIB_RDTSC_REGS
+    );
+    return 0;
+#elif (ACC_ARCH_IA32 && (ACC_OS_DOS32 || ACC_OS_WIN32) && (ACC_CC_DMC || ACC_CC_INTELC || ACC_CC_MSC || ACC_CC_PELLESC))
+    ACC_UNUSED(t);
+    __asm {
+        mov ecx, t
+        clc
+#  if (ACC_CC_MSC && (_MSC_VER < 1200))
+        _emit 0x0f
+        _emit 0x31
+#  else
+        rdtsc
+#  endif
+        add [ecx], eax
+        adc edx, 0
+        add [ecx+4], edx
+    }
+    return 0;
+#else
+    acc_uint32e_t v[2];
+    int r;
+    r = acc_tsc_read(v);
+    t[0] += v[0];
+    if (t[0] < v[0]) t[1] += 1;
+    t[1] += v[1];
+    return r;
+#endif
+}
+
+
+#endif /* defined(acc_int32e_t) */
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/uclock.ch b/tools/ucl/acc/acclib/uclock.ch
new file mode 100644
index 0000000000..d20dc9c6a8
--- /dev/null
+++ b/tools/ucl/acc/acclib/uclock.ch
@@ -0,0 +1,230 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_UCLOCK_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+#if (ACC_OS_DOS16 || ACC_OS_WIN16)
+#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
+#elif (ACC_OS_CYGWIN || ACC_OS_WIN32 || ACC_OS_WIN64) && (ACC_HAVE_WINDOWS_H)
+#  if defined(acc_int64l_t)
+     /* See also: KB Q274323: PRB: Performance Counter Value May
+      *   Unexpectedly Leap Forward */
+#    define __ACCLIB_UCLOCK_USE_QPC 1
+#  endif
+   /* fallbacks */
+#  if ((ACC_CC_DMC && (__DMC__ < 0x838)) || ACC_CC_LCC)
+     /* winmm.lib is missing */
+#    define __ACCLIB_UCLOCK_USE_CLOCK 1
+#  else
+#    define __ACCLIB_UCLOCK_USE_WINMM 1
+#    if (ACC_CC_MSC && (_MSC_VER >= 900))
+       /* avoid `-W4' warnings in <mmsystem.h> */
+#      pragma warning(disable: 4201)
+#    elif (ACC_CC_MWERKS)
+       /* avoid duplicate typedef in <mmsystem.h> */
+#      define LPUINT __ACC_MMSYSTEM_H_LPUINT
+#    endif
+#    if 1
+#      include <mmsystem.h>
+#    else
+#      if (ACC_CC_INTELC || ACC_CC_MSC || ACC_CC_PELLESC)
+         ACC_EXTERN_C __declspec(dllimport) unsigned long __stdcall timeGetTime(void);
+#      else
+         ACC_EXTERN_C unsigned long __stdcall timeGetTime(void);
+#      endif
+#    endif
+#    if (ACC_CC_DMC)
+#      pragma DMC includelib "winmm.lib"
+#    elif (ACC_CC_INTELC || ACC_CC_MSC || ACC_CC_PELLESC)
+#      pragma comment(lib, "winmm.lib")
+#    elif (ACC_CC_MWERKS && (__MWERKS__ >= 0x3000))
+#      pragma comment(lib, "winmm.lib")
+#    elif (ACC_CC_SYMANTECC)
+#      pragma SC includelib "winmm.lib"
+#    elif (ACC_CC_WATCOMC && (__WATCOMC__ >= 1050))
+#      pragma library("winmm.lib")
+#    endif
+#  endif
+#elif (ACC_OS_EMX) && (ACC_HAVE_WINDOWS_H) && defined(acc_int64l_t)
+#  define __ACCLIB_UCLOCK_USE_QPC 1
+#elif (ACC_OS_CYGWIN || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_TOS || ACC_OS_WIN32 || ACC_OS_WIN64)
+#  define __ACCLIB_UCLOCK_USE_CLOCK 1
+#endif
+
+#if (__ACCLIB_UCLOCK_USE_CLOCK) && !defined(CLOCKS_PER_SEC)
+#  if defined(CLK_TCK)
+#    define CLOCKS_PER_SEC CLK_TCK
+#  else
+#    undef __ACCLIB_UCLOCK_USE_CLOCK
+#  endif
+#endif
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+ACCLIB_PUBLIC(int, acc_uclock_open) (acc_uclock_handle_p h)
+{
+    acc_uclock_t c;
+    int i;
+
+#if (__ACCLIB_UCLOCK_USE_QPC)
+    LARGE_INTEGER li;
+    h->qpf = 0.0;
+    if (QueryPerformanceFrequency(&li) != 0) {
+        h->qpf = (double) li.QuadPart;
+        if (h->qpf <= 0.0 || QueryPerformanceCounter(&li) == 0) {
+            h->qpf = 0.0;
+        }
+    }
+#elif (ACC_HAVE_WINDOWS_H) && defined(acc_int64l_t)
+    h->qpf = 0.0;
+#endif
+    h->h = 1;
+    h->mode = 0;
+
+    /* warm up */
+    i = 100;
+    do {
+        acc_uclock_read(h, &c);
+#if (__ACCLIB_UCLOCK_USE_QPC)
+        if (h->qpf > 0.0 && c.qpc == 0) { h->qpf = 0.0; i = 100; }
+#endif
+    } while (--i > 0);
+
+    return 0;
+}
+
+
+ACCLIB_PUBLIC(int, acc_uclock_close) (acc_uclock_handle_p h)
+{
+    h->h = 0;
+    h->mode = -1;
+    return 0;
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+ACCLIB_PUBLIC(void, acc_uclock_read) (acc_uclock_handle_p h, acc_uclock_p c)
+{
+#if (__ACCLIB_UCLOCK_USE_QPC)
+    if (h->qpf > 0.0) {
+        LARGE_INTEGER li;
+        if (QueryPerformanceCounter(&li) != 0) {
+            c->qpc = (acc_int64l_t) li.QuadPart;
+            if (c->qpc > 0)
+                return;
+        }
+        c->qpc = 0; /* failed */
+    }
+#elif (ACC_HAVE_WINDOWS_H) && defined(acc_int64l_t)
+    /* c->qpc = 0; */
+#endif
+
+    {
+#if (ACC_OS_DOS16 || ACC_OS_WIN16)
+# if (ACC_CC_AZTECC)
+    c->ticks.t32 = 0;
+# else
+    union REGS ri, ro;
+    ri.x.ax = 0x2c00; int86(0x21, &ri, &ro);
+    c->ticks.t32 = ro.h.ch*60UL*60UL*100UL + ro.h.cl*60UL*100UL + ro.h.dh*100UL + ro.h.dl;
+# endif
+#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
+    c->ticks.t64 = uclock();
+#elif (__ACCLIB_UCLOCK_USE_CLOCK) && defined(acc_int64l_t)
+    c->ticks.t64 = clock();
+#elif (__ACCLIB_UCLOCK_USE_CLOCK)
+    c->ticks.t32 = clock();
+#elif (__ACCLIB_UCLOCK_USE_WINMM)
+    c->ticks.t32 = timeGetTime();
+#elif (__ACCLIB_UCLOCK_USE_GETRUSAGE)
+    struct rusage ru;
+    if (getrusage(RUSAGE_SELF, &ru) != 0) c->ticks.rd = 0;
+    else c->ticks.td = ru.ru_utime.tv_sec + ru.ru_utime.tv_usec / 1000000.0;
+#elif (HAVE_GETTIMEOFDAY)
+    struct timeval tv;
+    if (gettimeofday(&tv, 0) != 0) c->ticks.td = 0;
+    else c->ticks.td = tv.tv_sec + tv.tv_usec / 1000000.0;
+#else
+    ACC_UNUSED(c);
+#endif
+    }
+    ACC_UNUSED(h);
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+ACCLIB_PUBLIC(double, acc_uclock_get_elapsed) (acc_uclock_handle_p h, const acc_uclock_p start, const acc_uclock_p stop)
+{
+    double d;
+
+    if (!h->h) {
+        h->mode = -1;
+        return 0.0;
+    }
+
+#if (__ACCLIB_UCLOCK_USE_QPC)
+    if (h->qpf > 0.0) {
+        h->mode = 1;
+        if (start->qpc == 0 || stop->qpc == 0) return 0.0;
+        return (double) (stop->qpc - start->qpc) / h->qpf;
+    }
+#endif
+
+#if (ACC_OS_DOS16 || ACC_OS_WIN16)
+    h->mode = 2;
+    d = (double) (stop->ticks.t32 - start->ticks.t32) / 100.0;
+    if (d < 0.0) d += 86400.0; /* midnight passed */
+#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
+    h->mode = 3;
+    d = (double) (stop->ticks.t64 - start->ticks.t64) / (UCLOCKS_PER_SEC);
+#elif (__ACCLIB_UCLOCK_USE_CLOCK) && defined(acc_int64l_t)
+    h->mode = 4;
+    d = (double) (stop->ticks.t64 - start->ticks.t64) / (CLOCKS_PER_SEC);
+#elif (__ACCLIB_UCLOCK_USE_CLOCK)
+    h->mode = 5;
+    d = (double) (stop->ticks.t32 - start->ticks.t32) / (CLOCKS_PER_SEC);
+#elif (__ACCLIB_UCLOCK_USE_WINMM)
+    h->mode = 6;
+    d = (double) (stop->ticks.t32 - start->ticks.t32) / 1000.0;
+#elif (__ACCLIB_UCLOCK_USE_GETRUSAGE)
+    h->mode = 7;
+    d = stop->ticks.td - start->ticks.td;
+#elif (HAVE_GETTIMEOFDAY)
+    h->mode = 8;
+    d = stop->ticks.td - start->ticks.td;
+#else
+    h->mode = 0;
+    d = 0.0;
+#endif
+    return d;
+}
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/acc/acclib/wildargv.ch b/tools/ucl/acc/acclib/wildargv.ch
new file mode 100644
index 0000000000..76ff4a0b7b
--- /dev/null
+++ b/tools/ucl/acc/acclib/wildargv.ch
@@ -0,0 +1,72 @@
+/* ACC -- Automatic Compiler Configuration
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   This software is a copyrighted work licensed under the terms of
+   the GNU General Public License. Please consult the file "ACC_LICENSE"
+   for details.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/
+ */
+
+
+#define __ACCLIB_WILDARGV_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+#if (ACC_OS_DOS16 || ACC_OS216 || ACC_OS_WIN16)
+#if 0 && (ACC_CC_MSC)
+
+/* FIXME */
+ACC_EXTERN_C int __acc_cdecl __setargv(void);
+ACC_EXTERN_C int __acc_cdecl _setargv(void);
+ACC_EXTERN_C int __acc_cdecl _setargv(void) { return __setargv(); }
+
+#endif
+#endif
+
+
+#if (ACC_OS_WIN32 || ACC_OS_WIN64)
+#if (ACC_CC_INTELC || ACC_CC_MSC)
+
+ACC_EXTERN_C int __acc_cdecl __setargv(void);
+ACC_EXTERN_C int __acc_cdecl _setargv(void);
+ACC_EXTERN_C int __acc_cdecl _setargv(void) { return __setargv(); }
+
+#endif
+#endif
+
+
+#if (ACC_OS_EMX)
+
+#define __ACCLIB_HAVE_ACC_WILDARGV 1
+ACCLIB_PUBLIC(void, acc_wildargv) (int* argc, char*** argv)
+{
+    _response(argc, argv);
+    _wildcard(argc, argv);
+}
+
+#endif
+
+
+#if !defined(__ACCLIB_HAVE_ACC_WILDARGV)
+#define __ACCLIB_HAVE_ACC_WILDARGV 1
+ACCLIB_PUBLIC(void, acc_wildargv) (int* argc, char*** argv)
+{
+    ACC_UNUSED(argc); ACC_UNUSED(argv);
+}
+#endif
+
+
+/*
+vi:ts=4:et
+*/
diff --git a/tools/ucl/include/ucl/ucl.h b/tools/ucl/include/ucl/ucl.h
index 3eb37925c8..b85fe4180f 100644
--- a/tools/ucl/include/ucl/ucl.h
+++ b/tools/ucl/include/ucl/ucl.h
@@ -1,7 +1,9 @@
-/* ucl.h -- prototypes for the UCL real-time data compression library
+/* ucl.h -- prototypes for the UCL data compression library
 
    This file is part of the UCL data compression library.
 
+   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
    Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
    Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
    Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
@@ -32,10 +34,10 @@
  */
 
 
-#ifndef __UCL_H
-#define __UCL_H
+#ifndef __UCL_H_INCLUDED
+#define __UCL_H_INCLUDED
 
-#ifndef __UCLCONF_H
+#ifndef __UCLCONF_H_INCLUDED
 #include <ucl/uclconf.h>
 #endif
 
@@ -45,11 +47,13 @@ extern "C" {
 
 
 /***********************************************************************
+// Compression fine-tuning configuration.
 //
+// Pass a NULL pointer to the compression functions for default values.
+// Otherwise set all values to -1 [i.e. initialize the struct by a
+// `memset(x,0xff,sizeof(x))'] and then set the required values.
 ************************************************************************/
 
-/* note: to use default values pass -1, i.e. initialize
- * this struct by a memset(x,0xff,sizeof(x)) */
 struct ucl_compress_config_t
 {
     int bb_endian;
@@ -68,6 +72,9 @@ struct ucl_compress_config_t
 
 /***********************************************************************
 // compressors
+//
+// Pass NULL for `cb' (no progress callback), `conf' (default compression
+// configuration) and `result' (no statistical result).
 ************************************************************************/
 
 UCL_EXTERN(int)
@@ -97,6 +104,11 @@ ucl_nrv2e_99_compress      ( const ucl_bytep src, ucl_uint src_len,
 
 /***********************************************************************
 // decompressors
+//
+// Always pass NULL for `wrkmem'. This parameter is for symetry
+// with my other compression libaries and is not used in UCL -
+// UCL does not need any additional memory (or even local stack space)
+// for decompression.
 ************************************************************************/
 
 UCL_EXTERN(int)
@@ -184,7 +196,9 @@ ucl_nrv2e_decompress_safe_le32  ( const ucl_bytep src, ucl_uint  src_len,
 // test an overlapping in-place decompression within a buffer:
 //   - try a virtual decompression from &buf[src_off] -> &buf[0]
 //   - no data is actually written
-//   - only the bytes at buf[src_off .. src_off+src_len] will get accessed
+//   - only the bytes at buf[src_off..src_off+src_len-1] will get accessed
+//
+// NOTE: always pass NULL for `wrkmem' - see above.
 ************************************************************************/
 
 UCL_EXTERN(int)
diff --git a/tools/ucl/include/ucl/ucl_asm.h b/tools/ucl/include/ucl/ucl_asm.h
new file mode 100644
index 0000000000..8f7b6877b6
--- /dev/null
+++ b/tools/ucl/include/ucl/ucl_asm.h
@@ -0,0 +1,320 @@
+/* ucl_asm.h -- assembler prototypes for the UCL data compression library
+
+   This file is part of the UCL data compression library.
+
+   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   The UCL library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   The UCL library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with the UCL library; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/opensource/ucl/
+ */
+
+
+#ifndef __UCL_ASM_H_INCLUDED
+#define __UCL_ASM_H_INCLUDED
+
+#ifndef __UCLCONF_H_INCLUDED
+#include <ucl/uclconf.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/***********************************************************************
+// NRV2B assembly decompressors
+************************************************************************/
+
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_safe_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_fast_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_fast_safe_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_small_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_small_safe_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+
+
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_safe_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_fast_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_fast_safe_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_small_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_small_safe_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+
+
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_safe_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_fast_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_fast_safe_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_small_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2b_decompress_asm_small_safe_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+
+
+/***********************************************************************
+// NRV2D assembly decompressors
+************************************************************************/
+
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_safe_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_fast_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_fast_safe_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_small_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_small_safe_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+
+
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_safe_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_fast_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_fast_safe_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_small_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_small_safe_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+
+
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_safe_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_fast_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_fast_safe_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_small_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2d_decompress_asm_small_safe_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+
+
+/***********************************************************************
+// NRV2E assembly decompressors
+************************************************************************/
+
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_safe_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_fast_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_fast_safe_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_small_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_small_safe_8
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+
+
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_safe_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_fast_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_fast_safe_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_small_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_small_safe_le16
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+
+
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_safe_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_fast_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_fast_safe_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_small_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+UCL_EXTERN(int) ucl_nrv2e_decompress_asm_small_safe_le32
+                                (const ucl_bytep src, ucl_uint  src_len,
+                                       ucl_bytep dst, ucl_uintp dst_len,
+                                       ucl_voidp wrkmem);
+
+
+/***********************************************************************
+// checksum and misc functions
+************************************************************************/
+
+UCL_EXTERN(ucl_uint32)
+ucl_crc32_asm(ucl_uint32 _c, const ucl_bytep _buf, ucl_uint _len,
+              const ucl_uint32p _crc_table);
+
+UCL_EXTERN(ucl_uint32)
+ucl_crc32_asm_small(ucl_uint32 _c, const ucl_bytep _buf, ucl_uint _len);
+
+UCL_EXTERN(int)
+ucl_cpuid_asm(ucl_uint32p /* ucl_uint32 info[16] */ );
+
+UCL_EXTERN(unsigned)
+ucl_rdtsc_asm(ucl_uint32p /* ucl_uint32 ticks[2] */ );
+UCL_EXTERN(unsigned)
+ucl_rdtsc_add_asm(ucl_uint32p /* ucl_uint32 ticks[2] */ );
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* already included */
+
diff --git a/tools/ucl/include/ucl/uclconf.h b/tools/ucl/include/ucl/uclconf.h
index 75f163fa8d..35d476376d 100644
--- a/tools/ucl/include/ucl/uclconf.h
+++ b/tools/ucl/include/ucl/uclconf.h
@@ -1,7 +1,9 @@
-/* uclconf.h -- configuration for the UCL real-time data compression library
+/* uclconf.h -- configuration for the UCL data compression library
 
    This file is part of the UCL data compression library.
 
+   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
    Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
    Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
    Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
@@ -32,12 +34,12 @@
  */
 
 
-#ifndef __UCLCONF_H
-#define __UCLCONF_H
+#ifndef __UCLCONF_H_INCLUDED
+#define __UCLCONF_H_INCLUDED
 
-#define UCL_VERSION             0x010100L
-#define UCL_VERSION_STRING      "1.01"
-#define UCL_VERSION_DATE        "Jan 02 2002"
+#define UCL_VERSION             0x010300L
+#define UCL_VERSION_STRING      "1.03"
+#define UCL_VERSION_DATE        "Jul 20 2004"
 
 /* internal Autoconf configuration file - only used when building UCL */
 #if defined(UCL_HAVE_CONFIG_H)
@@ -65,13 +67,14 @@ extern "C" {
 #endif
 
 /* workaround a compiler bug under hpux 10.20 */
+#define UCL_0xffffL             65535ul
 #define UCL_0xffffffffL         4294967295ul
 
 #if !defined(UCL_UINT32_C)
 #  if (UINT_MAX < UCL_0xffffffffL)
 #    define UCL_UINT32_C(c)     c ## UL
 #  else
-#    define UCL_UINT32_C(c)     c ## U
+#    define UCL_UINT32_C(c)     ((c) + 0U)
 #  endif
 #endif
 
@@ -80,66 +83,103 @@ extern "C" {
 // architecture defines
 ************************************************************************/
 
-#if !defined(__UCL_WIN) && !defined(__UCL_DOS) && !defined(__UCL_OS2)
-#  if defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
-#    define __UCL_WIN
-#  elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
-#    define __UCL_WIN
-#  elif defined(__NT__) || defined(__NT_DLL__) || defined(__WINDOWS_386__)
-#    define __UCL_WIN
-#  elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS)
-#    define __UCL_DOS
-#  elif defined(__OS2__) || defined(__OS2V2__) || defined(OS2)
-#    define __UCL_OS2
-#  elif defined(__palmos__)
-#    define __UCL_PALMOS
-#  elif defined(__TOS__) || defined(__atarist__)
-#    define __UCL_TOS
-#  endif
-#endif
-
-#if (UINT_MAX < UCL_0xffffffffL)
-#  if defined(__UCL_WIN)
-#    define __UCL_WIN16
-#  elif defined(__UCL_DOS)
-#    define __UCL_DOS16
-#  elif defined(__UCL_PALMOS)
-#    define __UCL_PALMOS16
-#  elif defined(__UCL_TOS)
-#    define __UCL_TOS16
-#  elif defined(__C166__)
+#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && defined(__GNUC__)
+#  define UCL_OS_CYGWIN         1
+#elif defined(__EMX__) && defined(__GNUC__)
+#  define UCL_OS_EMX            1
+#elif defined(__BORLANDC__) && defined(__DPMI32__) && (__BORLANDC__ >= 0x0460)
+#  define UCL_OS_DOS32          1
+#elif defined(__BORLANDC__) && defined(__DPMI16__)
+#  define UCL_OS_DOS16          1
+#elif defined(__ZTC__) && defined(DOS386)
+#  define UCL_OS_DOS32          1
+#elif defined(__OS2__) || defined(__OS2V2__)
+#  if (UINT_MAX == UCL_0xffffL)
+#    define UCL_OS_OS216        1
+#  elif (UINT_MAX == UCL_0xffffffffL)
+#    define UCL_OS_OS2          1
 #  else
-#    error "16-bit target not supported - contact me for porting hints"
+#    error "check your limits.h header"
 #  endif
-#endif
-
-#if !defined(__UCL_i386)
-#  if defined(__UCL_DOS) || defined(__UCL_WIN16)
-#    define __UCL_i386
-#  elif defined(__i386__) || defined(__386__) || defined(_M_IX86)
-#    define __UCL_i386
+#elif defined(__WIN64__) || defined(_WIN64) || defined(WIN64)
+#  define UCL_OS_WIN64          1
+#elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WINDOWS_386__)
+#  define UCL_OS_WIN32          1
+#elif defined(__MWERKS__) && defined(__INTEL__)
+#  define UCL_OS_WIN32          1
+#elif defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
+#  if (UINT_MAX == UCL_0xffffL)
+#    define UCL_OS_WIN16        1
+#  elif (UINT_MAX == UCL_0xffffffffL)
+#    define UCL_OS_WIN32        1
+#  else
+#    error "check your limits.h header"
 #  endif
-#endif
-
-#if defined(__UCL_STRICT_16BIT)
-#  if (UINT_MAX < UCL_0xffffffffL)
-#    include <ucl/ucl16bit.h>
+#elif defined(__DOS__) || defined(__MSDOS__) || defined(_MSDOS) || defined(MSDOS) || (defined(__PACIFIC__) && defined(DOS))
+#  if (UINT_MAX == UCL_0xffffL)
+#    define UCL_OS_DOS16        1
+#  elif (UINT_MAX == UCL_0xffffffffL)
+#    define UCL_OS_DOS32        1
+#  else
+#    error "check your limits.h header"
 #  endif
+#elif defined(__WATCOMC__)
+#  if defined(__NT__) && (UINT_MAX == UCL_0xffffL)
+     /* wcl: NT host defaults to DOS target */
+#    define UCL_OS_DOS16        1
+#  elif defined(__NT__) && (__WATCOMC__ < 1100)
+     /* wcl386: Watcom C 11 defines _WIN32 */
+#    define UCL_OS_WIN32        1
+#  else
+#    error "please specify a target using the -bt compiler option"
+#  endif
+#elif defined(__palmos__)
+#  if (UINT_MAX == UCL_0xffffL)
+#    define UCL_OS_PALMOS       1
+#  else
+#    error "check your limits.h header"
+#  endif
+#elif defined(__TOS__) || defined(__atarist__)
+#  define UCL_OS_TOS            1
+#elif defined(macintosh)
+#  define UCL_OS_MACCLASSIC     1
+#elif defined(__VMS)
+#  define UCL_OS_VMS            1
+#else
+#  define UCL_OS_POSIX          1
 #endif
 
 /* memory checkers */
 #if !defined(__UCL_CHECKER)
 #  if defined(__BOUNDS_CHECKING_ON)
-#    define __UCL_CHECKER
+#    define __UCL_CHECKER       1
 #  elif defined(__CHECKER__)
-#    define __UCL_CHECKER
+#    define __UCL_CHECKER       1
 #  elif defined(__INSURE__)
-#    define __UCL_CHECKER
+#    define __UCL_CHECKER       1
 #  elif defined(__PURIFY__)
-#    define __UCL_CHECKER
+#    define __UCL_CHECKER       1
 #  endif
 #endif
 
+/* fix ancient compiler versions */
+#if (UINT_MAX == UCL_0xffffL)
+#if (defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0410)) || (defined(MSDOS) && defined(_MSC_VER) && (_MSC_VER < 700))
+#  if !defined(__cdecl)
+#    define __cdecl cdecl
+#  endif
+#  if !defined(__far)
+#    define __far far
+#  endif
+#  if !defined(__huge)
+#    define __huge huge
+#  endif
+#  if !defined(__near)
+#    define __near near
+#  endif
+#endif
+#endif
+
 
 /***********************************************************************
 // integral and pointer types
@@ -187,18 +227,16 @@ extern "C" {
 #if !defined(__UCL_MMODEL)
 #  if (UCL_UINT_MAX <= UINT_MAX)
 #    define __UCL_MMODEL
-#  elif defined(__UCL_DOS16) || defined(__UCL_WIN16)
+#  elif defined(UCL_OS_DOS16) || defined(UCL_OS_OS216) || defined(UCL_OS_WIN16)
+#    define __UCL_MMODEL_HUGE   1
 #    define __UCL_MMODEL        __huge
-#    define UCL_999_UNSUPPORTED
-#  elif defined(__UCL_PALMOS16) || defined(__UCL_TOS16)
-#    define __UCL_MMODEL
+#    define ucl_uintptr_t       unsigned long
 #  else
-#    error "__UCL_MMODEL"
+#    define __UCL_MMODEL
 #  endif
 #endif
 
 /* no typedef here because of const-pointer issues */
-#define ucl_byte                unsigned char __UCL_MMODEL
 #define ucl_bytep               unsigned char __UCL_MMODEL *
 #define ucl_charp               char __UCL_MMODEL *
 #define ucl_voidp               void __UCL_MMODEL *
@@ -210,6 +248,8 @@ extern "C" {
 #define ucl_intp                ucl_int __UCL_MMODEL *
 #define ucl_voidpp              ucl_voidp __UCL_MMODEL *
 #define ucl_bytepp              ucl_bytep __UCL_MMODEL *
+/* deprecated - use `ucl_bytep' instead of `ucl_byte *' */
+#define ucl_byte                unsigned char __UCL_MMODEL
 
 typedef int ucl_bool;
 
@@ -218,7 +258,7 @@ typedef int ucl_bool;
 // function types
 ************************************************************************/
 
-/* linkage */
+/* name mangling */
 #if !defined(__UCL_EXTERN_C)
 #  ifdef __cplusplus
 #    define __UCL_EXTERN_C      extern "C"
@@ -227,21 +267,18 @@ typedef int ucl_bool;
 #  endif
 #endif
 
-/* calling conventions */
+/* calling convention */
 #if !defined(__UCL_CDECL)
-#  if defined(__UCL_DOS16) || defined(__UCL_WIN16)
+#  if defined(__GNUC__) || defined(__HIGHC__) || defined(__NDPC__)
+#    define __UCL_CDECL
+#  elif defined(UCL_OS_DOS16) || defined(UCL_OS_OS216) || defined(UCL_OS_WIN16)
 #    define __UCL_CDECL         __far __cdecl
-#  elif defined(__UCL_i386) && defined(_MSC_VER)
+#  elif defined(UCL_OS_DOS32) || defined(UCL_OS_OS2) || defined(UCL_OS_WIN32) || defined(UCL_OS_WIN64)
 #    define __UCL_CDECL         __cdecl
-#  elif defined(__UCL_i386) && defined(__WATCOMC__)
-#    define __UCL_CDECL         __near __cdecl
 #  else
 #    define __UCL_CDECL
 #  endif
 #endif
-#if !defined(__UCL_ENTRY)
-#  define __UCL_ENTRY           __UCL_CDECL
-#endif
 
 /* DLL export information */
 #if !defined(__UCL_EXPORT1)
@@ -251,24 +288,15 @@ typedef int ucl_bool;
 #  define __UCL_EXPORT2
 #endif
 
-/* calling convention for C functions */
+/* __cdecl calling convention for public C and assembly functions */
 #if !defined(UCL_PUBLIC)
-#  define UCL_PUBLIC(_rettype)  __UCL_EXPORT1 _rettype __UCL_EXPORT2 __UCL_ENTRY
+#  define UCL_PUBLIC(_rettype)  __UCL_EXPORT1 _rettype __UCL_EXPORT2 __UCL_CDECL
 #endif
 #if !defined(UCL_EXTERN)
 #  define UCL_EXTERN(_rettype)  __UCL_EXTERN_C UCL_PUBLIC(_rettype)
 #endif
 #if !defined(UCL_PRIVATE)
-#  define UCL_PRIVATE(_rettype) static _rettype __UCL_ENTRY
-#endif
-
-/* cdecl calling convention for assembler functions */
-#if !defined(UCL_PUBLIC_CDECL)
-#  define UCL_PUBLIC_CDECL(_rettype) \
-                __UCL_EXPORT1 _rettype __UCL_EXPORT2 __UCL_CDECL
-#endif
-#if !defined(UCL_EXTERN_CDECL)
-#  define UCL_EXTERN_CDECL(_rettype)  __UCL_EXTERN_C UCL_PUBLIC_CDECL(_rettype)
+#  define UCL_PRIVATE(_rettype) static _rettype __UCL_CDECL
 #endif
 
 /* C++ exception specification for extern "C" function types */
@@ -279,39 +307,38 @@ typedef int ucl_bool;
 #  define UCL_NOTHROW
 #endif
 
-
+/* function types */
 typedef int
-(__UCL_ENTRY *ucl_compress_t)   ( const ucl_bytep src, ucl_uint  src_len,
+(__UCL_CDECL *ucl_compress_t)   ( const ucl_bytep src, ucl_uint  src_len,
                                         ucl_bytep dst, ucl_uintp dst_len,
                                         ucl_voidp wrkmem );
 
 typedef int
-(__UCL_ENTRY *ucl_decompress_t) ( const ucl_bytep src, ucl_uint  src_len,
+(__UCL_CDECL *ucl_decompress_t) ( const ucl_bytep src, ucl_uint  src_len,
                                         ucl_bytep dst, ucl_uintp dst_len,
                                         ucl_voidp wrkmem );
 
 typedef int
-(__UCL_ENTRY *ucl_optimize_t)   (       ucl_bytep src, ucl_uint  src_len,
+(__UCL_CDECL *ucl_optimize_t)   (       ucl_bytep src, ucl_uint  src_len,
                                         ucl_bytep dst, ucl_uintp dst_len,
                                         ucl_voidp wrkmem );
 
 typedef int
-(__UCL_ENTRY *ucl_compress_dict_t)(const ucl_bytep src, ucl_uint  src_len,
+(__UCL_CDECL *ucl_compress_dict_t)(const ucl_bytep src, ucl_uint  src_len,
                                         ucl_bytep dst, ucl_uintp dst_len,
                                         ucl_voidp wrkmem,
                                   const ucl_bytep dict, ucl_uint dict_len );
 
 typedef int
-(__UCL_ENTRY *ucl_decompress_dict_t)(const ucl_bytep src, ucl_uint  src_len,
+(__UCL_CDECL *ucl_decompress_dict_t)(const ucl_bytep src, ucl_uint  src_len,
                                         ucl_bytep dst, ucl_uintp dst_len,
                                         ucl_voidp wrkmem,
                                   const ucl_bytep dict, ucl_uint dict_len );
 
-
 /* a progress indicator callback function */
 typedef struct
 {
-    void (__UCL_ENTRY *callback) (ucl_uint, ucl_uint, int, ucl_voidp user);
+    void (__UCL_CDECL *callback) (ucl_uint, ucl_uint, int, ucl_voidp);
     ucl_voidp user;
 }
 ucl_progress_callback_t;
@@ -375,17 +402,22 @@ UCL_EXTERN(ucl_uint32)
 ucl_adler32(ucl_uint32 _adler, const ucl_bytep _buf, ucl_uint _len);
 UCL_EXTERN(ucl_uint32)
 ucl_crc32(ucl_uint32 _c, const ucl_bytep _buf, ucl_uint _len);
+UCL_EXTERN(const ucl_uint32p)
+ucl_get_crc32_table(void);
+
+/* memory allocation hooks */
+typedef ucl_voidp (__UCL_CDECL *ucl_malloc_hook_t) (ucl_uint);
+typedef void (__UCL_CDECL *ucl_free_hook_t) (ucl_voidp);
+UCL_EXTERN(void)
+ucl_set_malloc_hooks(ucl_malloc_hook_t, ucl_free_hook_t);
+UCL_EXTERN(void)
+ucl_get_malloc_hooks(ucl_malloc_hook_t*, ucl_free_hook_t*);
 
 /* memory allocation functions */
-UCL_EXTERN(ucl_voidp) ucl_alloc(ucl_uint _nelems, ucl_uint _size);
-UCL_EXTERN(ucl_voidp) ucl_malloc(ucl_uint _size);
-UCL_EXTERN(void) ucl_free(ucl_voidp _ptr);
+UCL_EXTERN(ucl_voidp) ucl_malloc(ucl_uint);
+UCL_EXTERN(ucl_voidp) ucl_alloc(ucl_uint, ucl_uint);
+UCL_EXTERN(void) ucl_free(ucl_voidp);
 
-typedef ucl_voidp (__UCL_ENTRY *ucl_alloc_hook_t) (ucl_uint, ucl_uint);
-typedef void (__UCL_ENTRY *ucl_free_hook_t) (ucl_voidp);
-
-extern ucl_alloc_hook_t ucl_alloc_hook;
-extern ucl_free_hook_t ucl_free_hook;
 
 /* misc. */
 UCL_EXTERN(ucl_bool) ucl_assert(int _expr);
diff --git a/tools/ucl/include/ucl/uclutil.h b/tools/ucl/include/ucl/uclutil.h
deleted file mode 100644
index 48d7e39ee9..0000000000
--- a/tools/ucl/include/ucl/uclutil.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* uclutil.h -- utilities for the UCL real-time data compression library
-
-   This file is part of the UCL data compression library.
-
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The UCL library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The UCL library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the UCL library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/ucl/
- */
-
-
-#ifndef __UCLUTIL_H
-#define __UCLUTIL_H
-
-#ifndef __UCLCONF_H
-#include <ucl/uclconf.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-UCL_EXTERN(ucl_uint)
-ucl_fread(FILE *f, ucl_voidp buf, ucl_uint size);
-UCL_EXTERN(ucl_uint)
-ucl_fwrite(FILE *f, const ucl_voidp buf, ucl_uint size);
-
-
-#if (UCL_UINT_MAX <= UINT_MAX)
-   /* avoid problems with Win32 DLLs */
-#  define ucl_fread(f,b,s)      (fread(b,1,s,f))
-#  define ucl_fwrite(f,b,s)     (fwrite(b,1,s,f))
-#endif
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/tools/ucl/lutil.h b/tools/ucl/lutil.h
deleted file mode 100644
index d83a8d1cb7..0000000000
--- a/tools/ucl/lutil.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* lutil.h -- utilities
-
-   This file is part of the UCL data compression library.
-
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The UCL library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The UCL library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the UCL library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
- */
-
-
-#include <stdio.h>
-#include <stddef.h>
-#if !defined(NO_STDLIB_H)
-#  include <stdlib.h>
-#endif
-#include <string.h>
-#include <ctype.h>
-#if defined(HAVE_UNISTD_H) || defined(__DJGPP__) || defined(__EMX__)
-#  include <unistd.h>
-#elif defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(__MINGW32__)
-#  include <unistd.h>
-#endif
-#if defined(HAVE_STAT)
-#  include <sys/types.h>
-#  include <sys/stat.h>
-#endif
-
-#include <ucl/uclconf.h>
-#include <ucl/uclutil.h>
-
-
-/* some systems have a xmalloc in their C library... */
-#undef xmalloc
-#undef xfree
-#undef xread
-#undef xwrite
-#undef xputc
-#undef xgetc
-#undef xread32
-#undef xwrite32
-#define xmalloc         my_xmalloc
-#define xfree           my_xfree
-
-
-#define HEAP_ALLOC(var,size) \
-    long __UCL_MMODEL var [ ((size) + (sizeof(long) - 1)) / sizeof(long) ]
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/tools/ucl/portab.h b/tools/ucl/portab.h
new file mode 100644
index 0000000000..8c8295c3dd
--- /dev/null
+++ b/tools/ucl/portab.h
@@ -0,0 +1,83 @@
+/* portab.h -- portability layer
+
+   This file is part of the UCL data compression library.
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   The UCL library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   The UCL library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with the UCL library; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/opensource/ucl/
+ */
+
+
+#include <ucl/uclconf.h>
+
+#if 1
+
+#include "portab_a.h"
+
+#else
+
+/* INFO:
+ *   The "portab_a.h" version above uses the ACC library to add
+ *   support for ancient systems (like 16-bit DOS) and to provide
+ *   some gimmicks like win32 high-resolution timers.
+ *   Still, on any halfway modern machine you can also use the
+ *   following pure ANSI-C code instead.
+ */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <time.h>
+#undef NDEBUG
+#include <assert.h>
+
+#define __acc_cdecl_main
+#define ACC_UNUSED(var)         ((void) &var)
+
+#if defined(WANT_UCL_MALLOC)
+#  define ucl_malloc(a)         (malloc(a))
+#  define ucl_free(a)           (free(a))
+#endif
+#if defined(WANT_UCL_FREAD)
+#  define ucl_fread(f,b,s)      (fread(b,1,s,f))
+#  define ucl_fwrite(f,b,s)     (fwrite(b,1,s,f))
+#endif
+#if defined(WANT_UCL_UCLOCK)
+#  define ucl_uclock_handle_t   int
+#  define ucl_uclock_t          double
+#  define ucl_uclock_open(a)    ((void)(a))
+#  define ucl_uclock_close(a)   ((void)(a))
+#  define ucl_uclock_read(a,b)  *(b) = (clock() / (double)(CLOCKS_PER_SEC))
+#  define ucl_uclock_get_elapsed(a,b,c) (*(c) - *(b))
+#endif
+#if defined(WANT_UCL_WILDARGV)
+#  define ucl_wildargv(a,b)     ((void)0)
+#endif
+
+#endif
+
+
+/*
+vi:ts=4:et
+*/
+
diff --git a/tools/ucl/portab_a.h b/tools/ucl/portab_a.h
new file mode 100644
index 0000000000..95376080f9
--- /dev/null
+++ b/tools/ucl/portab_a.h
@@ -0,0 +1,141 @@
+/* portab_a.h -- advanced portability layer
+
+   This file is part of the UCL data compression library.
+
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   The UCL library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   The UCL library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with the UCL library; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/opensource/ucl/
+ */
+
+
+#include <ucl/uclconf.h>
+
+
+/*************************************************************************
+// use the ACC library for the hard work
+**************************************************************************/
+
+#if defined(UCL_HAVE_CONFIG_H)
+#  define ACC_CONFIG_NO_HEADER 1
+#endif
+#include "acc/acc.h"
+
+#if (ACC_CC_MSC && (_MSC_VER >= 1000 && _MSC_VER < 1200))
+   /* avoid `-W4' warnings in system header files */
+#  pragma warning(disable: 4201 4214 4514)
+#endif
+#if (ACC_CC_MSC && (_MSC_VER >= 1300))
+   /* avoid `-Wall' warnings in system header files */
+#  pragma warning(disable: 4163 4255 4820)
+   /* avoid warnings about inlining */
+#  pragma warning(disable: 4710 4711)
+#endif
+#if (ACC_CC_MSC && (_MSC_VER >= 1400))
+   /* avoid warnings when using "deprecated" POSIX functions */
+#  pragma warning(disable: 4996)
+#endif
+
+#include "acc/acc_incd.h"
+#include "acc/acc_ince.h"
+#if defined(__UCL_MMODEL_HUGE) || defined(WANT_UCL_UCLOCK) || defined(WANT_UCL_WILDARGV)
+#  include "acc/acc_inci.h"
+#  include "acc/acc_lib.h"
+#endif
+
+#if defined(WANT_UCL_MALLOC)
+#  if defined(__UCL_MMODEL_HUGE)
+#    include "acc/acclib/halloc.ch"
+#  else
+#    define acc_halloc(a)           (malloc(a))
+#    define acc_hfree(a)            (free(a))
+#  endif
+#endif
+#if defined(WANT_UCL_FREAD)
+#  if defined(__UCL_MMODEL_HUGE)
+#    include "acc/acclib/hfread.ch"
+#  else
+#    define acc_hfread(f,b,s)       (fread(b,1,s,f))
+#    define acc_hfwrite(f,b,s)      (fwrite(b,1,s,f))
+#  endif
+#endif
+#if defined(WANT_UCL_UCLOCK)
+#  include "acc/acclib/uclock.ch"
+#endif
+#if defined(WANT_UCL_WILDARGV)
+#  include "acc/acclib/wildargv.ch"
+#endif
+#if (__ACCLIB_REQUIRE_HMEMCPY_CH) && !defined(__ACCLIB_HMEMCPY_CH_INCLUDED)
+#  include "acc/acclib/hmemcpy.ch"
+#endif
+
+
+/*************************************************************************
+// misc
+**************************************************************************/
+
+/* turn on assertions */
+#undef NDEBUG
+#include <assert.h>
+
+/* just in case */
+#undef xmalloc
+#undef xfree
+#undef xread
+#undef xwrite
+#undef xputc
+#undef xgetc
+#undef xread32
+#undef xwrite32
+
+
+/*************************************************************************
+// finally pull into the UCL namespace
+**************************************************************************/
+
+#undef ucl_malloc
+#undef ucl_free
+#undef ucl_fread
+#undef ucl_fwrite
+#if defined(WANT_UCL_MALLOC)
+#  define ucl_malloc(a)         acc_halloc(a)
+#  define ucl_free(a)           acc_hfree(a)
+#endif
+#if defined(WANT_UCL_FREAD)
+#  define ucl_fread(f,b,s)      acc_hfread(f,b,s)
+#  define ucl_fwrite(f,b,s)     acc_hfwrite(f,b,s)
+#endif
+#if defined(WANT_UCL_UCLOCK)
+#  define ucl_uclock_handle_t   acc_uclock_handle_t
+#  define ucl_uclock_t          acc_uclock_t
+#  define ucl_uclock_open(a)    acc_uclock_open(a)
+#  define ucl_uclock_close(a)   acc_uclock_close(a)
+#  define ucl_uclock_read(a,b)  acc_uclock_read(a,b)
+#  define ucl_uclock_get_elapsed(a,b,c) acc_uclock_get_elapsed(a,b,c)
+#endif
+#if defined(WANT_UCL_WILDARGV)
+#  define ucl_wildargv(a,b)     acc_wildargv(a,b)
+#endif
+
+
+/*
+vi:ts=4:et
+*/
+
diff --git a/tools/ucl/src/Makefile b/tools/ucl/src/Makefile
index 7fffe59a7b..96e89fc221 100644
--- a/tools/ucl/src/Makefile
+++ b/tools/ucl/src/Makefile
@@ -4,9 +4,8 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
-CFLAGS += -I../include
+CFLAGS += -I../include -I..
 
 ifndef V
 SILENT = @
@@ -62,7 +61,7 @@ $(info Compiler creates $(COMPILETARGET) binaries)
 TARGET_DIR ?= $(shell pwd)/
 OBJDIR = $(TARGET_DIR)build$(RBARCH)
 
-SOURCES = alloc.c io.c n2b_99.c n2b_d.c n2b_ds.c n2b_to.c n2d_99.c	\
+SOURCES = alloc.c n2b_99.c n2b_d.c n2b_ds.c n2b_to.c n2d_99.c	\
 	n2d_d.c n2d_ds.c n2d_to.c n2e_99.c n2e_d.c n2e_ds.c n2e_to.c ucl_crc.c	\
 	ucl_init.c ucl_ptr.c ucl_str.c ucl_util.c #ucl_dll.c
 
diff --git a/tools/ucl/src/alloc.c b/tools/ucl/src/alloc.c
index d32ea5113a..3761321210 100644
--- a/tools/ucl/src/alloc.c
+++ b/tools/ucl/src/alloc.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2003 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -28,50 +28,29 @@
 
 #include "ucl_conf.h"
 
-#if defined(HAVE_MALLOC_H)
-#  include <malloc.h>
-#endif
-#if defined(__palmos__)
-#  include <System/MemoryMgr.h>
-#endif
-
-
-#undef ucl_alloc_hook
-#undef ucl_free_hook
-#undef ucl_alloc
-#undef ucl_malloc
-#undef ucl_free
-
 
 /***********************************************************************
 // implementation
 ************************************************************************/
 
+#if defined(__UCL_MMODEL_HUGE)
+
+#define acc_hsize_t             ucl_uint
+#define acc_hvoid_p             ucl_voidp
+#define ACCLIB_PUBLIC(r,f)      static r __UCL_CDECL f
+#define acc_halloc              ucl_malloc_internal
+#define acc_hfree               ucl_free_internal
+#include "acc/acclib/halloc.ch"
+#undef ACCLIB_PUBLIC
+
+#else
+
 UCL_PRIVATE(ucl_voidp)
-ucl_alloc_internal(ucl_uint nelems, ucl_uint size)
+ucl_malloc_internal(ucl_uint size)
 {
     ucl_voidp p = NULL;
-    unsigned long s = (unsigned long) nelems * size;
-
-    if (nelems <= 0 || size <= 0 || s < nelems || s < size)
-        return NULL;
-
-#if defined(__palmos__)
-    p = (ucl_voidp) MemPtrNew(s);
-#elif (UCL_UINT_MAX <= SIZE_T_MAX)
-    if (s < SIZE_T_MAX)
-        p = (ucl_voidp) malloc((size_t)s);
-#elif defined(HAVE_HALLOC) && defined(__DMC__)
-    if (size < SIZE_T_MAX)
-        p = (ucl_voidp) _halloc(nelems,(size_t)size);
-#elif defined(HAVE_HALLOC)
-    if (size < SIZE_T_MAX)
-        p = (ucl_voidp) halloc(nelems,(size_t)size);
-#else
-    if (s < SIZE_T_MAX)
-        p = (ucl_voidp) malloc((size_t)s);
-#endif
-
+    if (size < ~(ucl_uint)0)
+        p = (ucl_voidp) malloc((size_t) size);
     return p;
 }
 
@@ -79,70 +58,65 @@ ucl_alloc_internal(ucl_uint nelems, ucl_uint size)
 UCL_PRIVATE(void)
 ucl_free_internal(ucl_voidp p)
 {
-    if (!p)
-        return;
-
-#if defined(__palmos__)
-    MemPtrFree(p);
-#elif (UCL_UINT_MAX <= SIZE_T_MAX)
-    free(p);
-#elif defined(HAVE_HALLOC) && defined(__DMC__)
-    _hfree(p);
-#elif defined(HAVE_HALLOC)
-    hfree(p);
-#else
-    free(p);
-#endif
+    if (p)
+        free(p);
 }
 
+#endif
+
 
 /***********************************************************************
 // public interface using the global hooks
 ************************************************************************/
 
 /* global allocator hooks */
-ucl_alloc_hook_t ucl_alloc_hook = ucl_alloc_internal;
-ucl_free_hook_t ucl_free_hook = ucl_free_internal;
+static ucl_malloc_hook_t ucl_malloc_hook = ucl_malloc_internal;
+static ucl_free_hook_t ucl_free_hook = ucl_free_internal;
 
-
-UCL_PUBLIC(ucl_voidp)
-ucl_alloc(ucl_uint nelems, ucl_uint size)
+UCL_PUBLIC(void)
+ucl_set_malloc_hooks(ucl_malloc_hook_t a, ucl_free_hook_t f)
 {
-    if (!ucl_alloc_hook)
-        return NULL;
+    ucl_malloc_hook = ucl_malloc_internal;
+    ucl_free_hook = ucl_free_internal;
+    if (a)
+        ucl_malloc_hook = a;
+    if (f)
+        ucl_free_hook = f;
+}
 
-    return ucl_alloc_hook(nelems,size);
+UCL_PUBLIC(void)
+ucl_get_malloc_hooks(ucl_malloc_hook_t* a, ucl_free_hook_t* f)
+{
+    if (a)
+        *a = ucl_malloc_hook;
+    if (f)
+        *f = ucl_free_hook;
 }
 
 
 UCL_PUBLIC(ucl_voidp)
 ucl_malloc(ucl_uint size)
 {
-    if (!ucl_alloc_hook)
+    if (size <= 0)
         return NULL;
+    return ucl_malloc_hook(size);
+}
 
-#if defined(__palmos__)
-    return ucl_alloc_hook(size,1);
-#elif (UCL_UINT_MAX <= SIZE_T_MAX)
-    return ucl_alloc_hook(size,1);
-#elif defined(HAVE_HALLOC)
-    /* use segment granularity by default */
-    if (size + 15 > size)   /* avoid overflow */
-        return ucl_alloc_hook((size+15)/16,16);
-    return ucl_alloc_hook(size,1);
-#else
-    return ucl_alloc_hook(size,1);
-#endif
+UCL_PUBLIC(ucl_voidp)
+ucl_alloc(ucl_uint nelems, ucl_uint size)
+{
+    ucl_uint s = nelems * size;
+    if (nelems <= 0 || s / nelems != size)
+        return NULL;
+    return ucl_malloc(s);
 }
 
 
 UCL_PUBLIC(void)
 ucl_free(ucl_voidp p)
 {
-    if (!ucl_free_hook)
-        return;
-
-    ucl_free_hook(p);
+    if (p)
+        ucl_free_hook(p);
 }
 
 
diff --git a/tools/ucl/src/fake16.h b/tools/ucl/src/fake16.h
deleted file mode 100644
index db773d5284..0000000000
--- a/tools/ucl/src/fake16.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* fake16.h -- fake the strict 16-bit memory model for test purposes
-
-   This file is part of the UCL data compression library.
-
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The UCL library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The UCL library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the UCL library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
- */
-
-
-/*
- * NOTE:
- *   this file is *only* for testing the strict 16-bit memory model
- *   on a 32-bit machine. Because things like integral promotion,
- *   size_t and ptrdiff_t cannot be faked this is no real substitute
- *   for testing under a real 16-bit system.
- *
- *   See also <ucl/ucl16bit.h>
- *
- *   Usage: #include "src/fake16.h" at the top of <ucl/uclconf.h>
- */
-
-
-#ifndef __UCLFAKE16BIT_H
-#define __UCLFAKE16BIT_H
-
-#ifdef __UCLCONF_H
-#  error "include this file before uclconf.h"
-#endif
-
-#include <limits.h>
-
-#if (USHRT_MAX == 0xffff)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define __UCL16BIT_H        /* do not use <ucl/ucl16bit.h> */
-
-#define __UCL_STRICT_16BIT
-#define __UCL_FAKE_STRICT_16BIT
-
-#define UCL_99_UNSUPPORTED
-#define UCL_999_UNSUPPORTED
-
-typedef unsigned short      ucl_uint;
-typedef short               ucl_int;
-#define UCL_UINT_MAX        USHRT_MAX
-#define UCL_INT_MAX         SHRT_MAX
-
-#if 1
-#define __UCL_NO_UNALIGNED
-#define __UCL_NO_ALIGNED
-#endif
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif
-
-#endif /* already included */
-
diff --git a/tools/ucl/src/getbit.h b/tools/ucl/src/getbit.h
index be27254cd4..4ca971e6d1 100644
--- a/tools/ucl/src/getbit.h
+++ b/tools/ucl/src/getbit.h
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2003 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -46,10 +46,10 @@
     (bb*=2,bb&0xffff ? (bb>>16)&1 : (ilen+=2,((bb=(src[ilen-2]+src[ilen-1]*256u)*2+1)>>16)&1))
 
 
-#if 1 && defined(UCL_UNALIGNED_OK_4) && (UCL_BYTE_ORDER == UCL_LITTLE_ENDIAN)
+#if 1 && (ACC_ENDIAN_LITTLE_ENDIAN) && defined(UA_GET4)
 #define getbit_le32(bb, bc, src, ilen) \
     (bc > 0 ? ((bb>>--bc)&1) : (bc=31,\
-    bb=*(const ucl_uint32p)((src)+ilen),ilen+=4,(bb>>31)&1))
+    bb=UA_GET4((src)+ilen),ilen+=4,(bb>>31)&1))
 #else
 #define getbit_le32(bb, bc, src, ilen) \
     (bc > 0 ? ((bb>>--bc)&1) : (bc=31,\
diff --git a/tools/ucl/src/internal.h b/tools/ucl/src/internal.h
deleted file mode 100644
index 101ed45cbb..0000000000
--- a/tools/ucl/src/internal.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* internal.h --
-
-   This file is part of the UCL data compression library.
-
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The UCL library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The UCL library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the UCL library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __UCL_INTERNAL_H
-#define __UCL_INTERNAL_H
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/tools/ucl/src/io.c b/tools/ucl/src/io.c
deleted file mode 100644
index 58bd436ac0..0000000000
--- a/tools/ucl/src/io.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* io.c -- io functions
-
-   This file is part of the UCL data compression library.
-
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The UCL library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The UCL library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the UCL library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/ucl/
- */
-
-
-#include "ucl_conf.h"
-
-#if !defined(NO_STDIO_H)
-
-#include <stdio.h>
-#include <ucl/uclutil.h>
-
-#undef ucl_fread
-#undef ucl_fwrite
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-UCL_PUBLIC(ucl_uint)
-ucl_fread(FILE *f, ucl_voidp s, ucl_uint len)
-{
-#if 1 && (UCL_UINT_MAX <= SIZE_T_MAX)
-    return fread(s,1,len,f);
-#else
-    ucl_byte *p = (ucl_byte *) s;
-    ucl_uint l = 0;
-    size_t k;
-    unsigned char *b;
-    unsigned char buf[512];
-
-    while (l < len)
-    {
-        k = len - l > sizeof(buf) ? sizeof(buf) : (size_t) (len - l);
-        k = fread(buf,1,k,f);
-        if (k <= 0)
-            break;
-        l += k;
-        b = buf; do *p++ = *b++; while (--k > 0);
-    }
-    return l;
-#endif
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-UCL_PUBLIC(ucl_uint)
-ucl_fwrite(FILE *f, const ucl_voidp s, ucl_uint len)
-{
-#if 1 && (UCL_UINT_MAX <= SIZE_T_MAX)
-    return fwrite(s,1,len,f);
-#else
-    const ucl_byte *p = (const ucl_byte *) s;
-    ucl_uint l = 0;
-    size_t k, n;
-    unsigned char *b;
-    unsigned char buf[512];
-
-    while (l < len)
-    {
-        k = len - l > sizeof(buf) ? sizeof(buf) : (size_t) (len - l);
-        b = buf; n = k; do *b++ = *p++; while (--n > 0);
-        k = fwrite(buf,1,k,f);
-        if (k <= 0)
-            break;
-        l += k;
-    }
-    return l;
-#endif
-}
-
-
-#endif /* !defined(NO_STDIO_H) */
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/tools/ucl/src/n2_99.ch b/tools/ucl/src/n2_99.ch
index 5df69baaf4..bd4ccc8ee9 100644
--- a/tools/ucl/src/n2_99.ch
+++ b/tools/ucl/src/n2_99.ch
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -27,36 +27,26 @@
 
 
 
-#include <ucl/uclconf.h>
-#include <ucl/ucl.h>
 #include "ucl_conf.h"
-
-#if 0
-#undef UCL_DEBUG
-#define UCL_DEBUG
-#endif
-
-#include <stdio.h>
-
-#if 0 && !defined(UCL_DEBUG)
-#undef NDEBUG
-#include <assert.h>
-#endif
+#include <ucl/ucl.h>
 
 
 /***********************************************************************
 //
 ************************************************************************/
 
-#if 0
-#define N       (128*1024ul)        /* size of ring buffer */
+#define SWD_USE_MALLOC 1
+#if (ACC_OS_DOS16)
+#define SWD_HMASK       (s->hmask)
+#define HEAD2_VAR
+#define IF_HEAD2(s)     if (s->use_head2)
 #else
-#define N       (1024*1024ul)       /* size of ring buffer */
-#define SWD_USE_MALLOC
-#define SWD_HSIZE   65536ul
+#define SWD_HMASK       (UCL_UINT32_C(65535))
+#define IF_HEAD2(s)
 #endif
-#define THRESHOLD       1           /* lower limit for match length */
-#define F            2048           /* upper limit for match length */
+#define SWD_N           (8*1024*1024ul) /* max. size of ring buffer */
+#define SWD_F           2048            /* upper limit for match length */
+#define SWD_THRESHOLD   1               /* lower limit for match length */
 
 #if defined(NRV2B)
 #  define UCL_COMPRESS_T                ucl_nrv2b_t
@@ -78,20 +68,11 @@
 #endif
 #define ucl_swd_p       ucl_swd_t * __UCL_MMODEL
 
-#if 0
-#  define HEAD3(b,p) \
-    ((((((ucl_uint32)b[p]<<3)^b[p+1])<<3)^b[p+2]) & (SWD_HSIZE-1))
-#endif
-#if 0 && defined(UCL_UNALIGNED_OK_4) && (UCL_BYTE_ORDER == UCL_LITTLE_ENDIAN)
-#  define HEAD3(b,p) \
-    (((* (ucl_uint32p) &b[p]) ^ ((* (ucl_uint32p) &b[p])>>10)) & (SWD_HSIZE-1))
-#endif
-
 #include "ucl_mchw.ch"
 
 
 /***********************************************************************
-//
+// start-step-stop prefix coding
 ************************************************************************/
 
 static void code_prefix_ss11(UCL_COMPRESS_T *c, ucl_uint32 i)
@@ -232,12 +213,12 @@ code_match(UCL_COMPRESS_T *c, ucl_uint m_len, const ucl_uint m_off)
 #endif
 
     c->last_m_off = m_off;
-    UCL_UNUSED(m_low);
+    ACC_UNUSED(m_low);
 }
 
 
 static void
-code_run(UCL_COMPRESS_T *c, const ucl_byte *ii, ucl_uint lit)
+code_run(UCL_COMPRESS_T *c, const ucl_bytep ii, ucl_uint lit)
 {
     if (lit == 0)
         return;
@@ -376,17 +357,17 @@ ucl_nrv_99_compress        ( const ucl_bytep in, ucl_uint in_len,
                              const struct ucl_compress_config_p conf,
                                    ucl_uintp result)
 {
-    const ucl_byte *ii;
+    const ucl_bytep ii;
     ucl_uint lit;
     ucl_uint m_len, m_off;
     UCL_COMPRESS_T c_buffer;
     UCL_COMPRESS_T * const c = &c_buffer;
-#undef swd
-#if 1 && defined(SWD_USE_MALLOC)
+#undef s
+#if defined(SWD_USE_MALLOC)
     ucl_swd_t the_swd;
-#   define swd (&the_swd)
+#   define s (&the_swd)
 #else
-    ucl_swd_p swd;
+    ucl_swd_p s;
 #endif
     ucl_uint result_buffer[16];
     int r;
@@ -403,6 +384,7 @@ ucl_nrv_99_compress        ( const ucl_bytep in, ucl_uint in_len,
     };
     const struct swd_config_t *sc;
     static const struct swd_config_t swd_config[10] = {
+#define F SWD_F
         /* faster compression */
         {   0,   0,   0,   8,    4,   0,  48*1024L },
         {   0,   0,   0,  16,    8,   0,  48*1024L },
@@ -413,8 +395,9 @@ ucl_nrv_99_compress        ( const ucl_bytep in, ucl_uint in_len,
         {   2,   8,  32, 128,  256,   0, 128*1024L },
         {   2,  32, 128,   F, 2048,   1, 128*1024L },
         {   2,  32, 128,   F, 2048,   1, 256*1024L },
-        {   2,   F,   F,   F, 4096,   1, N }
+        {   2,   F,   F,   F, 4096,   1, SWD_N }
         /* max. compression */
+#undef F
     };
 
     if (level < 1 || level > 10)
@@ -422,6 +405,7 @@ ucl_nrv_99_compress        ( const ucl_bytep in, ucl_uint in_len,
     sc = &swd_config[level - 1];
 
     memset(c, 0, sizeof(*c));
+    memset(&c->conf, 0xff, sizeof(c->conf));
     c->ip = c->in = in;
     c->in_end = in + in_len;
     c->out = out;
@@ -429,12 +413,11 @@ ucl_nrv_99_compress        ( const ucl_bytep in, ucl_uint in_len,
         c->cb = cb;
     cb = NULL;
     c->result = result ? result : (ucl_uintp) result_buffer;
-    memset(c->result, 0, 16*sizeof(*c->result));
-    c->result[0] = c->result[2] = c->result[4] = UCL_UINT_MAX;
     result = NULL;
-    memset(&c->conf, 0xff, sizeof(c->conf));
+    ucl_memset(c->result, 0, 16*sizeof(*c->result));
+    c->result[0] = c->result[2] = c->result[4] = UCL_UINT_MAX;
     if (conf)
-        memcpy(&c->conf, conf, sizeof(c->conf));
+        ucl_memcpy(&c->conf, conf, sizeof(c->conf));
     conf = NULL;
     r = bbConfig(c, 0, 8);
     if (r == 0)
@@ -446,39 +429,51 @@ ucl_nrv_99_compress        ( const ucl_bytep in, ucl_uint in_len,
     ii = c->ip;             /* point to start of literal run */
     lit = 0;
 
-#if !defined(swd)
-    swd = (ucl_swd_p) ucl_alloc(1, ucl_sizeof(*swd));
-    if (!swd)
+#if !defined(s)
+    s = (ucl_swd_p) ucl_malloc(ucl_sizeof(*s));
+    if (!s)
         return UCL_E_OUT_OF_MEMORY;
 #endif
-    swd->f = UCL_MIN(F, c->conf.max_match);
-    swd->n = UCL_MIN(N, sc->max_offset);
+    s->f = UCL_MIN((ucl_uint)SWD_F, c->conf.max_match);
+    s->n = UCL_MIN((ucl_uint)SWD_N, sc->max_offset);
+    s->hmask = UCL_UINT32_C(65535);
+#ifdef HEAD2_VAR
+    s->use_head2 = 1;
+#if defined(ACC_MM_AHSHIFT)
+    if (ACC_MM_AHSHIFT != 3) {
+        s->hmask = 16 * 1024 - 1;
+        s->use_head2 = 0;
+    }
+#endif
+#endif
     if (c->conf.max_offset != UCL_UINT_MAX)
-        swd->n = UCL_MIN(N, c->conf.max_offset);
-    if (in_len >= 256 && in_len < swd->n)
-        swd->n = in_len;
-    if (swd->f < 8 || swd->n < 256)
+        s->n = UCL_MIN(SWD_N, c->conf.max_offset);
+    if (in_len < s->n)
+        s->n = UCL_MAX(in_len, 256);
+    if (s->f < 8 || s->n < 256)
         return UCL_E_INVALID_ARGUMENT;
-    r = init_match(c,swd,NULL,0,sc->flags);
+    r = init_match(c,s,NULL,0,sc->flags);
+    if (r == UCL_E_OK && (SWD_HSIZE - 1 != s->hmask))
+        r = UCL_E_ERROR;
     if (r != UCL_E_OK)
     {
-#if !defined(swd)
-        ucl_free(swd);
+#if !defined(s)
+        ucl_free(s);
 #endif
         return r;
     }
     if (sc->max_chain > 0)
-        swd->max_chain = sc->max_chain;
+        s->max_chain = sc->max_chain;
     if (sc->nice_length > 0)
-        swd->nice_length = sc->nice_length;
-    if (c->conf.max_match < swd->nice_length)
-        swd->nice_length = c->conf.max_match;
+        s->nice_length = sc->nice_length;
+    if (c->conf.max_match < s->nice_length)
+        s->nice_length = c->conf.max_match;
 
     if (c->cb)
         (*c->cb->callback)(0,0,-1,c->cb->user);
 
     c->last_m_off = 1;
-    r = find_match(c,swd,0,0);
+    r = find_match(c,s,0,0);
     if (r != UCL_E_OK)
         return r;
     while (c->look > 0)
@@ -487,7 +482,7 @@ ucl_nrv_99_compress        ( const ucl_bytep in, ucl_uint in_len,
         ucl_uint max_ahead;
         int l1, l2;
 
-        c->codesize = c->bb_op - out;
+        c->codesize = (ucl_uint) (c->bb_op - out);
 
         m_len = c->m_len;
         m_off = c->m_off;
@@ -497,25 +492,25 @@ ucl_nrv_99_compress        ( const ucl_bytep in, ucl_uint in_len,
         if (lit == 0)
             ii = c->bp;
         assert(ii + lit == c->bp);
-        assert(swd->b_char == *(c->bp));
+        assert(s->b_char == *(c->bp));
 
         if (m_len < 2 || (m_len == 2 && (m_off > M2_MAX_OFFSET))
             || m_off > c->conf.max_offset)
         {
             /* a literal */
             lit++;
-            swd->max_chain = sc->max_chain;
-            r = find_match(c,swd,1,0);
+            s->max_chain = sc->max_chain;
+            r = find_match(c,s,1,0);
             assert(r == 0);
             continue;
         }
 
     /* a match */
 #if defined(SWD_BEST_OFF)
-        if (swd->use_best_off)
-            better_match(swd,&m_len,&m_off);
+        if (s->use_best_off)
+            better_match(s,&m_len,&m_off);
 #endif
-        assert_match(swd,m_len,m_off);
+        assert_match(s,m_len,m_off);
 
         /* shall we try a lazy match ? */
         ahead = 0;
@@ -530,16 +525,16 @@ ucl_nrv_99_compress        ( const ucl_bytep in, ucl_uint in_len,
             /* yes, try a lazy match */
             l1 = len_of_coded_match(c,m_len,m_off);
             assert(l1 > 0);
-            max_ahead = UCL_MIN(sc->try_lazy, m_len - 1);
+            max_ahead = UCL_MIN((ucl_uint)sc->try_lazy, m_len - 1);
         }
 
         while (ahead < max_ahead && c->look > m_len)
         {
             if (m_len >= sc->good_length)
-                swd->max_chain = sc->max_chain >> 2;
+                s->max_chain = sc->max_chain >> 2;
             else
-                swd->max_chain = sc->max_chain;
-            r = find_match(c,swd,1,0);
+                s->max_chain = sc->max_chain;
+            r = find_match(c,s,1,0);
             ahead++;
 
             assert(r == 0);
@@ -549,8 +544,8 @@ ucl_nrv_99_compress        ( const ucl_bytep in, ucl_uint in_len,
             if (c->m_len < 2)
                 continue;
 #if defined(SWD_BEST_OFF)
-            if (swd->use_best_off)
-                better_match(swd,&c->m_len,&c->m_off);
+            if (s->use_best_off)
+                better_match(s,&c->m_len,&c->m_off);
 #endif
             l2 = len_of_coded_match(c,c->m_len,c->m_off);
             if (l2 < 0)
@@ -562,7 +557,7 @@ ucl_nrv_99_compress        ( const ucl_bytep in, ucl_uint in_len,
 #endif
             {
                 c->lazy++;
-                assert_match(swd,c->m_len,c->m_off);
+                assert_match(s,c->m_len,c->m_off);
 
 #if 0
                 if (l3 > 0)
@@ -591,8 +586,8 @@ ucl_nrv_99_compress        ( const ucl_bytep in, ucl_uint in_len,
 
         /* 2 - code match */
         code_match(c,m_len,m_off);
-        swd->max_chain = sc->max_chain;
-        r = find_match(c,swd,m_len,1+ahead);
+        s->max_chain = sc->max_chain;
+        r = find_match(c,s,m_len,1+ahead);
         assert(r == 0);
 
 lazy_match_done: ;
@@ -615,8 +610,8 @@ lazy_match_done: ;
     bbFlushBits(c, 0);
 
     assert(c->textsize == in_len);
-    c->codesize = c->bb_op - out;
-    *out_len = c->bb_op - out;
+    c->codesize = (ucl_uint) (c->bb_op - out);
+    *out_len = (ucl_uint) (c->bb_op - out);
     if (c->cb)
         (*c->cb->callback)(c->textsize,c->codesize,4,c->cb->user);
 
@@ -628,12 +623,12 @@ lazy_match_done: ;
 #endif
     assert(c->lit_bytes + c->match_bytes == in_len);
 
-    swd_exit(swd);
-#if !defined(swd)
-    ucl_free(swd);
+    swd_exit(s);
+#if !defined(s)
+    ucl_free(s);
 #endif
     return UCL_E_OK;
-#undef swd
+#undef s
 }
 
 
diff --git a/tools/ucl/src/n2b_99.c b/tools/ucl/src/n2b_99.c
index d2e6d6edf5..e3b11cc162 100644
--- a/tools/ucl/src/n2b_99.c
+++ b/tools/ucl/src/n2b_99.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
diff --git a/tools/ucl/src/n2b_d.c b/tools/ucl/src/n2b_d.c
index e8f96d6d37..26b6ca5061 100644
--- a/tools/ucl/src/n2b_d.c
+++ b/tools/ucl/src/n2b_d.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@
 #ifdef SAFE
     const ucl_uint oend = *dst_len;
 #endif
-    UCL_UNUSED(wrkmem);
+    ACC_UNUSED(wrkmem);
 
 #ifdef TEST_OVERLAP
     src_len += src_off;
@@ -108,7 +108,7 @@
         fail(olen > ilen, UCL_E_OVERLAP_OVERRUN);
 #else
         {
-            const ucl_byte *m_pos;
+            const ucl_bytep m_pos;
             m_pos = dst + olen - m_off;
             dst[olen++] = *m_pos++;
             do dst[olen++] = *m_pos++; while (--m_len > 0);
@@ -130,8 +130,8 @@
 
 #ifndef getbit
 
-#include <ucl/ucl.h>
 #include "ucl_conf.h"
+#include <ucl/ucl.h>
 #include "getbit.h"
 
 
diff --git a/tools/ucl/src/n2b_ds.c b/tools/ucl/src/n2b_ds.c
index 1a52b46218..899c886fc6 100644
--- a/tools/ucl/src/n2b_ds.c
+++ b/tools/ucl/src/n2b_ds.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
diff --git a/tools/ucl/src/n2b_to.c b/tools/ucl/src/n2b_to.c
index 29a6d65820..c05e0a1251 100644
--- a/tools/ucl/src/n2b_to.c
+++ b/tools/ucl/src/n2b_to.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -31,8 +31,8 @@
 // entries for the different bit-buffer sizes
 ************************************************************************/
 
-#include <ucl/ucl.h>
 #include "ucl_conf.h"
+#include <ucl/ucl.h>
 #include "getbit.h"
 
 #define SAFE
diff --git a/tools/ucl/src/n2d_99.c b/tools/ucl/src/n2d_99.c
index c4d501a26b..97c2ae812b 100644
--- a/tools/ucl/src/n2d_99.c
+++ b/tools/ucl/src/n2d_99.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
diff --git a/tools/ucl/src/n2d_d.c b/tools/ucl/src/n2d_d.c
index 42409506c3..ae07bd4e3c 100644
--- a/tools/ucl/src/n2d_d.c
+++ b/tools/ucl/src/n2d_d.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@
 #ifdef SAFE
     const ucl_uint oend = *dst_len;
 #endif
-    UCL_UNUSED(wrkmem);
+    ACC_UNUSED(wrkmem);
 
 #ifdef TEST_OVERLAP
     src_len += src_off;
@@ -113,7 +113,7 @@
         fail(olen > ilen, UCL_E_OVERLAP_OVERRUN);
 #else
         {
-            const ucl_byte *m_pos;
+            const ucl_bytep m_pos;
             m_pos = dst + olen - m_off;
             dst[olen++] = *m_pos++;
             do dst[olen++] = *m_pos++; while (--m_len > 0);
@@ -135,8 +135,8 @@
 
 #ifndef getbit
 
-#include <ucl/ucl.h>
 #include "ucl_conf.h"
+#include <ucl/ucl.h>
 #include "getbit.h"
 
 
diff --git a/tools/ucl/src/n2d_ds.c b/tools/ucl/src/n2d_ds.c
index 81b15c02a0..45c90f2059 100644
--- a/tools/ucl/src/n2d_ds.c
+++ b/tools/ucl/src/n2d_ds.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
diff --git a/tools/ucl/src/n2d_to.c b/tools/ucl/src/n2d_to.c
index 58b43fa57a..c058065bb0 100644
--- a/tools/ucl/src/n2d_to.c
+++ b/tools/ucl/src/n2d_to.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -31,8 +31,8 @@
 // entries for the different bit-buffer sizes
 ************************************************************************/
 
-#include <ucl/ucl.h>
 #include "ucl_conf.h"
+#include <ucl/ucl.h>
 #include "getbit.h"
 
 #define SAFE
diff --git a/tools/ucl/src/n2e_99.c b/tools/ucl/src/n2e_99.c
index 122c4dc036..011c8e95dd 100644
--- a/tools/ucl/src/n2e_99.c
+++ b/tools/ucl/src/n2e_99.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
diff --git a/tools/ucl/src/n2e_d.c b/tools/ucl/src/n2e_d.c
index 6c4586d75c..efddb490bd 100644
--- a/tools/ucl/src/n2e_d.c
+++ b/tools/ucl/src/n2e_d.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@
 #ifdef SAFE
     const ucl_uint oend = *dst_len;
 #endif
-    UCL_UNUSED(wrkmem);
+    ACC_UNUSED(wrkmem);
 
 #ifdef TEST_OVERLAP
     src_len += src_off;
@@ -116,7 +116,7 @@
         fail(olen > ilen, UCL_E_OVERLAP_OVERRUN);
 #else
         {
-            const ucl_byte *m_pos;
+            const ucl_bytep m_pos;
             m_pos = dst + olen - m_off;
             dst[olen++] = *m_pos++;
             do dst[olen++] = *m_pos++; while (--m_len > 0);
@@ -138,14 +138,14 @@
 
 #ifndef getbit
 
-#include <ucl/ucl.h>
 #include "ucl_conf.h"
+#include <ucl/ucl.h>
 #include "getbit.h"
 
 
 UCL_PUBLIC(int)
-ucl_nrv2e_decompress_8          ( const ucl_byte *src, ucl_uint  src_len,
-                                        ucl_byte *dst, ucl_uintp dst_len,
+ucl_nrv2e_decompress_8          ( const ucl_bytep src, ucl_uint  src_len,
+                                        ucl_bytep dst, ucl_uintp dst_len,
                                         ucl_voidp wrkmem )
 {
 #define getbit(bb)      getbit_8(bb,src,ilen)
diff --git a/tools/ucl/src/n2e_ds.c b/tools/ucl/src/n2e_ds.c
index 4afe3899f0..ea890c5a8c 100644
--- a/tools/ucl/src/n2e_ds.c
+++ b/tools/ucl/src/n2e_ds.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
diff --git a/tools/ucl/src/n2e_to.c b/tools/ucl/src/n2e_to.c
index 33bcd07b19..dcc4d8ded4 100644
--- a/tools/ucl/src/n2e_to.c
+++ b/tools/ucl/src/n2e_to.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -31,8 +31,8 @@
 // entries for the different bit-buffer sizes
 ************************************************************************/
 
-#include <ucl/ucl.h>
 #include "ucl_conf.h"
+#include <ucl/ucl.h>
 #include "getbit.h"
 
 #define SAFE
diff --git a/tools/ucl/src/ucl_conf.h b/tools/ucl/src/ucl_conf.h
index 20bbd3b6cd..9c432b66f7 100644
--- a/tools/ucl/src/ucl_conf.h
+++ b/tools/ucl/src/ucl_conf.h
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -22,6 +22,7 @@
 
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
+   http://www.oberhumer.com/opensource/ucl/
  */
 
 
@@ -34,81 +35,86 @@
 #ifndef __UCL_CONF_H
 #define __UCL_CONF_H
 
-#if !defined(__UCL_IN_MINIUCL)
-#  ifndef __UCLCONF_H
-#    include <ucl/uclconf.h>
-#  endif
-#endif
-
 
 /***********************************************************************
-// memory checkers
+//
 ************************************************************************/
 
-#if defined(__BOUNDS_CHECKING_ON)
-#  include <unchecked.h>
-#else
-#  define BOUNDS_CHECKING_OFF_DURING(stmt)      stmt
-#  define BOUNDS_CHECKING_OFF_IN_EXPR(expr)     (expr)
+#if defined(__UCLCONF_H_INCLUDED)
+#  error "include this file first"
+#endif
+#include <ucl/uclconf.h>
+
+#if defined(UCL_HAVE_CONFIG_H)
+#  define ACC_CONFIG_NO_HEADER 1
+#endif
+#define __ACCLIB_FUNCNAME(f)        error_do_not_use_acclib
+#include "acc/acc.h"
+
+#if (ACC_CC_MSC && (_MSC_VER >= 1300))
+   /* avoid `-Wall' warnings in system header files */
+#  pragma warning(disable: 4820)
+   /* avoid warnings about inlining */
+#  pragma warning(disable: 4710 4711)
+#endif
+
+#if defined(__UCL_MMODEL_HUGE) && (!ACC_HAVE_MM_HUGE_PTR)
+#  error "this should not happen - check defines for __huge"
+#endif
+#if !defined(__UCL_MMODEL_HUGE) && defined(HAVE_MEMCMP)
+#  define ucl_memcmp(a,b,c)     memcmp(a,b,c)
+#endif
+#if !defined(__UCL_MMODEL_HUGE) && defined(HAVE_MEMCPY)
+#  define ucl_memcpy(a,b,c)     memcpy(a,b,c)
+#endif
+#if !defined(__UCL_MMODEL_HUGE) && defined(HAVE_MEMMOVE)
+#  define ucl_memmove(a,b,c)    memmove(a,b,c)
+#endif
+#if !defined(__UCL_MMODEL_HUGE) && defined(HAVE_MEMSET)
+#  define ucl_memset(a,b,c)     memset(a,b,c)
+#endif
+
+#if (ACC_OS_DOS16 + 0 != UCL_OS_DOS16 + 0)
+#  error "DOS16"
+#endif
+#if (ACC_OS_OS216 + 0 != UCL_OS_OS216 + 0)
+#  error "OS216"
+#endif
+#if (ACC_OS_WIN16 + 0 != UCL_OS_WIN16 + 0)
+#  error "WIN16"
+#endif
+#if (ACC_OS_DOS32 + 0 != UCL_OS_DOS32 + 0)
+#  error "DOS32"
+#endif
+#if (ACC_OS_OS2 + 0 != UCL_OS_OS2 + 0)
+#  error "DOS32"
+#endif
+#if (ACC_OS_WIN32 + 0 != UCL_OS_WIN32 + 0)
+#  error "WIN32"
+#endif
+#if (ACC_OS_WIN64 + 0 != UCL_OS_WIN64 + 0)
+#  error "WIN64"
 #endif
 
 
-/***********************************************************************
-// autoconf section
-************************************************************************/
-
-#if !defined(UCL_HAVE_CONFIG_H)
-#  include <stddef.h>           /* ptrdiff_t, size_t */
-#  include <string.h>           /* memcpy, memmove, memcmp, memset */
-#  if !defined(NO_STDLIB_H)
-#    include <stdlib.h>
-#  endif
-#  define HAVE_MEMCMP
-#  define HAVE_MEMCPY
-#  define HAVE_MEMMOVE
-#  define HAVE_MEMSET
-#else
-#  include <sys/types.h>
-#  if defined(STDC_HEADERS)
-#    include <string.h>
-#    include <stdlib.h>
-#  endif
-#  if defined(HAVE_STDDEF_H)
-#    include <stddef.h>
-#  endif
-#  if defined(HAVE_MEMORY_H)
-#    include <memory.h>
-#  endif
+#include "acc/acc_incd.h"
+#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
+#  include "acc/acc_ince.h"
+#  include "acc/acc_inci.h"
 #endif
 
-#if defined(__UCL_DOS16) || defined(__UCL_WIN16)
-#  define HAVE_MALLOC_H
-#  define HAVE_HALLOC
-#endif
-
-
 #undef NDEBUG
 #if !defined(UCL_DEBUG)
-#  define NDEBUG
-#endif
-#if 1 || defined(UCL_DEBUG) || !defined(NDEBUG)
-#  if !defined(NO_STDIO_H)
-#    include <stdio.h>
-#  endif
+#  define NDEBUG 1
 #endif
 #include <assert.h>
 
 
-#if !defined(UCL_UNUSED)
-#  define UCL_UNUSED(parm)  (parm = parm)
-#endif
-
-
-#if !defined(__inline__) && !defined(__GNUC__)
-#  if defined(__cplusplus)
-#    define __inline__      inline
+#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16) && (ACC_CC_BORLANDC)
+#  if (__BORLANDC__ >= 0x0450)  /* v4.00 */
+#    pragma option -h           /* enable fast huge pointers */
 #  else
-#    define __inline__      /* nothing */
+#    pragma option -h-          /* disable fast huge pointers - compiler bug */
 #  endif
 #endif
 
@@ -153,80 +159,6 @@
 #define UCL_UTYPE_MAX(b)    (((1ul << (8*(b)-1)) - 1ul) + (1ul << (8*(b)-1)))
 
 
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(SIZEOF_UNSIGNED)
-#  if (UINT_MAX == 0xffff)
-#    define SIZEOF_UNSIGNED         2
-#  elif (UINT_MAX == UCL_0xffffffffL)
-#    define SIZEOF_UNSIGNED         4
-#  elif (UINT_MAX >= UCL_0xffffffffL)
-#    define SIZEOF_UNSIGNED         8
-#  else
-#    error "SIZEOF_UNSIGNED"
-#  endif
-#endif
-
-#if !defined(SIZEOF_UNSIGNED_LONG)
-#  if (ULONG_MAX == UCL_0xffffffffL)
-#    define SIZEOF_UNSIGNED_LONG    4
-#  elif (ULONG_MAX >= UCL_0xffffffffL)
-#    define SIZEOF_UNSIGNED_LONG    8
-#  else
-#    error "SIZEOF_UNSIGNED_LONG"
-#  endif
-#endif
-
-
-#if !defined(SIZEOF_SIZE_T)
-#  define SIZEOF_SIZE_T             SIZEOF_UNSIGNED_LONG
-#endif
-#if !defined(SIZE_T_MAX)
-#  define SIZE_T_MAX                UCL_UTYPE_MAX(SIZEOF_SIZE_T)
-#endif
-
-
-/***********************************************************************
-// <string.h> section
-************************************************************************/
-
-#if defined(NO_MEMCMP)
-#  undef HAVE_MEMCMP
-#endif
-
-#if (UCL_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMCMP)
-#  define ucl_memcmp                memcmp
-#endif
-#if (UCL_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMCPY)
-#  define ucl_memcpy                memcpy
-#endif
-#if (UCL_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMMOVE)
-#  define ucl_memmove               memmove
-#endif
-#if (UCL_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMSET)
-#  define ucl_memset                memset
-#endif
-
-#if !defined(HAVE_MEMCMP)
-#  undef memcmp
-#  define memcmp                    ucl_memcmp
-#endif
-#if !defined(HAVE_MEMCPY)
-#  undef memcpy
-#  define memcpy                    ucl_memcpy
-#endif
-#if !defined(HAVE_MEMMOVE)
-#  undef memmove
-#  define memmove                   ucl_memmove
-#endif
-#if !defined(HAVE_MEMSET)
-#  undef memset
-#  define memset                    ucl_memset
-#endif
-
-
 /***********************************************************************
 // compiler and architecture specific stuff
 ************************************************************************/
@@ -236,81 +168,22 @@
  * even if it is allowed by your system.
  */
 
-#if 1 && defined(__UCL_i386) && (UINT_MAX == UCL_0xffffffffL)
-#  if !defined(UCL_UNALIGNED_OK_2) && (USHRT_MAX == 0xffff)
-#    define UCL_UNALIGNED_OK_2
-#  endif
-#  if !defined(UCL_UNALIGNED_OK_4) && (UCL_UINT32_MAX == UCL_0xffffffffL)
-#    define UCL_UNALIGNED_OK_4
-#  endif
-#endif
-
-#if defined(UCL_UNALIGNED_OK_2) || defined(UCL_UNALIGNED_OK_4)
-#  if !defined(UCL_UNALIGNED_OK)
-#    define UCL_UNALIGNED_OK
-#  endif
-#endif
-
-#if defined(__UCL_NO_UNALIGNED)
-#  undef UCL_UNALIGNED_OK
-#  undef UCL_UNALIGNED_OK_2
-#  undef UCL_UNALIGNED_OK_4
-#endif
-
-#if defined(UCL_UNALIGNED_OK_2) && (USHRT_MAX != 0xffff)
-#  error "UCL_UNALIGNED_OK_2 must not be defined on this system"
-#endif
-#if defined(UCL_UNALIGNED_OK_4) && (UCL_UINT32_MAX != UCL_0xffffffffL)
-#  error "UCL_UNALIGNED_OK_4 must not be defined on this system"
-#endif
-
-
-/* Many modern processors can transfer 32bit words much faster than
- * bytes - this can significantly speed decompression.
- */
-
-#if defined(__UCL_NO_ALIGNED)
-#  undef UCL_ALIGNED_OK_4
-#endif
-
-#if defined(UCL_ALIGNED_OK_4) && (UCL_UINT32_MAX != UCL_0xffffffffL)
-#  error "UCL_ALIGNED_OK_4 must not be defined on this system"
-#endif
-
-
-/* Definitions for byte order, according to significance of bytes, from low
- * addresses to high addresses. The value is what you get by putting '4'
- * in the most significant byte, '3' in the second most significant byte,
- * '2' in the second least significant byte, and '1' in the least
- * significant byte.
- * The byte order is only needed if we use UCL_UNALIGNED_OK.
- */
-
-#define UCL_LITTLE_ENDIAN       1234
-#define UCL_BIG_ENDIAN          4321
-#define UCL_PDP_ENDIAN          3412
-
-#if !defined(UCL_BYTE_ORDER)
-#  if defined(MFX_BYTE_ORDER)
-#    define UCL_BYTE_ORDER      MFX_BYTE_ORDER
-#  elif defined(__UCL_i386)
-#    define UCL_BYTE_ORDER      UCL_LITTLE_ENDIAN
-#  elif defined(BYTE_ORDER)
-#    define UCL_BYTE_ORDER      BYTE_ORDER
-#  elif defined(__BYTE_ORDER)
-#    define UCL_BYTE_ORDER      __BYTE_ORDER
-#  endif
-#endif
-
-#if defined(UCL_BYTE_ORDER)
-#  if (UCL_BYTE_ORDER != UCL_LITTLE_ENDIAN) && \
-      (UCL_BYTE_ORDER != UCL_BIG_ENDIAN)
-#    error "invalid UCL_BYTE_ORDER"
-#  endif
-#endif
-
-#if defined(UCL_UNALIGNED_OK) && !defined(UCL_BYTE_ORDER)
-#  error "UCL_BYTE_ORDER is not defined"
+#undef UA_GET2
+#undef UA_SET2
+#undef UA_GET4
+#undef UA_SET4
+#if 1 && (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
+#  define UA_GET2(p)    (* (const ucl_ushortp) (p))
+#  define UA_SET2(p)    (* (ucl_ushortp) (p))
+#  define UA_GET4(p)    (* (const acc_uint32e_t *) (p))
+#  define UA_SET4(p)    (* (acc_uint32e_t *) (p))
+#elif 0 && (ACC_ARCH_M68K) && (ACC_CC_GNUC >= 0x020900ul)
+   typedef struct { unsigned short v; } __ucl_ua2_t __attribute__((__aligned__(1)));
+   typedef struct { unsigned long v; }  __ucl_ua4_t __attribute__((__aligned__(1)));
+#  define UA_GET2(p)    (((const __ucl_ua2_t *)(p))->v)
+#  define UA_SET2(p)    (((__ucl_ua2_t *)(p))->v)
+#  define UA_GET4(p)    (((const __ucl_ua4_t *)(p))->v)
+#  define UA_SET4(p)    (((__ucl_ua4_t *)(p))->v)
 #endif
 
 
@@ -319,9 +192,7 @@
 ************************************************************************/
 
 __UCL_EXTERN_C int __ucl_init_done;
-__UCL_EXTERN_C const ucl_byte __ucl_copyright[];
-UCL_EXTERN(const ucl_byte *) ucl_copyright(void);
-__UCL_EXTERN_C const ucl_uint32 _ucl_crc32_table[256];
+UCL_EXTERN(const ucl_bytep) ucl_copyright(void);
 
 
 /***********************************************************************
@@ -331,18 +202,6 @@ __UCL_EXTERN_C const ucl_uint32 _ucl_crc32_table[256];
 #define _UCL_STRINGIZE(x)           #x
 #define _UCL_MEXPAND(x)             _UCL_STRINGIZE(x)
 
-/* concatenate */
-#define _UCL_CONCAT2(a,b)           a ## b
-#define _UCL_CONCAT3(a,b,c)         a ## b ## c
-#define _UCL_CONCAT4(a,b,c,d)       a ## b ## c ## d
-#define _UCL_CONCAT5(a,b,c,d,e)     a ## b ## c ## d ## e
-
-/* expand and concatenate (by using one level of indirection) */
-#define _UCL_ECONCAT2(a,b)          _UCL_CONCAT2(a,b)
-#define _UCL_ECONCAT3(a,b,c)        _UCL_CONCAT3(a,b,c)
-#define _UCL_ECONCAT4(a,b,c,d)      _UCL_CONCAT4(a,b,c,d)
-#define _UCL_ECONCAT5(a,b,c,d,e)    _UCL_CONCAT5(a,b,c,d,e)
-
 
 /***********************************************************************
 //
@@ -356,4 +215,3 @@ __UCL_EXTERN_C const ucl_uint32 _ucl_crc32_table[256];
 /*
 vi:ts=4:et
 */
-
diff --git a/tools/ucl/src/ucl_crc.c b/tools/ucl/src/ucl_crc.c
index 7608ecffb6..da9edbc0e4 100644
--- a/tools/ucl/src/ucl_crc.c
+++ b/tools/ucl/src/ucl_crc.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -27,7 +27,6 @@
 
 
 #include "ucl_conf.h"
-#include "ucl_util.h"
 
 
 /***********************************************************************
@@ -36,7 +35,7 @@
 // see http://www.cdrom.com/pub/infozip/zlib/
 ************************************************************************/
 
-const ucl_uint32 _ucl_crc32_table[256] = {
+static const ucl_uint32 __ucl_crc32_table[256] = {
   0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
   0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
   0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
@@ -92,12 +91,19 @@ const ucl_uint32 _ucl_crc32_table[256] = {
 };
 
 
+UCL_PUBLIC(const ucl_uint32p)
+ucl_get_crc32_table(void)
+{
+    return __ucl_crc32_table;
+}
+
+
 #if 1
 #define UCL_DO1(buf,i) \
-    crc = _ucl_crc32_table[((int)crc ^ buf[i]) & 0xff] ^ (crc >> 8)
+    crc = table[((int)crc ^ buf[i]) & 0xff] ^ (crc >> 8)
 #else
 #define UCL_DO1(buf,i) \
-    crc = _ucl_crc32_table[(unsigned char)((unsigned char)crc ^ buf[i])] ^ (crc >> 8)
+    crc = table[(unsigned char)((unsigned char)crc ^ buf[i])] ^ (crc >> 8)
 #endif
 #define UCL_DO2(buf,i)  UCL_DO1(buf,i); UCL_DO1(buf,i+1);
 #define UCL_DO4(buf,i)  UCL_DO2(buf,i); UCL_DO2(buf,i+2);
@@ -108,11 +114,18 @@ const ucl_uint32 _ucl_crc32_table[256] = {
 UCL_PUBLIC(ucl_uint32)
 ucl_crc32(ucl_uint32 c, const ucl_bytep buf, ucl_uint len)
 {
-    ucl_uint32 crc = (c & UCL_UINT32_C(0xffffffff)) ^ UCL_UINT32_C(0xffffffff);
+    ucl_uint32 crc;
+#undef table
+#if 1
+#  define table __ucl_crc32_table
+#else
+   const ucl_uint32 * table = __ucl_crc32_table;
+#endif
 
     if (buf == NULL)
         return 0;
 
+    crc = (c & UCL_UINT32_C(0xffffffff)) ^ UCL_UINT32_C(0xffffffff);
     if (len >= 16) do
     {
         UCL_DO16(buf,0);
@@ -127,6 +140,7 @@ ucl_crc32(ucl_uint32 c, const ucl_bytep buf, ucl_uint len)
     } while (len > 0);
 
     return crc ^ UCL_UINT32_C(0xffffffff);
+#undef table
 }
 
 
diff --git a/tools/ucl/src/ucl_dll.c b/tools/ucl/src/ucl_dll.ch
similarity index 84%
rename from tools/ucl/src/ucl_dll.c
rename to tools/ucl/src/ucl_dll.ch
index ec9df43e73..501ae15b04 100644
--- a/tools/ucl/src/ucl_dll.c
+++ b/tools/ucl/src/ucl_dll.ch
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -26,36 +26,27 @@
  */
 
 
-#include "ucl_conf.h"
-
-
 /***********************************************************************
 // Windows 16 bit + Watcom C + DLL
 ************************************************************************/
 
-#if defined(__UCL_WIN16) && defined(__WATCOMC__) && defined(__SW_BD)
+#if (ACC_OS_WIN16 && ACC_CC_WATCOMC) && defined(__SW_BD)
 
 /* don't pull in <windows.h> - we don't need it */
 #if 0
-#include <windows.h>
-#endif
-
-#pragma off (unreferenced);
-#if 0 && defined(WINVER)
 BOOL FAR PASCAL LibMain ( HANDLE hInstance, WORD wDataSegment,
                           WORD wHeapSize, LPSTR lpszCmdLine )
 #else
 int __far __pascal LibMain ( int a, short b, short c, long d )
 #endif
-#pragma on (unreferenced);
 {
+    ACC_UNUSED(a); ACC_UNUSED(b); ACC_UNUSED(c); ACC_UNUSED(d);
     return 1;
 }
 
 #endif
 
 
-
 /*
 vi:ts=4:et
 */
diff --git a/tools/ucl/src/ucl_init.c b/tools/ucl/src/ucl_init.c
index 4798acae97..b1a01d3ef7 100644
--- a/tools/ucl/src/ucl_init.c
+++ b/tools/ucl/src/ucl_init.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -27,27 +27,19 @@
 
 
 #include "ucl_conf.h"
-#include "ucl_util.h"
-#include <stdio.h>
-
-
-#if 0
-#  define IS_SIGNED(type)       (((type) (1ul << (8 * sizeof(type) - 1))) < 0)
-#  define IS_UNSIGNED(type)     (((type) (1ul << (8 * sizeof(type) - 1))) > 0)
-#else
-#  define IS_SIGNED(type)       (((type) (-1)) < ((type) 0))
-#  define IS_UNSIGNED(type)     (((type) (-1)) > ((type) 0))
-#endif
 
 
 /***********************************************************************
 // Runtime check of the assumptions about the size of builtin types,
 // memory model, byte order and other low-level constructs.
 //
-// We are really paranoid here - UCL should either fail (or crash)
+// We are really paranoid here - UCL should either fail
 // at startup or not at all.
 //
-// Because of inlining much of these functions evaluates to nothing.
+// Because of inlining much of this evaluates to nothing at compile time.
+//
+// And while many of the tests seem highly obvious and redundant they are
+// here to catch compiler/optimizer bugs. Yes, these do exist.
 ************************************************************************/
 
 static ucl_bool schedule_insns_bug(void);   /* avoid inlining */
@@ -55,6 +47,7 @@ static ucl_bool strength_reduce_bug(int *); /* avoid inlining */
 
 
 #if 0 || defined(UCL_DEBUG)
+#include <stdio.h>
 static ucl_bool __ucl_assert_fail(const char *s, unsigned line)
 {
 #if defined(__palmos__)
@@ -71,114 +64,28 @@ static ucl_bool __ucl_assert_fail(const char *s, unsigned line)
 
 
 /***********************************************************************
-// The next two functions should get completely optimized out of existance.
-// Some assertions are redundant - but included for clarity.
+// basic_check - compile time assertions
 ************************************************************************/
 
-static ucl_bool basic_integral_check(void)
-{
-    ucl_bool r = 1;
-    ucl_bool sanity;
+#if 1
 
-    /* paranoia */
-    r &= __ucl_assert(CHAR_BIT == 8);
-    r &= __ucl_assert(sizeof(char) == 1);
-    r &= __ucl_assert(sizeof(short) >= 2);
-    r &= __ucl_assert(sizeof(long) >= 4);
-    r &= __ucl_assert(sizeof(int) >= sizeof(short));
-    r &= __ucl_assert(sizeof(long) >= sizeof(int));
+#undef ACCCHK_ASSERT
+#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT_HEADER(expr)
+
+#include "acc/acc_chk.ch"
+
+    ACCCHK_ASSERT_IS_SIGNED_T(ucl_int)
+    ACCCHK_ASSERT_IS_UNSIGNED_T(ucl_uint)
+
+    ACCCHK_ASSERT_IS_SIGNED_T(ucl_int32)
+    ACCCHK_ASSERT_IS_UNSIGNED_T(ucl_uint32)
+    ACCCHK_ASSERT((UCL_UINT32_C(1) << (int)(8*sizeof(UCL_UINT32_C(1))-1)) > 0)
+
+    ACCCHK_ASSERT_IS_UNSIGNED_T(ucl_uintptr_t)
+    ACCCHK_ASSERT(sizeof(ucl_uintptr_t) >= sizeof(ucl_voidp))
 
-    r &= __ucl_assert(sizeof(ucl_uint32) >= 4);
-    r &= __ucl_assert(sizeof(ucl_uint32) >= sizeof(unsigned));
-#if defined(__UCL_STRICT_16BIT)
-    r &= __ucl_assert(sizeof(ucl_uint) == 2);
-#else
-    r &= __ucl_assert(sizeof(ucl_uint) >= 4);
-    r &= __ucl_assert(sizeof(ucl_uint) >= sizeof(unsigned));
 #endif
-
-#if defined(SIZEOF_UNSIGNED)
-    r &= __ucl_assert(SIZEOF_UNSIGNED == sizeof(unsigned));
-#endif
-#if defined(SIZEOF_UNSIGNED_LONG)
-    r &= __ucl_assert(SIZEOF_UNSIGNED_LONG == sizeof(unsigned long));
-#endif
-#if defined(SIZEOF_UNSIGNED_SHORT)
-    r &= __ucl_assert(SIZEOF_UNSIGNED_SHORT == sizeof(unsigned short));
-#endif
-#if !defined(__UCL_IN_MINIUCL)
-#if defined(SIZEOF_SIZE_T)
-    r &= __ucl_assert(SIZEOF_SIZE_T == sizeof(size_t));
-#endif
-#endif
-
-    /* assert the signedness of our integral types */
-    sanity = IS_UNSIGNED(unsigned short) && IS_UNSIGNED(unsigned) &&
-             IS_UNSIGNED(unsigned long) &&
-             IS_SIGNED(short) && IS_SIGNED(int) && IS_SIGNED(long);
-    if (sanity)
-    {
-        r &= __ucl_assert(IS_UNSIGNED(ucl_uint32));
-        r &= __ucl_assert(IS_UNSIGNED(ucl_uint));
-        r &= __ucl_assert(IS_SIGNED(ucl_int32));
-        r &= __ucl_assert(IS_SIGNED(ucl_int));
-
-        r &= __ucl_assert(INT_MAX    == UCL_STYPE_MAX(sizeof(int)));
-        r &= __ucl_assert(UINT_MAX   == UCL_UTYPE_MAX(sizeof(unsigned)));
-        r &= __ucl_assert(LONG_MAX   == UCL_STYPE_MAX(sizeof(long)));
-        r &= __ucl_assert(ULONG_MAX  == UCL_UTYPE_MAX(sizeof(unsigned long)));
-        r &= __ucl_assert(SHRT_MAX   == UCL_STYPE_MAX(sizeof(short)));
-        r &= __ucl_assert(USHRT_MAX  == UCL_UTYPE_MAX(sizeof(unsigned short)));
-        r &= __ucl_assert(UCL_UINT32_MAX == UCL_UTYPE_MAX(sizeof(ucl_uint32)));
-        r &= __ucl_assert(UCL_UINT_MAX   == UCL_UTYPE_MAX(sizeof(ucl_uint)));
-#if !defined(__UCL_IN_MINIUCL)
-        r &= __ucl_assert(SIZE_T_MAX     == UCL_UTYPE_MAX(sizeof(size_t)));
-#endif
-    }
-
-    return r;
-}
-
-
-static ucl_bool basic_ptr_check(void)
-{
-    ucl_bool r = 1;
-    ucl_bool sanity;
-
-    r &= __ucl_assert(sizeof(char *) >= sizeof(int));
-    r &= __ucl_assert(sizeof(ucl_byte *) >= sizeof(char *));
-
-    r &= __ucl_assert(sizeof(ucl_voidp) == sizeof(ucl_byte *));
-    r &= __ucl_assert(sizeof(ucl_voidp) == sizeof(ucl_voidpp));
-    r &= __ucl_assert(sizeof(ucl_voidp) == sizeof(ucl_bytepp));
-    r &= __ucl_assert(sizeof(ucl_voidp) >= sizeof(ucl_uint));
-
-    r &= __ucl_assert(sizeof(ucl_ptr_t) == sizeof(ucl_voidp));
-    r &= __ucl_assert(sizeof(ucl_ptr_t) >= sizeof(ucl_uint));
-
-    r &= __ucl_assert(sizeof(ucl_ptrdiff_t) >= 4);
-    r &= __ucl_assert(sizeof(ucl_ptrdiff_t) >= sizeof(ptrdiff_t));
-
-#if defined(SIZEOF_CHAR_P)
-    r &= __ucl_assert(SIZEOF_CHAR_P == sizeof(char *));
-#endif
-#if defined(SIZEOF_PTRDIFF_T)
-    r &= __ucl_assert(SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t));
-#endif
-
-    /* assert the signedness of our integral types */
-    sanity = IS_UNSIGNED(unsigned short) && IS_UNSIGNED(unsigned) &&
-             IS_UNSIGNED(unsigned long) &&
-             IS_SIGNED(short) && IS_SIGNED(int) && IS_SIGNED(long);
-    if (sanity)
-    {
-        r &= __ucl_assert(IS_UNSIGNED(ucl_ptr_t));
-        r &= __ucl_assert(IS_SIGNED(ucl_ptrdiff_t));
-        r &= __ucl_assert(IS_SIGNED(ucl_sptr_t));
-    }
-
-    return r;
-}
+#undef ACCCHK_ASSERT
 
 
 /***********************************************************************
@@ -189,31 +96,25 @@ static ucl_bool ptr_check(void)
 {
     ucl_bool r = 1;
     int i;
-    char _wrkmem[10 * sizeof(ucl_byte *) + sizeof(ucl_align_t)];
+    unsigned char _wrkmem[10 * sizeof(ucl_bytep) + sizeof(ucl_align_t)];
     ucl_bytep wrkmem;
     ucl_bytepp dict;
     unsigned char x[4 * sizeof(ucl_align_t)];
     long d;
     ucl_align_t a;
-    ucl_align_t u;
 
     for (i = 0; i < (int) sizeof(x); i++)
         x[i] = UCL_BYTE(i);
 
-    wrkmem = UCL_PTR_ALIGN_UP((ucl_byte *)_wrkmem,sizeof(ucl_align_t));
+    wrkmem = UCL_PTR_ALIGN_UP((ucl_bytep)_wrkmem, sizeof(ucl_align_t));
 
-#if 0
-    dict = (ucl_bytepp) wrkmem;
-#else
-    /* Avoid a compiler warning on architectures that
-     * do not allow unaligned access. */
-    u.a_ucl_bytep = wrkmem; dict = u.a_ucl_bytepp;
-#endif
+    dict = (ucl_bytepp) (ucl_voidp) wrkmem;
 
     d = (long) ((const ucl_bytep) dict - (const ucl_bytep) _wrkmem);
     r &= __ucl_assert(d >= 0);
     r &= __ucl_assert(d < (long) sizeof(ucl_align_t));
 
+    /* this may seem obvious, but some compilers incorrectly inline memset */
     memset(&a,0xff,sizeof(a));
     r &= __ucl_assert(a.a_ushort == USHRT_MAX);
     r &= __ucl_assert(a.a_uint == UINT_MAX);
@@ -224,32 +125,21 @@ static ucl_bool ptr_check(void)
     if (r == 1)
     {
         for (i = 0; i < 8; i++)
-            r &= __ucl_assert((const ucl_voidp) (&dict[i]) == (const ucl_voidp) (&wrkmem[i * sizeof(ucl_byte *)]));
+            r &= __ucl_assert((const ucl_voidp) (&dict[i]) == (const ucl_voidp) (&wrkmem[i * sizeof(ucl_bytep)]));
     }
 
-    /* check BZERO8_PTR and that NULL == 0 */
+    /* check that NULL == 0 */
     memset(&a,0,sizeof(a));
     r &= __ucl_assert(a.a_char_p == NULL);
     r &= __ucl_assert(a.a_ucl_bytep == NULL);
-    r &= __ucl_assert(NULL == (void*)0);
-    if (r == 1)
-    {
-        for (i = 0; i < 10; i++)
-            dict[i] = wrkmem;
-        BZERO8_PTR(dict+1,sizeof(dict[0]),8);
-        r &= __ucl_assert(dict[0] == wrkmem);
-        for (i = 1; i < 9; i++)
-            r &= __ucl_assert(dict[i] == NULL);
-        r &= __ucl_assert(dict[9] == wrkmem);
-    }
 
     /* check that the pointer constructs work as expected */
     if (r == 1)
     {
         unsigned k = 1;
         const unsigned n = (unsigned) sizeof(ucl_uint32);
-        ucl_byte *p0;
-        ucl_byte *p1;
+        ucl_bytep p0;
+        ucl_bytep p1;
 
         k += __ucl_align_gap(&x[k],n);
         p0 = (ucl_bytep) &x[k];
@@ -264,7 +154,7 @@ static ucl_bool ptr_check(void)
         p1 = (ucl_bytep) &x[1];
         r &= __ucl_assert(PTR_GE(p0,p1));
 
-        r &= __ucl_assert(k < 1+n);
+        r &= __ucl_assert(k < 1u+n);
         p1 = (ucl_bytep) &x[1+n];
         r &= __ucl_assert(PTR_LT(p0,p1));
 
@@ -272,17 +162,8 @@ static ucl_bool ptr_check(void)
         if (r == 1)
         {
             ucl_uint32 v0, v1;
-#if 0
-            v0 = * (ucl_uint32 *) &x[k];
-            v1 = * (ucl_uint32 *) &x[k+n];
-#else
-            /* Avoid compiler warnings on architectures that
-             * do not allow unaligned access. */
-            u.a_uchar_p = &x[k];
-            v0 = *u.a_ucl_uint32_p;
-            u.a_uchar_p = &x[k+n];
-            v1 = *u.a_ucl_uint32_p;
-#endif
+            v0 = * (ucl_uint32p) (ucl_voidp) &x[k];
+            v1 = * (ucl_uint32p) (ucl_voidp) &x[k+n];
             r &= __ucl_assert(v0 > 0);
             r &= __ucl_assert(v1 > 0);
         }
@@ -308,64 +189,42 @@ _ucl_config_check(void)
         unsigned char x[4*sizeof(ucl_align_t)];
     } u;
 
-#if 0
-    /* paranoia - the following is guaranteed by definition anyway */
-    r &= __ucl_assert((const void *)&u == (const void *)&u.a);
-    r &= __ucl_assert((const void *)&u == (const void *)&u.b);
-    r &= __ucl_assert((const void *)&u == (const void *)&u.x[0]);
-    r &= __ucl_assert((const void *)&u == (const void *)&u.aa[0]);
-#endif
-
-    r &= basic_integral_check();
-    r &= basic_ptr_check();
-    if (r != 1)
-        return UCL_E_ERROR;
-
     u.a = 0; u.b = 0;
     for (i = 0; i < (int) sizeof(u.x); i++)
         u.x[i] = UCL_BYTE(i);
 
-#if 0
-    /* check if the compiler correctly casts signed to unsigned */
-    r &= __ucl_assert( (int) (unsigned char) ((char) -1) == 255);
-#endif
-
-    /* check UCL_BYTE_ORDER */
-#if defined(UCL_BYTE_ORDER)
+#if defined(ACC_ENDIAN_BIG_ENDIAN) || defined(ACC_ENDIAN_LITTLE_ENDIAN)
     if (r == 1)
     {
-#  if (UCL_BYTE_ORDER == UCL_LITTLE_ENDIAN)
-        ucl_uint32 a = (ucl_uint32) (u.a & UCL_UINT32_C(0xffffffff));
-        unsigned short b = (unsigned short) (u.b & 0xffff);
-        r &= __ucl_assert(a == UCL_UINT32_C(0x03020100));
-        r &= __ucl_assert(b == 0x0100);
-#  elif (UCL_BYTE_ORDER == UCL_BIG_ENDIAN)
+#  if defined(ACC_ENDIAN_BIG_ENDIAN)
         ucl_uint32 a = u.a >> (8 * sizeof(u.a) - 32);
         unsigned short b = u.b >> (8 * sizeof(u.b) - 16);
         r &= __ucl_assert(a == UCL_UINT32_C(0x00010203));
         r &= __ucl_assert(b == 0x0001);
-#  else
-#    error "invalid UCL_BYTE_ORDER"
+#  endif
+#  if defined(ACC_ENDIAN_LITTLE_ENDIAN)
+        ucl_uint32 a = (ucl_uint32) (u.a & UCL_UINT32_C(0xffffffff));
+        unsigned short b = (unsigned short) (u.b & 0xffff);
+        r &= __ucl_assert(a == UCL_UINT32_C(0x03020100));
+        r &= __ucl_assert(b == 0x0100);
 #  endif
     }
 #endif
 
     /* check that unaligned memory access works as expected */
-#if defined(UCL_UNALIGNED_OK_2)
-    r &= __ucl_assert(sizeof(short) == 2);
+#if defined(UA_GET2) || defined(UA_SET2)
     if (r == 1)
     {
         unsigned short b[4];
-
         for (i = 0; i < 4; i++)
-            b[i] = * (const unsigned short *) &u.x[i];
-
-#  if (UCL_BYTE_ORDER == UCL_LITTLE_ENDIAN)
+            b[i] = UA_GET2(&u.x[i]);
+#  if defined(ACC_ENDIAN_LITTLE_ENDIAN)
         r &= __ucl_assert(b[0] == 0x0100);
         r &= __ucl_assert(b[1] == 0x0201);
         r &= __ucl_assert(b[2] == 0x0302);
         r &= __ucl_assert(b[3] == 0x0403);
-#  elif (UCL_BYTE_ORDER == UCL_BIG_ENDIAN)
+#  endif
+#  if defined(ACC_ENDIAN_BIG_ENDIAN)
         r &= __ucl_assert(b[0] == 0x0001);
         r &= __ucl_assert(b[1] == 0x0102);
         r &= __ucl_assert(b[2] == 0x0203);
@@ -374,21 +233,19 @@ _ucl_config_check(void)
     }
 #endif
 
-#if defined(UCL_UNALIGNED_OK_4)
-    r &= __ucl_assert(sizeof(ucl_uint32) == 4);
+#if defined(UA_GET4) || defined(UA_SET4)
     if (r == 1)
     {
         ucl_uint32 a[4];
-
         for (i = 0; i < 4; i++)
-            a[i] = * (const ucl_uint32 *) &u.x[i];
-
-#  if (UCL_BYTE_ORDER == UCL_LITTLE_ENDIAN)
+            a[i] = UA_GET4(&u.x[i]);
+#  if defined(ACC_ENDIAN_LITTLE_ENDIAN)
         r &= __ucl_assert(a[0] == UCL_UINT32_C(0x03020100));
         r &= __ucl_assert(a[1] == UCL_UINT32_C(0x04030201));
         r &= __ucl_assert(a[2] == UCL_UINT32_C(0x05040302));
         r &= __ucl_assert(a[3] == UCL_UINT32_C(0x06050403));
-#  elif (UCL_BYTE_ORDER == UCL_BIG_ENDIAN)
+#  endif
+#  if defined(ACC_ENDIAN_BIG_ENDIAN)
         r &= __ucl_assert(a[0] == UCL_UINT32_C(0x00010203));
         r &= __ucl_assert(a[1] == UCL_UINT32_C(0x01020304));
         r &= __ucl_assert(a[2] == UCL_UINT32_C(0x02030405));
@@ -397,17 +254,13 @@ _ucl_config_check(void)
     }
 #endif
 
-#if defined(UCL_ALIGNED_OK_4)
-    r &= __ucl_assert(sizeof(ucl_uint32) == 4);
-#endif
-
     /* check the ucl_adler32() function */
     if (r == 1)
     {
         ucl_uint32 adler;
         adler = ucl_adler32(0, NULL, 0);
-        adler = ucl_adler32(adler, ucl_copyright(), 186);
-        r &= __ucl_assert(adler == UCL_UINT32_C(0x47fb39fc));
+        adler = ucl_adler32(adler, ucl_copyright(), 195);
+        r &= __ucl_assert(adler == UCL_UINT32_C(0x52ca3a75));
     }
 
     /* check for the gcc schedule-insns optimization bug */
@@ -434,6 +287,7 @@ _ucl_config_check(void)
         r &= ptr_check();
     }
 
+    ACC_UNUSED(u);
     return r == 1 ? UCL_E_OK : UCL_E_ERROR;
 }
 
@@ -454,7 +308,11 @@ static ucl_bool schedule_insns_bug(void)
 
 static ucl_bool strength_reduce_bug(int *x)
 {
+#if 1 && (ACC_CC_DMC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
+    return 0;
+#else
     return x[0] != -3 || x[1] != -2 || x[2] != -1;
+#endif
 }
 
 
@@ -470,6 +328,12 @@ __ucl_init2(ucl_uint32 v, int s1, int s2, int s3, int s4, int s5,
 {
     int r;
 
+#if (ACC_CC_MSC && ((_MSC_VER) < 700))
+#else
+#include "acc/acc_chk.ch"
+#undef ACCCHK_ASSERT
+#endif
+
     __ucl_init_done = 1;
 
     if (v == 0)
@@ -495,6 +359,9 @@ __ucl_init2(ucl_uint32 v, int s1, int s2, int s3, int s4, int s5,
 }
 
 
+#include "ucl_dll.ch"
+
+
 /*
 vi:ts=4:et
 */
diff --git a/tools/ucl/src/ucl_mchw.ch b/tools/ucl/src/ucl_mchw.ch
index f2bcc9506f..c462576d80 100644
--- a/tools/ucl/src/ucl_mchw.ch
+++ b/tools/ucl/src/ucl_mchw.ch
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -22,11 +22,10 @@
 
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
+   http://www.oberhumer.com/opensource/ucl/
  */
 
 
-
-
 /***********************************************************************
 //
 ************************************************************************/
@@ -43,19 +42,19 @@ typedef struct
     ucl_uint last_m_len;
     ucl_uint last_m_off;
 
-    const ucl_byte *bp;
-    const ucl_byte *ip;
-    const ucl_byte *in;
-    const ucl_byte *in_end;
-    ucl_byte *out;
+    const ucl_bytep bp;
+    const ucl_bytep ip;
+    const ucl_bytep in;
+    const ucl_bytep in_end;
+    ucl_bytep out;
 
     ucl_uint32 bb_b;
     unsigned bb_k;
     unsigned bb_c_endian;
     unsigned bb_c_s;
     unsigned bb_c_s8;
-    ucl_byte *bb_p;
-    ucl_byte *bb_op;
+    ucl_bytep bb_p;
+    ucl_bytep bb_op;
 
     struct ucl_compress_config_t conf;
     ucl_uintp result;
@@ -76,9 +75,9 @@ UCL_COMPRESS_T;
 
 
 
-#if defined(__PUREC__) && defined(__UCL_TOS16)
-/* the cast is needed to work around a bug in Pure C */
-#define getbyte(c)  ((c).ip < (c).in_end ? (unsigned) *((c).ip)++ : (-1))
+#if (ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
+/* the cast is needed to work around a code generation bug */
+#define getbyte(c)  ((c).ip < (c).in_end ? (int) (unsigned) *((c).ip)++ : (-1))
 #else
 #define getbyte(c)  ((c).ip < (c).in_end ? *((c).ip)++ : (-1))
 #endif
@@ -93,7 +92,7 @@ UCL_COMPRESS_T;
 
 static int
 init_match ( UCL_COMPRESS_T *c, ucl_swd_t *s,
-             const ucl_byte *dict, ucl_uint dict_len,
+             const ucl_bytep dict, ucl_uint dict_len,
              ucl_uint32 flags )
 {
     int r;
@@ -143,7 +142,7 @@ find_match ( UCL_COMPRESS_T *c, ucl_swd_t *s,
         c->textsize += this_len - skip;
     }
 
-    s->m_len = THRESHOLD;
+    s->m_len = SWD_THRESHOLD;
 #ifdef SWD_BEST_OFF
     if (s->use_best_off)
         memset(s->best_pos,0,sizeof(s->best_pos));
@@ -154,7 +153,7 @@ find_match ( UCL_COMPRESS_T *c, ucl_swd_t *s,
     /* s->m_off may be uninitialized if we didn't find a match,
      * but then its value will never be used.
      */
-    c->m_off = (s->m_len == THRESHOLD) ? 0 : s->m_off;
+    c->m_off = (s->m_len == SWD_THRESHOLD) ? 0 : s->m_off;
 #else
     c->m_off = s->m_off;
 #endif
@@ -175,14 +174,14 @@ find_match ( UCL_COMPRESS_T *c, ucl_swd_t *s,
 
 #if 0
     /* brute force match search */
-    if (c->m_len > THRESHOLD && c->m_len + 1 <= c->look)
+    if (c->m_len > SWD_THRESHOLD && c->m_len + 1 <= c->look)
     {
-        const ucl_byte *ip = c->bp;
-        const ucl_byte *m  = c->bp - c->m_off;
-        const ucl_byte *in = c->in;
+        const ucl_bytep ip = c->bp;
+        const ucl_bytep m  = c->bp - c->m_off;
+        const ucl_bytep in = c->in;
 
-        if (ip - in > N)
-            in = ip - N;
+        if (ip - in > s->n)
+            in = ip - s->n;
         for (;;)
         {
             while (*in != *ip)
@@ -235,7 +234,7 @@ static int bbConfig(UCL_COMPRESS_T *c, int endian, int bitsize)
 
 static void bbWriteBits(UCL_COMPRESS_T *c)
 {
-    ucl_byte *p = c->bb_p;
+    ucl_bytep p = c->bb_p;
     ucl_uint32 b = c->bb_b;
 
     p[0] = UCL_BYTE(b >>  0);
diff --git a/tools/ucl/src/ucl_ptr.c b/tools/ucl/src/ucl_ptr.c
index b092d2440f..168f5bd177 100644
--- a/tools/ucl/src/ucl_ptr.c
+++ b/tools/ucl/src/ucl_ptr.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -33,13 +33,13 @@
 //
 ************************************************************************/
 
-UCL_PUBLIC(ucl_ptr_t)
+UCL_PUBLIC(ucl_uintptr_t)
 __ucl_ptr_linear(const ucl_voidp ptr)
 {
-    ucl_ptr_t p;
+    ucl_uintptr_t p;
 
-#if defined(__UCL_DOS16) || defined(__UCL_WIN16)
-    p = (((ucl_ptr_t)(_FP_SEG(ptr))) << (16 - __UCL_HShift)) + (_FP_OFF(ptr));
+#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
+    p = (((ucl_uintptr_t)(ACC_FP_SEG(ptr))) << (16 - ACC_MM_AHSHIFT)) + (ACC_FP_OFF(ptr));
 #else
     p = PTR_LINEAR(ptr);
 #endif
@@ -55,12 +55,12 @@ __ucl_ptr_linear(const ucl_voidp ptr)
 UCL_PUBLIC(unsigned)
 __ucl_align_gap(const ucl_voidp ptr, ucl_uint size)
 {
-    ucl_ptr_t p, s, n;
+    ucl_uintptr_t p, s, n;
 
     assert(size > 0);
 
     p = __ucl_ptr_linear(ptr);
-    s = (ucl_ptr_t) (size - 1);
+    s = (ucl_uintptr_t) (size - 1);
 #if 0
     assert((size & (size - 1)) == 0);
     n = ((p + s) & ~s) - p;
diff --git a/tools/ucl/src/ucl_ptr.h b/tools/ucl/src/ucl_ptr.h
index 86221b9ac1..ebfa2759fe 100644
--- a/tools/ucl/src/ucl_ptr.h
+++ b/tools/ucl/src/ucl_ptr.h
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -22,6 +22,7 @@
 
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
+   http://www.oberhumer.com/opensource/ucl/
  */
 
 
@@ -39,93 +40,12 @@ extern "C" {
 #endif
 
 
-/* This is the lowest part of the UCL library.
- * It deals with pointer representations at bit level.
- */
-
-
-/***********************************************************************
-// Includes
-************************************************************************/
-
-#if defined(__UCL_DOS16) || defined(__UCL_WIN16)
-#  include <dos.h>
-#  if 1 && defined(__WATCOMC__)
-#    include <i86.h>
-     __UCL_EXTERN_C unsigned char _HShift;
-#    define __UCL_HShift    _HShift
-#  elif 1 && defined(_MSC_VER)
-     __UCL_EXTERN_C unsigned short __near _AHSHIFT;
-#    define __UCL_HShift    ((unsigned) &_AHSHIFT)
-#  elif defined(__UCL_WIN16)
-#    define __UCL_HShift    3
-#  else
-#    define __UCL_HShift    12
-#  endif
-#  if !defined(_FP_SEG) && defined(FP_SEG)
-#    define _FP_SEG         FP_SEG
-#  endif
-#  if !defined(_FP_OFF) && defined(FP_OFF)
-#    define _FP_OFF         FP_OFF
-#  endif
-#endif
-
-
 /***********************************************************************
 // Integral types
 ************************************************************************/
 
-/* ptrdiff_t */
-#if !defined(ucl_ptrdiff_t)
-  #if (UINT_MAX >= UCL_0xffffffffL)
-     typedef ptrdiff_t          ucl_ptrdiff_t;
-  #else
-     typedef long               ucl_ptrdiff_t;
-  #endif
-#endif
-
-
-/* Unsigned type that has *exactly* the same number of bits as a ucl_voidp */
-#if !defined(__UCL_HAVE_PTR_T)
-#  if defined(ucl_ptr_t)
-#    define __UCL_HAVE_PTR_T
-#  endif
-#endif
-#if !defined(__UCL_HAVE_PTR_T)
-#  if defined(SIZEOF_CHAR_P) && defined(SIZEOF_UNSIGNED_LONG)
-#    if (SIZEOF_CHAR_P == SIZEOF_UNSIGNED_LONG)
-       typedef unsigned long    ucl_ptr_t;
-       typedef long             ucl_sptr_t;
-#      define __UCL_HAVE_PTR_T
-#    endif
-#  endif
-#endif
-#if !defined(__UCL_HAVE_PTR_T)
-#  if defined(SIZEOF_CHAR_P) && defined(SIZEOF_UNSIGNED)
-#    if (SIZEOF_CHAR_P == SIZEOF_UNSIGNED)
-       typedef unsigned int     ucl_ptr_t;
-       typedef int              ucl_sptr_t;
-#      define __UCL_HAVE_PTR_T
-#    endif
-#  endif
-#endif
-#if !defined(__UCL_HAVE_PTR_T)
-#  if defined(SIZEOF_CHAR_P) && defined(SIZEOF_UNSIGNED_SHORT)
-#    if (SIZEOF_CHAR_P == SIZEOF_UNSIGNED_SHORT)
-       typedef unsigned short   ucl_ptr_t;
-       typedef short            ucl_sptr_t;
-#      define __UCL_HAVE_PTR_T
-#    endif
-#  endif
-#endif
-#if !defined(__UCL_HAVE_PTR_T)
-#  if defined(UCL_HAVE_CONFIG_H) || defined(SIZEOF_CHAR_P)
-#    error "no suitable type for ucl_ptr_t"
-#  else
-     typedef unsigned long      ucl_ptr_t;
-     typedef long               ucl_sptr_t;
-#    define __UCL_HAVE_PTR_T
-#  endif
+#if !defined(ucl_uintptr_t)
+#  define ucl_uintptr_t     acc_uintptr_t
 #endif
 
 
@@ -144,13 +64,13 @@ extern "C" {
  * that are pointing to Nirvana.
  */
 
-#if defined(__UCL_DOS16) || defined(__UCL_WIN16)
+#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
 #define PTR(a)              ((ucl_bytep) (a))
 /* only need the low bits of the pointer -> offset is ok */
-#define PTR_ALIGNED_4(a)    ((_FP_OFF(a) & 3) == 0)
-#define PTR_ALIGNED2_4(a,b) (((_FP_OFF(a) | _FP_OFF(b)) & 3) == 0)
+#define PTR_ALIGNED_4(a)    ((ACC_FP_OFF(a) & 3) == 0)
+#define PTR_ALIGNED2_4(a,b) (((ACC_FP_OFF(a) | ACC_FP_OFF(b)) & 3) == 0)
 #else
-#define PTR(a)              ((ucl_ptr_t) (a))
+#define PTR(a)              ((ucl_uintptr_t) (a))
 #define PTR_LINEAR(a)       PTR(a)
 #define PTR_ALIGNED_4(a)    ((PTR_LINEAR(a) & 3) == 0)
 #define PTR_ALIGNED_8(a)    ((PTR_LINEAR(a) & 7) == 0)
@@ -160,10 +80,9 @@ extern "C" {
 
 #define PTR_LT(a,b)         (PTR(a) < PTR(b))
 #define PTR_GE(a,b)         (PTR(a) >= PTR(b))
-#define PTR_DIFF(a,b)       ((ucl_ptrdiff_t) (PTR(a) - PTR(b)))
 
 
-UCL_EXTERN(ucl_ptr_t)
+UCL_EXTERN(ucl_uintptr_t)
 __ucl_ptr_linear(const ucl_voidp ptr);
 
 
@@ -182,8 +101,7 @@ typedef union
     ucl_int32       a_ucl_int32;
     ucl_uint32      a_ucl_uint32;
     ptrdiff_t       a_ptrdiff_t;
-    ucl_ptrdiff_t   a_ucl_ptrdiff_t;
-    ucl_ptr_t       a_ucl_ptr_t;
+    ucl_uintptr_t   a_ucl_uintptr_t;
     ucl_voidp       a_ucl_voidp;
     void *          a_void_p;
     ucl_bytep       a_ucl_bytep;
diff --git a/tools/ucl/src/ucl_str.c b/tools/ucl/src/ucl_str.c
index 5866fb6377..5beced1ce8 100644
--- a/tools/ucl/src/ucl_str.c
+++ b/tools/ucl/src/ucl_str.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -38,94 +38,19 @@
 // slow but portable <string.h> stuff, only used in assertions
 ************************************************************************/
 
-UCL_PUBLIC(int)
-ucl_memcmp(const ucl_voidp s1, const ucl_voidp s2, ucl_uint len)
-{
-#if (UCL_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMCMP)
-    return memcmp(s1,s2,len);
-#else
-    const ucl_byte *p1 = (const ucl_byte *) s1;
-    const ucl_byte *p2 = (const ucl_byte *) s2;
-    int d;
-
-    if (len > 0) do
-    {
-        d = *p1 - *p2;
-        if (d != 0)
-            return d;
-        p1++;
-        p2++;
-    }
-    while (--len > 0);
-    return 0;
+#if !defined(__UCL_MMODEL_HUGE)
+#  undef ACC_HAVE_MM_HUGE_PTR
 #endif
-}
-
-
-UCL_PUBLIC(ucl_voidp)
-ucl_memcpy(ucl_voidp dest, const ucl_voidp src, ucl_uint len)
-{
-#if (UCL_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMCPY)
-    return memcpy(dest,src,len);
-#else
-    ucl_byte *p1 = (ucl_byte *) dest;
-    const ucl_byte *p2 = (const ucl_byte *) src;
-
-    if (len <= 0 || p1 == p2)
-        return dest;
-    do
-        *p1++ = *p2++;
-    while (--len > 0);
-    return dest;
-#endif
-}
-
-
-UCL_PUBLIC(ucl_voidp)
-ucl_memmove(ucl_voidp dest, const ucl_voidp src, ucl_uint len)
-{
-#if (UCL_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMMOVE)
-    return memmove(dest,src,len);
-#else
-    ucl_byte *p1 = (ucl_byte *) dest;
-    const ucl_byte *p2 = (const ucl_byte *) src;
-
-    if (len <= 0 || p1 == p2)
-        return dest;
-
-    if (p1 < p2)
-    {
-        do
-            *p1++ = *p2++;
-        while (--len > 0);
-    }
-    else
-    {
-        p1 += len;
-        p2 += len;
-        do
-            *--p1 = *--p2;
-        while (--len > 0);
-    }
-    return dest;
-#endif
-}
-
-
-UCL_PUBLIC(ucl_voidp)
-ucl_memset(ucl_voidp s, int c, ucl_uint len)
-{
-#if (UCL_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMSET)
-    return memset(s,c,len);
-#else
-    ucl_byte *p = (ucl_byte *) s;
-
-    if (len > 0) do
-        *p++ = UCL_BYTE(c);
-    while (--len > 0);
-    return s;
-#endif
-}
+#define acc_hsize_t             ucl_uint
+#define acc_hvoid_p             ucl_voidp
+#define acc_hbyte_p             ucl_bytep
+#define ACCLIB_PUBLIC(r,f)      UCL_PUBLIC(r) f
+#define acc_hmemcmp             ucl_memcmp
+#define acc_hmemcpy             ucl_memcpy
+#define acc_hmemmove            ucl_memmove
+#define acc_hmemset             ucl_memset
+#include "acc/acclib/hmemcpy.ch"
+#undef ACCLIB_PUBLIC
 
 
 /*
diff --git a/tools/ucl/src/ucl_swd.ch b/tools/ucl/src/ucl_swd.ch
index e40b4a4662..abc0ae1eb6 100644
--- a/tools/ucl/src/ucl_swd.ch
+++ b/tools/ucl/src/ucl_swd.ch
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -22,6 +22,7 @@
 
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
+   http://www.oberhumer.com/opensource/ucl/
  */
 
 
@@ -34,52 +35,43 @@
 //
 ************************************************************************/
 
-#ifndef SWD_N
-#  define SWD_N             N
-#endif
-#ifndef SWD_F
-#  define SWD_F             F
-#endif
-#ifndef SWD_THRESHOLD
-#  define SWD_THRESHOLD     THRESHOLD
-#endif
-
 /* unsigned type for dictionary access - don't waste memory here */
-#if (SWD_N + SWD_F + SWD_F < USHRT_MAX)
+#if (0UL + SWD_N + SWD_F + SWD_F < 0UL + USHRT_MAX)
    typedef unsigned short   swd_uint;
 #  define SWD_UINT_MAX      USHRT_MAX
 #else
    typedef ucl_uint         swd_uint;
 #  define SWD_UINT_MAX      UCL_UINT_MAX
 #endif
+#define swd_uintp           swd_uint __UCL_MMODEL *
 #define SWD_UINT(x)         ((swd_uint)(x))
 
 
-#ifndef SWD_HSIZE
-#  define SWD_HSIZE         16384
-#endif
 #ifndef SWD_MAX_CHAIN
 #  define SWD_MAX_CHAIN     2048
 #endif
+#define SWD_HSIZE           (SWD_HMASK + 1)
 
 #if !defined(HEAD3)
 #if 1
 #  define HEAD3(b,p) \
-    (((0x9f5f*(((((ucl_uint32)b[p]<<5)^b[p+1])<<5)^b[p+2]))>>5) & (SWD_HSIZE-1))
+    (((0x9f5f*(((((ucl_uint32)b[p]<<5)^b[p+1])<<5)^b[p+2]))>>5) & SWD_HMASK)
 #else
 #  define HEAD3(b,p) \
-    (((0x9f5f*(((((ucl_uint32)b[p+2]<<5)^b[p+1])<<5)^b[p]))>>5) & (SWD_HSIZE-1))
+    (((0x9f5f*(((((ucl_uint32)b[p+2]<<5)^b[p+1])<<5)^b[p]))>>5) & SWD_HMASK)
 #endif
 #endif
 
-#if (SWD_THRESHOLD == 1) && !defined(HEAD2)
-#  if 1 && defined(UCL_UNALIGNED_OK_2)
-#    define HEAD2(b,p)      (* (const ucl_ushortp) &(b[p]))
+#if !defined(HEAD2)
+#if (SWD_THRESHOLD == 1)
+#  if 1 && defined(UA_GET2)
+#    define HEAD2(b,p)      UA_GET2(&(b[p]))
 #  else
 #    define HEAD2(b,p)      (b[p] ^ ((unsigned)b[p+1]<<8))
 #  endif
 #  define NIL2              SWD_UINT_MAX
 #endif
+#endif
 
 
 #if defined(__UCL_CHECKER)
@@ -96,6 +88,7 @@ typedef struct
     ucl_uint n;
     ucl_uint f;
     ucl_uint threshold;
+    ucl_uint hmask;
 
 /* public - configuration */
     ucl_uint max_chain;
@@ -120,8 +113,8 @@ typedef struct
 #endif
 
 /* private */
-    const ucl_byte *dict;
-    const ucl_byte *dict_end;
+    const ucl_bytep dict;
+    const ucl_bytep dict_end;
     ucl_uint dict_len;
 
 /* private */
@@ -130,19 +123,22 @@ typedef struct
     ucl_uint rp;                /* remove pointer */
     ucl_uint b_size;
 
-    unsigned char *b_wrap;
+    ucl_bytep b_wrap;
 
     ucl_uint node_count;
     ucl_uint first_rp;
 
 #if defined(SWD_USE_MALLOC)
-    unsigned char *b;
-    swd_uint *head3;
-    swd_uint *succ3;
-    swd_uint *best3;
-    swd_uint *llen3;
+    ucl_bytep b;
+    swd_uintp head3;
+    swd_uintp succ3;
+    swd_uintp best3;
+    swd_uintp llen3;
 #ifdef HEAD2
-    swd_uint *head2;
+    swd_uintp head2;
+#ifdef HEAD2_VAR
+    int use_head2;
+#endif
 #endif
 #else
     unsigned char b [ SWD_N + SWD_F + SWD_F ];
@@ -163,10 +159,10 @@ ucl_swd_t;
  * but then its value will never be used.
  */
 #if defined(__UCL_CHECKER)
-#  define s_head3(s,key) \
+#  define s_get_head3(s,key) \
         ((s->llen3[key] == 0) ? SWD_UINT_MAX : s->head3[key])
 #else
-#  define s_head3(s,key)        s->head3[key]
+#  define s_get_head3(s,key)    s->head3[key]
 #endif
 
 
@@ -175,7 +171,7 @@ ucl_swd_t;
 ************************************************************************/
 
 static
-void swd_initdict(ucl_swd_t *s, const ucl_byte *dict, ucl_uint dict_len)
+void swd_initdict(ucl_swd_t *s, const ucl_bytep dict, ucl_uint dict_len)
 {
     s->dict = s->dict_end = NULL;
     s->dict_len = 0;
@@ -207,15 +203,17 @@ void swd_insertdict(ucl_swd_t *s, ucl_uint node, ucl_uint len)
     while (len-- > 0)
     {
         key = HEAD3(s->b,node);
-        s->succ3[node] = s_head3(s,key);
+        s->succ3[node] = s_get_head3(s,key);
         s->head3[key] = SWD_UINT(node);
         s->best3[node] = SWD_UINT(s->f + 1);
         s->llen3[key]++;
         assert(s->llen3[key] <= s->n);
 
 #ifdef HEAD2
-        key = HEAD2(s->b,node);
-        s->head2[key] = SWD_UINT(node);
+        IF_HEAD2(s) {
+            key = HEAD2(s->b,node);
+            s->head2[key] = SWD_UINT(node);
+        }
 #endif
 
         node++;
@@ -228,10 +226,18 @@ void swd_insertdict(ucl_swd_t *s, ucl_uint node, ucl_uint len)
 ************************************************************************/
 
 static
-int swd_init(ucl_swd_t *s, const ucl_byte *dict, ucl_uint dict_len)
+int swd_init(ucl_swd_t *s, const ucl_bytep dict, ucl_uint dict_len)
 {
-    ucl_uint i = 0;
-    int c = 0;
+#if defined(SWD_USE_MALLOC)
+    s->b = NULL;
+    s->head3 = NULL;
+    s->succ3 = NULL;
+    s->best3 = NULL;
+    s->llen3 = NULL;
+#ifdef HEAD2
+    s->head2 = NULL;
+#endif
+#endif
 
     if (s->n == 0)
         s->n = SWD_N;
@@ -242,17 +248,19 @@ int swd_init(ucl_swd_t *s, const ucl_byte *dict, ucl_uint dict_len)
         return UCL_E_INVALID_ARGUMENT;
 
 #if defined(SWD_USE_MALLOC)
-    s->b = (unsigned char *) ucl_alloc(s->n + s->f + s->f, 1);
-    s->head3 = (swd_uint *) ucl_alloc(SWD_HSIZE, sizeof(*s->head3));
-    s->succ3 = (swd_uint *) ucl_alloc(s->n + s->f, sizeof(*s->succ3));
-    s->best3 = (swd_uint *) ucl_alloc(s->n + s->f, sizeof(*s->best3));
-    s->llen3 = (swd_uint *) ucl_alloc(SWD_HSIZE, sizeof(*s->llen3));
+    s->b = (ucl_bytep) ucl_malloc(s->n + s->f + s->f);
+    s->head3 = (swd_uintp) ucl_alloc(SWD_HSIZE, sizeof(*s->head3));
+    s->succ3 = (swd_uintp) ucl_alloc(s->n + s->f, sizeof(*s->succ3));
+    s->best3 = (swd_uintp) ucl_alloc(s->n + s->f, sizeof(*s->best3));
+    s->llen3 = (swd_uintp) ucl_alloc(SWD_HSIZE, sizeof(*s->llen3));
     if (!s->b || !s->head3  || !s->succ3 || !s->best3 || !s->llen3)
         return UCL_E_OUT_OF_MEMORY;
 #ifdef HEAD2
-    s->head2 = (swd_uint *) ucl_alloc(UCL_UINT32_C(65536), sizeof(*s->head2));
-    if (!s->head2)
-        return UCL_E_OUT_OF_MEMORY;
+    IF_HEAD2(s) {
+        s->head2 = (swd_uintp) ucl_alloc(UCL_UINT32_C(65536), sizeof(*s->head2));
+        if (!s->head2)
+            return UCL_E_OUT_OF_MEMORY;
+    }
 #endif
 #endif
 
@@ -268,15 +276,18 @@ int swd_init(ucl_swd_t *s, const ucl_byte *dict, ucl_uint dict_len)
     s->b_wrap = s->b + s->b_size;
     s->node_count = s->n;
 
-    ucl_memset(s->llen3, 0, sizeof(s->llen3[0]) * SWD_HSIZE);
+    ucl_memset(s->llen3, 0, (ucl_uint)sizeof(s->llen3[0]) * SWD_HSIZE);
 #ifdef HEAD2
+    IF_HEAD2(s) {
 #if 1
-    ucl_memset(s->head2, 0xff, sizeof(s->head2[0]) * UCL_UINT32_C(65536));
-    assert(s->head2[0] == NIL2);
+        ucl_memset(s->head2, 0xff, (ucl_uint)sizeof(s->head2[0]) * UCL_UINT32_C(65536));
+        assert(s->head2[0] == NIL2);
 #else
-    for (i = 0; i < UCL_UINT32_C(65536); i++)
-        s->head2[i] = NIL2;
+        ucl_uint32 i;
+        for (i = 0; i < UCL_UINT32_C(65536); i++)
+            s->head2[i] = NIL2;
 #endif
+    }
 #endif
 
     s->ip = 0;
@@ -299,6 +310,7 @@ int swd_init(ucl_swd_t *s, const ucl_byte *dict, ucl_uint dict_len)
     s->look = 0;
     while (s->look < s->f)
     {
+        int c;
         if ((c = getbyte(*(s->c))) < 0)
             break;
         s->b[s->ip] = UCL_BYTE(c);
@@ -325,8 +337,6 @@ int swd_init(ucl_swd_t *s, const ucl_byte *dict, ucl_uint dict_len)
         ucl_memset(&s->b[s->bp+s->look],0,3);
 #endif
 
-    UCL_UNUSED(i);
-    UCL_UNUSED(c);
     return UCL_E_OK;
 }
 
@@ -345,7 +355,7 @@ void swd_exit(ucl_swd_t *s)
     ucl_free(s->head3); s->head3 = NULL;
     ucl_free(s->b); s->b = NULL;
 #else
-    UCL_UNUSED(s);
+    ACC_UNUSED(s);
 #endif
 }
 
@@ -358,7 +368,7 @@ void swd_exit(ucl_swd_t *s)
 //
 ************************************************************************/
 
-static __inline__
+static
 void swd_getbyte(ucl_swd_t *s)
 {
     int c;
@@ -393,7 +403,7 @@ void swd_getbyte(ucl_swd_t *s)
 // remove node from lists
 ************************************************************************/
 
-static __inline__
+static
 void swd_remove_node(ucl_swd_t *s, ucl_uint node)
 {
     if (s->node_count == 0)
@@ -404,7 +414,7 @@ void swd_remove_node(ucl_swd_t *s, ucl_uint node)
         if (s->first_rp != UCL_UINT_MAX)
         {
             if (node != s->first_rp)
-                printf("Remove %5d: %5d %5d %5d %5d  %6d %6d\n",
+                printf("Remove %5u: %5u %5u %5u %5u  %6u %6u\n",
                         node, s->rp, s->ip, s->bp, s->first_rp,
                         s->ip - node, s->ip - s->bp);
             assert(node == s->first_rp);
@@ -417,10 +427,12 @@ void swd_remove_node(ucl_swd_t *s, ucl_uint node)
         --s->llen3[key];
 
 #ifdef HEAD2
-        key = HEAD2(s->b,node);
-        assert(s->head2[key] != NIL2);
-        if ((ucl_uint) s->head2[key] == node)
-            s->head2[key] = NIL2;
+        IF_HEAD2(s) {
+            key = HEAD2(s->b,node);
+            assert(s->head2[key] != NIL2);
+            if ((ucl_uint) s->head2[key] == node)
+                s->head2[key] = NIL2;
+        }
 #endif
     }
     else
@@ -445,16 +457,18 @@ void swd_accept(ucl_swd_t *s, ucl_uint n)
 
         /* add bp into HEAD3 */
         key = HEAD3(s->b,s->bp);
-        s->succ3[s->bp] = s_head3(s,key);
+        s->succ3[s->bp] = s_get_head3(s,key);
         s->head3[key] = SWD_UINT(s->bp);
         s->best3[s->bp] = SWD_UINT(s->f + 1);
         s->llen3[key]++;
         assert(s->llen3[key] <= s->n);
 
 #ifdef HEAD2
-        /* add bp into HEAD2 */
-        key = HEAD2(s->b,s->bp);
-        s->head2[key] = SWD_UINT(s->bp);
+        IF_HEAD2(s) {
+            /* add bp into HEAD2 */
+            key = HEAD2(s->b,s->bp);
+            s->head2[key] = SWD_UINT(s->bp);
+        }
 #endif
 
         swd_getbyte(s);
@@ -469,19 +483,13 @@ void swd_accept(ucl_swd_t *s, ucl_uint n)
 static
 void swd_search(ucl_swd_t *s, ucl_uint node, ucl_uint cnt)
 {
-#if 0 && defined(__GNUC__) && defined(__i386__)
-    register const unsigned char *p1 __asm__("%edi");
-    register const unsigned char *p2 __asm__("%esi");
-    register const unsigned char *px __asm__("%edx");
-#else
-    const unsigned char *p1;
-    const unsigned char *p2;
-    const unsigned char *px;
-#endif
+    const ucl_bytep p1;
+    const ucl_bytep p2;
+    const ucl_bytep px;
     ucl_uint m_len = s->m_len;
-    const unsigned char * b  = s->b;
-    const unsigned char * bp = s->b + s->bp;
-    const unsigned char * bx = s->b + s->bp + s->look;
+    const ucl_bytep b  = s->b;
+    const ucl_bytep bp = s->b + s->bp;
+    const ucl_bytep bx = s->b + s->bp + s->look;
     unsigned char scan_end1;
 
     assert(s->m_len > 0);
@@ -506,9 +514,9 @@ void swd_search(ucl_swd_t *s, ucl_uint node, ucl_uint cnt)
             ucl_uint i;
             assert(ucl_memcmp(bp,&b[node],3) == 0);
 
-#if 0 && defined(UCL_UNALIGNED_OK_4)
+#if 0 && defined(UA_GET4)
             p1 += 3; p2 += 3;
-            while (p1 < px && * (const ucl_uint32p) p1 == * (const ucl_uint32p) p2)
+            while (p1 < px && UA_GET4(p1) == UA_GET4(p2))
                 p1 += 4, p2 += 4;
             while (p1 < px && *p1 == *p2)
                 p1 += 1, p2 += 1;
@@ -516,7 +524,7 @@ void swd_search(ucl_swd_t *s, ucl_uint node, ucl_uint cnt)
             p1 += 2; p2 += 2;
             do {} while (++p1 < px && *p1 == *++p2);
 #endif
-            i = p1 - bp;
+            i = (ucl_uint) (p1 - bp);
 
 #ifdef UCL_DEBUG
             if (ucl_memcmp(bp,&b[node],i) != 0)
@@ -604,7 +612,7 @@ void swd_findbest(ucl_swd_t *s)
 
     /* get current head, add bp into HEAD3 */
     key = HEAD3(s->b,s->bp);
-    node = s->succ3[s->bp] = s_head3(s,key);
+    node = s->succ3[s->bp] = s_get_head3(s,key);
     cnt = s->llen3[key]++;
     assert(s->llen3[key] <= s->n + s->f);
     if (cnt > s->max_chain && s->max_chain > 0)
@@ -622,11 +630,21 @@ void swd_findbest(ucl_swd_t *s)
     }
     else
     {
-#ifdef HEAD2
-        if (swd_search2(s))
-#endif
+#if defined(HEAD2_VAR)
+        if (s->use_head2) {
+            if (swd_search2(s) && s->look >= 3)
+                swd_search(s,node,cnt);
+        } else {
             if (s->look >= 3)
                 swd_search(s,node,cnt);
+        }
+#elif defined(HEAD2)
+        if (swd_search2(s) && s->look >= 3)
+            swd_search(s,node,cnt);
+#else
+        if (s->look >= 3)
+            swd_search(s,node,cnt);
+#endif
         if (s->m_len > len)
             s->m_off = swd_pos2off(s,s->m_pos);
         s->best3[s->bp] = SWD_UINT(s->m_len);
@@ -648,15 +666,18 @@ void swd_findbest(ucl_swd_t *s)
 
 #ifdef HEAD2
     /* add bp into HEAD2 */
-    key = HEAD2(s->b,s->bp);
-    s->head2[key] = SWD_UINT(s->bp);
+    IF_HEAD2(s) {
+        key = HEAD2(s->b,s->bp);
+        s->head2[key] = SWD_UINT(s->bp);
+    }
 #endif
 }
 
 
 #undef HEAD3
 #undef HEAD2
-#undef s_head3
+#undef IF_HEAD2
+#undef s_get_head3
 
 
 /*
diff --git a/tools/ucl/src/ucl_util.c b/tools/ucl/src/ucl_util.c
index 93b7298302..7e49a2a3b0 100644
--- a/tools/ucl/src/ucl_util.c
+++ b/tools/ucl/src/ucl_util.c
@@ -2,7 +2,7 @@
 
    This file is part of the UCL data compression library.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The UCL library is free software; you can redistribute it and/or
@@ -27,7 +27,6 @@
 
 
 #include "ucl_conf.h"
-#include "ucl_util.h"
 
 
 /***********************************************************************
@@ -49,75 +48,37 @@ ucl_assert(int expr)
  * copyright string in the executable of your product.
 .*/
 
-const ucl_byte __ucl_copyright[] =
-    "\n\n\n"
-    "UCL real-time data compression library.\n"
-    "$Copyright: UCL (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Markus Franz Xaver Johannes Oberhumer $\n"
+static const char __ucl_copyright[] =
+    "\r\n\n"
+    "UCL data compression library.\n"
+    "$Copyright: UCL (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Markus Franz Xaver Johannes Oberhumer\n"
     "<markus@oberhumer.com>\n"
-    "http://www.oberhumer.com\n"
-    "\n"
-    "UCL version: v" UCL_VERSION_STRING ", " UCL_VERSION_DATE "\n"
-    "UCL build date: " __DATE__ " " __TIME__ "\n\n"
-    "UCL special compilation options:\n"
-#ifdef __cplusplus
-    " __cplusplus\n"
+    "http://www.oberhumer.com $\n\n"
+    "$Id: UCL version: v" UCL_VERSION_STRING ", " UCL_VERSION_DATE " $\n"
+    "$Built: " __DATE__ " " __TIME__ " $\n"
+    "$Info: " ACC_INFO_OS
+#if defined(ACC_INFO_OS_POSIX)
+    "/" ACC_INFO_OS_POSIX
 #endif
-#if defined(__PIC__)
-    " __PIC__\n"
-#elif defined(__pic__)
-    " __pic__\n"
+    " " ACC_INFO_ARCH
+#if defined(ACC_INFO_ENDIAN)
+    "/" ACC_INFO_ENDIAN
 #endif
-#if (UINT_MAX < UCL_0xffffffffL)
-    " 16BIT\n"
-#endif
-#if defined(__UCL_STRICT_16BIT)
-    " __UCL_STRICT_16BIT\n"
-#endif
-#if (UINT_MAX > UCL_0xffffffffL)
-    " UINT_MAX=" _UCL_MEXPAND(UINT_MAX) "\n"
-#endif
-#if (ULONG_MAX > UCL_0xffffffffL)
-    " ULONG_MAX=" _UCL_MEXPAND(ULONG_MAX) "\n"
-#endif
-#if defined(UCL_BYTE_ORDER)
-    " UCL_BYTE_ORDER=" _UCL_MEXPAND(UCL_BYTE_ORDER) "\n"
-#endif
-#if defined(UCL_UNALIGNED_OK_2)
-    " UCL_UNALIGNED_OK_2\n"
-#endif
-#if defined(UCL_UNALIGNED_OK_4)
-    " UCL_UNALIGNED_OK_4\n"
-#endif
-#if defined(UCL_ALIGNED_OK_4)
-    " UCL_ALIGNED_OK_4\n"
-#endif
-#if defined(__UCL_IN_MINIUCL)
-    " __UCL_IN_MINIUCL\n"
-#endif
-    "\n\n"
-/* RCS information */
-    "$Id: UCL " UCL_VERSION_STRING " built " __DATE__ " " __TIME__
-#if defined(__GNUC__) && defined(__VERSION__)
-    " by gcc " __VERSION__
-#elif defined(__BORLANDC__)
-    " by Borland C " _UCL_MEXPAND(__BORLANDC__)
-#elif defined(_MSC_VER)
-    " by Microsoft C " _UCL_MEXPAND(_MSC_VER)
-#elif defined(__PUREC__)
-    " by Pure C " _UCL_MEXPAND(__PUREC__)
-#elif defined(__SC__)
-    " by Symantec C " _UCL_MEXPAND(__SC__)
-#elif defined(__TURBOC__)
-    " by Turbo C " _UCL_MEXPAND(__TURBOC__)
-#elif defined(__WATCOMC__)
-    " by Watcom C " _UCL_MEXPAND(__WATCOMC__)
+    " " ACC_INFO_MM
+    " " ACC_INFO_CC
+#if defined(ACC_INFO_CCVER)
+    " " ACC_INFO_CCVER
 #endif
     " $\n";
 
-UCL_PUBLIC(const ucl_byte *)
+UCL_PUBLIC(const ucl_bytep)
 ucl_copyright(void)
 {
-    return __ucl_copyright;
+#if (ACC_OS_DOS16 && ACC_CC_TURBOC)
+    return (ucl_voidp) __ucl_copyright;
+#else
+    return (const ucl_bytep) __ucl_copyright;
+#endif
 }
 
 UCL_PUBLIC(ucl_uint32)
@@ -168,7 +129,7 @@ _ucl_version_date(void)
 #define UCL_DO16(buf,i) UCL_DO8(buf,i); UCL_DO8(buf,i+8);
 
 UCL_PUBLIC(ucl_uint32)
-ucl_adler32(ucl_uint32 adler, const ucl_byte *buf, ucl_uint len)
+ucl_adler32(ucl_uint32 adler, const ucl_bytep buf, ucl_uint len)
 {
     ucl_uint32 s1 = adler & 0xffff;
     ucl_uint32 s2 = (adler >> 16) & 0xffff;
diff --git a/tools/ucl/src/ucl_util.h b/tools/ucl/src/ucl_util.h
deleted file mode 100644
index 2292716e4c..0000000000
--- a/tools/ucl/src/ucl_util.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* ucl_util.h -- utilities for the UCL library
-
-   This file is part of the UCL data compression library.
-
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The UCL library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The UCL library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the UCL library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __UCL_UTIL_H
-#define __UCL_UTIL_H
-
-#ifndef __UCL_CONF_H
-#  include "ucl_conf.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-// fast memcpy that copies multiples of 8 byte chunks.
-// len is the number of bytes.
-// note: all parameters must be lvalues, len >= 8
-//       dest and src advance, len is undefined afterwards
-************************************************************************/
-
-#if 1 && defined(HAVE_MEMCPY)
-#if !defined(__UCL_DOS16) && !defined(__UCL_WIN16)
-
-#define MEMCPY8_DS(dest,src,len) \
-    memcpy(dest,src,len); \
-    dest += len; \
-    src += len
-
-#endif
-#endif
-
-
-#if 0 && !defined(MEMCPY8_DS)
-
-#define MEMCPY8_DS(dest,src,len) \
-    { do { \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        len -= 8; \
-    } while (len > 0); }
-
-#endif
-
-
-#if !defined(MEMCPY8_DS)
-
-#define MEMCPY8_DS(dest,src,len) \
-    { register ucl_uint __l = (len) / 8; \
-    do { \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-        *dest++ = *src++; \
-    } while (--__l > 0); }
-
-#endif
-
-
-/***********************************************************************
-// memcpy and pseudo-memmove
-// len is the number of bytes.
-// note: all parameters must be lvalues, len > 0
-//       dest and src advance, len is undefined afterwards
-************************************************************************/
-
-#define MEMCPY_DS(dest,src,len) \
-    do *dest++ = *src++; \
-    while (--len > 0)
-
-#define MEMMOVE_DS(dest,src,len) \
-    do *dest++ = *src++; \
-    while (--len > 0)
-
-
-/***********************************************************************
-// fast bzero that clears multiples of 8 pointers
-// n is the number of pointers.
-// note: n > 0
-//       s and n are undefined afterwards
-************************************************************************/
-
-#if (UCL_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMSET)
-
-#if 1
-#define BZERO8_PTR(s,l,n)   memset((s),0,(ucl_uint)(l)*(n))
-#else
-#define BZERO8_PTR(s,l,n)   memset((ucl_voidp)(s),0,(ucl_uint)(l)*(n))
-#endif
-
-#else
-
-#define BZERO8_PTR(s,l,n) \
-    ucl_memset((ucl_voidp)(s),0,(ucl_uint)(l)*(n))
-
-#endif
-
-
-/***********************************************************************
-// rotate (not used at the moment)
-************************************************************************/
-
-#if 0
-#if defined(__GNUC__) && defined(__i386__)
-
-unsigned char ucl_rotr8(unsigned char value, int shift);
-extern __inline__ unsigned char ucl_rotr8(unsigned char value, int shift)
-{
-    unsigned char result;
-
-    __asm__ __volatile__ ("movb %b1, %b0; rorb %b2, %b0"
-                        : "=a"(result) : "g"(value), "c"(shift));
-    return result;
-}
-
-unsigned short ucl_rotr16(unsigned short value, int shift);
-extern __inline__ unsigned short ucl_rotr16(unsigned short value, int shift)
-{
-    unsigned short result;
-
-    __asm__ __volatile__ ("movw %b1, %b0; rorw %b2, %b0"
-                        : "=a"(result) : "g"(value), "c"(shift));
-    return result;
-}
-
-#endif
-#endif
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
diff --git a/tools/ucl/uclpack.c b/tools/ucl/uclpack.c
index ddf9e04d93..3d161ec394 100644
--- a/tools/ucl/uclpack.c
+++ b/tools/ucl/uclpack.c
@@ -34,7 +34,11 @@
 **************************************************************************/
 
 #include <ucl/ucl.h>
-#include "lutil.h"
+#include "portab.h"
+
+#include "acc/acc_inci.h"
+#include "acc/acc_lib.h"
+#include "acc/acclib/hfread.ch"
 
 static const char *progname = NULL;
 
@@ -58,7 +62,7 @@ ucl_uint xread(FILE *f, ucl_voidp buf, ucl_uint len, ucl_bool allow_eof)
 {
     ucl_uint l;
 
-    l = ucl_fread(f,buf,len);
+    l = acc_hfread(f,buf,len);
     if (l > len)
     {
         fprintf(stderr,"\nsomething's wrong with your C library !!!\n");
@@ -79,7 +83,7 @@ ucl_uint xwrite(FILE *f, const ucl_voidp buf, ucl_uint len)
 
     if (f != NULL)
     {
-        l = ucl_fwrite(f,buf,len);
+        l = acc_hfwrite(f,buf,len);
         if (l != len)
         {
             fprintf(stderr,"\nwrite error [%ld %ld]  (disk full ?)\n",
diff --git a/tools/ucl2src.pl b/tools/ucl2src.pl
index 54cda5b3c0..932255237c 100755
--- a/tools/ucl2src.pl
+++ b/tools/ucl2src.pl
@@ -6,7 +6,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/ 
-# $Id$
 #
 # Copyright (C) 2005 by Jens Arnold
 #
diff --git a/tools/version.sh b/tools/version.sh
index dce5354387..2fcdcd02c4 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # Usage: version.sh [source-root]
diff --git a/tools/voice.pl b/tools/voice.pl
index c9450a41c0..6eb5d6f4e3 100755
--- a/tools/voice.pl
+++ b/tools/voice.pl
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2007 Jonas Häggqvist
 # Copyright (C) 2020 Solomon Peachy
diff --git a/tools/voicefont.c b/tools/voicefont.c
index 2c092dc00c..7333121719 100644
--- a/tools/voicefont.c
+++ b/tools/voicefont.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Jörg Hohensohn
  *
@@ -97,8 +96,13 @@ int voicefont(FILE* voicefontids,int targetnum,char* filedir, FILE* output, unsi
     for (i=0; i<count; i++)
     {
         pos[i] = ftell(output);
-        sprintf(encfilename1, "%s%s.enc", filedir, names[i]);
-        sprintf(encfilename2, "%s%s.wav.enc", filedir, names[i]);
+        if (snprintf(encfilename1, sizeof(encfilename1), "%s%s.enc", filedir, names[i]) >= (int)sizeof(encfilename1) ||
+            snprintf(encfilename2, sizeof(encfilename2), "%s%s.wav.enc", filedir, names[i]) >= (int)sizeof(encfilename2)) {
+                printf("enc filename '%s' too long!\n", encfilename1);
+                size[i] = 0;
+                continue;
+        }
+
         encfilename = encfilename1;
         pEncFile = fopen(encfilename, "rb");
         if (pEncFile == NULL)
diff --git a/tools/voicefont.h b/tools/voicefont.h
index 233f594bd1..192f97866e 100644
--- a/tools/voicefont.h
+++ b/tools/voicefont.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Jörg Hohensohn
  *
diff --git a/tools/vorbiscomm.pm b/tools/vorbiscomm.pm
index f2e48e8632..5d7004fc00 100644
--- a/tools/vorbiscomm.pm
+++ b/tools/vorbiscomm.pm
@@ -3,7 +3,6 @@
 # http://search.cpan.org/~amolloy/Ogg-Vorbis-Header-PurePerl-0.07/PurePerl.pm
 # written by Andrew Molloy
 # Code under GNU GENERAL PUBLIC LICENCE v2
-# $Id$
 #############################################################################
 
 package vorbiscomm;
diff --git a/tools/wavtrim.c b/tools/wavtrim.c
index 560d88dcab..6371b5367c 100644
--- a/tools/wavtrim.c
+++ b/tools/wavtrim.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Jörg Hohensohn
  *
diff --git a/tools/wavtrim.h b/tools/wavtrim.h
index c65e3e2c93..d91b903d95 100644
--- a/tools/wavtrim.h
+++ b/tools/wavtrim.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2004 by Jörg Hohensohn
  *
diff --git a/tools/wn2rdf.pl b/tools/wn2rdf.pl
index 2fff87d66b..3304702992 100755
--- a/tools/wn2rdf.pl
+++ b/tools/wn2rdf.pl
@@ -6,7 +6,6 @@
 #
 # Written by Miika Pekkarinen <slasher@ihme.org>
 #
-# $Id$
 
 use strict;
 
diff --git a/tools/xml2h.py b/tools/xml2h.py
index d259c5ba3c..09cc4e8445 100644
--- a/tools/xml2h.py
+++ b/tools/xml2h.py
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2007 Catalin Patulea <cat@vv.carleton.ca>
 #
diff --git a/uisimulator/buttonmap/agptek-rocker.c b/uisimulator/buttonmap/agptek-rocker.c
index 527d1cb83c..220eb1d6e2 100644
--- a/uisimulator/buttonmap/agptek-rocker.c
+++ b/uisimulator/buttonmap/agptek-rocker.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/uisimulator/buttonmap/buttonmaps.c b/uisimulator/buttonmap/buttonmaps.c
index b015a26020..c56b027e8f 100644
--- a/uisimulator/buttonmap/buttonmaps.c
+++ b/uisimulator/buttonmap/buttonmaps.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 by Fred Bauer
  *
diff --git a/uisimulator/buttonmap/cowon-d2.c b/uisimulator/buttonmap/cowon-d2.c
index f08905e648..1f1bd5dc8c 100644
--- a/uisimulator/buttonmap/cowon-d2.c
+++ b/uisimulator/buttonmap/cowon-d2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Rob Purchase
  *
diff --git a/uisimulator/buttonmap/creative-zen.c b/uisimulator/buttonmap/creative-zen.c
index 17762d3372..b4f4d42919 100644
--- a/uisimulator/buttonmap/creative-zen.c
+++ b/uisimulator/buttonmap/creative-zen.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/uisimulator/buttonmap/creative-zenxfi2.c b/uisimulator/buttonmap/creative-zenxfi2.c
index e9aa1d134a..9b5c1f57d2 100644
--- a/uisimulator/buttonmap/creative-zenxfi2.c
+++ b/uisimulator/buttonmap/creative-zenxfi2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/uisimulator/buttonmap/creative-zenxfi3.c b/uisimulator/buttonmap/creative-zenxfi3.c
index 9bda70f4c8..d9cd393742 100644
--- a/uisimulator/buttonmap/creative-zenxfi3.c
+++ b/uisimulator/buttonmap/creative-zenxfi3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/uisimulator/buttonmap/creative-zv.c b/uisimulator/buttonmap/creative-zv.c
index c282720459..1d94c88bd8 100644
--- a/uisimulator/buttonmap/creative-zv.c
+++ b/uisimulator/buttonmap/creative-zv.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Maurus Cuelenaere
  *
diff --git a/uisimulator/buttonmap/creative-zvm.c b/uisimulator/buttonmap/creative-zvm.c
index 54bdac6e90..9e45157272 100644
--- a/uisimulator/buttonmap/creative-zvm.c
+++ b/uisimulator/buttonmap/creative-zvm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Maurus Cuelenaere
  *
diff --git a/uisimulator/buttonmap/fiio-m3k.c b/uisimulator/buttonmap/fiio-m3k.c
index c0fa5c3a49..f9bf264dd9 100644
--- a/uisimulator/buttonmap/fiio-m3k.c
+++ b/uisimulator/buttonmap/fiio-m3k.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 by Solomon Peachy
  *
diff --git a/uisimulator/buttonmap/gigabeat-s.c b/uisimulator/buttonmap/gigabeat-s.c
index 1d0b17b2ce..2d1f79c003 100644
--- a/uisimulator/buttonmap/gigabeat-s.c
+++ b/uisimulator/buttonmap/gigabeat-s.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Will Robertson
  *
diff --git a/uisimulator/buttonmap/gigabeat.c b/uisimulator/buttonmap/gigabeat.c
index 072ac65696..c0c0a6d447 100644
--- a/uisimulator/buttonmap/gigabeat.c
+++ b/uisimulator/buttonmap/gigabeat.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/uisimulator/buttonmap/gogear-hdd1630.c b/uisimulator/buttonmap/gogear-hdd1630.c
index 7f70e2a1db..ab80c251e2 100644
--- a/uisimulator/buttonmap/gogear-hdd1630.c
+++ b/uisimulator/buttonmap/gogear-hdd1630.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mark Arigo
  *
diff --git a/uisimulator/buttonmap/gogear-hdd6330.c b/uisimulator/buttonmap/gogear-hdd6330.c
index ed985763d3..9fa1dee7ef 100644
--- a/uisimulator/buttonmap/gogear-hdd6330.c
+++ b/uisimulator/buttonmap/gogear-hdd6330.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Szymon Dziok
  *
diff --git a/uisimulator/buttonmap/gogear-sa9200.c b/uisimulator/buttonmap/gogear-sa9200.c
index 528cf11bbc..7e28363f94 100644
--- a/uisimulator/buttonmap/gogear-sa9200.c
+++ b/uisimulator/buttonmap/gogear-sa9200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mark Arigo
  *
diff --git a/uisimulator/buttonmap/hiby-r3proii.c b/uisimulator/buttonmap/hiby-r3proii.c
index 7b5e0b87a2..434a9a3721 100644
--- a/uisimulator/buttonmap/hiby-r3proii.c
+++ b/uisimulator/buttonmap/hiby-r3proii.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 by Solomon Peachy
  *
diff --git a/uisimulator/buttonmap/iaudio-6_7.c b/uisimulator/buttonmap/iaudio-6_7.c
index 82ec78ce99..fadaff8423 100644
--- a/uisimulator/buttonmap/iaudio-6_7.c
+++ b/uisimulator/buttonmap/iaudio-6_7.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Vitja Makarov
  *
diff --git a/uisimulator/buttonmap/iaudio-m3.c b/uisimulator/buttonmap/iaudio-m3.c
index acc1aaf3b0..37f1abddaa 100644
--- a/uisimulator/buttonmap/iaudio-m3.c
+++ b/uisimulator/buttonmap/iaudio-m3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jens Arnold
  *
diff --git a/uisimulator/buttonmap/iaudio-x5_m5.c b/uisimulator/buttonmap/iaudio-x5_m5.c
index 6f3f44c6dd..b5249b61a6 100644
--- a/uisimulator/buttonmap/iaudio-x5_m5.c
+++ b/uisimulator/buttonmap/iaudio-x5_m5.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/uisimulator/buttonmap/ihifi2.c b/uisimulator/buttonmap/ihifi2.c
index 1d8fc8ae01..c85bd6f65c 100644
--- a/uisimulator/buttonmap/ihifi2.c
+++ b/uisimulator/buttonmap/ihifi2.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/uisimulator/buttonmap/ipod.c b/uisimulator/buttonmap/ipod.c
index b15a8d137d..50c6b20361 100644
--- a/uisimulator/buttonmap/ipod.c
+++ b/uisimulator/buttonmap/ipod.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/uisimulator/buttonmap/iriver-h10.c b/uisimulator/buttonmap/iriver-h10.c
index ffe27c6284..0166f6d92c 100644
--- a/uisimulator/buttonmap/iriver-h10.c
+++ b/uisimulator/buttonmap/iriver-h10.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Barry Wardell
  *
diff --git a/uisimulator/buttonmap/iriver-h100_h300.c b/uisimulator/buttonmap/iriver-h100_h300.c
index 081ea62970..b0858addc4 100644
--- a/uisimulator/buttonmap/iriver-h100_h300.c
+++ b/uisimulator/buttonmap/iriver-h100_h300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dan Everton
  *
diff --git a/uisimulator/buttonmap/meizu-m6sl.c b/uisimulator/buttonmap/meizu-m6sl.c
index f55b315d54..9f545f850b 100644
--- a/uisimulator/buttonmap/meizu-m6sl.c
+++ b/uisimulator/buttonmap/meizu-m6sl.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Marcoen Hirschberg
  *
diff --git a/uisimulator/buttonmap/mpio-hd200.c b/uisimulator/buttonmap/mpio-hd200.c
index 291af0f545..9a29a1f24a 100644
--- a/uisimulator/buttonmap/mpio-hd200.c
+++ b/uisimulator/buttonmap/mpio-hd200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Marcin Bukat
  *
diff --git a/uisimulator/buttonmap/mpio-hd300.c b/uisimulator/buttonmap/mpio-hd300.c
index 454e3a6d6f..b2d637cc30 100644
--- a/uisimulator/buttonmap/mpio-hd300.c
+++ b/uisimulator/buttonmap/mpio-hd300.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Michael Leslie
  *
diff --git a/uisimulator/buttonmap/mrobe100.c b/uisimulator/buttonmap/mrobe100.c
index b5c0f3efa2..0562554e61 100644
--- a/uisimulator/buttonmap/mrobe100.c
+++ b/uisimulator/buttonmap/mrobe100.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Robert Kukla
  *
diff --git a/uisimulator/buttonmap/mrobe500.c b/uisimulator/buttonmap/mrobe500.c
index aac3117f47..b3c43371a8 100644
--- a/uisimulator/buttonmap/mrobe500.c
+++ b/uisimulator/buttonmap/mrobe500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Karl Kurbjun
  *
diff --git a/uisimulator/buttonmap/onda-vx747.c b/uisimulator/buttonmap/onda-vx747.c
index 6d50427075..bd52a096d2 100644
--- a/uisimulator/buttonmap/onda-vx747.c
+++ b/uisimulator/buttonmap/onda-vx747.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Maurus Cuelenaere
  *
diff --git a/uisimulator/buttonmap/onda-vx777.c b/uisimulator/buttonmap/onda-vx777.c
index 9181b07fe0..9d73d77085 100644
--- a/uisimulator/buttonmap/onda-vx777.c
+++ b/uisimulator/buttonmap/onda-vx777.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Maurus Cuelenaere
  *
diff --git a/uisimulator/buttonmap/pbell-vibe500.c b/uisimulator/buttonmap/pbell-vibe500.c
index 4c49f31b43..b2e8fda6e1 100644
--- a/uisimulator/buttonmap/pbell-vibe500.c
+++ b/uisimulator/buttonmap/pbell-vibe500.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Szymon Dziok
  *
diff --git a/uisimulator/buttonmap/rg-nano.c b/uisimulator/buttonmap/rg-nano.c
index 86ea50c5d5..0b7dd41fb8 100644
--- a/uisimulator/buttonmap/rg-nano.c
+++ b/uisimulator/buttonmap/rg-nano.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Szymon Dziok
  *
diff --git a/uisimulator/buttonmap/samsung-yh820.c b/uisimulator/buttonmap/samsung-yh820.c
index 401dec323c..938b5b27ae 100644
--- a/uisimulator/buttonmap/samsung-yh820.c
+++ b/uisimulator/buttonmap/samsung-yh820.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mark Arigo
  *
diff --git a/uisimulator/buttonmap/samsung-yh92x.c b/uisimulator/buttonmap/samsung-yh92x.c
index 6c73581240..cd96380ad8 100644
--- a/uisimulator/buttonmap/samsung-yh92x.c
+++ b/uisimulator/buttonmap/samsung-yh92x.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Mark Arigo
  *
diff --git a/uisimulator/buttonmap/sansa-c200.c b/uisimulator/buttonmap/sansa-c200.c
index fee8a2f259..dd6253ae43 100644
--- a/uisimulator/buttonmap/sansa-c200.c
+++ b/uisimulator/buttonmap/sansa-c200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Mark Arigo
  *
diff --git a/uisimulator/buttonmap/sansa-clip.c b/uisimulator/buttonmap/sansa-clip.c
index d1c1dd8a40..3b4cd7f160 100644
--- a/uisimulator/buttonmap/sansa-clip.c
+++ b/uisimulator/buttonmap/sansa-clip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Rafaël Carré
  *
diff --git a/uisimulator/buttonmap/sansa-connect.c b/uisimulator/buttonmap/sansa-connect.c
index 28870f5e82..d9fc6059fc 100644
--- a/uisimulator/buttonmap/sansa-connect.c
+++ b/uisimulator/buttonmap/sansa-connect.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: $
  *
  * Copyright (C) 2011 by Tomasz Moń
  *
diff --git a/uisimulator/buttonmap/sansa-e200.c b/uisimulator/buttonmap/sansa-e200.c
index cfe0836c49..8d7be005ad 100644
--- a/uisimulator/buttonmap/sansa-e200.c
+++ b/uisimulator/buttonmap/sansa-e200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Barry Wardell
  *
diff --git a/uisimulator/buttonmap/sansa-fuze.c b/uisimulator/buttonmap/sansa-fuze.c
index 33f43855c6..3278d65bae 100644
--- a/uisimulator/buttonmap/sansa-fuze.c
+++ b/uisimulator/buttonmap/sansa-fuze.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Thomas Martitz
  *
diff --git a/uisimulator/buttonmap/sansa-fuzeplus.c b/uisimulator/buttonmap/sansa-fuzeplus.c
index 52e41bea23..a1bf4a94e5 100644
--- a/uisimulator/buttonmap/sansa-fuzeplus.c
+++ b/uisimulator/buttonmap/sansa-fuzeplus.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/uisimulator/buttonmap/sansa-m200.c b/uisimulator/buttonmap/sansa-m200.c
index f30f7496b0..d9ea44893f 100644
--- a/uisimulator/buttonmap/sansa-m200.c
+++ b/uisimulator/buttonmap/sansa-m200.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Dominik Wenger
  *
diff --git a/uisimulator/buttonmap/shanling-q1.c b/uisimulator/buttonmap/shanling-q1.c
index 5fec2ca284..d1e24526d7 100644
--- a/uisimulator/buttonmap/shanling-q1.c
+++ b/uisimulator/buttonmap/shanling-q1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 by Aidan MacDonald
  *
diff --git a/uisimulator/buttonmap/sony-nwz.c b/uisimulator/buttonmap/sony-nwz.c
index 290a402e3c..86b4a61b60 100644
--- a/uisimulator/buttonmap/sony-nwz.c
+++ b/uisimulator/buttonmap/sony-nwz.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/uisimulator/buttonmap/sony-nwza860.c b/uisimulator/buttonmap/sony-nwza860.c
index ef3cdae884..2e676a83f7 100644
--- a/uisimulator/buttonmap/sony-nwza860.c
+++ b/uisimulator/buttonmap/sony-nwza860.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 by Amaury Pouly
  *
diff --git a/uisimulator/buttonmap/xduoo-x3.c b/uisimulator/buttonmap/xduoo-x3.c
index 33bf0bcaaf..918f139210 100644
--- a/uisimulator/buttonmap/xduoo-x3.c
+++ b/uisimulator/buttonmap/xduoo-x3.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/uisimulator/buttonmap/xduoo-x3ii.c b/uisimulator/buttonmap/xduoo-x3ii.c
index 2b3333ebd6..959e883aa5 100644
--- a/uisimulator/buttonmap/xduoo-x3ii.c
+++ b/uisimulator/buttonmap/xduoo-x3ii.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Roman Stolyarov
  *
diff --git a/uisimulator/common/Makefile b/uisimulator/common/Makefile
index c892f1c615..468572eea4 100644
--- a/uisimulator/common/Makefile
+++ b/uisimulator/common/Makefile
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/ 
-# $Id$
 #
 # Copyright (C) 2002 by Daniel Stenberg <daniel@haxx.se>
 #
diff --git a/uisimulator/common/backlight-sim.c b/uisimulator/common/backlight-sim.c
index 7acdee84ae..83f18c7219 100644
--- a/uisimulator/common/backlight-sim.c
+++ b/uisimulator/common/backlight-sim.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Thomas Martitz
  *
diff --git a/uisimulator/common/backlight-sim.h b/uisimulator/common/backlight-sim.h
index cbb100b645..3424a61251 100644
--- a/uisimulator/common/backlight-sim.h
+++ b/uisimulator/common/backlight-sim.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2009 by Thomas Martitz
  *
diff --git a/uisimulator/common/filesystem-sim.c b/uisimulator/common/filesystem-sim.c
index dc9d3ec345..16e852901b 100644
--- a/uisimulator/common/filesystem-sim.c
+++ b/uisimulator/common/filesystem-sim.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Daniel Stenberg
  * Copyright (C) 2014 Michael Sevakis
diff --git a/uisimulator/common/filesystem-sim.h b/uisimulator/common/filesystem-sim.h
index 346d6fa74e..38fff3bd4e 100644
--- a/uisimulator/common/filesystem-sim.h
+++ b/uisimulator/common/filesystem-sim.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/uisimulator/common/fmradio.c b/uisimulator/common/fmradio.c
index a18db819f2..a32953a5f2 100644
--- a/uisimulator/common/fmradio.c
+++ b/uisimulator/common/fmradio.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Linus Nielsen Feltzing
  *
diff --git a/uisimulator/common/lcd-common.c b/uisimulator/common/lcd-common.c
index 97cc17638e..ac2f4077e3 100644
--- a/uisimulator/common/lcd-common.c
+++ b/uisimulator/common/lcd-common.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Robert E. Hak <rhak@ramapo.edu>
  *
@@ -38,10 +37,12 @@ static bool lcd_enabled = false;
 static bool lcd_sleeping = true;
 #endif
 
+#if !defined(HAVE_LCD_FLIP)
 void lcd_set_flip(bool yesno)
 {
     (void)yesno;
 }
+#endif
 
 void lcd_set_invert_display(bool invert)
 {
diff --git a/uisimulator/common/load_code-sim.c b/uisimulator/common/load_code-sim.c
index 024a428b64..00dbae8551 100644
--- a/uisimulator/common/load_code-sim.c
+++ b/uisimulator/common/load_code-sim.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Daniel Stenberg
  *
diff --git a/uisimulator/common/player_icons/Makefile b/uisimulator/common/player_icons/Makefile
index 288458f00d..39782b9ec7 100644
--- a/uisimulator/common/player_icons/Makefile
+++ b/uisimulator/common/player_icons/Makefile
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/ 
-# $Id$
 #
 # Copyright (C) 2002 by Mats Lidell <matsl@contactor.se>
 #
diff --git a/uisimulator/common/powermgmt-sim.c b/uisimulator/common/powermgmt-sim.c
index 8abee5d048..5daeab0e9e 100644
--- a/uisimulator/common/powermgmt-sim.c
+++ b/uisimulator/common/powermgmt-sim.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
  * Revisions copyright (C) 2005 by Gerald Van Baren
diff --git a/uisimulator/common/sim_tasks.c b/uisimulator/common/sim_tasks.c
index 8a02aa5c80..ba56841d46 100644
--- a/uisimulator/common/sim_tasks.c
+++ b/uisimulator/common/sim_tasks.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Jens Arnold
  * Copyright (C) 2011 by Thomas Martitz
@@ -195,6 +194,11 @@ int usb_detect(void)
     return is_usb_inserted ? USB_INSERTED : USB_EXTRACTED;
 }
 
+bool usb_inserted(void)
+{
+    return is_usb_inserted;
+}
+
 void usb_init(void)
 {
 }
diff --git a/uisimulator/common/sim_tasks.h b/uisimulator/common/sim_tasks.h
index cfe3e71c3a..9394d2771a 100644
--- a/uisimulator/common/sim_tasks.h
+++ b/uisimulator/common/sim_tasks.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Jens Arnold
  *
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index ba5e2c9908..cadead5c70 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Björn Stenberg <bjorn@haxx.se>
  *
@@ -203,13 +202,6 @@ bool usb_charging_enable(bool on)
 }
 #endif
 
-#ifndef USB_NONE
-bool usb_inserted(void)
-{
-    return false;
-}
-#endif
-
 #ifdef HAVE_REMOTE_LCD_TICKING
 void lcd_remote_emireduce(bool state)
 {
diff --git a/uisimulator/common/time-win32.c b/uisimulator/common/time-win32.c
index 1de69c35e6..279bf71a49 100644
--- a/uisimulator/common/time-win32.c
+++ b/uisimulator/common/time-win32.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Michael Sevakis
  *
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make
index f63b9e6ee4..844d9d559f 100644
--- a/uisimulator/uisimulator.make
+++ b/uisimulator/uisimulator.make
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 INCLUDES += -I$(ROOTDIR)/uisimulator/bitmaps -I$(ROOTDIR)/uisimulator/common -I$(ROOTDIR)/uisimulator/buttonmap $\
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 31f142f913..1032478af2 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -42,22 +42,29 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     add_link_options($<$<CONFIG:RELEASE>:-s>)
 endif()
 
-
 enable_testing()
 
 # Qt
-find_package(QT NAMES Qt6 Qt5 REQUIRED)
-if(QT_VERSION_MAJOR EQUAL 5)
-    find_package(Qt5 REQUIRED COMPONENTS
-                 Core Widgets Svg Multimedia Network Test LinguistTools)
-else()
-    find_package(Qt6 REQUIRED COMPONENTS
+find_package(QT NAMES Qt6 REQUIRED)
+    find_package(Qt6 6.6 REQUIRED COMPONENTS
                  Core Core5Compat Widgets Svg Network LinguistTools SvgWidgets
-                 OPTIONAL_COMPONENTS Multimedia Test)
-endif()
+                 OPTIONAL_COMPONENTS Multimedia Test TextToSpeech)
+	       ## note Core5Compat is only needed for QuaZip
 get_target_property(_moc_executable Qt${QT_VERSION_MAJOR}::moc IMPORTED_LOCATION)
 get_filename_component(QT_BINDIR "${_moc_executable}" DIRECTORY)
 message("-- Found Qt${QT_VERSION_MAJOR}: ${Qt${QT_VERSION_MAJOR}_DIR}")
+if (TARGET Qt${QT_VERSION_MAJOR}::Multimedia)
+  message("-- Found Qt::Multimedia")
+else()
+  message("-- QT::Multimedia not found, TTS preview not available")
+endif()
+if (TARGET Qt${QT_VERSION_MAJOR}::TextToSpeech)
+  message("-- Found Qt::TextToSpeech")
+else()
+  message("-- QT::TextToSpeech not found, Qt TTS not available")
+endif()
+
+add_compile_definitions(QT_NO_USE_NODISCARD_FILE_OPEN)
 
 # If we're on Linux, try to find the used libs in the system.
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
@@ -65,6 +72,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     find_package(PkgConfig)
     pkg_check_modules(libusb QUIET REQUIRED IMPORTED_TARGET libusb-1.0)
     message("-- Found libusb: ${libusb_LINK_LIBRARIES}")
+    add_compile_definitions(USE_LIBUSBAPI)
 
     # optional system libs.
     pkg_check_modules(speex QUIET IMPORTED_TARGET speex speexdsp)
@@ -89,7 +97,7 @@ if(QuaZip-Qt${QT_VERSION_MAJOR}_FOUND)
     message("-- Found QuaZip")
     set(QUAZIP_LIBRARY QuaZip::QuaZip)
 else()
-    message("-- QuaZip not found, building our own")
+    message("-- Could not find system QuaZip, using our own copy.")
     # TODO: Upstream has cmake support, use that instead.
     add_library(quazip
         ${CMAKE_CURRENT_LIST_DIR}/rbutilqt/quazip/ioapi.h
@@ -110,9 +118,7 @@ else()
         ${CMAKE_CURRENT_LIST_DIR}/rbutilqt/quazip/zip.h)
     target_include_directories(quazip PUBLIC ${CMAKE_CURRENT_LIST_DIR}/rbutilqt/quazip)
     target_link_libraries(quazip z Qt${QT_VERSION_MAJOR}::Core)
-    if(QT_VERSION_MAJOR EQUAL 6)
-        target_link_libraries(quazip Qt${QT_VERSION_MAJOR}::Core5Compat)
-    endif()
+    target_link_libraries(quazip Qt${QT_VERSION_MAJOR}::Core5Compat)
     target_compile_definitions(quazip PUBLIC QUAZIP_STATIC)
     set_property(TARGET quazip PROPERTY AUTOMOC ON)
     set(QUAZIP_LIBRARY quazip)
@@ -120,7 +126,7 @@ endif()
 
 add_executable(ipodpatcher-bin
     ipodpatcher/main.c
-    ipodpatcher/ipodpatcher-aupd.c
+    ipodpatcher/ipodpatcher_aupd.c
     )
 target_link_libraries(ipodpatcher-bin ipodpatcher)
 target_compile_definitions(ipodpatcher-bin PRIVATE VERSION="none")
@@ -197,10 +203,7 @@ target_link_libraries(mkamsboot ucl)
 
 add_library(ucl
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/alloc.c
-    ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/fake16.h
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/getbit.h
-    ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/internal.h
-    ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/io.c
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/Makefile
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/n2_99.ch
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/n2b_99.c
@@ -217,7 +220,7 @@ add_library(ucl
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/n2e_to.c
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/ucl_conf.h
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/ucl_crc.c
-    ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/ucl_dll.c
+    ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/ucl_dll.ch
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/ucl_init.c
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/ucl_mchw.ch
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/ucl_ptr.c
@@ -225,10 +228,9 @@ add_library(ucl
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/ucl_str.c
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/ucl_swd.ch
     ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/ucl_util.c
-    ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/src/ucl_util.h
     )
 
-target_include_directories(ucl PUBLIC ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/include)
+target_include_directories(ucl PUBLIC ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl/include ${CMAKE_CURRENT_LIST_DIR}/../tools/ucl)
 
 add_library(rbspeex
     ${CMAKE_CURRENT_LIST_DIR}/../tools/rbspeex/rbspeex.c
@@ -322,6 +324,9 @@ add_library(mks5lboot
     mks5lboot/mks5lboot.h
     )
 target_include_directories(mks5lboot PUBLIC ${CMAKE_CURRENT_LIST_DIR}/mks5lboot)
+if(WIN32)
+target_link_libraries(mks5lboot PRIVATE setupapi)
+endif()
 
 add_library(bspatch
     bspatch/bspatch.c
diff --git a/utils/MTP/beastpatcher/beastpatcher.c b/utils/MTP/beastpatcher/beastpatcher.c
index 6f9dcb6b50..7ab190293a 100644
--- a/utils/MTP/beastpatcher/beastpatcher.c
+++ b/utils/MTP/beastpatcher/beastpatcher.c
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  *
- * $Id$
  *
  * Copyright (c) 2009, Dave Chapman
  * All rights reserved.
diff --git a/utils/MTP/beastpatcher/beastpatcher.h b/utils/MTP/beastpatcher/beastpatcher.h
index d9a26b18b8..c441c83c28 100644
--- a/utils/MTP/beastpatcher/beastpatcher.h
+++ b/utils/MTP/beastpatcher/beastpatcher.h
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  *
- * $Id$
  *
  * Copyright (c) 2009, Dave Chapman
  * All rights reserved.
diff --git a/utils/MTP/beastpatcher/main.c b/utils/MTP/beastpatcher/main.c
index 3f7957a8c2..24f35f87b5 100644
--- a/utils/MTP/beastpatcher/main.c
+++ b/utils/MTP/beastpatcher/main.c
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  *
- * $Id$
  *
  * Copyright (c) 2009, Dave Chapman
  * All rights reserved.
diff --git a/utils/MTP/beastpatcher/mknkboot.c b/utils/MTP/beastpatcher/mknkboot.c
index 29de27217d..0de93f7937 100644
--- a/utils/MTP/beastpatcher/mknkboot.c
+++ b/utils/MTP/beastpatcher/mknkboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Dave Chapman
  *
diff --git a/utils/MTP/beastpatcher/mknkboot.h b/utils/MTP/beastpatcher/mknkboot.h
index 162cfc5ddf..bea36f847a 100644
--- a/utils/MTP/beastpatcher/mknkboot.h
+++ b/utils/MTP/beastpatcher/mknkboot.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Dave Chapman
  *
diff --git a/utils/MTP/beastpatcher/mtp_common.h b/utils/MTP/beastpatcher/mtp_common.h
index 8cd261416c..038ea9b3bf 100644
--- a/utils/MTP/beastpatcher/mtp_common.h
+++ b/utils/MTP/beastpatcher/mtp_common.h
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  *
- * $Id$
  *
  * Copyright (c) 2009, Dave Chapman
  * All rights reserved.
diff --git a/utils/MTP/beastpatcher/mtp_libmtp.c b/utils/MTP/beastpatcher/mtp_libmtp.c
index 7377c520ea..bea098aff9 100644
--- a/utils/MTP/beastpatcher/mtp_libmtp.c
+++ b/utils/MTP/beastpatcher/mtp_libmtp.c
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  * 
- * $Id$
  *
  * Copyright (c) 2009, Dave Chapman
  * All rights reserved.
diff --git a/utils/MTP/beastpatcher/mtp_win32.c b/utils/MTP/beastpatcher/mtp_win32.c
index 626467ecbe..652c97b516 100644
--- a/utils/MTP/beastpatcher/mtp_win32.c
+++ b/utils/MTP/beastpatcher/mtp_win32.c
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  *
- * $Id$
  *
  * Copyright (c) 2009, Dave Chapman
  * All rights reserved.
diff --git a/utils/MTP/sendfirm.c b/utils/MTP/sendfirm.c
index f06f183e02..4073043e8e 100644
--- a/utils/MTP/sendfirm.c
+++ b/utils/MTP/sendfirm.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Based on sendfile.c from libmtp: http://libmtp.sourceforge.net
  * Modified by Maurus Cuelenaere and Nicolas Pennequin.
diff --git a/utils/MTP/sendfirm_win.c b/utils/MTP/sendfirm_win.c
index c74b93bb37..c5c8645f69 100644
--- a/utils/MTP/sendfirm_win.c
+++ b/utils/MTP/sendfirm_win.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Maurus Cuelenaere
  *
diff --git a/utils/analysis/find_addr.pl b/utils/analysis/find_addr.pl
index b66f35f48e..515213ad37 100755
--- a/utils/analysis/find_addr.pl
+++ b/utils/analysis/find_addr.pl
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2009 by Maurus Cuelenaere
 #
diff --git a/utils/atj2137/atjboottool/afi.c b/utils/atj2137/atjboottool/afi.c
index 1ce9d0c01e..b15c11c580 100644
--- a/utils/atj2137/atjboottool/afi.c
+++ b/utils/atj2137/atjboottool/afi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Amaury Pouly
  *
diff --git a/utils/atj2137/atjboottool/afi.h b/utils/atj2137/atjboottool/afi.h
index 6756364d2a..dfd1b7c43d 100644
--- a/utils/atj2137/atjboottool/afi.h
+++ b/utils/atj2137/atjboottool/afi.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Amaury Pouly
  *
diff --git a/utils/atj2137/atjboottool/atj_tables.c b/utils/atj2137/atjboottool/atj_tables.c
index e2bd976bfe..0a3d25a093 100644
--- a/utils/atj2137/atjboottool/atj_tables.c
+++ b/utils/atj2137/atjboottool/atj_tables.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/atj2137/atjboottool/atj_tables.h b/utils/atj2137/atjboottool/atj_tables.h
index 5ed75d6ac4..a61ba81b76 100644
--- a/utils/atj2137/atjboottool/atj_tables.h
+++ b/utils/atj2137/atjboottool/atj_tables.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/atj2137/atjboottool/atjboottool.c b/utils/atj2137/atjboottool/atjboottool.c
index b68ada980e..1065ba5fcd 100644
--- a/utils/atj2137/atjboottool/atjboottool.c
+++ b/utils/atj2137/atjboottool/atjboottool.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/atj2137/atjboottool/fw.c b/utils/atj2137/atjboottool/fw.c
index 114123813b..e622472a2b 100644
--- a/utils/atj2137/atjboottool/fw.c
+++ b/utils/atj2137/atjboottool/fw.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Amaury Pouly
  *
diff --git a/utils/atj2137/atjboottool/fw.h b/utils/atj2137/atjboottool/fw.h
index 9047de4b6d..4ddbb8345f 100644
--- a/utils/atj2137/atjboottool/fw.h
+++ b/utils/atj2137/atjboottool/fw.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Amaury Pouly
  *
diff --git a/utils/atj2137/atjboottool/fwu.c b/utils/atj2137/atjboottool/fwu.c
index c9f6c440fd..c9d22e0942 100644
--- a/utils/atj2137/atjboottool/fwu.c
+++ b/utils/atj2137/atjboottool/fwu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Amaury Pouly
  *
diff --git a/utils/atj2137/atjboottool/fwu.h b/utils/atj2137/atjboottool/fwu.h
index dc49d91df3..f8fdeb0aef 100644
--- a/utils/atj2137/atjboottool/fwu.h
+++ b/utils/atj2137/atjboottool/fwu.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2017 Amaury Pouly
  *
diff --git a/utils/atj2137/atjboottool/misc.c b/utils/atj2137/atjboottool/misc.c
index b13e4b4c5e..8efaf932c9 100644
--- a/utils/atj2137/atjboottool/misc.c
+++ b/utils/atj2137/atjboottool/misc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/atj2137/atjboottool/misc.h b/utils/atj2137/atjboottool/misc.h
index 9248dba62c..abc5305312 100644
--- a/utils/atj2137/atjboottool/misc.h
+++ b/utils/atj2137/atjboottool/misc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/bootchart/gnuplot.sh b/utils/bootchart/gnuplot.sh
index 8e541a3fec..222457e2c5 100755
--- a/utils/bootchart/gnuplot.sh
+++ b/utils/bootchart/gnuplot.sh
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2010 by Maurus Cuelenaere
 #
diff --git a/utils/bspatch/Makefile b/utils/bspatch/Makefile
index 8f287a5ebb..873dafa101 100644
--- a/utils/bspatch/Makefile
+++ b/utils/bspatch/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 LIBSOURCES := bspatch.c
diff --git a/utils/bspatch/bspatch.c b/utils/bspatch/bspatch.c
index d1d7a5aa7a..fe736213f0 100644
--- a/utils/bspatch/bspatch.c
+++ b/utils/bspatch/bspatch.c
@@ -147,8 +147,8 @@ int apply_bspatch(const char *infile, const char *outfile, const char *patchfile
 	pold = (u_char *)malloc(oldsize + 1);
 	if (pold == NULL)	err(1, "Malloc failed :%s", infile);
 	fseek(fs, 0, SEEK_SET);
-	if (fread(pold, 1, oldsize, fs) == -1)	err(1, "Read failed :%s", infile);
-	if (fclose(fs) == -1)	err(1, "Close failed :%s", infile);
+	if (fread(pold, 1, oldsize, fs) != (size_t)oldsize)	err(1, "Read failed :%s", infile);
+	if (fclose(fs) != 0)	err(1, "Close failed :%s", infile);
 
 	pnew = malloc(newsize + 1);
 	if (pnew == NULL)err(1, NULL);
@@ -208,8 +208,8 @@ int apply_bspatch(const char *infile, const char *outfile, const char *patchfile
 	/* Write the pnew file */
 	fs = fopen(outfile, "wb");
 	if (fs == NULL)err(1, "Create failed :%s", outfile);
-	if (fwrite(pnew, 1, newsize, fs) == -1)err(1, "Write failed :%s", outfile);
-	if (fclose(fs) == -1)err(1, "Close failed :%s", outfile);
+	if (fwrite(pnew, 1, newsize, fs) != (size_t)newsize)err(1, "Write failed :%s", outfile);
+	if (fclose(fs) != 0)err(1, "Close failed :%s", outfile);
 
 	free(pnew);
 	free(pold);
diff --git a/utils/bzip2/Makefile b/utils/bzip2/Makefile
index 6dc59ed025..a2355f3414 100644
--- a/utils/bzip2/Makefile
+++ b/utils/bzip2/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 LIBSOURCES := blocksort.c  compress.c  decompress.c  randtable.c \
diff --git a/utils/chinachippatcher/Makefile b/utils/chinachippatcher/Makefile
index c8defcb5c4..4195efa3c0 100644
--- a/utils/chinachippatcher/Makefile
+++ b/utils/chinachippatcher/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 CFLAGS += -g -Wall
 
diff --git a/utils/chinachippatcher/chinachip.c b/utils/chinachippatcher/chinachip.c
index 79b5acad66..ab3111d9ad 100644
--- a/utils/chinachippatcher/chinachip.c
+++ b/utils/chinachippatcher/chinachip.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
@@ -212,7 +211,7 @@ enum cc_error chinachip_patch(const char* firmware, const char* bootloader,
         goto err;
     }
 
-    snprintf(header_time, 13, "%04d%02d%02d%02d%02d", time_info->tm_year + 1900,
+    snprintf(header_time, 13, "%04u%02u%02u%02u%02u", time_info->tm_year + 1900,
                                               time_info->tm_mon,
                                               time_info->tm_mday,
                                               time_info->tm_hour,
@@ -255,4 +254,3 @@ err:
 
     return result;
 }
-
diff --git a/utils/chinachippatcher/chinachip.h b/utils/chinachippatcher/chinachip.h
index b92066bb8b..31ad0a6a08 100644
--- a/utils/chinachippatcher/chinachip.h
+++ b/utils/chinachippatcher/chinachip.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/utils/chinachippatcher/main.c b/utils/chinachippatcher/main.c
index e7779774c9..a84c6cc41c 100644
--- a/utils/chinachippatcher/main.c
+++ b/utils/chinachippatcher/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 by Maurus Cuelenaere
  *
diff --git a/utils/cmake/deploy.cmake b/utils/cmake/deploy.cmake
index 252aba0636..ff21da4444 100644
--- a/utils/cmake/deploy.cmake
+++ b/utils/cmake/deploy.cmake
@@ -25,19 +25,19 @@ endif()
 
 # Linux: Build AppImage
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set(LINUXDEPLOY ${CMAKE_BINARY_DIR}/linuxdeploy-x86_64.AppImage)
-    set(LINUXDEPLOYQT ${CMAKE_BINARY_DIR}/linuxdeploy-plugin-qt-x86_64.AppImage)
+    set(LINUXDEPLOY ${CMAKE_BINARY_DIR}/linuxdeploy-${CMAKE_SYSTEM_PROCESSOR}.AppImage)
+    set(LINUXDEPLOYQT ${CMAKE_BINARY_DIR}/linuxdeploy-plugin-qt-${CMAKE_SYSTEM_PROCESSOR}.AppImage)
     add_custom_command(
         COMMENT "Downloading linuxdeploy"
         OUTPUT ${LINUXDEPLOY}
                ${LINUXDEPLOYQT}
         COMMAND ${CMAKE_COMMAND}
             -DOUTDIR=${CMAKE_BINARY_DIR}
-            -DURL=https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+            -DURL=https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${CMAKE_SYSTEM_PROCESSOR}.AppImage
             -P ${CMAKE_CURRENT_LIST_DIR}/download.cmake
         COMMAND ${CMAKE_COMMAND}
             -DOUTDIR=${CMAKE_BINARY_DIR}
-            -DURL=https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+            -DURL=https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-${CMAKE_SYSTEM_PROCESSOR}.AppImage
             -P ${CMAKE_CURRENT_LIST_DIR}/download.cmake
     )
     # intermediate target needed to be able to get back to the actual file dependency.
@@ -94,6 +94,18 @@ endif()
 
 # MacOS: Build dmg
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(CODESIGN_IDENTITY "-" CACHE STRING
+            "Code signing identity to use for macOS signing")
+    set(DMGBUILD_STAMP ${CMAKE_BINARY_DIR}/dmgbuild.stamp)
+    add_custom_command(
+            COMMENT "Setting up dmgbuild virtualenv"
+            OUTPUT ${DMGBUILD_STAMP}
+            COMMAND python3 -m venv ${CMAKE_BINARY_DIR}/venv
+            COMMAND ${CMAKE_BINARY_DIR}/venv/bin/python -m pip install -q --upgrade pip
+            COMMAND ${CMAKE_BINARY_DIR}/venv/bin/python -m pip install -q dmgbuild
+    )
+    add_custom_target(dmgbuild_venv DEPENDS ${DMGBUILD_STAMP})
+
     function(deploy_qt)
         cmake_parse_arguments(deploy ""
             "TARGET;DESKTOPFILE;ICONFILE;QTBINDIR;DMGBUILDCFG"
@@ -103,11 +115,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
             message(WARNING "Deploying a Debug build.")
         endif()
         set(DMGBUILD ${CMAKE_BINARY_DIR}/venv/bin/python3 -m dmgbuild)
-        set(DMGBUILD_STAMP ${CMAKE_BINARY_DIR}/dmgbuild.stamp)
         find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${QTBINDIR}")
 
         # need extra rules so we can use generator expressions
-        # (using get_target_property() doesn't know neede values during generation)
+        # (using get_target_property() doesn't know needed values during generation)
         set(_deploy_deps "")
         foreach(_deploy_exe_tgt ${deploy_EXECUTABLES})
             add_custom_command(
@@ -118,32 +129,28 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
                                             $<TARGET_BUNDLE_CONTENT_DIR:${deploy_TARGET}>/bin
                 COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${_deploy_exe_tgt}.app.stamp
                 DEPENDS ${_deploy_exe_tgt}
-                )
+            )
             add_custom_target(deploy_${deploy_TARGET}_${_deploy_exe_tgt}
                 DEPENDS ${CMAKE_BINARY_DIR}/${_deploy_exe_tgt}.app.stamp)
 
             set(_deploy_deps "${_deploy_deps};deploy_${deploy_TARGET}_${_deploy_exe_tgt}")
         endforeach()
 
-        add_custom_command(
-            COMMENT "Setting up dmgbuild virtualenv"
-            OUTPUT ${DMGBUILD_STAMP}
-            COMMAND python3 -m venv ${CMAKE_BINARY_DIR}/venv
-            COMMAND ${CMAKE_BINARY_DIR}/venv/bin/python -m pip install -q dmgbuild
-        )
-
         add_custom_command(
             # TODO: find a better way to figure the app bundle name.
             OUTPUT ${CMAKE_BINARY_DIR}/${deploy_TARGET}.dmg
             COMMENT "Running macdeployqt and creating dmg ${deploy_TARGET}"
             COMMAND ${MACDEPLOYQT_EXECUTABLE} ${deploy_TARGET}.app
+
+            COMMAND codesign --force --deep --sign "${CODESIGN_IDENTITY}" ${deploy_TARGET}.app
+
             COMMAND ${DMGBUILD} -s ${deploy_DMGBUILDCFG}
                     -Dappbundle=${deploy_TARGET}.app
                     ${deploy_TARGET} ${CMAKE_BINARY_DIR}/${deploy_TARGET}.dmg
             DEPENDS ${deploy_TARGET}
-                    ${DMGBUILD_STAMP}
+                    dmgbuild_venv
                     ${_deploy_deps}
-            )
+        )
         add_custom_target(deploy_${deploy_TARGET}
             DEPENDS ${CMAKE_BINARY_DIR}/${deploy_TARGET}.dmg)
         add_dependencies(deploy deploy_${deploy_TARGET})
@@ -216,4 +223,3 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
         add_dependencies(deploy deploy_${deploy_TARGET})
     endfunction()
 endif()
-
diff --git a/utils/e200rpatcher/e200rpatcher.c b/utils/e200rpatcher/e200rpatcher.c
index be09370997..0bebc47175 100644
--- a/utils/e200rpatcher/e200rpatcher.c
+++ b/utils/e200rpatcher/e200rpatcher.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/utils/e200tool/e200load.c b/utils/e200tool/e200load.c
index 8e5005b1f8..eb542f980f 100644
--- a/utils/e200tool/e200load.c
+++ b/utils/e200tool/e200load.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 Amaury Pouly
  *
diff --git a/utils/editors/rockbox-style.el b/utils/editors/rockbox-style.el
index b1d3aed09c..3aa9e3f26d 100644
--- a/utils/editors/rockbox-style.el
+++ b/utils/editors/rockbox-style.el
@@ -1,5 +1,4 @@
 ;;;; Emacs Lisp help for writing rockbox code. ;;;;
-;;;; $Id$
 
 ;;; The rockbox hacker's C conventions.
 
diff --git a/utils/editors/sample.emacs b/utils/editors/sample.emacs
index decf5b94a5..9f0c07aa58 100644
--- a/utils/editors/sample.emacs
+++ b/utils/editors/sample.emacs
@@ -1,4 +1,3 @@
-;; $Id$ -*- emacs-lisp -*-
 
 ;; Here's a sample .emacs file that might help you along the way.
 
diff --git a/utils/editors/wps.vim b/utils/editors/wps.vim
index 094771ef9c..d531525e91 100644
--- a/utils/editors/wps.vim
+++ b/utils/editors/wps.vim
@@ -5,7 +5,6 @@
 "   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 "   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 "                     \/            \/     \/    \/            \/
-" $Id$
 "
 " Vim syntax file for Rockbox WPS (While Playing Screen) definitions.
 " Copyright (C) 2009 by Kevin Schoedel
diff --git a/utils/hwpatcher/hwpatcher.c b/utils/hwpatcher/hwpatcher.c
index 7153a220c9..97a33c0ede 100644
--- a/utils/hwpatcher/hwpatcher.c
+++ b/utils/hwpatcher/hwpatcher.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Amaury Pouly
  *
diff --git a/utils/hwstub/include/hwstub.hpp b/utils/hwstub/include/hwstub.hpp
index 96072dde4f..c4f9e56ff3 100644
--- a/utils/hwstub/include/hwstub.hpp
+++ b/utils/hwstub/include/hwstub.hpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2015 by Amaury Pouly
  *
diff --git a/utils/hwstub/include/hwstub_net.hpp b/utils/hwstub/include/hwstub_net.hpp
index ae0e09e920..72d73e83e5 100644
--- a/utils/hwstub/include/hwstub_net.hpp
+++ b/utils/hwstub/include/hwstub_net.hpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/utils/hwstub/include/hwstub_protocol.h b/utils/hwstub/include/hwstub_protocol.h
index ed26ee78e4..b9a70e4f36 100644
--- a/utils/hwstub/include/hwstub_protocol.h
+++ b/utils/hwstub/include/hwstub_protocol.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/hwstub/include/hwstub_uri.hpp b/utils/hwstub/include/hwstub_uri.hpp
index d461764cd9..f08f1fe5c1 100644
--- a/utils/hwstub/include/hwstub_uri.hpp
+++ b/utils/hwstub/include/hwstub_uri.hpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/utils/hwstub/include/hwstub_usb.hpp b/utils/hwstub/include/hwstub_usb.hpp
index 0fa64a4f63..7ad2625850 100644
--- a/utils/hwstub/include/hwstub_usb.hpp
+++ b/utils/hwstub/include/hwstub_usb.hpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2015 by Amaury Pouly
  *
diff --git a/utils/hwstub/include/hwstub_virtual.hpp b/utils/hwstub/include/hwstub_virtual.hpp
index 1e35378840..9b90504ea6 100644
--- a/utils/hwstub/include/hwstub_virtual.hpp
+++ b/utils/hwstub/include/hwstub_virtual.hpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/utils/hwstub/lib/hwstub.cpp b/utils/hwstub/lib/hwstub.cpp
index ba9ecb7f06..dfcec454e1 100644
--- a/utils/hwstub/lib/hwstub.cpp
+++ b/utils/hwstub/lib/hwstub.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2015 by Amaury Pouly
  *
diff --git a/utils/hwstub/lib/hwstub_net.cpp b/utils/hwstub/lib/hwstub_net.cpp
index e2d9d4b8f2..89994cdf7a 100644
--- a/utils/hwstub/lib/hwstub_net.cpp
+++ b/utils/hwstub/lib/hwstub_net.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/utils/hwstub/lib/hwstub_uri.cpp b/utils/hwstub/lib/hwstub_uri.cpp
index e940fe69e2..da59671540 100644
--- a/utils/hwstub/lib/hwstub_uri.cpp
+++ b/utils/hwstub/lib/hwstub_uri.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2015 by Amaury Pouly
  *
diff --git a/utils/hwstub/lib/hwstub_usb.cpp b/utils/hwstub/lib/hwstub_usb.cpp
index e6679ff780..9dd89114fe 100644
--- a/utils/hwstub/lib/hwstub_usb.cpp
+++ b/utils/hwstub/lib/hwstub_usb.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2015 by Amaury Pouly
  *
diff --git a/utils/hwstub/lib/hwstub_virtual.cpp b/utils/hwstub/lib/hwstub_virtual.cpp
index 5c9e79e5a1..2eb1fcf0c8 100644
--- a/utils/hwstub/lib/hwstub_virtual.cpp
+++ b/utils/hwstub/lib/hwstub_virtual.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/asm/arm/memcpy.S b/utils/hwstub/stub/asm/arm/memcpy.S
index 2a55fb5656..961dd5e1d8 100644
--- a/utils/hwstub/stub/asm/arm/memcpy.S
+++ b/utils/hwstub/stub/asm/arm/memcpy.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Free Software Foundation, Inc.
  * This file was originally part of the GNU C Library
diff --git a/utils/hwstub/stub/asm/arm/memmove.S b/utils/hwstub/stub/asm/arm/memmove.S
index d8cab048be..f0671e205b 100644
--- a/utils/hwstub/stub/asm/arm/memmove.S
+++ b/utils/hwstub/stub/asm/arm/memmove.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Free Software Foundation, Inc.
  * This file was originally part of the GNU C Library
diff --git a/utils/hwstub/stub/asm/arm/memset.S b/utils/hwstub/stub/asm/arm/memset.S
index 682da874ce..c02e61e65b 100644
--- a/utils/hwstub/stub/asm/arm/memset.S
+++ b/utils/hwstub/stub/asm/arm/memset.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 by Thom Johansen
  *
diff --git a/utils/hwstub/stub/asm/arm/system.S b/utils/hwstub/stub/asm/arm/system.S
index 41551a8004..5e3aa0bf93 100644
--- a/utils/hwstub/stub/asm/arm/system.S
+++ b/utils/hwstub/stub/asm/arm/system.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/asm/mips/memcpy.S b/utils/hwstub/stub/asm/mips/memcpy.S
index 0477dcd0fb..e50c8f8b51 100644
--- a/utils/hwstub/stub/asm/mips/memcpy.S
+++ b/utils/hwstub/stub/asm/mips/memcpy.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002, 2003 Free Software Foundation, Inc.
  * This file was originally part of the GNU C Library
diff --git a/utils/hwstub/stub/asm/mips/memset.S b/utils/hwstub/stub/asm/mips/memset.S
index 6dfe0bf864..d584b56bcd 100644
--- a/utils/hwstub/stub/asm/mips/memset.S
+++ b/utils/hwstub/stub/asm/mips/memset.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * This file was originally part of the Linux/MIPS GNU C Library
  * Copyright (C) 1998 by Ralf Baechle
diff --git a/utils/hwstub/stub/config.h b/utils/hwstub/stub/config.h
index f9308ef22d..ef5c0c5744 100644
--- a/utils/hwstub/stub/config.h
+++ b/utils/hwstub/stub/config.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/format.c b/utils/hwstub/stub/format.c
index f5783159c0..aa9e7eb33c 100644
--- a/utils/hwstub/stub/format.c
+++ b/utils/hwstub/stub/format.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 by Gary Czvitkovicz
  *
diff --git a/utils/hwstub/stub/format.h b/utils/hwstub/stub/format.h
index 2ad4229f1e..988bdbce65 100644
--- a/utils/hwstub/stub/format.h
+++ b/utils/hwstub/stub/format.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/logf.c b/utils/hwstub/stub/logf.c
index 623ddb1c6c..37fae5bd40 100644
--- a/utils/hwstub/stub/logf.c
+++ b/utils/hwstub/stub/logf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/logf.h b/utils/hwstub/stub/logf.h
index 48c8c2c9b9..9131d4f6bd 100644
--- a/utils/hwstub/stub/logf.h
+++ b/utils/hwstub/stub/logf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/main.c b/utils/hwstub/stub/main.c
index 9e2e7116df..35e1180c49 100644
--- a/utils/hwstub/stub/main.c
+++ b/utils/hwstub/stub/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/memory.h b/utils/hwstub/stub/memory.h
index 20c84ad755..36a8f2776a 100644
--- a/utils/hwstub/stub/memory.h
+++ b/utils/hwstub/stub/memory.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/pp/hwstub.lds b/utils/hwstub/stub/pp/hwstub.lds
index baf10252e1..5d3e3109b5 100644
--- a/utils/hwstub/stub/pp/hwstub.lds
+++ b/utils/hwstub/stub/pp/hwstub.lds
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/pp/target.c b/utils/hwstub/stub/pp/target.c
index 27323584e5..5535534292 100644
--- a/utils/hwstub/stub/pp/target.c
+++ b/utils/hwstub/stub/pp/target.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/stddef.h b/utils/hwstub/stub/stddef.h
index 9bfd767750..da89576acd 100644
--- a/utils/hwstub/stub/stddef.h
+++ b/utils/hwstub/stub/stddef.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/stdint.h b/utils/hwstub/stub/stdint.h
index 393ff3fffd..16572048b7 100644
--- a/utils/hwstub/stub/stdint.h
+++ b/utils/hwstub/stub/stdint.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Dave Chapman
  *
diff --git a/utils/hwstub/stub/stmp/hwstub.lds b/utils/hwstub/stub/stmp/hwstub.lds
index 7b93d50863..ddc42e9c67 100644
--- a/utils/hwstub/stub/stmp/hwstub.lds
+++ b/utils/hwstub/stub/stmp/hwstub.lds
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/stmp/target.c b/utils/hwstub/stub/stmp/target.c
index 8d48707088..423e1e9d4c 100644
--- a/utils/hwstub/stub/stmp/target.c
+++ b/utils/hwstub/stub/stmp/target.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/string.c b/utils/hwstub/stub/string.c
index 1f8c415a99..069114c152 100644
--- a/utils/hwstub/stub/string.c
+++ b/utils/hwstub/stub/string.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/string.h b/utils/hwstub/stub/string.h
index ae352fe50e..39af33b3a6 100644
--- a/utils/hwstub/stub/string.h
+++ b/utils/hwstub/stub/string.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/system.h b/utils/hwstub/stub/system.h
index 5de08cb40a..ea0b617c08 100644
--- a/utils/hwstub/stub/system.h
+++ b/utils/hwstub/stub/system.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/target.h b/utils/hwstub/stub/target.h
index 4992dd5bf8..e2da5feb3b 100644
--- a/utils/hwstub/stub/target.h
+++ b/utils/hwstub/stub/target.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/hwstub/stub/usb_ch9.h b/utils/hwstub/stub/usb_ch9.h
index 09141b93bd..5501108b8a 100644
--- a/utils/hwstub/stub/usb_ch9.h
+++ b/utils/hwstub/stub/usb_ch9.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) by Linux Kernel Developers
  *
diff --git a/utils/hwstub/stub/usb_drv.h b/utils/hwstub/stub/usb_drv.h
index ef032f52a3..d97763ce2c 100644
--- a/utils/hwstub/stub/usb_drv.h
+++ b/utils/hwstub/stub/usb_drv.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Björn Stenberg
  *
diff --git a/utils/hwstub/stub/usb_drv_arc.c b/utils/hwstub/stub/usb_drv_arc.c
index ab87be8a4c..278f4f7e33 100644
--- a/utils/hwstub/stub/usb_drv_arc.c
+++ b/utils/hwstub/stub/usb_drv_arc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Driver for ARC USBOTG Device Controller
  *
diff --git a/utils/hwstub/tools/hwstub_dump.cpp b/utils/hwstub/tools/hwstub_dump.cpp
index ffa2832a55..adb9b15237 100644
--- a/utils/hwstub/tools/hwstub_dump.cpp
+++ b/utils/hwstub/tools/hwstub_dump.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/utils/hwstub/tools/hwstub_load.cpp b/utils/hwstub/tools/hwstub_load.cpp
index ab9ab7b967..65ce64b05c 100644
--- a/utils/hwstub/tools/hwstub_load.cpp
+++ b/utils/hwstub/tools/hwstub_load.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/hwstub/tools/hwstub_server.cpp b/utils/hwstub/tools/hwstub_server.cpp
index 6cb8010897..d0c9c26a75 100644
--- a/utils/hwstub/tools/hwstub_server.cpp
+++ b/utils/hwstub/tools/hwstub_server.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/utils/hwstub/tools/hwstub_shell.cpp b/utils/hwstub/tools/hwstub_shell.cpp
index 568bb37f9f..9fda72981f 100644
--- a/utils/hwstub/tools/hwstub_shell.cpp
+++ b/utils/hwstub/tools/hwstub_shell.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/hwstub/tools/hwstub_test.cpp b/utils/hwstub/tools/hwstub_test.cpp
index c93e601c36..c9ccf661f2 100644
--- a/utils/hwstub/tools/hwstub_test.cpp
+++ b/utils/hwstub/tools/hwstub_test.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2015 by Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/Makefile b/utils/imxtools/sbtools/Makefile
index 64a9651f4a..c4033706c5 100644
--- a/utils/imxtools/sbtools/Makefile
+++ b/utils/imxtools/sbtools/Makefile
@@ -1,7 +1,6 @@
 DEFINES=
 CC := gcc
-CXX := g++
-LD := g++
+LD := gcc
 
 TOMCRYPT_DIR := ../../tomcrypt/
 
diff --git a/utils/imxtools/sbtools/crc.c b/utils/imxtools/sbtools/crc.c
index 9f7146881b..9576f97df5 100644
--- a/utils/imxtools/sbtools/crc.c
+++ b/utils/imxtools/sbtools/crc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/crypto.c b/utils/imxtools/sbtools/crypto.c
index d3ec18bd11..64db77a04a 100644
--- a/utils/imxtools/sbtools/crypto.c
+++ b/utils/imxtools/sbtools/crypto.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/crypto.h b/utils/imxtools/sbtools/crypto.h
index 446891b7f2..adfff0b84e 100644
--- a/utils/imxtools/sbtools/crypto.h
+++ b/utils/imxtools/sbtools/crypto.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/dbparser.c b/utils/imxtools/sbtools/dbparser.c
index cfec7c2cd5..df53a849db 100644
--- a/utils/imxtools/sbtools/dbparser.c
+++ b/utils/imxtools/sbtools/dbparser.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/dbparser.h b/utils/imxtools/sbtools/dbparser.h
index c55d560df4..dbec25c9b4 100644
--- a/utils/imxtools/sbtools/dbparser.h
+++ b/utils/imxtools/sbtools/dbparser.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/elf.c b/utils/imxtools/sbtools/elf.c
index 68f66107a3..0177ba8603 100644
--- a/utils/imxtools/sbtools/elf.c
+++ b/utils/imxtools/sbtools/elf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/elf.h b/utils/imxtools/sbtools/elf.h
index bc2971c4f1..1660303fe1 100644
--- a/utils/imxtools/sbtools/elf.h
+++ b/utils/imxtools/sbtools/elf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/elftosb.c b/utils/imxtools/sbtools/elftosb.c
index ebfa033fcb..bdd5c526b3 100644
--- a/utils/imxtools/sbtools/elftosb.c
+++ b/utils/imxtools/sbtools/elftosb.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/elftosb1.c b/utils/imxtools/sbtools/elftosb1.c
index 83e1c175bc..01a4646454 100644
--- a/utils/imxtools/sbtools/elftosb1.c
+++ b/utils/imxtools/sbtools/elftosb1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/misc.c b/utils/imxtools/sbtools/misc.c
index c5832b6bb9..887ce8d5f3 100644
--- a/utils/imxtools/sbtools/misc.c
+++ b/utils/imxtools/sbtools/misc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/misc.h b/utils/imxtools/sbtools/misc.h
index 65386a728f..85b249fc17 100644
--- a/utils/imxtools/sbtools/misc.h
+++ b/utils/imxtools/sbtools/misc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/rsrc.c b/utils/imxtools/sbtools/rsrc.c
index a3bc150fa1..3e42985ace 100644
--- a/utils/imxtools/sbtools/rsrc.c
+++ b/utils/imxtools/sbtools/rsrc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
@@ -32,6 +31,7 @@
 
 const char crypto_key[16] = "SanDiskSlotRadi";
 
+#if 0
 static void rsrc_crypt(void *buf, int size)
 {
     if(size % 16)
@@ -43,6 +43,7 @@ static void rsrc_crypt(void *buf, int size)
             p[j] ^= crypto_key[j];
     }
 }
+#endif
 
 enum rsrc_error_t rsrc_write_file(struct rsrc_file_t *rsrc, const char *filename)
 {
@@ -253,4 +254,3 @@ void rsrc_dump(struct rsrc_file_t *file, void *u, rsrc_color_printf cprintf)
     #undef printf
     #undef print_hex
 }
-
diff --git a/utils/imxtools/sbtools/rsrc.h b/utils/imxtools/sbtools/rsrc.h
index 9dfd27b465..1ba70724e1 100644
--- a/utils/imxtools/sbtools/rsrc.h
+++ b/utils/imxtools/sbtools/rsrc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/rsrctool.c b/utils/imxtools/sbtools/rsrctool.c
index 43482d5626..fc5f38ddd0 100644
--- a/utils/imxtools/sbtools/rsrctool.c
+++ b/utils/imxtools/sbtools/rsrctool.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
@@ -38,7 +37,9 @@
 #define PAD_TO_BOUNDARY(x) (((x) + 0x1ff) & ~0x1ff)
 
 /* If you find a firmware that breaks the known format ^^ */
+#ifndef assert
 #define assert(a) do { if(!(a)) { fprintf(stderr,"Assertion \"%s\" failed in %s() line %d!\n\nPlease send us your firmware!\n",#a,__func__,__LINE__); exit(1); } } while(0)
+#endif
 
 #define crypto_cbc(...) \
     do { int ret = crypto_cbc(__VA_ARGS__); \
@@ -199,4 +200,3 @@ int main(int argc, char **argv)
 
     return 0;
 }
-
diff --git a/utils/imxtools/sbtools/sb.c b/utils/imxtools/sbtools/sb.c
index 04acc2a6ad..47adf268cd 100644
--- a/utils/imxtools/sbtools/sb.c
+++ b/utils/imxtools/sbtools/sb.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Amaury Pouly
  *
@@ -489,11 +488,11 @@ enum sb_error_t sb_write_file(struct sb_file_t *sb, const char *filename, void *
 
     if(buf_p - buf != sb_hdr.image_size * BLOCK_SIZE)
     {
-        free(buf);
         printf(GREY, "Internal error: SB image buffer was not entirely filled !\n");
         printf(GREY, "Internal error: expected %u blocks, got %u\n",
             (buf_p - buf) / BLOCK_SIZE, sb_hdr.image_size);
         cprintf(u, true, GREY, "Internal error\n");
+        free(buf);
         return SB_ERROR;
     }
 
diff --git a/utils/imxtools/sbtools/sb.h b/utils/imxtools/sbtools/sb.h
index 62fe4464fb..b85add9797 100644
--- a/utils/imxtools/sbtools/sb.h
+++ b/utils/imxtools/sbtools/sb.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Amaury Pouly
  *
@@ -37,7 +36,7 @@ struct sb_version_t
     uint16_t pad1;
     uint16_t revision;
     uint16_t pad2;
-};
+} __attribute__((packed));
 
 struct sb_header_t
 {
diff --git a/utils/imxtools/sbtools/sb1.c b/utils/imxtools/sbtools/sb1.c
index f252ded2b8..1fc9bfb622 100644
--- a/utils/imxtools/sbtools/sb1.c
+++ b/utils/imxtools/sbtools/sb1.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/sb1.h b/utils/imxtools/sbtools/sb1.h
index dd2f8afeec..9edb20e910 100644
--- a/utils/imxtools/sbtools/sb1.h
+++ b/utils/imxtools/sbtools/sb1.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/sbloader.c b/utils/imxtools/sbtools/sbloader.c
index 99715a6232..9ab9edc6fe 100644
--- a/utils/imxtools/sbtools/sbloader.c
+++ b/utils/imxtools/sbtools/sbloader.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/imxtools/sbtools/sbtoelf.c b/utils/imxtools/sbtools/sbtoelf.c
index 11a46968dd..a336e95681 100644
--- a/utils/imxtools/sbtools/sbtoelf.c
+++ b/utils/imxtools/sbtools/sbtoelf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Bertrik Sikken
  *
diff --git a/utils/imxtools/sbtools/xorcrypt.c b/utils/imxtools/sbtools/xorcrypt.c
index 63a8232117..eeb0452dc3 100644
--- a/utils/imxtools/sbtools/xorcrypt.c
+++ b/utils/imxtools/sbtools/xorcrypt.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/imxtools/scsitools/misc.c b/utils/imxtools/scsitools/misc.c
index 36eae198e5..e3dc5041cd 100644
--- a/utils/imxtools/scsitools/misc.c
+++ b/utils/imxtools/scsitools/misc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/imxtools/scsitools/misc.h b/utils/imxtools/scsitools/misc.h
index 0ff5bdae50..f1f5545c2f 100644
--- a/utils/imxtools/scsitools/misc.h
+++ b/utils/imxtools/scsitools/misc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/imxtools/scsitools/scsitool.c b/utils/imxtools/scsitools/scsitool.c
index 8367af6939..0d47260fd8 100644
--- a/utils/imxtools/scsitools/scsitool.c
+++ b/utils/imxtools/scsitools/scsitool.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/imxtools/scsitools/stmp_scsi.c b/utils/imxtools/scsitools/stmp_scsi.c
index 8daeb8a532..04dbf49d26 100644
--- a/utils/imxtools/scsitools/stmp_scsi.c
+++ b/utils/imxtools/scsitools/stmp_scsi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/imxtools/scsitools/stmp_scsi.h b/utils/imxtools/scsitools/stmp_scsi.h
index 37267863d2..60e6d9b244 100644
--- a/utils/imxtools/scsitools/stmp_scsi.h
+++ b/utils/imxtools/scsitools/stmp_scsi.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/ingenic_tools/usbboot.c b/utils/ingenic_tools/usbboot.c
index 0001711605..208888d3d4 100644
--- a/utils/ingenic_tools/usbboot.c
+++ b/utils/ingenic_tools/usbboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/utils/ipod/bin2note/Makefile b/utils/ipod/bin2note/Makefile
index 985ed00da7..6c16195493 100644
--- a/utils/ipod/bin2note/Makefile
+++ b/utils/ipod/bin2note/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 all: bin2note
diff --git a/utils/ipod/bin2note/bin2note.c b/utils/ipod/bin2note/bin2note.c
index 5100039962..b4aa41ae01 100644
--- a/utils/ipod/bin2note/bin2note.c
+++ b/utils/ipod/bin2note/bin2note.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * bin2note - a program to insert binary code in an iPod Nano 2nd
  *            Generation notes file
diff --git a/utils/ipod/flashsplit/Makefile b/utils/ipod/flashsplit/Makefile
index 4283fd9c09..3de197985c 100644
--- a/utils/ipod/flashsplit/Makefile
+++ b/utils/ipod/flashsplit/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 all: flashsplit
diff --git a/utils/ipod/flashsplit/flashsplit.c b/utils/ipod/flashsplit/flashsplit.c
index c4bb3b4255..df6add11a3 100644
--- a/utils/ipod/flashsplit/flashsplit.c
+++ b/utils/ipod/flashsplit/flashsplit.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/utils/ipodpatcher/Makefile b/utils/ipodpatcher/Makefile
index 47e96fcf30..1406279728 100644
--- a/utils/ipodpatcher/Makefile
+++ b/utils/ipodpatcher/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 CFLAGS += -Wall -W
@@ -32,7 +31,7 @@ LDOPTS_OSX = -framework CoreFoundation -framework IOKit
 
 LIBSOURCES = ipodpatcher.c fat32format.c arc4.c \
 	     ipodio-posix.c ipodio-win32-scsi.c ipodio-win32.c \
-	     ipodpatcher-aupd.c
+	     ipodpatcher_aupd.c
 SOURCES = main.c $(BOOTSRC)
 ipodpatcher: SOURCES+= ipodio-posix.c
 
diff --git a/utils/ipodpatcher/fat32format.c b/utils/ipodpatcher/fat32format.c
index 7ee8021cbf..9a42a064b4 100644
--- a/utils/ipodpatcher/fat32format.c
+++ b/utils/ipodpatcher/fat32format.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  *
  * FAT32 formatting functions.  Based on:
diff --git a/utils/ipodpatcher/ipodio-posix.c b/utils/ipodpatcher/ipodio-posix.c
index dc856a2e0d..bfcc13e27e 100644
--- a/utils/ipodpatcher/ipodio-posix.c
+++ b/utils/ipodpatcher/ipodio-posix.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
@@ -179,7 +178,7 @@ int ipod_scsi_inquiry(struct ipod_t* ipod, int page_code,
     io_iterator_t iterator = IO_OBJECT_NULL;
     /* get matching services from IO registry. Consumes one reference to
      * the dictionary, so no need to release that. */
-    kr = IOServiceGetMatchingServices(kIOMasterPortDefault, match_dict, &iterator);
+    kr = IOServiceGetMatchingServices(kIOMainPortDefault, match_dict, &iterator);
 
     if(!iterator | (kr != kIOReturnSuccess))
         return -1;
@@ -339,8 +338,7 @@ int ipod_open(struct ipod_t* ipod, int silent)
 int ipod_reopen_rw(struct ipod_t* ipod)
 {
 #if defined(__APPLE__) && defined(__MACH__)
-    if (ipod_unmount(ipod) < 0)
-        return -1;
+    ipod_unmount(ipod);
 #endif
 
     close(ipod->dh);
diff --git a/utils/ipodpatcher/ipodio-win32-scsi.c b/utils/ipodpatcher/ipodio-win32-scsi.c
index 16460cfba3..b218e7397a 100644
--- a/utils/ipodpatcher/ipodio-win32-scsi.c
+++ b/utils/ipodpatcher/ipodio-win32-scsi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Dave Chapman
  * 
diff --git a/utils/ipodpatcher/ipodio-win32.c b/utils/ipodpatcher/ipodio-win32.c
index 2c52a64658..db0623a6dc 100644
--- a/utils/ipodpatcher/ipodio-win32.c
+++ b/utils/ipodpatcher/ipodio-win32.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
@@ -40,33 +39,34 @@
 
 #include "ipodio.h"
 
-static int lock_volume(HANDLE hDisk) 
-{ 
+static int lock_volume(HANDLE hDisk)
+{
   DWORD dummy;
 
   return DeviceIoControl(hDisk, FSCTL_LOCK_VOLUME, NULL, 0, NULL, 0,
-			 &dummy, NULL); 
+			 &dummy, NULL);
 }
 
-static int unlock_volume(HANDLE hDisk) 
-{ 
+static int unlock_volume(HANDLE hDisk)
+{
   DWORD dummy;
 
   return DeviceIoControl(hDisk, FSCTL_UNLOCK_VOLUME, NULL, 0, NULL, 0,
-			 &dummy, NULL); 
-} 
+			 &dummy, NULL);
+}
 
 void ipod_print_error(char* msg)
 {
     LPSTR pMsgBuf = NULL;
 
     printf(msg);
-    FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
+    if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
                   FORMAT_MESSAGE_IGNORE_INSERTS, NULL, GetLastError(),
-                  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), pMsgBuf,
-                  0, NULL);
-    printf(pMsgBuf);
-    LocalFree(pMsgBuf);
+                       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&pMsgBuf,
+                       0, NULL)) {
+        printf(pMsgBuf);
+        LocalFree(pMsgBuf);
+    }
 }
 
 int ipod_open(struct ipod_t* ipod, int silent)
@@ -224,4 +224,3 @@ ssize_t ipod_write(struct ipod_t* ipod, int nbytes)
 }
 
 #endif
-
diff --git a/utils/ipodpatcher/ipodio.h b/utils/ipodpatcher/ipodio.h
index 4f1a35dd09..3873c55646 100644
--- a/utils/ipodpatcher/ipodio.h
+++ b/utils/ipodpatcher/ipodio.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
diff --git a/utils/ipodpatcher/ipodpatcher.c b/utils/ipodpatcher/ipodpatcher.c
index e7c0cc3358..de9ca5b3f7 100644
--- a/utils/ipodpatcher/ipodpatcher.c
+++ b/utils/ipodpatcher/ipodpatcher.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
@@ -66,9 +65,9 @@ static const char apple_stop_sign[] = "{{~~  /-----\\   "\
                                       "----------------"\
                                       "---------------";
 
-/* Windows requires the buffer for disk I/O to be aligned in memory on a 
+/* Windows requires the buffer for disk I/O to be aligned in memory on a
    multiple of the disk volume size - so we use a single global variable
-   and initialise it with ipod_alloc_buf() 
+   and initialise it with ipod_alloc_buf()
 */
 
 char* get_parttype(unsigned int pt)
@@ -128,19 +127,6 @@ static inline int be2int(unsigned char* buf)
    return res;
 }
 
-static inline int getint16le(char* buf)
-{
-   int16_t res = (buf[1] << 8) | buf[0];
-
-   return res;
-}
-
-static inline void short2le(unsigned short val, unsigned char* addr)
-{
-    addr[0] = val & 0xFF;
-    addr[1] = (val >> 8) & 0xff;
-}
-
 static inline void int2le(unsigned int val, unsigned char* addr)
 {
     addr[0] = val & 0xFF;
@@ -232,7 +218,7 @@ int read_partinfo(struct ipod_t* ipod, int silent)
             /* see if it's a partition entry */
             if ((ipod->sectorbuf[0] != 'P') || (ipod->sectorbuf[1] != 'M')) {
                 /* end of partition table -> leave the loop */
-                break;  
+                break;
             }
 
             /* Extract the interesting entries */
@@ -268,8 +254,8 @@ int read_partinfo(struct ipod_t* ipod, int silent)
            1) Partition 1 is of type 0 (Empty) but isn't empty.
            2) Partition 2 is of type 0xb or 0xc (winpod) or -1 (macpod)
     */
-    if ((ipod->pinfo[0].type != 0) || (ipod->pinfo[0].size == 0) || 
-        ((ipod->pinfo[1].type != 0xb) && (ipod->pinfo[1].type != 0xc) && 
+    if ((ipod->pinfo[0].type != 0) || (ipod->pinfo[0].size == 0) ||
+        ((ipod->pinfo[1].type != 0xb) && (ipod->pinfo[1].type != 0xc) &&
          (ipod->pinfo[1].type != PARTTYPE_HFS))) {
         if (!silent) fprintf(stderr,"[ERR]  Partition layout is not an ipod\n");
         return -1;
@@ -371,7 +357,7 @@ int write_partition(struct ipod_t* ipod, int infile)
            /* We need to pad the last write to a multiple of SECTOR_SIZE */
            if ((n % ipod->sector_size) != 0) {
                padding = (ipod->sector_size-(n % ipod->sector_size));
-               n += padding; 
+               n += padding;
            }
         }
 
@@ -381,7 +367,7 @@ int write_partition(struct ipod_t* ipod, int infile)
 
         if (res < 0) {
             ipod_print_error(" Error writing to disk: ");
-            fprintf(stderr,"Bytes written: %d\n",byteswritten);
+            fprintf(stderr,"Bytes read/written: %d/%d\n", bytesread, byteswritten);
             return -1;
         }
 
@@ -409,8 +395,8 @@ int diskmove(struct ipod_t* ipod, int delta)
     int n;
 
     src_start = ipod->ipod_directory[1].devOffset;
-    src_end = (ipod->ipod_directory[ipod->nimages-1].devOffset + ipod->sector_size + 
-              ipod->ipod_directory[ipod->nimages-1].len + 
+    src_end = (ipod->ipod_directory[ipod->nimages-1].devOffset + ipod->sector_size +
+              ipod->ipod_directory[ipod->nimages-1].len +
               (ipod->sector_size-1)) & ~(ipod->sector_size-1);
     bytesleft = src_end - src_start;
 
@@ -495,13 +481,13 @@ static int rename_image(struct ipod_t* ipod, char* from, char* to)
         return -1;
     }
     /* Read directory */
-    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { 
+    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) {
         fprintf(stderr,"[ERR]  Seek to diroffset (%08x) failed.\n",(unsigned)ipod->diroffset);
         return -1;
     }
 
     n=ipod_read(ipod, ipod->sector_size);
-    if (n < 0) { 
+    if (n < 0) {
         fprintf(stderr,"[ERR]  Read of directory failed.\n");
         return -1;
     }
@@ -515,7 +501,7 @@ static int rename_image(struct ipod_t* ipod, char* from, char* to)
         ipod->diroffset += ipod->sector_size - x;
 
         n=ipod_read(ipod, ipod->sector_size);
-        if (n < 0) { 
+        if (n < 0) {
             fprintf(stderr,"[ERR]  Read of directory failed.\n");
             return -1;
         }
@@ -538,13 +524,13 @@ static int rename_image(struct ipod_t* ipod, char* from, char* to)
     }
 
     /* Write directory back to disk */
-    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { 
+    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) {
         fprintf(stderr,"[ERR]  Seek to diroffset (%08x) failed.\n",(unsigned)ipod->diroffset);
         return -1;
     }
 
     n=ipod_write(ipod, ipod->sector_size);
-    if (n < 0) { 
+    if (n < 0) {
         fprintf(stderr,"[ERR]  Write of directory failed in rename_image.\n");
         return -1;
     }
@@ -564,13 +550,13 @@ static int delete_image(struct ipod_t* ipod, char* name)
     x = ipod->diroffset % ipod->sector_size;
 
     /* Read directory */
-    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { 
+    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) {
         fprintf(stderr,"[ERR]  Seek to diroffset (%08x) failed.\n",(unsigned)ipod->diroffset);
         return -1;
     }
 
     n=ipod_read(ipod, ipod->sector_size);
-    if (n < 0) { 
+    if (n < 0) {
         fprintf(stderr,"[ERR]  Read of directory failed.\n");
         return -1;
     }
@@ -584,7 +570,7 @@ static int delete_image(struct ipod_t* ipod, char* name)
         ipod->diroffset += ipod->sector_size - x;
 
         n=ipod_read(ipod, ipod->sector_size);
-        if (n < 0) { 
+        if (n < 0) {
             fprintf(stderr,"[ERR]  Read of directory failed.\n");
             return -1;
         }
@@ -606,13 +592,13 @@ static int delete_image(struct ipod_t* ipod, char* name)
     }
 
     /* Write directory back to disk */
-    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { 
+    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) {
         fprintf(stderr,"[ERR]  Seek to diroffset (%08x) failed.\n",(unsigned)ipod->diroffset);
         return -1;
     }
 
     n=ipod_write(ipod, ipod->sector_size);
-    if (n < 0) { 
+    if (n < 0) {
         fprintf(stderr,"[ERR]  Write of directory failed in delete_image.\n");
         return -1;
     }
@@ -644,8 +630,8 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
         fprintf(stderr,"[INFO] Using internal bootloader - %d bytes\n",ipod->bootloader_len);
         length = ipod->bootloader_len;
         infile = -1;
-    } 
-    else 
+    }
+    else
 #endif
     {
         /* First check that the input file is the correct type for this ipod. */
@@ -654,7 +640,7 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
             fprintf(stderr,"[ERR]  Couldn't open input file %s\n",filename);
             return -1;
         }
-    
+
         if (type==FILETYPE_DOT_IPOD) {
             n = read(infile,header,8);
             if (n < 8) {
@@ -662,16 +648,16 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
                 close(infile);
                 return -1;
             }
-    
+
             if (memcmp(header+4, ipod->modelname,4)!=0) {
                 fprintf(stderr,"[ERR]  Model name in input file (%c%c%c%c) doesn't match ipod model (%s)\n",
                         header[4],header[5],header[6],header[7], ipod->modelname);
                 close(infile);
                 return -1;
             }
-    
+
             filechksum = be2int(header);
-    
+
             length = filesize(infile)-8;
         } else {
             length = filesize(infile);
@@ -694,7 +680,7 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
 #ifdef WITH_BOOTOBJS
     if (type == FILETYPE_INTERNAL) {
         memcpy(ipod->sectorbuf,ipod->bootloader,ipod->bootloader_len);
-    } 
+    }
     else
 #endif
     {
@@ -734,7 +720,7 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
     /* 2nd Gen Nano has encrypted firmware, and the sector
        preceeding the firmware contains hashes that need to be
        preserved.  Nano 2G images include these extra 2048 (0x800)
-       bytes 
+       bytes
      */
     if (ipod_seek(ipod, offset - (ipod->modelnum == 62 ? 0x800 : 0)) < 0) {
         fprintf(stderr,"[ERR]  Seek failed\n");
@@ -753,7 +739,7 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
     }
     fprintf(stderr,"[INFO]  Wrote %d bytes to firmware partition\n",n);
 
-    /* Now we need to create a new directory entry 
+    /* Now we need to create a new directory entry
 
        NOTE: On the Nano 2G, the checksum is the checksum of the
              unencrypted firmware.  But this isn't checked by the NOR
@@ -803,7 +789,7 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
     int2le(length - (ipod->modelnum==62 ? 0x800: 0), p + 16);    /* len */
     int2le(chksum, p + 28);                                      /* checksum */
 
-    /* Write directory */    
+    /* Write directory */
     if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { return -1; }
     n=ipod_write(ipod, ipod->sector_size);
     if (n < 0) { return -1; }
@@ -930,8 +916,8 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
         memcpy(ipod->sectorbuf+entryOffset,ipod->bootloader,ipod->bootloader_len);
         length = ipod->bootloader_len;
         paddedlength=(ipod->bootloader_len+ipod->sector_size-1)&~(ipod->sector_size-1);
-    } 
-    else 
+    }
+    else
 #endif
     {
         infile=open(filename,O_RDONLY);
@@ -948,16 +934,16 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
                 close(infile);
                 return -1;
             }
-    
+
             if (memcmp(header+4, ipod->modelname,4)!=0) {
                 fprintf(stderr,"[ERR]  Model name in input file (%c%c%c%c) doesn't match ipod model (%s)\n",
                         header[4],header[5],header[6],header[7], ipod->modelname);
                 close(infile);
                 return -1;
             }
-    
+
             filechksum = be2int(header);
-    
+
             length=filesize(infile)-8;
         } else {
             length=filesize(infile);
@@ -977,7 +963,7 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
             fprintf(stderr,"[ERR]  Couldn't read input file\n");
             return -1;
         }
-    
+
         if (type==FILETYPE_DOT_IPOD) {
             /* Calculate and confirm bootloader checksum */
             chksum = ipod->modelnum;
@@ -985,7 +971,7 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
                  /* add 8 unsigned bits but keep a 32 bit sum */
                  chksum += bootloader_buf[i];
             }
-    
+
             if (chksum == filechksum) {
                 fprintf(stderr,"[INFO] Checksum OK in %s\n",filename);
             } else {
@@ -1058,7 +1044,7 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
     chksum = 0;
     for (i=0;i<entryOffset + length; i++) {
          chksum += ipod->sectorbuf[i];
-    }    
+    }
 
     /* Now write the combined firmware image to the disk */
 
@@ -1083,7 +1069,7 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
     x = ipod->diroffset % ipod->sector_size;
 
     /* Read directory */
-    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { 
+    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) {
         fprintf(stderr,"[ERR]  Seek failed\n");
         return -1;
     }
@@ -1107,13 +1093,13 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
         }
     }
 
-    /* Write directory */    
-    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { 
+    /* Write directory */
+    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) {
         fprintf(stderr,"[ERR]  Seek to %d failed\n", (int)(ipod->start+ipod->diroffset-x));
         return -1;
     }
     n=ipod_write(ipod, ipod->sector_size);
-    if (n < 0) { 
+    if (n < 0) {
         fprintf(stderr,"[ERR]  Directory write failed\n");
         return -1;
     }
@@ -1195,7 +1181,7 @@ int delete_bootloader(struct ipod_t* ipod)
     int2le(0,ipod->sectorbuf+x+24);
     int2le(chksum,ipod->sectorbuf+x+28);
 
-    /* Write directory */    
+    /* Write directory */
     if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { return -1; }
     n=ipod_write(ipod, ipod->sector_size);
     if (n < 0) { return -1; }
@@ -1227,8 +1213,8 @@ int write_firmware(struct ipod_t* ipod, char* filename, int type)
         fprintf(stderr,"[INFO] Using internal bootloader - %d bytes\n",ipod->bootloader_len);
         length = ipod->bootloader_len;
         infile = -1;
-    } 
-    else 
+    }
+    else
 #endif
     {
         /* First check that the input file is the correct type for this ipod. */
@@ -1237,7 +1223,7 @@ int write_firmware(struct ipod_t* ipod, char* filename, int type)
             fprintf(stderr,"[ERR]  Couldn't open input file %s\n",filename);
             return -1;
         }
-    
+
         if (type==FILETYPE_DOT_IPOD) {
             n = read(infile,header,8);
             if (n < 8) {
@@ -1245,16 +1231,16 @@ int write_firmware(struct ipod_t* ipod, char* filename, int type)
                 close(infile);
                 return -1;
             }
-    
+
             if (memcmp(header+4, ipod->modelname,4)!=0) {
                 fprintf(stderr,"[ERR]  Model name in input file (%c%c%c%c) doesn't match ipod model (%s)\n",
                         header[4],header[5],header[6],header[7], ipod->modelname);
                 close(infile);
                 return -1;
             }
-    
+
             filechksum = be2int(header);
-    
+
             length = filesize(infile)-8;
         } else {
             length = filesize(infile);
@@ -1289,7 +1275,7 @@ int write_firmware(struct ipod_t* ipod, char* filename, int type)
 #ifdef WITH_BOOTOBJS
     if (type == FILETYPE_INTERNAL) {
         memcpy(ipod->sectorbuf,ipod->bootloader,ipod->bootloader_len);
-    } 
+    }
     else
 #endif
     {
@@ -1330,7 +1316,7 @@ int write_firmware(struct ipod_t* ipod, char* filename, int type)
         /* 2nd Gen Nano has encrypted firmware, and the sector
            preceeding the firmware contains hashes that need to be
            preserved.  Nano 2G images include these extra 2048 (0x800)
-           bytes 
+           bytes
         */
 
         offset -= 0x800;
@@ -1481,17 +1467,17 @@ int read_directory(struct ipod_t* ipod)
 
     ipod->nimages=0;
 
-    /* Read firmware partition header (first 512 bytes of disk - but 
+    /* Read firmware partition header (first 512 bytes of disk - but
        let's read a whole sector) */
 
-    if (ipod_seek(ipod, ipod->start) < 0) { 
+    if (ipod_seek(ipod, ipod->start) < 0) {
         fprintf(stderr,"[ERR]  Seek to 0x%08x in read_directory() failed.\n",
                        (unsigned int)(ipod->start));
         return -1;
     }
 
     n=ipod_read(ipod, ipod->sector_size);
-    if (n < 0) { 
+    if (n < 0) {
         fprintf(stderr,"[ERR]  ipod_read(ipod,0x%08x) failed in read_directory()\n", ipod->sector_size);
         return -1;
     }
@@ -1517,13 +1503,13 @@ int read_directory(struct ipod_t* ipod)
     x = ipod->diroffset % ipod->sector_size;
 
     /* Read directory */
-    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { 
+    if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) {
         fprintf(stderr,"[ERR]  Seek to diroffset (%08x) failed.\n",(unsigned)ipod->diroffset);
         return -1;
     }
 
     n=ipod_read(ipod, ipod->sector_size);
-    if (n < 0) { 
+    if (n < 0) {
         fprintf(stderr,"[ERR]  Read of directory failed.\n");
         return -1;
     }
@@ -1537,7 +1523,7 @@ int read_directory(struct ipod_t* ipod)
         ipod->diroffset += ipod->sector_size - x;
 
         n=ipod_read(ipod, ipod->sector_size);
-        if (n < 0) { 
+        if (n < 0) {
             fprintf(stderr,"[ERR]  Read of directory failed.\n");
             return -1;
         }
@@ -1545,7 +1531,7 @@ int read_directory(struct ipod_t* ipod)
     }
 
     ipod->ososimage = -1;
-    while ((ipod->nimages < MAX_IMAGES) && (p < (ipod->sectorbuf + x + 400)) && 
+    while ((ipod->nimages < MAX_IMAGES) && (p < (ipod->sectorbuf + x + 400)) &&
            ((memcmp(p,"!ATA",4)==0) || (memcmp(p,"DNAN",4)==0))) {
         p+=4;
         if (memcmp(p,"soso",4)==0) {
@@ -1824,7 +1810,7 @@ int ipod_scan(struct ipod_t* ipod)
          }
 
 #ifdef __WIN32__
-         printf("[INFO] Ipod found - %s (\"%s\") - disk device %d\n", 
+         printf("[INFO] Ipod found - %s (\"%s\") - disk device %d\n",
              ipod->modelstr,ipod->macpod ? "macpod" : "winpod",i);
 #else
          printf("[INFO] Ipod found - %s (\"%s\") - %s\n",
@@ -1881,7 +1867,7 @@ int write_dos_partition_table(struct ipod_t* ipod)
     memset(ipod->sectorbuf, 0, ipod->sector_size);
 
     /* Now add the partition info */
-    for (i=0; i < 4 ; i++) 
+    for (i=0; i < 4 ; i++)
     {
         p = ipod->sectorbuf + 0x1be + i*16;
 
@@ -1933,7 +1919,7 @@ int ipod_get_xmlinfo(struct ipod_t* ipod)
         return -1;
     }
 
-    /* Reading directly into hdr[] causes problems (for an unknown reason) on 
+    /* Reading directly into hdr[] causes problems (for an unknown reason) on
        win32 */
     memcpy(hdr, buf, sizeof(hdr));
 
@@ -1941,7 +1927,7 @@ int ipod_get_xmlinfo(struct ipod_t* ipod)
 
     psize = npages * 0xf8; /* Hopefully this is enough. */
 
-    ipod->xmlinfo = malloc(psize); 
+    ipod->xmlinfo = malloc(psize);
     ipod->xmlinfo_len = 0;
 
     if (ipod->xmlinfo == NULL) {
@@ -1950,7 +1936,7 @@ int ipod_get_xmlinfo(struct ipod_t* ipod)
     }
 
     p = ipod->xmlinfo;
-    
+
     for (i=0; i < npages; i++) {
         if (ipod_scsi_inquiry(ipod, hdr[i+4], buf, sizeof(buf)) < 0) {
             fprintf(stderr,"[ERR]  Sending SCSI Command failed.\n");
@@ -1967,7 +1953,7 @@ int ipod_get_xmlinfo(struct ipod_t* ipod)
 
         memcpy(p, buf + 4, buf[3]);
         p += buf[3];
-        ipod->xmlinfo_len += buf[3];        
+        ipod->xmlinfo_len += buf[3];
     }
 
     /* NULL-terminate the XML info */
@@ -1992,4 +1978,3 @@ void ipod_get_ramsize(struct ipod_t* ipod)
         ipod->ramsize = atoi(p + sizeof(needle) - 1);
     }
 }
-
diff --git a/utils/ipodpatcher/ipodpatcher.h b/utils/ipodpatcher/ipodpatcher.h
index 2cd2331666..271274cb0f 100644
--- a/utils/ipodpatcher/ipodpatcher.h
+++ b/utils/ipodpatcher/ipodpatcher.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
diff --git a/utils/ipodpatcher/ipodpatcher-aupd.c b/utils/ipodpatcher/ipodpatcher_aupd.c
similarity index 99%
rename from utils/ipodpatcher/ipodpatcher-aupd.c
rename to utils/ipodpatcher/ipodpatcher_aupd.c
index 69b027284c..45e160f797 100644
--- a/utils/ipodpatcher/ipodpatcher-aupd.c
+++ b/utils/ipodpatcher/ipodpatcher_aupd.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
diff --git a/utils/ipodpatcher/main.c b/utils/ipodpatcher/main.c
index 031458488d..e207bf782f 100644
--- a/utils/ipodpatcher/main.c
+++ b/utils/ipodpatcher/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
diff --git a/utils/jz4740_tools/DLanalyser.c b/utils/jz4740_tools/DLanalyser.c
index 1209acec7b..f32615b22d 100644
--- a/utils/jz4740_tools/DLanalyser.c
+++ b/utils/jz4740_tools/DLanalyser.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jin Le
  *
diff --git a/utils/jz4740_tools/HXF2IHFS.c b/utils/jz4740_tools/HXF2IHFS.c
index bba88929f0..f4de328b68 100644
--- a/utils/jz4740_tools/HXF2IHFS.c
+++ b/utils/jz4740_tools/HXF2IHFS.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by William Poetra Yoga Hadisoeseno
  *
diff --git a/utils/jz4740_tools/HXFmerge.c b/utils/jz4740_tools/HXFmerge.c
index fdd81b8445..b95f27c8b8 100644
--- a/utils/jz4740_tools/HXFmerge.c
+++ b/utils/jz4740_tools/HXFmerge.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/utils/jz4740_tools/HXFreplace.c b/utils/jz4740_tools/HXFreplace.c
index 5a05525194..39c3824eff 100644
--- a/utils/jz4740_tools/HXFreplace.c
+++ b/utils/jz4740_tools/HXFreplace.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/utils/jz4740_tools/HXFsplit.c b/utils/jz4740_tools/HXFsplit.c
index dbeace8a20..7e7de57d45 100644
--- a/utils/jz4740_tools/HXFsplit.c
+++ b/utils/jz4740_tools/HXFsplit.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/utils/jz4740_tools/IHFSsplit.c b/utils/jz4740_tools/IHFSsplit.c
index ad62d81daf..c05d7077a6 100644
--- a/utils/jz4740_tools/IHFSsplit.c
+++ b/utils/jz4740_tools/IHFSsplit.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by William Poetra Yoga Hadisoeseno 
  *
diff --git a/utils/jz4740_tools/README b/utils/jz4740_tools/README
index 722bcc13d5..01abce6f06 100644
--- a/utils/jz4740_tools/README
+++ b/utils/jz4740_tools/README
@@ -34,7 +34,6 @@ More info/tools:
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/utils/jz4740_tools/jz4740_usbtool.c b/utils/jz4740_tools/jz4740_usbtool.c
index e76c038887..9056ecb4c4 100644
--- a/utils/jz4740_tools/jz4740_usbtool.c
+++ b/utils/jz4740_tools/jz4740_usbtool.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
diff --git a/utils/jz4760_tools/packtools.cpp b/utils/jz4760_tools/packtools.cpp
index b594525978..28ce3cdc61 100644
--- a/utils/jz4760_tools/packtools.cpp
+++ b/utils/jz4760_tools/packtools.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2015 by Amaury Pouly
  *
diff --git a/utils/jz4760_tools/usbboot.c b/utils/jz4760_tools/usbboot.c
index b6c378f538..8ed5dad93d 100644
--- a/utils/jz4760_tools/usbboot.c
+++ b/utils/jz4760_tools/usbboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2015 by Amaury Pouly
  *
diff --git a/utils/jztool/include/jztool.h b/utils/jztool/include/jztool.h
index 934a339af2..732e65a0ee 100644
--- a/utils/jztool/include/jztool.h
+++ b/utils/jztool/include/jztool.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/utils/jztool/jztool.c b/utils/jztool/jztool.c
index db6ddc92e8..e5fbad6b40 100644
--- a/utils/jztool/jztool.c
+++ b/utils/jztool/jztool.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/utils/jztool/src/buffer.c b/utils/jztool/src/buffer.c
index 9e9c9ff5d1..db7a05e522 100644
--- a/utils/jztool/src/buffer.c
+++ b/utils/jztool/src/buffer.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/utils/jztool/src/context.c b/utils/jztool/src/context.c
index d269d1eece..030914e9f0 100644
--- a/utils/jztool/src/context.c
+++ b/utils/jztool/src/context.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/utils/jztool/src/device_info.c b/utils/jztool/src/device_info.c
index 39a0408af8..69cce405cf 100644
--- a/utils/jztool/src/device_info.c
+++ b/utils/jztool/src/device_info.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/utils/jztool/src/identify_file.c b/utils/jztool/src/identify_file.c
index e475d98a3b..6119f6748f 100644
--- a/utils/jztool/src/identify_file.c
+++ b/utils/jztool/src/identify_file.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/utils/jztool/src/jztool_private.h b/utils/jztool/src/jztool_private.h
index 11299f21f9..8843dc8304 100644
--- a/utils/jztool/src/jztool_private.h
+++ b/utils/jztool/src/jztool_private.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/utils/jztool/src/ucl_unpack.c b/utils/jztool/src/ucl_unpack.c
index 3b199c7008..63317c8023 100644
--- a/utils/jztool/src/ucl_unpack.c
+++ b/utils/jztool/src/ucl_unpack.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/utils/jztool/src/usb.c b/utils/jztool/src/usb.c
index cfc3ba60cb..7747f3c27e 100644
--- a/utils/jztool/src/usb.c
+++ b/utils/jztool/src/usb.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/utils/jztool/src/x1000.c b/utils/jztool/src/x1000.c
index e4bd466562..7c3b08b54b 100644
--- a/utils/jztool/src/x1000.c
+++ b/utils/jztool/src/x1000.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2021 Aidan MacDonald
  *
diff --git a/utils/mkamsboot/dualboot/bin2c.c b/utils/mkamsboot/dualboot/bin2c.c
index b02af88a4d..2ae41136a3 100644
--- a/utils/mkamsboot/dualboot/bin2c.c
+++ b/utils/mkamsboot/dualboot/bin2c.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/utils/mkamsboot/dualboot/dualboot.S b/utils/mkamsboot/dualboot/dualboot.S
index 4e4dbe5505..3cc1748d13 100644
--- a/utils/mkamsboot/dualboot/dualboot.S
+++ b/utils/mkamsboot/dualboot/dualboot.S
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Rafaël Carré
  *
diff --git a/utils/mkamsboot/main.c b/utils/mkamsboot/main.c
index cf40811ace..129eb519bb 100644
--- a/utils/mkamsboot/main.c
+++ b/utils/mkamsboot/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * mkamsboot - a tool for merging bootloader code into an Sansa V2
  *             (AMS) firmware file
diff --git a/utils/mkamsboot/mkamsboot.c b/utils/mkamsboot/mkamsboot.c
index d7660793f0..09665105e0 100644
--- a/utils/mkamsboot/mkamsboot.c
+++ b/utils/mkamsboot/mkamsboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * mkamsboot.c - a tool for merging bootloader code into an Sansa V2
  *               (AMS) firmware file
diff --git a/utils/mkamsboot/mkamsboot.h b/utils/mkamsboot/mkamsboot.h
index 263fe9e9c1..839da766ad 100644
--- a/utils/mkamsboot/mkamsboot.h
+++ b/utils/mkamsboot/mkamsboot.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * mkamsboot.h - a tool for merging bootloader code into an Sansa V2
  *               (AMS) firmware file
diff --git a/utils/mkimxboot/dualboot/bin2c.c b/utils/mkimxboot/dualboot/bin2c.c
index b02af88a4d..2ae41136a3 100644
--- a/utils/mkimxboot/dualboot/bin2c.c
+++ b/utils/mkimxboot/dualboot/bin2c.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/utils/mkimxboot/dualboot/config.h b/utils/mkimxboot/dualboot/config.h
index e9ea8d4a35..9129ff7ddc 100644
--- a/utils/mkimxboot/dualboot/config.h
+++ b/utils/mkimxboot/dualboot/config.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/mkimxboot/dualboot/dualboot.c b/utils/mkimxboot/dualboot/dualboot.c
index 77b816bf76..19bebce7d2 100644
--- a/utils/mkimxboot/dualboot/dualboot.c
+++ b/utils/mkimxboot/dualboot/dualboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/mkimxboot/main.c b/utils/mkimxboot/main.c
index 5b8cceb044..8f899b5ec2 100644
--- a/utils/mkimxboot/main.c
+++ b/utils/mkimxboot/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
@@ -220,7 +219,7 @@ int main(int argc, char *argv[])
             case 'x':
                 dump_imx_dev_info("");
                 printf("variant mapping:\n");
-                for(int i = 0; i < sizeof(imx_variants) / sizeof(imx_variants[0]); i++)
+                for(unsigned int i = 0; i < sizeof(imx_variants) / sizeof(imx_variants[0]); i++)
                     printf("  %s -> variant=%d\n", imx_variants[i].name, imx_variants[i].variant);
                 break;
             case 'p':
@@ -235,7 +234,7 @@ int main(int argc, char *argv[])
                     printf("You cannot specify two models\n");
                     return 1;
                 }
-                for(int i = 0; i < NR_MODELS; i++)
+                for(unsigned int i = 0; i < NR_MODELS; i++)
                     if(strcmp(optarg, imx_models[i].name) == 0)
                     {
                         model = imx_models[i].model;
diff --git a/utils/mkimxboot/mkimxboot.c b/utils/mkimxboot/mkimxboot.c
index 0483b5aeee..e9ce9c6ca9 100644
--- a/utils/mkimxboot/mkimxboot.c
+++ b/utils/mkimxboot/mkimxboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
@@ -422,14 +421,14 @@ static enum imx_error_t patch_std_zero_host_play(int jump_before,
 
 static enum imx_error_t parse_subversion(const char *s, const char *end, uint16_t *ver)
 {
-    int len = (end == NULL) ? strlen(s) : end - s;
+    size_t len = (end == NULL) ? strlen(s) : (size_t)(end - s);
     if(len > 4)
     {
         printf("[ERR] Bad subversion override '%s' (too long)\n", s);
         return IMX_ERROR;
     }
     *ver = 0;
-    for(int i = 0; i < len; i++)
+    for(unsigned int i = 0; i < len; i++)
     {
         if(!isdigit(s[i]))
         {
@@ -455,12 +454,16 @@ static enum imx_error_t parse_version(const char *s, struct sb_version_t *ver)
         printf("[ERR] Bad version override '%s' (missing second dot)\n", s);
         return IMX_ERROR;
     }
-    enum imx_error_t ret = parse_subversion(s, dot1, &ver->major);
+    uint16_t major, minor, revision;
+    enum imx_error_t ret = parse_subversion(s, dot1, &major);
     if(ret != IMX_SUCCESS) return ret;
-    ret = parse_subversion(dot1 + 1, dot2, &ver->minor);
+    ret = parse_subversion(dot1 + 1, dot2, &minor);
     if(ret != IMX_SUCCESS) return ret;
-    ret = parse_subversion(dot2 + 1, NULL, &ver->revision);
+    ret = parse_subversion(dot2 + 1, NULL, &revision);
     if(ret != IMX_SUCCESS) return ret;
+    memcpy(&ver->major, &major, sizeof(ver->major));
+    memcpy(&ver->minor, &minor, sizeof(ver->minor));
+    memcpy(&ver->revision, &revision, sizeof(ver->revision));
     return IMX_SUCCESS;
 }
 
@@ -565,6 +568,7 @@ static enum imx_error_t unpatch_std_zero_host_play(int jump_before,
     free(sec->insts);
     sec->insts = new_inst;
 
+    (void)opt;
     return IMX_SUCCESS;
 }
 
@@ -617,23 +621,23 @@ static uint32_t get_uint32be(unsigned char *p)
 void dump_imx_dev_info(const char *prefix)
 {
     printf("%smkimxboot models:\n", prefix);
-    for(int i = 0; i < NR_IMX_MODELS; i++)
+    for(unsigned int i = 0; i < NR_IMX_MODELS; i++)
     {
         printf("%s  %s: idx=%d rb_model=%s rb_num=%d\n", prefix,
             imx_models[i].model_name, i, imx_models[i].rb_model_name,
             imx_models[i].rb_model_num);
     }
     printf("%smkimxboot variants:\n", prefix);
-    for(int i = 0; i < VARIANT_COUNT; i++)
+    for(unsigned int i = 0; i < VARIANT_COUNT; i++)
     {
         printf("%s  %d: %s\n", prefix, i, imx_fw_variant[i]);
     }
     printf("%smkimxboot mapping:\n", prefix);
-    for(int i = 0; i < NR_IMX_SUMS; i++)
+    for(unsigned int i = 0; i < NR_IMX_SUMS; i++)
     {
         printf("%s  md5sum=%s -> idx=%d, ver=%s\n", prefix, imx_sums[i].md5sum,
             imx_sums[i].model, imx_sums[i].version);
-        for(int j = 0; j < VARIANT_COUNT; j++)
+        for(unsigned int j = 0; j < VARIANT_COUNT; j++)
             if(imx_sums[i].fw_variants[j].size)
                 printf("%s    variant=%d -> offset=%#x size=%#x\n", prefix,
                     j, (unsigned)imx_sums[i].fw_variants[j].offset,
@@ -644,7 +648,7 @@ void dump_imx_dev_info(const char *prefix)
 /* find an entry into imx_sums which matches the MD5 sum of a file */
 static enum imx_error_t find_model_by_md5sum(uint8_t file_md5sum[16], int *md5_idx)
 {
-    int i = 0;
+    unsigned int i = 0;
     while(i < NR_IMX_SUMS)
     {
         uint8_t md5[20];
@@ -822,13 +826,13 @@ enum imx_error_t compute_soft_md5sum(const char *file, uint8_t soft_md5sum[16])
     if(sb == NULL)
     {
         printf("[ERR] Cannot load SB file: %d\n", err);
-        return err;
+        return ((enum imx_error_t)err);
     }
     /* compute sum */
-    err = compute_soft_md5sum_buf(sb, soft_md5sum);
+    err = (enum sb_error_t) compute_soft_md5sum_buf(sb, soft_md5sum);
     /* release file */
     sb_free(sb);
-    return err;
+    return ((enum imx_error_t)err);
 }
 
 /* Load a rockbox firwmare from a buffer. Data is copied. Assume firmware is
@@ -850,7 +854,7 @@ static enum imx_error_t rb_fw_load_buf_scramble(struct rb_fw_t *fw, uint8_t *buf
     }
     /* check checksum */
     uint32_t sum = imx_models[model].rb_model_num;
-    for(int i = 8; i < sz; i++)
+    for(unsigned int i = 8; i < sz; i++)
         sum += buf[i];
     if(sum != get_uint32be(buf))
     {
@@ -938,6 +942,8 @@ static enum imx_error_t rb_fw_load_buf_elf(struct rb_fw_t *fw, uint8_t *buf,
         return IMX_BOOT_INVALID;
     }
     elf_release(&elf);
+
+    (void)model;
     return IMX_SUCCESS;
 }
 
@@ -1114,7 +1120,7 @@ enum imx_error_t mkimxboot(const char *infile, const char *bootfile,
     if(ret == IMX_SUCCESS)
     {
         /* write image */
-        ret = sb_write_file(sb_file, outfile, NULL, generic_std_printf);
+        ret = (enum imx_error_t) sb_write_file(sb_file, outfile, NULL, generic_std_printf);
     }
     /* cleanup */
     sb_free(sb_file);
diff --git a/utils/mkimxboot/mkimxboot.h b/utils/mkimxboot/mkimxboot.h
index 6bf0415e9c..8a73efaf55 100644
--- a/utils/mkimxboot/mkimxboot.h
+++ b/utils/mkimxboot/mkimxboot.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/utils/mkmpioboot/main.c b/utils/mkmpioboot/main.c
index 9861cba261..05266d30e5 100644
--- a/utils/mkmpioboot/main.c
+++ b/utils/mkmpioboot/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2010 by Marcin Bukat
  *
diff --git a/utils/mkmpioboot/mkmpioboot.c b/utils/mkmpioboot/mkmpioboot.c
index ea619ed2f2..e92f730ce4 100644
--- a/utils/mkmpioboot/mkmpioboot.c
+++ b/utils/mkmpioboot/mkmpioboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2010 by Marcin Bukat
  *
diff --git a/utils/mkmpioboot/mkmpioboot.h b/utils/mkmpioboot/mkmpioboot.h
index 4828ac953e..7e1f61ba31 100644
--- a/utils/mkmpioboot/mkmpioboot.h
+++ b/utils/mkmpioboot/mkmpioboot.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2010 by Marcin Bukat
  * code based mainly on mkboot.h
diff --git a/utils/mknwzboot/main.c b/utils/mknwzboot/main.c
index 491a18043b..a03a1f4327 100644
--- a/utils/mknwzboot/main.c
+++ b/utils/mknwzboot/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/utils/mknwzboot/mknwzboot.c b/utils/mknwzboot/mknwzboot.c
index 22885674d8..39d44a0ef4 100644
--- a/utils/mknwzboot/mknwzboot.c
+++ b/utils/mknwzboot/mknwzboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/utils/mknwzboot/mknwzboot.h b/utils/mknwzboot/mknwzboot.h
index 31f2c6355e..731b4390e0 100644
--- a/utils/mknwzboot/mknwzboot.h
+++ b/utils/mknwzboot/mknwzboot.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Amaury Pouly
  *
diff --git a/utils/mkrk27boot/Makefile b/utils/mkrk27boot/Makefile
index cbb7231f66..3b87bac2df 100644
--- a/utils/mkrk27boot/Makefile
+++ b/utils/mkrk27boot/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 FIRMWARE = ../../firmware/
diff --git a/utils/mkrk27boot/ata-sim.c b/utils/mkrk27boot/ata-sim.c
index 129c4b36a9..710986b20f 100644
--- a/utils/mkrk27boot/ata-sim.c
+++ b/utils/mkrk27boot/ata-sim.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2012 by Andrew Ryabinin
  *
diff --git a/utils/mkrk27boot/autoconf.h b/utils/mkrk27boot/autoconf.h
index a4907d4599..9f3b17121b 100644
--- a/utils/mkrk27boot/autoconf.h
+++ b/utils/mkrk27boot/autoconf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2012 by Andrew Ryabinin
  *
diff --git a/utils/mkrk27boot/main.c b/utils/mkrk27boot/main.c
index 5ba69b5a98..d228a4511c 100644
--- a/utils/mkrk27boot/main.c
+++ b/utils/mkrk27boot/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2012 by Andrew Ryabinin
  *
diff --git a/utils/mkrk27boot/mkrk27boot.c b/utils/mkrk27boot/mkrk27boot.c
index 0ecdf93506..19a6c6f61d 100644
--- a/utils/mkrk27boot/mkrk27boot.c
+++ b/utils/mkrk27boot/mkrk27boot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2012 by Andrew Ryabinin
  *
diff --git a/utils/mkrk27boot/mkrk27boot.h b/utils/mkrk27boot/mkrk27boot.h
index dc8c2e8133..b0bb7ff732 100644
--- a/utils/mkrk27boot/mkrk27boot.h
+++ b/utils/mkrk27boot/mkrk27boot.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2012 by Andrew Ryabinin
  *
diff --git a/utils/mks5lboot/dualboot/Makefile b/utils/mks5lboot/dualboot/Makefile
index 41887d09a0..ad0603a216 100644
--- a/utils/mks5lboot/dualboot/Makefile
+++ b/utils/mks5lboot/dualboot/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 ifndef V
 SILENT = @
diff --git a/utils/mks5lboot/dualboot/bin2c.c b/utils/mks5lboot/dualboot/bin2c.c
index 4d74a19696..fd8d2582ef 100644
--- a/utils/mks5lboot/dualboot/bin2c.c
+++ b/utils/mks5lboot/dualboot/bin2c.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/utils/mks5lboot/dualboot/dualboot.c b/utils/mks5lboot/dualboot/dualboot.c
index b31b3963c7..d58c2299e2 100644
--- a/utils/mks5lboot/dualboot/dualboot.c
+++ b/utils/mks5lboot/dualboot/dualboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2015 by Cástor Muñoz
  *
diff --git a/utils/mks5lboot/ipoddfu.c b/utils/mks5lboot/ipoddfu.c
index 5e2914af4b..e64599aa8c 100644
--- a/utils/mks5lboot/ipoddfu.c
+++ b/utils/mks5lboot/ipoddfu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2015 by Cástor Muñoz
  *
@@ -246,6 +245,7 @@ struct dfuAPI {
 /*
  * DFU API low-level (specific) functions
  */
+#if defined(WIN32) || defined(USE_LIBUSBAPI) || defined(__APPLE__)
 static bool dfu_check_id(int vid, int pid, int *pid_list)
 {
     int *p;
@@ -264,6 +264,7 @@ static void dfu_add_reqerrstr(struct dfuDev *dfuh, struct usbControlSetup *cs)
         sizeof(dfuh->err) - strlen(dfuh->err), " (cs=%02x/%d/%d/%d/%d)",
         cs->bmRequestType, cs->bRequest, cs->wValue, cs->wIndex, cs->wLength);
 }
+#endif
 
 #ifdef WIN32
 static bool dfu_winapi_chkrc(struct dfuDev *dfuh, char *str, bool success)
@@ -603,7 +604,7 @@ static dfuAPIResult dfu_iokit_open(struct dfuDev *dfuh, int *pid_list)
 
     usb_matching_dict = IOServiceMatching(kIOUSBDeviceClassName);
     dfuh->kr = IOServiceGetMatchingServices(
-                kIOMasterPortDefault, usb_matching_dict, &usb_iterator);
+                kIOMainPortDefault, usb_matching_dict, &usb_iterator);
     if (!dfu_iokit_chkrc(dfuh, "Could not get matching services"))
         goto error;
 
@@ -696,7 +697,7 @@ static struct dfuAPI api_list[] =
  */
 static int DEBUG_DFUREQ = 0;
 
-static dfuAPIResult dfuapi_request(struct dfuDev *dfuh,
+static __attribute__ ((noinline)) dfuAPIResult dfuapi_request(struct dfuDev *dfuh,
                             struct usbControlSetup *cs, void *data)
 {
     if (!DEBUG_DFUREQ)
@@ -891,7 +892,7 @@ static void dfuapi_destroy(struct dfuDev *dfuh)
 
 static struct dfuDev *dfuapi_create(void)
 {
-    return calloc(sizeof(struct dfuDev), 1);
+        return calloc(1, sizeof(struct dfuDev));
 }
 
 
@@ -903,7 +904,7 @@ static int ipoddfu_download_file(struct dfuDev* dfuh,
 {
     unsigned int blknum, len, remaining;
     int poll_tmo;
-    DFUStatus status;
+    DFUStatus status = errNONE;
     DFUState state;
 
     if (dfuapi_req_getstate(dfuh, &state) != DFUAPISuccess)
diff --git a/utils/mks5lboot/main.c b/utils/mks5lboot/main.c
index 31e16eca82..206dcf4838 100644
--- a/utils/mks5lboot/main.c
+++ b/utils/mks5lboot/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2015 by Cástor Muñoz
  *
diff --git a/utils/mks5lboot/mkdfu.c b/utils/mks5lboot/mkdfu.c
index bb1929bffd..ff9ca7041c 100644
--- a/utils/mks5lboot/mkdfu.c
+++ b/utils/mks5lboot/mkdfu.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2015 by Cástor Muñoz
  *
@@ -192,9 +191,9 @@ unsigned char *mkdfu(int dfu_type, char *dfu_arg, int* dfu_size,
 {
     const struct ipod_models *model = NULL;
     unsigned char *dfu_buf = NULL;
-    unsigned char *f_buf;
+    unsigned char *f_buf = NULL;
     int f_size;
-    uint32_t padded_bl_size;
+    uint32_t padded_bl_size = 0;
     uint32_t cert_off, cert_sz;
     off_t cur_off;
     char *dfu_desc;
diff --git a/utils/mks5lboot/mks5lboot.h b/utils/mks5lboot/mks5lboot.h
index 4cb21ddcee..d0185eefa9 100644
--- a/utils/mks5lboot/mks5lboot.h
+++ b/utils/mks5lboot/mks5lboot.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
  *
  * Copyright (C) 2015 by Cástor Muñoz
  *
@@ -48,8 +47,8 @@ extern "C" {
 
 struct Im3Info
 {
-    uint8_t ident[4];
-    uint8_t version[3];
+    uint8_t ident[4] __attribute__((nonstring));
+    uint8_t version[3] __attribute__((nonstring));
     uint8_t enc_type;
     uint8_t entry[4];   /* LE */
     uint8_t data_sz[4]; /* LE */
@@ -59,13 +58,13 @@ struct Im3Info
             uint8_t _reserved[32];
         } enc12;
         struct {
-            uint8_t sign_off[4]; /* LE */
-            uint8_t cert_off[4]; /* LE */
-            uint8_t cert_sz[4];  /* LE */
+            uint8_t sign_off[4] __attribute__((nonstring)); /* LE */
+            uint8_t cert_off[4] __attribute__((nonstring)); /* LE */
+            uint8_t cert_sz[4] __attribute__((nonstring));  /* LE */
             uint8_t _reserved[36];
         } enc34;
     } u;
-    uint8_t info_sign[SIGN_SZ];
+    uint8_t info_sign[SIGN_SZ] __attribute__((nonstring));
 } __attribute__ ((packed));
 
 struct Im3Hdr
diff --git a/utils/mktccboot/Makefile b/utils/mktccboot/Makefile
index 4943a8c568..b02287a25d 100644
--- a/utils/mktccboot/Makefile
+++ b/utils/mktccboot/Makefile
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 # We use the Telechips code available in the Rockbox tools/ directory
diff --git a/utils/mktccboot/main.c b/utils/mktccboot/main.c
index 4dd5d0c6c4..49d5972929 100644
--- a/utils/mktccboot/main.c
+++ b/utils/mktccboot/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Dave Chapman
  *
diff --git a/utils/mktccboot/mktccboot.c b/utils/mktccboot/mktccboot.c
index 4f2c3258db..9071324770 100644
--- a/utils/mktccboot/mktccboot.c
+++ b/utils/mktccboot/mktccboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Dave Chapman
  *
diff --git a/utils/mktccboot/mktccboot.h b/utils/mktccboot/mktccboot.h
index 17179c11e7..25d124e6bd 100644
--- a/utils/mktccboot/mktccboot.h
+++ b/utils/mktccboot/mktccboot.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * mktccboot.h - a tool to inject a bootloader into a Telechips 77X/78X firmware
  *               file.
diff --git a/utils/mkzenboot/dualboot/bin2c.c b/utils/mkzenboot/dualboot/bin2c.c
index b02af88a4d..2ae41136a3 100644
--- a/utils/mkzenboot/dualboot/bin2c.c
+++ b/utils/mkzenboot/dualboot/bin2c.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/utils/mkzenboot/dualboot/config.h b/utils/mkzenboot/dualboot/config.h
index ff59cee710..90dca64bb3 100644
--- a/utils/mkzenboot/dualboot/config.h
+++ b/utils/mkzenboot/dualboot/config.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/mkzenboot/dualboot/dualboot.c b/utils/mkzenboot/dualboot/dualboot.c
index 0b32772afb..e083129b32 100644
--- a/utils/mkzenboot/dualboot/dualboot.c
+++ b/utils/mkzenboot/dualboot/dualboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/mkzenboot/main.c b/utils/mkzenboot/main.c
index 7aef2b76a3..5a2475e14a 100644
--- a/utils/mkzenboot/main.c
+++ b/utils/mkzenboot/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/mkzenboot/mkzenboot.c b/utils/mkzenboot/mkzenboot.c
index 6da55a8f0e..dd200f4139 100644
--- a/utils/mkzenboot/mkzenboot.c
+++ b/utils/mkzenboot/mkzenboot.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  * Based on zenutils by Rasmus Ry <rasmus.ry{at}gmail.com>
diff --git a/utils/mkzenboot/mkzenboot.h b/utils/mkzenboot/mkzenboot.h
index 8da3e25762..2dd9022247 100644
--- a/utils/mkzenboot/mkzenboot.h
+++ b/utils/mkzenboot/mkzenboot.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/mkzenboot/utils.c b/utils/mkzenboot/utils.c
index b8ef3be237..18e048ccca 100644
--- a/utils/mkzenboot/utils.c
+++ b/utils/mkzenboot/utils.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  * Based on zenutils by Rasmus Ry <rasmus.ry{at}gmail.com>
diff --git a/utils/mkzenboot/utils.h b/utils/mkzenboot/utils.h
index 56edb4e20b..3aa3951bf2 100644
--- a/utils/mkzenboot/utils.h
+++ b/utils/mkzenboot/utils.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/nwztools/database/gen_db.py b/utils/nwztools/database/gen_db.py
index 9e8bc89102..c7cb1dcb98 100755
--- a/utils/nwztools/database/gen_db.py
+++ b/utils/nwztools/database/gen_db.py
@@ -51,7 +51,7 @@ for f in map_files:
     h = hashlib.md5()
     h.update(open(f, "rb").read())
     hash = h.hexdigest()
-    codename = re.search('nvp/([^\.]*)\.txt', f).group(1)
+    codename = re.search('nvp/([^\\.]*)\\.txt', f).group(1)
     # sanity check
     if not (codename in g_series_codename):
         print("Warning: file %s does not have a match series in series.txt" % f)
@@ -133,11 +133,11 @@ header_begin = \
 """\
 /***************************************************************************
  *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \\
- *                     \/            \/     \/    \/            \/
+ *   Open      \\______   \\ ____   ____ |  | _\\_ |__   _______  ___
+ *   Source     |       _//  _ \\_/ ___\\|  |/ /| __ \\ /  _ \\  \\/  /
+ *   Jukebox    |    |   (  <_> )  \\___|    < | \\_\\ (  <_> > <  <
+ *   Firmware   |____|_  /\\____/ \\___  >__|_ \\|___  /\\____/__/\\_ \\
+ *                     \\/            \\/     \\/    \\/            \\/
  *
  * Copyright (C) 2016 Amaury Pouly
  *
@@ -153,7 +153,7 @@ header_begin = \
 #ifndef __NWZ_DB_H__
 #define __NWZ_DB_H__
 
-/** /!\ This file was automatically generated, DO NOT MODIFY IT DIRECTLY /!\ */
+/** /!\\ This file was automatically generated, DO NOT MODIFY IT DIRECTLY /!\\ */
 
 /* List of all known NVP nodes */
 enum nwz_nvp_node_t
@@ -232,11 +232,11 @@ impl_begin = \
 """\
 /***************************************************************************
  *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \\
- *                     \/            \/     \/    \/            \/
+ *   Open      \\______   \\ ____   ____ |  | _\\_ |__   _______  ___
+ *   Source     |       _//  _ \\_/ ___\\|  |/ /| __ \\ /  _ \\  \\/  /
+ *   Jukebox    |    |   (  <_> )  \\___|    < | \\_\\ (  <_> > <  <
+ *   Firmware   |____|_  /\\____/ \\___  >__|_ \\|___  /\\____/__/\\_ \\
+ *                     \\/            \\/     \\/    \\/            \\/
  *
  * Copyright (C) 2016 Amaury Pouly
  *
@@ -250,7 +250,7 @@ impl_begin = \
  *
  ****************************************************************************/
 
-/** /!\ This file was automatically generated, DO NOT MODIFY IT DIRECTLY /!\ */
+/** /!\\ This file was automatically generated, DO NOT MODIFY IT DIRECTLY /!\\ */
 
 #include "nwz-db.h"
 
diff --git a/utils/nwztools/database/nvp/nvptool.cpp b/utils/nwztools/database/nvp/nvptool.cpp
index 8c09d1bea0..8f2bebc6e1 100644
--- a/utils/nwztools/database/nvp/nvptool.cpp
+++ b/utils/nwztools/database/nvp/nvptool.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 Amaury Pouly
  *
diff --git a/utils/nwztools/emmctools/emmctool.c b/utils/nwztools/emmctools/emmctool.c
index 26226b6f07..bfcffa5aef 100644
--- a/utils/nwztools/emmctools/emmctool.c
+++ b/utils/nwztools/emmctools/emmctool.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
@@ -47,6 +46,7 @@ static int g_nvp_node = -1;
 
 #define errorf(...) do { cprintf(GREY, __VA_ARGS__); return __LINE__; } while(0)
 
+#if 0
 static void print_hex(void *p, int size, int unit)
 {
     uint8_t *p8 = p;
@@ -64,6 +64,7 @@ static void print_hex(void *p, int size, int unit)
             printf(" %08x", *p32);
     }
 }
+#endif
 
 #define SECTOR              512u
 #define EMMC_MINIBOOT_START 0
diff --git a/utils/nwztools/emmctools/misc.c b/utils/nwztools/emmctools/misc.c
index 108235e7fd..c03506205d 100644
--- a/utils/nwztools/emmctools/misc.c
+++ b/utils/nwztools/emmctools/misc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/nwztools/emmctools/misc.h b/utils/nwztools/emmctools/misc.h
index 035b0ef8c1..fe6069b2ab 100644
--- a/utils/nwztools/emmctools/misc.h
+++ b/utils/nwztools/emmctools/misc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/nwztools/emmctools/nvp.c b/utils/nwztools/emmctools/nvp.c
index bbc05563b5..993b8212e6 100644
--- a/utils/nwztools/emmctools/nvp.c
+++ b/utils/nwztools/emmctools/nvp.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/nwztools/emmctools/nvp.h b/utils/nwztools/emmctools/nvp.h
index c24d0a6375..eb0d6bb6d7 100644
--- a/utils/nwztools/emmctools/nvp.h
+++ b/utils/nwztools/emmctools/nvp.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/nwztools/scsitools/misc.c b/utils/nwztools/scsitools/misc.c
index 36eae198e5..e3dc5041cd 100644
--- a/utils/nwztools/scsitools/misc.c
+++ b/utils/nwztools/scsitools/misc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/nwztools/scsitools/misc.h b/utils/nwztools/scsitools/misc.h
index 035b0ef8c1..fe6069b2ab 100644
--- a/utils/nwztools/scsitools/misc.h
+++ b/utils/nwztools/scsitools/misc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/nwztools/scsitools/para_noise.c b/utils/nwztools/scsitools/para_noise.c
index fa1c7f9466..2c3be702b3 100644
--- a/utils/nwztools/scsitools/para_noise.c
+++ b/utils/nwztools/scsitools/para_noise.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/nwztools/scsitools/para_noise.h b/utils/nwztools/scsitools/para_noise.h
index 340ea1bd6e..bde2b46e35 100644
--- a/utils/nwztools/scsitools/para_noise.h
+++ b/utils/nwztools/scsitools/para_noise.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/nwztools/scsitools/scsitool.c b/utils/nwztools/scsitools/scsitool.c
index 488e45a5e0..473f4a1a64 100644
--- a/utils/nwztools/scsitools/scsitool.c
+++ b/utils/nwztools/scsitools/scsitool.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/nwztools/upgtools/keysig_search.c b/utils/nwztools/upgtools/keysig_search.c
index c16dae5260..b1deadcfdb 100644
--- a/utils/nwztools/upgtools/keysig_search.c
+++ b/utils/nwztools/upgtools/keysig_search.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/nwztools/upgtools/keysig_search.h b/utils/nwztools/upgtools/keysig_search.h
index 67461d9b2b..257580992a 100644
--- a/utils/nwztools/upgtools/keysig_search.h
+++ b/utils/nwztools/upgtools/keysig_search.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/nwztools/upgtools/mg.cpp b/utils/nwztools/upgtools/mg.cpp
index 79107e96bb..e36bd64f32 100644
--- a/utils/nwztools/upgtools/mg.cpp
+++ b/utils/nwztools/upgtools/mg.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/nwztools/upgtools/mg.h b/utils/nwztools/upgtools/mg.h
index a2de5952fd..9907e7dbc8 100644
--- a/utils/nwztools/upgtools/mg.h
+++ b/utils/nwztools/upgtools/mg.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/nwztools/upgtools/misc.c b/utils/nwztools/upgtools/misc.c
index 0fc4542336..e47336214b 100644
--- a/utils/nwztools/upgtools/misc.c
+++ b/utils/nwztools/upgtools/misc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/nwztools/upgtools/misc.h b/utils/nwztools/upgtools/misc.h
index e493cc2019..32b3e2b52c 100644
--- a/utils/nwztools/upgtools/misc.h
+++ b/utils/nwztools/upgtools/misc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/nwztools/upgtools/upg.c b/utils/nwztools/upgtools/upg.c
index 3270ced39b..1c7fa736f1 100644
--- a/utils/nwztools/upgtools/upg.c
+++ b/utils/nwztools/upgtools/upg.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 Amaury Pouly
  *
diff --git a/utils/nwztools/upgtools/upg.h b/utils/nwztools/upgtools/upg.h
index e6cdaba1f7..b6574cf87c 100644
--- a/utils/nwztools/upgtools/upg.h
+++ b/utils/nwztools/upgtools/upg.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 Amaury Pouly
  *
diff --git a/utils/nwztools/upgtools/upgtool.c b/utils/nwztools/upgtools/upgtool.c
index b573532d6e..438f340cb8 100644
--- a/utils/nwztools/upgtools/upgtool.c
+++ b/utils/nwztools/upgtools/upgtool.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt
index a160279189..b3b564510f 100644
--- a/utils/rbutilqt/CMakeLists.txt
+++ b/utils/rbutilqt/CMakeLists.txt
@@ -13,6 +13,8 @@
 # KIND, either express or implied.
 #
 
+add_compile_definitions(QT_NO_USE_NODISCARD_FILE_OPEN)
+
 set(RBUTIL_TS_FILES
     ${CMAKE_CURRENT_LIST_DIR}/lang/rbutil_cs.ts
     ${CMAKE_CURRENT_LIST_DIR}/lang/rbutil_de.ts
@@ -32,11 +34,7 @@ set(RBUTIL_TS_FILES
     ${CMAKE_CURRENT_LIST_DIR}/lang/rbutil_zh_CN.ts
     ${CMAKE_CURRENT_LIST_DIR}/lang/rbutil_zh_TW.ts
     )
-if(QT_VERSION_MAJOR EQUAL 5)
-    qt5_add_translation(RBUTIL_QM_FILES ${RBUTIL_TS_FILES})
-else()
     qt6_add_translation(RBUTIL_QM_FILES ${RBUTIL_TS_FILES})
-endif()
 
 # The qrc file searches input files based on its location, and the qm files are
 # generated in the build dir. Copy the qrc file to the build dir, make it
@@ -106,14 +104,12 @@ add_executable(RockboxUtility WIN32 MACOSX_BUNDLE
     ${CMAKE_CURRENT_BINARY_DIR}/rbutilqt-lang.qrc
     )
 
+target_compile_features(RockboxUtility PRIVATE cxx_std_17 c_std_11)
+
 if(WIN32)
     target_sources(RockboxUtility PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/rbutilqt-win.qrc
         ${CMAKE_CURRENT_LIST_DIR}/rbutilqt.rc)
-    if(QT_VERSION_MAJOR EQUAL 5)
-        # needed on Windows, otherwise svg icons won't show.
-        target_link_libraries(RockboxUtility Qt${QT_VERSION_MAJOR}::QSvgIconPlugin)
-    endif()
 endif()
 if(APPLE)
     # MacOS Application Bundle specifics.
@@ -134,9 +130,7 @@ if (TARGET Qt${QT_VERSION_MAJOR}::Multimedia) # optional
         Qt${QT_VERSION_MAJOR}::Multimedia)
 endif()
 
-if(QT_VERSION_MAJOR EQUAL 6)
-    target_link_libraries(RockboxUtility Qt${QT_VERSION_MAJOR}::SvgWidgets)
-endif()
+target_link_libraries(RockboxUtility Qt${QT_VERSION_MAJOR}::SvgWidgets)
 
 target_include_directories(RockboxUtility PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/gui
@@ -236,7 +230,6 @@ add_library(rbbase
     ${CMAKE_CURRENT_LIST_DIR}/base/ttsmssp.h
     ${CMAKE_CURRENT_LIST_DIR}/base/ttssapi.cpp
     ${CMAKE_CURRENT_LIST_DIR}/base/ttssapi.h
-    ${CMAKE_CURRENT_LIST_DIR}/base/ttssapi4.h
     ${CMAKE_CURRENT_LIST_DIR}/base/ttsswift.h
     ${CMAKE_CURRENT_LIST_DIR}/base/uninstall.cpp
     ${CMAKE_CURRENT_LIST_DIR}/base/uninstall.h
@@ -249,13 +242,22 @@ add_library(rbbase
     ${CMAKE_CURRENT_LIST_DIR}/base/ziputil.cpp
     ${CMAKE_CURRENT_LIST_DIR}/base/ziputil.h
     )
-
 if(APPLE)
     target_sources(rbbase PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/base/ttscarbon.cpp
         ${CMAKE_CURRENT_LIST_DIR}/base/ttscarbon.h)
 endif()
 
+if (TARGET Qt${QT_VERSION_MAJOR}::TextToSpeech AND TARGET Qt${QT_VERSION_MAJOR}::Multimedia)
+    target_sources(rbbase PRIVATE
+        ${CMAKE_CURRENT_LIST_DIR}/base/ttsqt.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/base/ttsqt.h)
+    target_link_libraries(rbbase
+        Qt${QT_VERSION_MAJOR}::TextToSpeech)
+    target_link_libraries(rbbase
+        Qt${QT_VERSION_MAJOR}::Multimedia)
+endif()
+
 target_link_libraries(rbbase
     cutelogger ${QUAZIP_LIBRARY} mspack bspatch rbspeex
     voicefont sansapatcher ipodpatcher chinachippatcher
@@ -321,6 +323,7 @@ add_library(mspack
     mspack/lzxc.c
     mspack/lzxd.c
     mspack/lzx.h
+    mspack/macros.h
     mspack/mspack.h
     mspack/mszipc.c
     mspack/mszipd.c
diff --git a/utils/rbutilqt/INSTALL b/utils/rbutilqt/INSTALL
index 837ac238e0..c397431238 100644
--- a/utils/rbutilqt/INSTALL
+++ b/utils/rbutilqt/INSTALL
@@ -19,13 +19,13 @@ for Rockbox.
 
 Requirements:
 =============
-- gcc
-- Qt 5 or
+- C++ compiler (GCC and Clang are known to work)
 - Qt 6
 - qt6-tools-dev
 - qt6-5compat-dev
 - qt6-svg-dev
 - qt6-multimedia-dev
+- qt6-network-dev
 
 - at least the following folders from Rockbox tree:
   o lib/rbcodec/codecs/libspeex
@@ -35,10 +35,10 @@ Requirements:
 
 Building:
 =========
-- run cmake in the utils/ folder
+- create a build directory somewhere, cd to it
+- run 'cmake /path/to/rockbox/utils'
 - run make
-eg. mkdir utils/build-rbutil ; cd build-rbutil ; cmake ../utils ; make
-
+eg. mkdir build-rbutil ; cd tbuild-rbutil ; cmake ../utils ; make
 
 Build Options:
 ==============
@@ -62,3 +62,4 @@ its source.
 The website for Rockbox Utility is
 https://www.rockbox.org/wiki/RockboxUtility
 
+//
diff --git a/utils/rbutilqt/RockboxUtility.desktop b/utils/rbutilqt/RockboxUtility.desktop
index bc5f45d53d..cd0fc08cfc 100644
--- a/utils/rbutilqt/RockboxUtility.desktop
+++ b/utils/rbutilqt/RockboxUtility.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 GenericName=Rockbox Installer and Maintainance Tool
-Version=1.0
+Version=1.5.2
 Hidden=false
 Name=Rockbox Utility
 Type=Application
diff --git a/utils/rbutilqt/base/autodetection.cpp b/utils/rbutilqt/base/autodetection.cpp
index 5021e1b3cc..820805ac69 100644
--- a/utils/rbutilqt/base/autodetection.cpp
+++ b/utils/rbutilqt/base/autodetection.cpp
@@ -266,7 +266,7 @@ void Autodetection::mergePatcher(void)
 #ifdef Q_OS_LINUX
         mp.append("2");
 #endif
-#ifdef Q_OS_MACX
+#ifdef Q_OS_MACOS
         mp.append("s2");
 #endif
         struct Detected d;
@@ -296,7 +296,7 @@ void Autodetection::mergePatcher(void)
 #ifdef Q_OS_LINUX
         mp.append("1");
 #endif
-#ifdef Q_OS_MACX
+#ifdef Q_OS_MACOS
         mp.append("s1");
 #endif
         struct Detected d;
diff --git a/utils/rbutilqt/base/bootloaderinstallbase.cpp b/utils/rbutilqt/base/bootloaderinstallbase.cpp
index b49a9b933b..649d296ae4 100644
--- a/utils/rbutilqt/base/bootloaderinstallbase.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallbase.cpp
@@ -25,7 +25,7 @@
 #include "mspackutil.h"
 #include "Logger.h"
 
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
 #include <sys/param.h>
 #include <sys/ucred.h>
 #include <sys/mount.h>
@@ -155,7 +155,7 @@ int BootloaderInstallBase::logInstall(LogMode mode)
 }
 
 
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
 void BootloaderInstallBase::waitRemount()
 {
     m_remountTries = 600;
@@ -168,7 +168,7 @@ void BootloaderInstallBase::waitRemount()
 
 void BootloaderInstallBase::checkRemount()
 {
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
     if(m_remountTries--) {
         int status = 0;
         // check if device has been remounted
diff --git a/utils/rbutilqt/base/bootloaderinstallbase.h b/utils/rbutilqt/base/bootloaderinstallbase.h
index 32ca637288..89247be5e6 100644
--- a/utils/rbutilqt/base/bootloaderinstallbase.h
+++ b/utils/rbutilqt/base/bootloaderinstallbase.h
@@ -90,7 +90,7 @@ class BootloaderInstallBase : public QObject
         QTemporaryFile m_tempof;   //! temporary file for OF extracted from archive
         QDateTime m_blversion; //! download timestamp used for version information
         QString m_offile;      //! path to the offile
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
         void waitRemount(void);
 
         int m_remountTries;
diff --git a/utils/rbutilqt/base/bootloaderinstallipod.cpp b/utils/rbutilqt/base/bootloaderinstallipod.cpp
index 56d338f4cc..1e5b1c39b2 100644
--- a/utils/rbutilqt/base/bootloaderinstallipod.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallipod.cpp
@@ -95,7 +95,7 @@ void BootloaderInstallIpod::installStage2(void)
     if(add_bootloader(&ipod, blfile.toLatin1().data(), FILETYPE_DOT_IPOD) == 0) {
         emit logItem(tr("Successfull added bootloader"), LOGOK);
         ipod_close(&ipod);
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
         m_remountDevice = ipod.diskname;
         connect(this, SIGNAL(remounted(bool)), this, SLOT(installStage3(bool)));
         waitRemount();
@@ -242,12 +242,12 @@ bool BootloaderInstallIpod::ipodInitialize(struct ipod_t *ipod)
             return false;
         }
 #if defined(Q_OS_WIN32)
-        sprintf(ipod->diskname, "\\\\.\\PhysicalDrive%i", devicename.toInt());
-#elif defined(Q_OS_MACX)
-        sprintf(ipod->diskname, "%s",
+        snprintf(ipod->diskname, sizeof(ipod->diskname), "\\\\.\\PhysicalDrive%i", devicename.toInt());
+#elif defined(Q_OS_MACOS)
+        snprintf(ipod->diskname, sizeof(ipod->diskname), "%s",
             qPrintable(devicename.remove(QRegularExpression("s[0-9]+$"))));
 #else
-        sprintf(ipod->diskname, "%s",
+        snprintf(ipod->diskname, sizeof(ipod->diskname), "%s",
             qPrintable(devicename.remove(QRegularExpression("[0-9]+$"))));
 #endif
         LOG_INFO() << "ipodpatcher: overriding scan, using"
diff --git a/utils/rbutilqt/base/bootloaderinstallmpio.cpp b/utils/rbutilqt/base/bootloaderinstallmpio.cpp
index a1f3df58b1..588318d466 100644
--- a/utils/rbutilqt/base/bootloaderinstallmpio.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallmpio.cpp
@@ -7,7 +7,6 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Wenger
- *   $Id: bootloaderinstallams.cpp 24778 2010-02-19 23:45:29Z funman $
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/utils/rbutilqt/base/bootloaderinstallmpio.h b/utils/rbutilqt/base/bootloaderinstallmpio.h
index 8e6c65affe..5a699b3a81 100644
--- a/utils/rbutilqt/base/bootloaderinstallmpio.h
+++ b/utils/rbutilqt/base/bootloaderinstallmpio.h
@@ -7,7 +7,6 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Wenger
- *   $Id: bootloaderinstallams.h 22317 2009-08-15 13:04:21Z Domonoky $
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/utils/rbutilqt/base/bootloaderinstallsansa.cpp b/utils/rbutilqt/base/bootloaderinstallsansa.cpp
index 84f3287dfe..d2c17113e8 100644
--- a/utils/rbutilqt/base/bootloaderinstallsansa.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallsansa.cpp
@@ -113,7 +113,7 @@ void BootloaderInstallSansa::installStage2(void)
     if(sansa_add_bootloader(&sansa, buf, len) == 0) {
         emit logItem(tr("Successfully installed bootloader"), LOGOK);
         sansa_close(&sansa);
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
         m_remountDevice = sansa.diskname;
         connect(this, SIGNAL(remounted(bool)), this, SLOT(installStage3(bool)));
         waitRemount();
@@ -245,12 +245,13 @@ bool BootloaderInstallSansa::sansaInitialize(struct sansa_t *sansa)
             return false;
         }
 #if defined(Q_OS_WIN32)
-        sprintf(sansa->diskname, "\\\\.\\PhysicalDrive%i", devicename.toInt());
-#elif defined(Q_OS_MACX)
-        sprintf(sansa->diskname,
+        snprintf(sansa->diskname, sizeof(sansa->diskname),
+            "\\\\.\\PhysicalDrive%i", devicename.toInt());
+#elif defined(Q_OS_MACOS)
+        snprintf(sansa->diskname, sizeof(sansa->diskname),
             "%s", qPrintable(devicename.remove(QRegularExpression("s[0-9]+$"))));
 #else
-        sprintf(sansa->diskname,
+        snprintf(sansa->diskname, sizeof(sansa->diskname),
             "%s", qPrintable(devicename.remove(QRegularExpression("[0-9]+$"))));
 #endif
         LOG_INFO() << "sansapatcher: overriding scan, using"
diff --git a/utils/rbutilqt/base/encoderlame.cpp b/utils/rbutilqt/base/encoderlame.cpp
index 1658a7092d..99942ba39c 100644
--- a/utils/rbutilqt/base/encoderlame.cpp
+++ b/utils/rbutilqt/base/encoderlame.cpp
@@ -241,7 +241,7 @@ bool EncoderLame::encode(QString input,QString output)
     wavbuflen = datalength;
     mp3buf = new unsigned char[mp3buflen];
     wavbuf = new short int[wavbuflen];
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
     // handle byte order -- the host might not be LE.
     if(samplesize == 8) {
         // no need to convert.
diff --git a/utils/rbutilqt/base/encttssettings.cpp b/utils/rbutilqt/base/encttssettings.cpp
index 9c8c2e57fd..8fd1bf7c81 100644
--- a/utils/rbutilqt/base/encttssettings.cpp
+++ b/utils/rbutilqt/base/encttssettings.cpp
@@ -7,7 +7,6 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2007 by Dominik Wenger
- *   $Id: encoders.h 17902 2008-06-30 22:09:45Z bluebrother $
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/utils/rbutilqt/base/httpget.cpp b/utils/rbutilqt/base/httpget.cpp
index 0cd9236209..9264e8fc1c 100644
--- a/utils/rbutilqt/base/httpget.cpp
+++ b/utils/rbutilqt/base/httpget.cpp
@@ -160,13 +160,7 @@ void HttpGet::requestFinished(QNetworkReply* reply)
         QUrl url = QUrl(org).resolved(
                 reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl());
         // reconstruct query
-#if QT_VERSION < 0x050000
-        QList<QPair<QByteArray, QByteArray> > qitms = org.encodedQueryItems();
-        for(int i = 0; i < qitms.size(); ++i)
-            url.addEncodedQueryItem(qitms.at(i).first, qitms.at(i).second);
-#else
         url.setQuery(org.query());
-#endif
         LOG_INFO() << "Redirected to" << url;
         startRequest(url);
         return;
@@ -205,13 +199,7 @@ void HttpGet::startRequest(QUrl url)
         req.setRawHeader("User-Agent", m_globalUserAgent.toLatin1());
 
     m_reply = m_mgr.get(req);
-#if QT_VERSION < 0x050f00
-    connect(m_reply,
-            static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error),
-            this, &HttpGet::networkError);
-#else
     connect(m_reply, &QNetworkReply::errorOccurred, this, &HttpGet::networkError);
-#endif
     connect(m_reply, &QNetworkReply::downloadProgress, this, &HttpGet::downloadProgress);
     connect(m_reply, &QNetworkReply::sslErrors, this, &HttpGet::gotSslError);
 }
@@ -276,4 +264,3 @@ int HttpGet::httpResponse(void)
 {
     return m_lastStatusCode;
 }
-
diff --git a/utils/rbutilqt/base/playerbuildinfo.cpp b/utils/rbutilqt/base/playerbuildinfo.cpp
index cd72d5d17f..6b7e078d08 100644
--- a/utils/rbutilqt/base/playerbuildinfo.cpp
+++ b/utils/rbutilqt/base/playerbuildinfo.cpp
@@ -36,14 +36,23 @@ const static struct {
     const char* name;
 } ServerInfoList[] = {
     { PlayerBuildInfo::BuildVoiceLangs,   "voices/:version:"    },
-    { PlayerBuildInfo::BuildVersion,      ":build:/:target:"     },
+    { PlayerBuildInfo::BuildVersion,      ":build:/:target:"    },
     { PlayerBuildInfo::BuildUrl,          ":build:/build_url"   },
     { PlayerBuildInfo::BuildVoiceUrl,     ":build:/voice_url"   },
     { PlayerBuildInfo::BuildManualUrl,    ":build:/manual_url"  },
     { PlayerBuildInfo::BuildSourceUrl,    ":build:/source_url"  },
     { PlayerBuildInfo::BuildFontUrl,      ":build:/font_url"    },
 
-    // other URLs -- those are not directly related to the build, but handled here.
+    // system URLs -- not directly related to build but pulled out of build-info
+    { PlayerBuildInfo::BootloaderUrl,     "bootloader/download_url" },
+    { PlayerBuildInfo::GenlangUrl,        "genlang_url"             },
+    { PlayerBuildInfo::ThemesUrl,         "themes_url"              },
+    { PlayerBuildInfo::ThemesInfoUrl,     "themes_info_url"         },
+    { PlayerBuildInfo::RbutilUrl,         "rbutil_url"              },
+    { PlayerBuildInfo::RbutilIniUrl,      "rbutilini_url"           },
+    { PlayerBuildInfo::VoiceCorrectionsUrl, "voicecorrections_url"  },
+
+    // other URLs -- those are not directly related to the build either .
     { PlayerBuildInfo::DoomUrl,           "other/doom_url"      },
     { PlayerBuildInfo::Duke3DUrl,         "other/duke3d_url"    },
     { PlayerBuildInfo::PuzzFontsUrl,      "other/puzzfonts_url" },
@@ -81,22 +90,14 @@ const static struct {
     PlayerBuildInfo::SystemUrl item;
     const char* name;
 } PlayerSystemUrls[] = {
-    { PlayerBuildInfo::BootloaderUrl,     "bootloader/download_url" },
     { PlayerBuildInfo::BuildInfoUrl,      "build_info_url"          },
-    { PlayerBuildInfo::GenlangUrl,        "genlang_url"             },
-    { PlayerBuildInfo::ThemesUrl,         "themes_url"              },
-    { PlayerBuildInfo::ThemesInfoUrl,     "themes_info_url"         },
-    { PlayerBuildInfo::RbutilUrl,         "rbutil_url"              },
 };
 
 PlayerBuildInfo::PlayerBuildInfo() :
      serverInfo(nullptr),
      playerInfo(":/ini/rbutil.ini", QSettings::IniFormat)
 {
-#if QT_VERSION < 0x060000
-    playerInfo.setIniCodec("UTF-8");
-#endif
-
+        // Nothing to do here.
 }
 
 void PlayerBuildInfo::setBuildInfo(QString file)
@@ -195,11 +196,7 @@ QVariant PlayerBuildInfo::value(BuildInfo item, BuildType type)
     // if the value is a string we can replace some patterns.
     // if we cannot convert it (f.e. for a QStringList) we leave as-is, since
     // the conversion would return an empty type.
-#if QT_VERSION < 0x060000
-    if (result.type() == QVariant::String)
-#else
     if (result.metaType().id() == QMetaType::QString)
-#endif
         result = result.toString()
                     .replace("%TARGET%", target)
                     .replace("%VERSION%", version.at(0));
@@ -323,7 +320,7 @@ QVariant PlayerBuildInfo::value(DeviceInfo item, unsigned int match)
 
 QVariant PlayerBuildInfo::value(SystemUrl item)
 {
-    // locate setting item in server info file
+    // locate setting item in the rbutil.ini file
     int i = 0;
     while(PlayerSystemUrls[i].item != item)
         i++;
@@ -333,6 +330,17 @@ QVariant PlayerBuildInfo::value(SystemUrl item)
     return result;
 }
 
+QVariant PlayerBuildInfo::value(BuildInfo item)
+{
+    // locate setting item in the serverInfo file
+    int i = 0;
+    while(ServerInfoList[i].item != item)
+        i++;
+
+    QVariant result = serverInfo->value(ServerInfoList[i].name);
+    LOG_INFO() << "U:" << ServerInfoList[i].name << result;
+    return result;
+}
 
 QString PlayerBuildInfo::statusAsString(QString platform)
 {
diff --git a/utils/rbutilqt/base/playerbuildinfo.h b/utils/rbutilqt/base/playerbuildinfo.h
index 8b73daa77d..3e76853758 100644
--- a/utils/rbutilqt/base/playerbuildinfo.h
+++ b/utils/rbutilqt/base/playerbuildinfo.h
@@ -49,6 +49,14 @@ public:
         BuildSourceUrl,
         BuildFontUrl,
 
+        BootloaderUrl,
+        GenlangUrl,
+        ThemesUrl,
+        ThemesInfoUrl,
+        RbutilUrl,
+        RbutilIniUrl,
+        VoiceCorrectionsUrl,
+
         DoomUrl,
         Duke3DUrl,
         PuzzFontsUrl,
@@ -81,12 +89,7 @@ public:
     };
 
     enum SystemUrl {
-        BootloaderUrl,
         BuildInfoUrl,
-        GenlangUrl,
-        ThemesUrl,
-        ThemesInfoUrl,
-        RbutilUrl,
     };
 
     static PlayerBuildInfo* instance();
@@ -104,9 +107,12 @@ public:
     // Get build information for currently selected player.
     QVariant value(BuildInfo item, BuildType type);
 
-    // Get fixed download URL information
+    // Get fixed download URL information from rbutil.ini
     QVariant value(SystemUrl item);
 
+    // Get fixed download URL information from serverInfo
+    QVariant value(BuildInfo item);
+
     QString statusAsString(QString target = "");
 
 protected:
diff --git a/utils/rbutilqt/base/rbsettings.cpp b/utils/rbutilqt/base/rbsettings.cpp
index e34d84c071..4c4790c513 100644
--- a/utils/rbutilqt/base/rbsettings.cpp
+++ b/utils/rbutilqt/base/rbsettings.cpp
@@ -51,7 +51,7 @@ const static struct {
     { RbSettings::InstallManual,        "install_manual",       "false" },
 #if defined(Q_OS_WIN32)
     { RbSettings::Tts,                  "tts",                  "sapi" },
-#elif defined(Q_OS_MACX)
+#elif defined(Q_OS_MACOS)
     { RbSettings::Tts,                  "tts",                  "carbon" },
 #else
     { RbSettings::Tts,                  "tts",                  "espeak" },
diff --git a/utils/rbutilqt/base/system.cpp b/utils/rbutilqt/base/system.cpp
index 0ec1a9d424..216ed4e733 100644
--- a/utils/rbutilqt/base/system.cpp
+++ b/utils/rbutilqt/base/system.cpp
@@ -28,8 +28,10 @@
 // Windows Includes
 #if defined(Q_OS_WIN32)
 #if defined(UNICODE)
+#ifndef _UNICODE
 #define _UNICODE
 #endif
+#endif
 #include <windows.h>
 #include <tchar.h>
 #include <lm.h>
@@ -38,7 +40,7 @@
 #endif
 
 // Linux and Mac includes
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
 #include <sys/utsname.h>
 #include <unistd.h>
 #include <pwd.h>
@@ -51,7 +53,7 @@
 #endif
 
 // Mac includes
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
 #include <sys/param.h>
 #include <sys/ucred.h>
 #include <sys/mount.h>
@@ -145,7 +147,7 @@ QString System::userName(void)
 
     return QString::fromWCharArray(userbuf);
 #endif
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
     struct passwd *user;
     user = getpwuid(geteuid());
     return QString(user->pw_name);
@@ -168,25 +170,18 @@ QString System::osVersionString(void)
     GetSystemInfo(&sysinfo);
 
     result = QString("Windows version %1.%2, ").arg(osvi.dwMajorVersion).arg(osvi.dwMinorVersion);
-    if(osvi.szCSDVersion)
-        result += QString("build %1 (%2)").arg(osvi.dwBuildNumber)
-            .arg(QString::fromWCharArray(osvi.szCSDVersion));
-    else
-        result += QString("build %1").arg(osvi.dwBuildNumber);
+    result += QString("build %1 (%2)").arg(osvi.dwBuildNumber)
+        .arg(QString::fromWCharArray(osvi.szCSDVersion));
     result += QString("<br/>CPU: %1, %2 processor(s)").arg(sysinfo.dwProcessorType)
               .arg(sysinfo.dwNumberOfProcessors);
 #endif
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
     struct utsname u;
     int ret;
+    int cores;
     ret = uname(&u);
+    cores = QThread::idealThreadCount();
 
-#if defined(Q_OS_MACX)
-    SInt32 cores;
-    Gestalt(gestaltCountOfCPUs, &cores);
-#else
-    long cores = sysconf(_SC_NPROCESSORS_ONLN);
-#endif
     if(ret != -1) {
         result = QString("CPU: %1, %2 processor(s)").arg(u.machine).arg(cores);
         result += QString("<br/>System: %2<br/>Release: %3<br/>Version: %4")
@@ -195,34 +190,23 @@ QString System::osVersionString(void)
     else {
         result = QString("(Error when retrieving system information)");
     }
-#if defined(Q_OS_MACX)
-    SInt32 major;
-    SInt32 minor;
-    SInt32 bugfix;
-    Gestalt(gestaltSystemVersionMajor, &major);
-    Gestalt(gestaltSystemVersionMinor, &minor);
-    Gestalt(gestaltSystemVersionBugFix, &bugfix);
+#if defined(Q_OS_MACOS)
+    auto ver = QOperatingSystemVersion::current();
 
-    result += QString("<br/>OS X %1.%2.%3 ").arg(major).arg(minor).arg(bugfix);
-    // 1: 86k, 2: ppc, 10: i386
-    SInt32 arch;
-    Gestalt(gestaltSysArchitecture, &arch);
-    switch(arch) {
-        case 1:
-            result.append("(86k)");
-            break;
-        case 2:
-            result.append("(ppc)");
-            break;
-        case 10:
-            result.append("(x86)");
-            break;
-        default:
-            result.append("(unknown)");
-            break;
-    }
-#endif
+    result += QString("<br/>macOS %1.%2.%3")
+        .arg(ver.majorVersion())
+        .arg(ver.minorVersion())
+        .arg(ver.microVersion());
+
+#if defined(__arm64__)
+    result += " (arm64)";
+#elif defined(__x86_64__)
+    result += " (x86_64)";
+#else
+    result += " (unknown)";
 #endif
+#endif /* defined(Q_OS_MACOS) */
+#endif /* defined(Q_OS_LINUX) || defined(Q_OS_MACOS) */
     result += QString("<br/>Qt version %1").arg(qVersion());
     return result;
 }
@@ -282,12 +266,12 @@ QMultiMap<uint32_t, QString> System::listUsbDevices(void)
     libusb_exit(nullptr);
 #endif
 
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
     kern_return_t result = KERN_FAILURE;
     CFMutableDictionaryRef usb_matching_dictionary;
     io_iterator_t usb_iterator = IO_OBJECT_NULL;
     usb_matching_dictionary = IOServiceMatching(kIOUSBDeviceClassName);
-    result = IOServiceGetMatchingServices(kIOMasterPortDefault, usb_matching_dictionary,
+    result = IOServiceGetMatchingServices(kIOMainPortDefault, usb_matching_dictionary,
                                           &usb_iterator);
     if(result) {
         LOG_ERROR() << "USB: IOKit: Could not get matching services.";
@@ -352,7 +336,7 @@ QMultiMap<uint32_t, QString> System::listUsbDevices(void)
         }
 
         if(id) {
-            usbids.insertMulti(id, name);
+            usbids.insert(id, name);
             LOG_INFO() << "USB:" << QString("0x%1").arg(id, 8, 16) << name;
         }
 
@@ -469,15 +453,13 @@ QUrl System::systemProxy(void)
         return QUrl("http://" + QString::fromWCharArray(proxyval));
     else
         return QUrl("");
-#elif defined(Q_OS_MACX)
+#elif defined(Q_OS_MACOS)
 
     CFDictionaryRef dictref;
     CFStringRef stringref;
     CFNumberRef numberref;
     int enable = 0;
     int port = 0;
-    unsigned int bufsize = 0;
-    char *buf;
     QUrl proxy;
 
     dictref = SCDynamicStoreCopyProxies(NULL);
@@ -490,24 +472,14 @@ QUrl System::systemProxy(void)
         // get proxy string
         stringref = (CFStringRef)CFDictionaryGetValue(dictref, kSCPropNetProxiesHTTPProxy);
         if(stringref != NULL) {
-            // get number of characters. CFStringGetLength uses UTF-16 code pairs
-            bufsize = CFStringGetLength(stringref) * 2 + 1;
-            buf = (char*)malloc(sizeof(char) * bufsize);
-            if(buf == NULL) {
-                LOG_ERROR() << "can't allocate memory for proxy string!";
-                CFRelease(dictref);
-                return QUrl("");
-            }
-            CFStringGetCString(stringref, buf, bufsize, kCFStringEncodingUTF16);
+            QString host = QString::fromCFString(stringref);
             numberref = (CFNumberRef)CFDictionaryGetValue(dictref, kSCPropNetProxiesHTTPPort);
             if(numberref != NULL)
                 CFNumberGetValue(numberref, kCFNumberIntType, &port);
             proxy.setScheme("http");
-            proxy.setHost(QString::fromUtf16((unsigned short*)buf));
+            proxy.setHost(host);
             proxy.setPort(port);
-
-            free(buf);
-            }
+        }
     }
     CFRelease(dictref);
 
@@ -516,5 +488,3 @@ QUrl System::systemProxy(void)
     return QUrl("");
 #endif
 }
-
-
diff --git a/utils/rbutilqt/base/ttsbase.cpp b/utils/rbutilqt/base/ttsbase.cpp
index 0102d215a6..b0bba40bc8 100644
--- a/utils/rbutilqt/base/ttsbase.cpp
+++ b/utils/rbutilqt/base/ttsbase.cpp
@@ -21,7 +21,6 @@
 
 #include "ttsfestival.h"
 #include "ttssapi.h"
-#include "ttssapi4.h"
 #include "ttsmssp.h"
 #include "ttsexes.h"
 #include "ttsespeak.h"
@@ -29,9 +28,12 @@
 #include "ttsflite.h"
 #include "ttsmimic.h"
 #include "ttsswift.h"
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
 #include "ttscarbon.h"
 #endif
+#if defined(QT_TEXTTOSPEECH_LIB) && defined(QT_MULTIMEDIA_LIB)
+#include "ttsqt.h"
+#endif
 
 // list of tts names and identifiers
 QMap<QString,QString> TTSBase::ttsList;
@@ -51,18 +53,18 @@ void TTSBase::initTTSList()
     ttsList["flite"] = tr("Flite TTS Engine");
     ttsList["swift"] = tr("Swift TTS Engine");
 #if defined(Q_OS_WIN)
-#if 0 /* SAPI4 has been disabled since long. Keep support for now. */
-    ttsList["sapi4"] = tr("SAPI4 TTS Engine");
-#endif
     ttsList["sapi"] = tr("SAPI5 TTS Engine");
     ttsList["mssp"] = tr("MS Speech Platform");
 #endif
 #if defined(Q_OS_LINUX)
     ttsList["festival"] = tr("Festival TTS Engine");
 #endif
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
     ttsList["carbon"] = tr("OS X System Engine");
 #endif
+#if defined(QT_TEXTTOSPEECH_LIB) && defined(QT_MULTIMEDIA_LIB)
+    ttsList["qt"] = tr("Qt TextToSpeech Engine");
+#endif
 }
 
 // function to get a specific encoder
@@ -73,8 +75,6 @@ TTSBase* TTSBase::getTTS(QObject* parent,QString ttsName)
 #if defined(Q_OS_WIN)
     if(ttsName == "sapi")
         tts = new TTSSapi(parent);
-    else if (ttsName == "sapi4")
-        tts = new TTSSapi4(parent);
     else if (ttsName == "mssp")
         tts = new TTSMssp(parent);
     else
@@ -82,10 +82,15 @@ TTSBase* TTSBase::getTTS(QObject* parent,QString ttsName)
     if (ttsName == "festival")
         tts = new TTSFestival(parent);
     else
-#elif defined(Q_OS_MACX)
+#elif defined(Q_OS_MACOS)
     if(ttsName == "carbon")
         tts = new TTSCarbon(parent);
     else
+#endif
+#if defined(QT_TEXTTOSPEECH_LIB) && defined(QT_MULTIMEDIA_LIB)
+    if(ttsName == "qt")
+        tts = new TTSQt(parent);
+    else
 #endif
     if(ttsName == "espeak")
         tts = new TTSEspeak(parent);
diff --git a/utils/rbutilqt/base/ttscarbon.cpp b/utils/rbutilqt/base/ttscarbon.cpp
index 6b20de764f..95cfeb3338 100644
--- a/utils/rbutilqt/base/ttscarbon.cpp
+++ b/utils/rbutilqt/base/ttscarbon.cpp
@@ -117,18 +117,33 @@ void TTSCarbon::generateSettings(void)
 
     // get system voice
     error = GetVoiceDescription(NULL, &vdesc, sizeof(vdesc));
+    if (error != 0) {
+        LOG_ERROR() << "GetVoiceDescription() failed with code" << error;
+        return;
+    }
     systemVoice
             = QString::fromLocal8Bit((const char*)&vdesc.name[1], vdesc.name[0]);
     // get list of all voices
     CountVoices(&numVoices);
     for(SInt16 i = 1; i < numVoices; ++i) {
         error = GetIndVoice(i, &vspec);
+        if (error != 0) {
+            LOG_ERROR() << "GetIndVoice(" << i << ") failed with code" << error;
+            continue;
+        }
         error = GetVoiceDescription(&vspec, &vdesc, sizeof(vdesc));
+        if (error != 0) {
+            LOG_ERROR() << "GetVoiceDescription(" << i << ") failed with code" << error;
+            continue;
+        }
         // name is pascal string, i.e. the first byte is the length.
         QString name
             = QString::fromLocal8Bit((const char*)&vdesc.name[1], vdesc.name[0]);
         voiceNames.append(name.trimmed());
     }
+    if (voiceNames.isEmpty()) {
+        return;
+    }
     // voice
     EncTtsSetting* setting;
     QString voice
@@ -328,7 +343,7 @@ int TTSCarbon::convertAiffToWav(const char* aiff, const char* wav)
     if(!buf) /* error out if malloc() failed */
         return -1;
     in = fopen(aiff, "rb");
-    if(fread(buf, 1, filestat.st_size, in) < filestat.st_size) {
+    if(fread(buf, 1, filestat.st_size, in) < (size_t)filestat.st_size) {
         printf("could not read file: not enought bytes read\n");
         fclose(in);
         free(buf);
diff --git a/utils/rbutilqt/base/ttsespeak.h b/utils/rbutilqt/base/ttsespeak.h
index afe19fbdac..c069d5bbfb 100644
--- a/utils/rbutilqt/base/ttsespeak.h
+++ b/utils/rbutilqt/base/ttsespeak.h
@@ -33,8 +33,15 @@ class TTSEspeak : public TTSExes
             m_name = "espeak";
 
             /* default to espeak */
-            m_TTSTemplate = "\"%exe\" %options -w \"%wavfile\" -- \"%text\"";
-            m_TTSSpeakTemplate = "\"%exe\" %options -- \"%text\"";
+            m_TTSTemplate << "%options";
+            m_TTSTemplate << "-w";
+            m_TTSTemplate << "%wavfile";
+            m_TTSTemplate << "--";
+            m_TTSTemplate << "%text";
+            m_TTSSpeakTemplate << "%options";
+            m_TTSSpeakTemplate << "--";
+            m_TTSSpeakTemplate << "%text";
+
             m_capabilities = TTSBase::CanSpeak;
         }
 };
diff --git a/utils/rbutilqt/base/ttsespeakng.h b/utils/rbutilqt/base/ttsespeakng.h
index 55aba62e7d..d47eb7cd42 100644
--- a/utils/rbutilqt/base/ttsespeakng.h
+++ b/utils/rbutilqt/base/ttsespeakng.h
@@ -32,8 +32,15 @@ class TTSEspeakNG : public TTSExes
         {
             m_name = "espeak-ng";
 
-            m_TTSTemplate = "\"%exe\" %options -w \"%wavfile\" -- \"%text\"";
-            m_TTSSpeakTemplate = "\"%exe\" %options -- \"%text\"";
+            m_TTSTemplate << "%options";
+            m_TTSTemplate << "-w";
+            m_TTSTemplate << "%wavfile";
+            m_TTSTemplate << "--";
+            m_TTSTemplate << "%text";
+            m_TTSSpeakTemplate << "%options";
+            m_TTSSpeakTemplate << "--";
+            m_TTSSpeakTemplate << "%text";
+
             m_capabilities = TTSBase::CanSpeak;
         }
 };
diff --git a/utils/rbutilqt/base/ttsexes.cpp b/utils/rbutilqt/base/ttsexes.cpp
index 3eae930eef..a4ecf985b7 100644
--- a/utils/rbutilqt/base/ttsexes.cpp
+++ b/utils/rbutilqt/base/ttsexes.cpp
@@ -24,14 +24,10 @@
 
 TTSExes::TTSExes(QObject* parent) : TTSBase(parent)
 {
-    /* default to espeak */
-    m_name = "espeak";
-    m_capabilities = TTSBase::CanSpeak;
-    m_TTSTemplate = "\"%exe\" %options -w \"%wavfile\" -- \"%text\"";
-    m_TTSSpeakTemplate = "\"%exe\" %options -- \"%text\"";
+    m_name = "false";
+    m_capabilities = TTSBase::None;
 }
 
-
 TTSBase::Capabilities TTSExes::capabilities()
 {
     return m_capabilities;
@@ -83,14 +79,14 @@ bool TTSExes::start(QString *errStr)
 TTSStatus TTSExes::voice(const QString& text, const QString& wavfile, QString *errStr)
 {
     (void) errStr;
-    QString execstring;
+    QStringList exec;
     if(wavfile.isEmpty() && m_capabilities & TTSBase::CanSpeak) {
         if(m_TTSSpeakTemplate.isEmpty()) {
             LOG_ERROR() << "internal error: TTS announces CanSpeak "
                            "but template empty!";
             return FatalError;
         }
-        execstring = m_TTSSpeakTemplate;
+        exec = m_TTSSpeakTemplate;
     }
     else if(wavfile.isEmpty()) {
         LOG_ERROR() << "no output file passed to voice() "
@@ -98,15 +94,19 @@ TTSStatus TTSExes::voice(const QString& text, const QString& wavfile, QString *e
         return FatalError;
     }
     else {
-        execstring = m_TTSTemplate;
+        exec = m_TTSTemplate;
     }
 
-    execstring.replace("%exe",m_TTSexec);
-    execstring.replace("%options",m_TTSOpts);
-    execstring.replace("%wavfile",wavfile);
-    execstring.replace("%text",text);
+    exec.replaceInStrings("%options",m_TTSOpts);
+    exec.replaceInStrings("%wavfile",wavfile);
+    exec.replaceInStrings("%text",text);
 
-    QProcess::execute(execstring);
+    int ret;
+    if ((ret = QProcess::execute(m_TTSexec, exec))) {
+        LOG_ERROR() << "TTS exec failed (" << ret << "): " << m_TTSexec << " " << exec;
+
+        return FatalError;
+    }
 
     if(!wavfile.isEmpty() && !QFileInfo(wavfile).isFile()) {
         LOG_ERROR() << "output file does not exist:" << wavfile;
@@ -124,4 +124,3 @@ bool TTSExes::configOk()
     else
         return false;
 }
-
diff --git a/utils/rbutilqt/base/ttsexes.h b/utils/rbutilqt/base/ttsexes.h
index 470b007e92..c9b1bb185d 100644
--- a/utils/rbutilqt/base/ttsexes.h
+++ b/utils/rbutilqt/base/ttsexes.h
@@ -50,8 +50,8 @@ class TTSExes : public TTSBase
         void loadSettings(void);
 
     protected:
-        QString m_TTSTemplate;
-        QString m_TTSSpeakTemplate;
+        QStringList m_TTSTemplate;
+        QStringList m_TTSSpeakTemplate;
         QString m_name;
         QString m_TTSexec;
         QString m_TTSOpts;
diff --git a/utils/rbutilqt/base/ttsfestival.cpp b/utils/rbutilqt/base/ttsfestival.cpp
index 9cdad7fe64..63e09a1673 100644
--- a/utils/rbutilqt/base/ttsfestival.cpp
+++ b/utils/rbutilqt/base/ttsfestival.cpp
@@ -295,11 +295,7 @@ QString TTSFestival::getVoiceInfo(QString voice)
                     QRegularExpression::CaseInsensitiveOption));
         LOG_INFO() << "voiceInfo w/o descr:" << response;
         response = response.remove(')');
-#if QT_VERSION >= 0x050e00
         QStringList responseLines = response.split('(', Qt::SkipEmptyParts);
-#else
-        QStringList responseLines = response.split('(', QString::SkipEmptyParts);
-#endif
         responseLines.removeAt(0); // the voice name itself
 
         QString description;
@@ -417,4 +413,3 @@ QString TTSFestival::queryServer(QString query, int timeout)
 
     return response.trimmed();
 }
-
diff --git a/utils/rbutilqt/base/ttsflite.h b/utils/rbutilqt/base/ttsflite.h
index 717c311a34..6d6c36740d 100644
--- a/utils/rbutilqt/base/ttsflite.h
+++ b/utils/rbutilqt/base/ttsflite.h
@@ -32,11 +32,14 @@ class TTSFlite : public TTSExes
         {
             m_name = "flite";
 
-            /* default to espeak */
-            m_TTSTemplate = "\"%exe\" %options -o \"%wavfile\" -t \"%text\"";
-            m_TTSSpeakTemplate = "";
-            m_capabilities = TTSBase::None;
+            m_TTSTemplate << "%options";
+            m_TTSTemplate << "-o";
+            m_TTSTemplate << "%wavfile";
+            m_TTSTemplate << "-t";
+            m_TTSTemplate << "%text";
+            //m_TTSSpeakTemplate << "";
 
+            m_capabilities = TTSBase::None;
         }
 };
 
diff --git a/utils/rbutilqt/base/ttsmimic.h b/utils/rbutilqt/base/ttsmimic.h
index f4d7a8beac..3b0295f44e 100644
--- a/utils/rbutilqt/base/ttsmimic.h
+++ b/utils/rbutilqt/base/ttsmimic.h
@@ -32,8 +32,15 @@ class TTSMimic : public TTSExes
         {
             m_name = "mimic";
 
-            m_TTSTemplate = "\"%exe\" %options -o \"%wavfile\" -t \"%text\"";
-            m_TTSSpeakTemplate = "\"%exe\" %options -t \"%text\"";
+            m_TTSTemplate << "%options";
+            m_TTSTemplate << "-o";
+            m_TTSTemplate << "%wavfile";
+            m_TTSTemplate << "-t";
+            m_TTSTemplate << "%text";
+            m_TTSSpeakTemplate << "%options";
+            m_TTSSpeakTemplate << "-t";
+            m_TTSSpeakTemplate << "%text";
+
             m_capabilities = TTSBase::CanSpeak;
         }
 };
diff --git a/utils/rbutilqt/base/ttsmssp.h b/utils/rbutilqt/base/ttsmssp.h
index 817b9fde58..755841338d 100644
--- a/utils/rbutilqt/base/ttsmssp.h
+++ b/utils/rbutilqt/base/ttsmssp.h
@@ -30,14 +30,10 @@ class TTSMssp: public TTSSapi
     public:
         TTSMssp(QObject* parent=nullptr) : TTSSapi(parent)
         {
-            m_TTSTemplate = "cscript //nologo \"%exe\" "
-                "/language:%lang /voice:\"%voice\" "
-                "/speed:%speed \"%options\" /mssp";
-            m_TTSVoiceTemplate = "cscript //nologo \"%exe\" "
-                "/language:%lang /listvoices /mssp";
+            m_TTSTemplate << "/mssp";
+            m_TTSVoiceTemplate << "/mssp";
             m_TTSType = "mssp";
         }
-
 };
 
 #endif
diff --git a/utils/rbutilqt/base/ttsqt.cpp b/utils/rbutilqt/base/ttsqt.cpp
new file mode 100644
index 0000000000..88aa2ee90e
--- /dev/null
+++ b/utils/rbutilqt/base/ttsqt.cpp
@@ -0,0 +1,221 @@
+/***************************************************************************
+*             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ *   Copyright (C) 2026 by Vencislav Atanasov
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include <QtCore>
+#include "ttsbase.h"
+#include "ttsqt.h"
+#include "encttssettings.h"
+#include "rbsettings.h"
+
+#include <QEventLoop>
+#include <QFile>
+#include <QDataStream>
+#include <QIODevice>
+#include <QtTextToSpeech/QTextToSpeech>
+#include <QtMultimedia/QAudioFormat>
+
+#include "Logger.h"
+
+TTSQt::TTSQt(QObject *parent) : TTSBase(parent)
+{
+    m_tts = new QTextToSpeech(this);
+}
+
+TTSQt::~TTSQt()
+{
+}
+
+TTSStatus TTSQt::voice(const QString& text, const QString& wavfile, QString* errStr)
+{
+    if (!m_tts) {
+        if (errStr) *errStr = "TTS engine not initialized";
+        return FatalError;
+    }
+
+    if (text.isEmpty()) {
+        if (errStr) *errStr = "Input text is empty";
+        return Warning;
+    }
+
+    QEventLoop loop;
+    bool success = true;
+    QString errorMsg;
+    bool hasStarted = false;
+
+    // Connect to state changes to know when the TTS engine finishes its task
+    QMetaObject::Connection conn = connect(m_tts, &QTextToSpeech::stateChanged, &loop, [&](QTextToSpeech::State state) {
+        if (state == QTextToSpeech::Error) {
+            success = false;
+            errorMsg = m_tts->errorString();
+            loop.quit();
+        } else if (state != QTextToSpeech::Ready) {
+            // Any state other than Ready (e.g., Speaking, Synthesizing) means it has started
+            hasStarted = true;
+        } else if (state == QTextToSpeech::Ready && hasStarted) {
+            // It has finished and returned to Ready state
+            loop.quit();
+        }
+    });
+
+    if (wavfile.isEmpty()) {
+        m_tts->say(text);
+    }
+    else {
+        m_audioData.clear();
+        m_format = QAudioFormat();
+
+        // Start synthesis. The functor is called with chunks of audio data.
+        m_tts->synthesize(text, [this](const QAudioFormat &format, const QByteArray &bytes) {
+            if (!m_format.isValid()) {
+                m_format = format; // Store the format from the first chunk
+            }
+            m_audioData.append(bytes);
+        });
+    }
+
+    // Wait for the asynchronous operation to finish.
+    // We check if it finished synchronously (edge case) to avoid deadlocking the QEventLoop.
+    if (m_tts->state() == QTextToSpeech::Ready && !hasStarted) {
+        // Already finished or didn't start
+    } else {
+        loop.exec();
+    }
+
+    disconnect(conn);
+
+    if (!success) {
+        if (errStr) *errStr = errorMsg;
+        return FatalError;
+    }
+
+    if (!wavfile.isEmpty()) {
+        if (m_audioData.isEmpty() || !m_format.isValid()) {
+            if (errStr) *errStr = "No audio data generated or invalid format";
+            return Warning;
+        }
+
+        if (!writeWavFile(wavfile, m_audioData, m_format)) {
+            if (errStr) *errStr = "Failed to write WAV file";
+            return FatalError;
+        }
+    }
+
+    return NoError;
+}
+
+bool TTSQt::start(QString *errStr)
+{
+    if (!m_tts) {
+        m_tts = new QTextToSpeech(this);
+    }
+    if (m_tts->availableEngines().isEmpty()) {
+        if (errStr) *errStr = "No TTS engines available on this system";
+        return false;
+    }
+
+    // XXX figure out the "best" engine.  Ignore 'mock' and
+    // any anything that doesn't support file output!
+
+    if (!(m_tts->engineCapabilities() & QTextToSpeech::Capability::Synthesize)) {
+        LOG_ERROR() << "QT TTS engine '" << m_tts->engine() << " does not support synthesis to file";
+        return false;
+    }
+
+    LOG_INFO() << "QT TTS engine: " << m_tts->engine();
+
+    return true;
+}
+
+bool TTSQt::stop()
+{
+    if (m_tts) {
+        m_tts->stop();
+    }
+    return true;
+}
+
+QString TTSQt::voiceVendor(void)
+{
+    return "Qt TextToSpeech";
+}
+
+bool TTSQt::configOk()
+{
+    return m_tts != nullptr && m_tts->state() != QTextToSpeech::Error;
+}
+
+void TTSQt::generateSettings()
+{
+    // TODO
+}
+
+void TTSQt::saveSettings()
+{
+    // TODO
+}
+
+TTSBase::Capabilities TTSQt::capabilities()
+{
+    return TTSBase::CanSpeak | TTSBase::RunInParallel;
+}
+
+bool TTSQt::writeWavFile(const QString &filePath, const QByteArray &audioData, const QAudioFormat &format)
+{
+    QFile file(filePath);
+    if (!file.open(QIODevice::WriteOnly)) {
+        return false;
+    }
+
+    quint32 dataSize = audioData.size();
+    quint32 fileSize = 36 + dataSize;
+    quint32 fmtChunkSize = 16;
+
+    // 3 for IEEE Float, 1 for standard PCM
+    quint16 audioFormat = (format.sampleFormat() == QAudioFormat::Float) ? 3 : 1;
+    quint16 channels = format.channelCount();
+    quint32 sampleRate = format.sampleRate();
+    quint16 bitsPerSample = format.bytesPerSample() * 8;
+    quint16 blockAlign = channels * format.bytesPerSample();
+    quint32 byteRate = sampleRate * blockAlign;
+
+    QDataStream stream(&file);
+    stream.setByteOrder(QDataStream::LittleEndian);
+
+    // RIFF header
+    stream.writeRawData("RIFF", 4);
+    stream << fileSize;
+    stream.writeRawData("WAVE", 4);
+
+    // fmt chunk
+    stream.writeRawData("fmt ", 4);
+    stream << fmtChunkSize;
+    stream << audioFormat;
+    stream << channels;
+    stream << sampleRate;
+    stream << byteRate;
+    stream << blockAlign;
+    stream << bitsPerSample;
+
+    // data chunk
+    stream.writeRawData("data", 4);
+    stream << dataSize;
+    stream.writeRawData(audioData.constData(), dataSize);
+
+    file.close();
+    return true;
+}
diff --git a/utils/rbutilqt/base/ttsqt.h b/utils/rbutilqt/base/ttsqt.h
new file mode 100644
index 0000000000..2c19aac239
--- /dev/null
+++ b/utils/rbutilqt/base/ttsqt.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+*             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ *   Copyright (C) 2026 by Vencislav Atanasov
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#ifndef TTSQT_H
+#define TTSQT_H
+
+#include <QtCore>
+#include "ttsbase.h"
+
+#include <QtTextToSpeech/QTextToSpeech>
+#include <QtMultimedia/QAudioFormat>
+
+class TTSQt : public TTSBase
+{
+    Q_OBJECT
+public:
+    explicit TTSQt(QObject *parent = nullptr);
+    ~TTSQt() override;
+
+    TTSStatus voice(const QString& text, const QString& wavfile, QString* errStr) override;
+    bool start(QString *errStr) override;
+    bool stop() override;
+
+    QString voiceVendor(void) override;
+    bool configOk() override;
+    void generateSettings() override;
+    void saveSettings() override;
+    Capabilities capabilities() override;
+
+private:
+    QTextToSpeech *m_tts = nullptr;
+    QByteArray m_audioData;
+    QAudioFormat m_format;
+
+    // Helper to write raw PCM data to a WAV file
+    bool writeWavFile(const QString &filePath, const QByteArray &audioData, const QAudioFormat &format);
+};
+
+#endif // TTSQT_H
diff --git a/utils/rbutilqt/base/ttssapi.cpp b/utils/rbutilqt/base/ttssapi.cpp
index c1a642a14e..14c0cae70e 100644
--- a/utils/rbutilqt/base/ttssapi.cpp
+++ b/utils/rbutilqt/base/ttssapi.cpp
@@ -24,9 +24,18 @@
 
 TTSSapi::TTSSapi(QObject* parent) : TTSBase(parent)
 {
-    m_TTSTemplate = "cscript //nologo \"%exe\" /language:%lang "
-        "/voice:\"%voice\" /speed:%speed \"%options\"";
-    m_TTSVoiceTemplate = "cscript //nologo \"%exe\" /language:%lang /listvoices";
+    m_TTSTemplate << "//nologo";
+    m_TTSTemplate << "%exe";
+    m_TTSTemplate << "/language:%lang";
+    m_TTSTemplate << "/voice:%voice";
+    m_TTSTemplate << "/speed:%speed";
+    m_TTSTemplate << "%options";
+
+    m_TTSVoiceTemplate << "//nologo";
+    m_TTSVoiceTemplate << "%exe";
+    m_TTSVoiceTemplate << "/language:%lang";
+    m_TTSVoiceTemplate << "/listvoices";
+
     m_TTSType = "sapi";
     defaultLanguage = "english";
     m_started = false;
@@ -113,17 +122,17 @@ bool TTSSapi::start(QString *errStr)
         return false;
     }
     // create the voice process
-    QString execstring = m_TTSTemplate;
-    execstring.replace("%exe",m_TTSexec);
-    execstring.replace("%options",m_TTSOpts);
-    execstring.replace("%lang",m_TTSLanguage);
-    execstring.replace("%voice",m_TTSVoice);
-    execstring.replace("%speed",m_TTSSpeed);
+    QStringList exec = m_TTSTemplate;
+    exec.replaceInStrings("%exe",m_TTSexec);
+    exec.replaceInStrings("%options",m_TTSOpts);
+    exec.replaceInStrings("%lang",m_TTSLanguage);
+    exec.replaceInStrings("%voice",m_TTSVoice);
+    exec.replaceInStrings("%speed",m_TTSSpeed);
 
-    LOG_INFO() << "Start:" << execstring;
+    LOG_INFO() << "Start: cscript " << exec;
     voicescript = new QProcess(nullptr);
     //connect(voicescript,SIGNAL(readyReadStandardError()),this,SLOT(error()));
-    voicescript->start(execstring);
+    voicescript->start("cscript", exec);
     LOG_INFO() << "wait for process";
     if(!voicescript->waitForStarted())
     {
@@ -140,11 +149,7 @@ bool TTSSapi::start(QString *errStr)
     }
 
     voicestream = new QTextStream(voicescript);
-#if QT_VERSION < 0x060000
-    voicestream->setCodec("UTF16-LE");
-#else
     voicestream->setEncoding(QStringConverter::Utf16LE);
-#endif
 
     m_started = true;
     return true;
@@ -182,13 +187,13 @@ QStringList TTSSapi::getVoiceList(QString language)
         return result;
 
     // create the voice process
-    QString execstring = m_TTSVoiceTemplate;
-    execstring.replace("%exe",m_TTSexec);
-    execstring.replace("%lang",language);
+    QStringList exec = m_TTSVoiceTemplate;
+    exec.replaceInStrings("%exe",m_TTSexec);
+    exec.replaceInStrings("%lang",language);
 
-    LOG_INFO() << "Start:" << execstring;
+    LOG_INFO() << "Start: cscript " << exec;
     voicescript = new QProcess(nullptr);
-    voicescript->start(execstring);
+    voicescript->start("cscript", exec);
     LOG_INFO() << "wait for process";
     if(!voicescript->waitForStarted()) {
         LOG_INFO() << "process startup timed out!";
@@ -201,11 +206,7 @@ QStringList TTSSapi::getVoiceList(QString language)
     if(dataRaw.startsWith("Error")) {
         LOG_INFO() << "Error:" << dataRaw;
     }
-#if QT_VERSION >= 0x050e00
     result = dataRaw.split(";", Qt::SkipEmptyParts);
-#else
-    result = dataRaw.split(";", QString::SkipEmptyParts);
-#endif
     if(result.size() > 0)
     {
         result.sort();
@@ -271,4 +272,3 @@ bool TTSSapi::configOk()
         return false;
     return true;
 }
-
diff --git a/utils/rbutilqt/base/ttssapi.h b/utils/rbutilqt/base/ttssapi.h
index b30b9d5fac..8ea1370133 100644
--- a/utils/rbutilqt/base/ttssapi.h
+++ b/utils/rbutilqt/base/ttssapi.h
@@ -67,8 +67,8 @@ class TTSSapi : public TTSBase
         bool m_started;
 
     protected:
-        QString m_TTSTemplate;
-        QString m_TTSVoiceTemplate;
+        QStringList m_TTSTemplate;
+        QStringList m_TTSVoiceTemplate;
         QString m_TTSType;
 };
 
diff --git a/utils/rbutilqt/base/ttssapi4.h b/utils/rbutilqt/base/ttssapi4.h
deleted file mode 100644
index d6408eaa2c..0000000000
--- a/utils/rbutilqt/base/ttssapi4.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
-*             __________               __   ___.
-*   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
-*   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
-*   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
-*   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
-*                     \/            \/     \/    \/            \/
-*
-*   Copyright (C) 2012 by Dominik Riebeling
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-* KIND, either express or implied.
-*
-****************************************************************************/
-
-#ifndef TTSSAPI4_H
-#define TTSSAPI4_H
-
-#include "ttsbase.h"
-#include "ttssapi.h"
-
-class TTSSapi4: public TTSSapi
-{
-    Q_OBJECT
-    public:
-        TTSSapi4(QObject* parent=nullptr) : TTSSapi(parent)
-        {
-            m_TTSTemplate = "cscript //nologo \"%exe\" "
-                "/language:%lang /voice:\"%voice\" "
-                "/speed:%speed \"%options\" /sapi4";
-            m_TTSVoiceTemplate = "cscript //nologo \"%exe\" "
-                "/language:%lang /listvoices /sapi4";
-            m_TTSType = "sapi4";
-        }
-
-};
-
-#endif
diff --git a/utils/rbutilqt/base/ttsswift.h b/utils/rbutilqt/base/ttsswift.h
index adbc674d78..78237bea2e 100644
--- a/utils/rbutilqt/base/ttsswift.h
+++ b/utils/rbutilqt/base/ttsswift.h
@@ -31,8 +31,14 @@ class TTSSwift : public TTSExes
         TTSSwift(QObject* parent=nullptr) : TTSExes(parent)
         {
             m_name = "swift";
-            m_TTSTemplate = "\"%exe\" %options -o \"%wavfile\" -- \"%text\"";
-            m_TTSSpeakTemplate = "";
+
+            m_TTSTemplate << "%options";
+            m_TTSTemplate << "-o";
+            m_TTSTemplate << "%wavfile";
+            m_TTSTemplate << "--";
+            m_TTSTemplate << "%text";
+            //m_TTSSpeakTemplate << "";
+
             m_capabilities = TTSBase::None;
         }
 };
diff --git a/utils/rbutilqt/base/utils.cpp b/utils/rbutilqt/base/utils.cpp
index 7b6eed30bc..8a88a5db0e 100644
--- a/utils/rbutilqt/base/utils.cpp
+++ b/utils/rbutilqt/base/utils.cpp
@@ -29,19 +29,22 @@
 
 #include <QtCore>
 #include <QDebug>
+#include <QStorageInfo>
+#include <QStandardPaths>
+#include <QDirIterator>
 #include <cstdlib>
 #include <stdio.h>
 
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
 #include <sys/statvfs.h>
 #endif
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
 #include <stdio.h>
 #endif
 #if defined(Q_OS_LINUX)
 #include <mntent.h>
 #endif
-#if defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
+#if defined(Q_OS_MACOS) || defined(Q_OS_OPENBSD)
 #include <sys/param.h>
 #include <sys/ucred.h>
 #include <sys/mount.h>
@@ -54,11 +57,9 @@
 #include <winioctl.h>
 #include <tlhelp32.h>
 #endif
-#if defined(Q_OS_MACX)
-#include <Carbon/Carbon.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreServices/CoreServices.h>
-#include <IOKit/IOKitLib.h>
+#if defined(Q_OS_MACOS)
+#include <libproc.h>
+#include <signal.h>
 #endif
 
 // recursive function to delete a dir with files
@@ -93,11 +94,7 @@ QString Utils::resolvePathCase(QString path)
 {
     int start;
     QString realpath;
-#if QT_VERSION >= 0x050e00
     QStringList elems = path.split("/", Qt::SkipEmptyParts);
-#else
-    QStringList elems = path.split("/", QString::SkipEmptyParts);
-#endif
 
     if(path.isEmpty())
         return QString();
@@ -138,108 +135,19 @@ QString Utils::resolvePathCase(QString path)
 
 QString Utils::filesystemType(QString path)
 {
-#if defined(Q_OS_LINUX)
-    FILE *mn = setmntent("/etc/mtab", "r");
-    if(!mn)
-        return QString("");
-
-    struct mntent *ent;
-    while((ent = getmntent(mn))) {
-        if(QString(ent->mnt_dir) == path) {
-            endmntent(mn);
-            LOG_INFO() << "device type is" << ent->mnt_type;
-            return QString(ent->mnt_type);
-        }
+    QStorageInfo storage(path);
+    if (storage.isValid()) {
+        QString fsType = QString::fromLocal8Bit(storage.fileSystemType());
+        LOG_INFO() << "device type is" << fsType;
+        return fsType;
     }
-    endmntent(mn);
-#endif
-
-#if defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
-    int num;
-    struct statfs *mntinf;
-
-    num = getmntinfo(&mntinf, MNT_WAIT);
-    while(num--) {
-        if(QString(mntinf->f_mntonname) == path) {
-            LOG_INFO() << "device type is" << mntinf->f_fstypename;
-            return QString(mntinf->f_fstypename);
-        }
-        mntinf++;
-    }
-#endif
-
-#if defined(Q_OS_WIN32)
-    wchar_t t[64];
-    memset(t, 0, 32);
-    if(GetVolumeInformationW((LPCWSTR)path.utf16(),
-                             NULL, 0, NULL, NULL, NULL, t, 64)) {
-        LOG_INFO() << "device type is" << t;
-        return QString::fromWCharArray(t);
-    }
-#endif
     return QString("-");
 }
 
 
-QString Utils::filesystemName(QString path)
+QString Utils::filesystemName(const QString &path)
 {
-    QString name;
-#if defined(Q_OS_WIN32)
-    wchar_t volname[MAX_PATH+1];
-    bool res = GetVolumeInformationW((LPTSTR)path.utf16(), volname, MAX_PATH+1,
-            NULL, NULL, NULL, NULL, 0);
-    if(res) {
-        name = QString::fromWCharArray(volname);
-    }
-#endif
-#if defined(Q_OS_MACX)
-    // BSD label does not include folder.
-    QString bsd = Utils::resolveDevicename(path).remove("/dev/");
-    if(bsd.isEmpty()) {
-        return name;
-    }
-    OSStatus result;
-    ItemCount index = 1;
-
-    do {
-        FSVolumeRefNum volrefnum;
-        HFSUniStr255 volname;
-
-        result = FSGetVolumeInfo(kFSInvalidVolumeRefNum, index, &volrefnum,
-                kFSVolInfoFSInfo, NULL, &volname, NULL);
-
-        if(result == noErr) {
-            GetVolParmsInfoBuffer volparms;
-            /* PBHGetVolParmsSync() is not available for 64bit while
-            FSGetVolumeParms() is available in 10.5+. Thus we need to use
-            PBHGetVolParmsSync() for 10.4, and that also requires 10.4 to
-            always use 32bit.
-            Qt 4 supports 32bit on 10.6 Cocoa only.
-            */
-#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
-            if(FSGetVolumeParms(volrefnum, &volparms, sizeof(volparms)) == noErr)
-#else
-            HParamBlockRec hpb;
-            hpb.ioParam.ioNamePtr = NULL;
-            hpb.ioParam.ioVRefNum = volrefnum;
-            hpb.ioParam.ioBuffer = (Ptr)&volparms;
-            hpb.ioParam.ioReqCount = sizeof(volparms);
-            if(PBHGetVolParmsSync(&hpb) == noErr)
-#endif
-            {
-                if(volparms.vMServerAdr == 0) {
-                    if(bsd == (char*)volparms.vMDeviceID) {
-                        name = QString::fromUtf16((const ushort*)volname.unicode,
-                                                  (int)volname.length);
-                        break;
-                    }
-                }
-            }
-        }
-        index++;
-    } while(result == noErr);
-#endif
-
+    QString name = QStorageInfo(path).displayName();
     LOG_INFO() << "Volume name of" << path << "is" << name;
     return name;
 }
@@ -250,7 +158,12 @@ QString Utils::filesystemName(QString path)
 //! @return size in bytes
 qulonglong Utils::filesystemFree(QString path)
 {
-    qulonglong size = filesystemSize(path, FilesystemFree);
+    QStorageInfo storage(path);
+    if (!storage.isValid()) {
+        return 0;
+    }
+
+    qulonglong size = storage.bytesAvailable();
     LOG_INFO() << "free disk space for" << path << size;
     return size;
 }
@@ -258,59 +171,33 @@ qulonglong Utils::filesystemFree(QString path)
 
 qulonglong Utils::filesystemTotal(QString path)
 {
-    qulonglong size = filesystemSize(path, FilesystemTotal);
+    QStorageInfo storage(path);
+    if (!storage.isValid()) {
+        return 0;
+    }
+
+    qulonglong size = storage.bytesTotal();
     LOG_INFO() << "total disk space for" << path << size;
     return size;
 }
 
 
-qulonglong Utils::filesystemSize(QString path, enum Utils::Size type)
+qulonglong Utils::filesystemClusterSize(QString path)
 {
     qulonglong size = 0;
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
-    // the usage of statfs() is deprecated by the LSB so use statvfs().
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
     struct statvfs fs;
-    int ret;
-
-    ret = statvfs(qPrintable(path), &fs);
-
-    if(ret == 0) {
-        if(type == FilesystemFree) {
-            size = (qulonglong)fs.f_frsize * (qulonglong)fs.f_bavail;
-        }
-        if(type == FilesystemTotal) {
-            size = (qulonglong)fs.f_frsize * (qulonglong)fs.f_blocks;
-        }
-        if(type == FilesystemClusterSize) {
-            size = (qulonglong)fs.f_frsize;
-        }
+    if (statvfs(qPrintable(path), &fs) == 0) {
+        size = (qulonglong)fs.f_frsize;
     }
-#endif
-#if defined(Q_OS_WIN32)
-    BOOL ret;
-    ULARGE_INTEGER freeAvailBytes;
-    ULARGE_INTEGER totalNumberBytes;
+#elif defined(Q_OS_WIN32)
+    DWORD sectorsPerCluster;
+    DWORD bytesPerSector;
+    DWORD dummy;
 
-    ret = GetDiskFreeSpaceExW((LPCTSTR)path.utf16(), &freeAvailBytes,
-            &totalNumberBytes, NULL);
-    if(ret) {
-        if(type == FilesystemFree) {
-            size = freeAvailBytes.QuadPart;
-        }
-        if(type == FilesystemTotal) {
-            size = totalNumberBytes.QuadPart;
-        }
-        if(type == FilesystemClusterSize) {
-            DWORD sectorsPerCluster;
-            DWORD bytesPerSector;
-            DWORD freeClusters;
-            DWORD totalClusters;
-            ret = GetDiskFreeSpaceW((LPCTSTR)path.utf16(), &sectorsPerCluster,
-                    &bytesPerSector, &freeClusters, &totalClusters);
-            if(ret) {
-                size = bytesPerSector * sectorsPerCluster;
-            }
-        }
+    if (GetDiskFreeSpaceW((LPCWSTR)path.utf16(), &sectorsPerCluster,
+                          &bytesPerSector, &dummy, &dummy)) {
+        size = bytesPerSector * sectorsPerCluster;
     }
 #endif
     return size;
@@ -319,38 +206,10 @@ qulonglong Utils::filesystemSize(QString path, enum Utils::Size type)
 //! \brief searches for a Executable in the Environement Path
 QString Utils::findExecutable(QString name)
 {
-    //try autodetect tts
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
-#if QT_VERSION >= 0x050e00
-    QStringList path = QString(getenv("PATH")).split(":", Qt::SkipEmptyParts);
-#else
-    QStringList path = QString(getenv("PATH")).split(":", QString::SkipEmptyParts);
-#endif
-#elif defined(Q_OS_WIN)
-#if QT_VERSION >= 0x050e00
-    QStringList path = QString(getenv("PATH")).split(";", Qt::SkipEmptyParts);
-#else
-    QStringList path = QString(getenv("PATH")).split(";", QString::SkipEmptyParts);
-#endif
-#endif
-    LOG_INFO() << "system path:" << path;
-    for(int i = 0; i < path.size(); i++)
-    {
-        QString executable = QDir::fromNativeSeparators(path.at(i)) + "/" + name;
-#if defined(Q_OS_WIN)
-        executable += ".exe";
-#if QT_VERSION >= 0x050e00
-        QStringList ex = executable.split("\"", Qt::SkipEmptyParts);
-#else
-        QStringList ex = executable.split("\"", QString::SkipEmptyParts);
-#endif
-        executable = ex.join("");
-#endif
-        if(QFileInfo(executable).isExecutable())
-        {
-            LOG_INFO() << "findExecutable: found" << executable;
-            return QDir::toNativeSeparators(executable);
-        }
+    QString executable = QStandardPaths::findExecutable(name);
+    if (!executable.isEmpty()) {
+        LOG_INFO() << "findExecutable: found" << executable;
+        return QDir::toNativeSeparators(executable);
     }
     LOG_INFO() << "findExecutable: could not find" << name;
     return "";
@@ -523,7 +382,7 @@ QString Utils::resolveDevicename(QString path)
 
 #endif
 
-#if defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
+#if defined(Q_OS_MACOS) || defined(Q_OS_OPENBSD)
     int num;
     struct statfs *mntinf;
 
@@ -607,7 +466,7 @@ QString Utils::resolveMountPoint(QString device)
 
 #endif
 
-#if defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
+#if defined(Q_OS_MACOS) || defined(Q_OS_OPENBSD)
     int num;
     struct statfs *mntinf;
 
@@ -653,75 +512,36 @@ QString Utils::resolveMountPoint(QString device)
 QStringList Utils::mountpoints(enum MountpointsFilter type)
 {
     QStringList supported;
-    QStringList tempList;
+    QStringList paths;
+
+    // Note: QStorageInfo::fileSystemType() result is platform-dependant!
 #if defined(Q_OS_WIN32)
-    supported << "FAT32" << "FAT16" << "FAT12" << "FAT" << "HFS";
-    QFileInfoList list = QDir::drives();
-    for(int i=0; i<list.size();i++)
-    {
-        wchar_t t[32];
-        memset(t, 0, 32);
-        if(GetVolumeInformationW((LPCWSTR)list.at(i).absolutePath().utf16(),
-                NULL, 0, NULL, NULL, NULL, t, 32) == 0) {
-            // on error empty retrieved type -- don't rely on
-            // GetVolumeInformation not changing it.
-            memset(t, 0, sizeof(t));
-        }
-
-        QString fstype = QString::fromWCharArray(t);
-        if(type == MountpointsAll || supported.contains(fstype)) {
-            tempList << list.at(i).absolutePath();
-            LOG_INFO() << "Added:" << list.at(i).absolutePath()
-                     << "type" << fstype;
-        }
-        else {
-            LOG_INFO() << "Ignored:" << list.at(i).absolutePath()
-                     << "type" << fstype;
-        }
-    }
-
-#elif defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
-    supported << "vfat" << "msdos" << "hfs";
-    int num;
-    struct statfs *mntinf;
-
-    num = getmntinfo(&mntinf, MNT_WAIT);
-    while(num--) {
-        if(type == MountpointsAll || supported.contains(mntinf->f_fstypename)) {
-            tempList << QString(mntinf->f_mntonname);
-            LOG_INFO() << "Added:" << mntinf->f_mntonname
-                     << "is" << mntinf->f_mntfromname << "type" << mntinf->f_fstypename;
-        }
-        else {
-            LOG_INFO() << "Ignored:" << mntinf->f_mntonname
-                     << "is" << mntinf->f_mntfromname << "type" << mntinf->f_fstypename;
-        }
-        mntinf++;
-    }
+    supported = {"FAT32", "FAT16", "FAT12", "FAT", "HFS"};
+#elif defined(Q_OS_MACOS) || defined(Q_OS_OPENBSD)
+    supported = {"vfat", "msdos", "hfs"}; // vfat might not be needed
 #elif defined(Q_OS_LINUX)
-    supported << "vfat" << "msdos" << "hfsplus";
-    FILE *mn = setmntent("/etc/mtab", "r");
-    if(!mn)
-        return QStringList("");
-
-    struct mntent *ent;
-    while((ent = getmntent(mn))) {
-        if(type == MountpointsAll || supported.contains(ent->mnt_type)) {
-            tempList << QString(ent->mnt_dir);
-            LOG_INFO() << "Added:" << ent->mnt_dir
-                     << "is" << ent->mnt_fsname << "type" << ent->mnt_type;
-        }
-        else {
-            LOG_INFO() << "Ignored:" << ent->mnt_dir
-                     << "is" << ent->mnt_fsname << "type" << ent->mnt_type;
-        }
-    }
-    endmntent(mn);
-
+    supported = {"vfat", "msdos", "hfsplus"}; // hfs might be needed, too
 #else
 #error Unknown Platform
 #endif
-    return tempList;
+
+    for (const QStorageInfo &storage : QStorageInfo::mountedVolumes()) {
+        if (!storage.isValid() || storage.isReadOnly()) {
+            continue;
+        }
+
+        QString fsType = QString::fromLocal8Bit(storage.fileSystemType());
+        QString rootPath = storage.rootPath();
+
+        if (type == MountpointsAll || supported.contains(fsType, Qt::CaseInsensitive)) {
+            paths << rootPath;
+            LOG_INFO() << "Added:" << rootPath << "type" << fsType;
+        } else {
+            LOG_INFO() << "Ignored:" << rootPath << "type" << fsType;
+        }
+    }
+
+    return paths;
 }
 
 
@@ -763,35 +583,46 @@ QMap<QString, QList<int> > Utils::findRunningProcess(QStringList names)
     } while(result);
     CloseHandle(hdl);
 #endif
-#if defined(Q_OS_MACX)
-    ProcessSerialNumber psn = { 0, kNoProcess };
-    OSErr err;
-    do {
-        pid_t pid;
-        err = GetNextProcess(&psn);
-        err = GetProcessPID(&psn, &pid);
-        if(err == noErr) {
-            char buf[32] = {0};
-            ProcessInfoRec info;
-            memset(&info, 0, sizeof(ProcessInfoRec));
-            info.processName = (unsigned char*)buf;
-            info.processInfoLength = sizeof(ProcessInfoRec);
-            err = GetProcessInformation(&psn, &info);
-            if(err == noErr) {
-                // some processes start with nonprintable characters. Skip those.
-                int i;
-                for(i = 0; i < 32; i++) {
-                    if(isprint(buf[i])) break;
-                }
-                // avoid adding duplicates.
-                QString name = QString::fromUtf8(&buf[i]);
-                if(processlist.find(name) == processlist.end()) {
-                    processlist.insert(name, QList<int>());
-                }
-                processlist[name].append(pid);
-            }
+#if defined(Q_OS_MACOS)
+    int bufferSize = proc_listallpids(nullptr, 0);
+    if (bufferSize <= 0) {
+        LOG_ERROR() << "proc_listallpids failed.";
+        return found;
+    }
+
+    int count = bufferSize / sizeof(pid_t);
+    QVector<pid_t> pids(count);
+    bufferSize = proc_listallpids(pids.data(), (int)(pids.size() * sizeof(pid_t)));
+
+    if (bufferSize <= 0) {
+        LOG_ERROR() << "proc_listallpids failed (2).";
+        return found;
+    }
+
+    char pathBuffer[PROC_PIDPATHINFO_MAXSIZE];
+
+    for (int i = 0; i < count; ++i) {
+        pid_t pid = pids[i];
+        if (pid <= 0) continue;
+
+        // Get executable path
+        int ret = proc_pidpath(pid, pathBuffer, sizeof(pathBuffer));
+        if (ret <= 0) continue;
+
+        QString fullPath = QString::fromUtf8(pathBuffer);
+
+        // Extract process name from path
+        QString name = QFileInfo(fullPath).fileName();
+
+        if (name.isEmpty())
+            continue;
+
+        if (!processlist.contains(name)) {
+            processlist.insert(name, QList<int>());
         }
-    } while(err == noErr);
+
+        processlist[name].append(pid);
+    }
 #endif
 #if defined(Q_OS_LINUX)
     // not implemented for Linux!
@@ -920,7 +751,7 @@ QList<int> Utils::suspendProcess(QList<int> pidlist, bool suspend)
         CloseHandle(hToken);
     }
 #endif
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
     int signal = suspend ? SIGSTOP : SIGCONT;
     for(int i = 0; i < pidlist.size(); i++) {
         pid_t pid = pidlist[i];
@@ -947,7 +778,7 @@ QList<int> Utils::suspendProcess(QList<int> pidlist, bool suspend)
  *  @param device mountpoint of the device
  *  @return true on success, fals otherwise.
  */
-bool Utils::ejectDevice(QString device)
+bool Utils::ejectDevice(const QString &device)
 {
 #if defined(Q_OS_WIN32)
     /* See http://support.microsoft.com/kb/165721 on the procedure to eject a
@@ -997,53 +828,26 @@ bool Utils::ejectDevice(QString device)
     return success;
 
 #endif
-#if defined(Q_OS_MACX)
-    // FIXME: FSUnmountVolumeSync is deprecated starting with 10.8.
+#if defined(Q_OS_MACOS)
     // Use DADiskUnmount / DiskArbitration framework eventually.
-    // BSD label does not include folder.
-    QString bsd = Utils::resolveDevicename(device).remove("/dev/");
-    OSStatus result;
-    ItemCount index = 1;
-    bool found = false;
+    QStorageInfo info(device);
+    if (!info.isValid())
+        return false;
 
-    do {
-        FSVolumeRefNum volrefnum;
+    QString mountPoint = info.rootPath();
 
-        result = FSGetVolumeInfo(kFSInvalidVolumeRefNum, index, &volrefnum,
-                kFSVolInfoFSInfo, NULL, NULL, NULL);
-        if(result == noErr) {
-            GetVolParmsInfoBuffer volparms;
-            /* See above -- PBHGetVolParmsSync() is not available for 64bit,
-             * and FSGetVolumeParms() on 10.5+ only. */
-#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
-            if(FSGetVolumeParms(volrefnum, &volparms, sizeof(volparms)) == noErr)
-#else
-            HParamBlockRec hpb;
-            hpb.ioParam.ioNamePtr = NULL;
-            hpb.ioParam.ioVRefNum = volrefnum;
-            hpb.ioParam.ioBuffer = (Ptr)&volparms;
-            hpb.ioParam.ioReqCount = sizeof(volparms);
-            if(PBHGetVolParmsSync(&hpb) == noErr)
-#endif
-            {
-                if(volparms.vMServerAdr == 0) {
-                    if(bsd == (char*)volparms.vMDeviceID) {
-                        pid_t dissenter;
-                        result = FSUnmountVolumeSync(volrefnum, 0, &dissenter);
-                        found = true;
-                        break;
-                    }
-                }
-            }
-        }
-        index++;
-    } while(result == noErr);
-    if(result == noErr && found)
-        return true;
+    QProcess proc;
+    proc.start("/usr/sbin/diskutil", {"eject", mountPoint});
+    if (!proc.waitForFinished())
+        return false;
 
+    return proc.exitStatus() == QProcess::NormalExit &&
+           proc.exitCode() == 0;
 #endif
 #if defined(Q_OS_LINUX)
     (void)device;
+    // TODO: eject [<device>|<mountPoint>] or
+    // udisksctl unmount -b <device> && udisksctl power-off -b <device>
 #endif
     return false;
 }
@@ -1052,13 +856,10 @@ bool Utils::ejectDevice(QString device)
 qint64 Utils::recursiveFolderSize(QString path)
 {
     qint64 size = 0;
-    QList<QFileInfo> items = QDir(path).entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
-    for (const auto &item: qAsConst(items)) {
-        size += item.size();
-    }
-    QList<QString> folders = QDir(path).entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-    for (auto const& folder: qAsConst(folders)) {
-        size += recursiveFolderSize(path + "/" + folder);
+    QDirIterator it(path, QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+    while (it.hasNext()) {
+        it.next();
+        size += it.fileInfo().size();
     }
     return size;
 }
diff --git a/utils/rbutilqt/base/utils.h b/utils/rbutilqt/base/utils.h
index c3c7cb949c..5cab48d3df 100644
--- a/utils/rbutilqt/base/utils.h
+++ b/utils/rbutilqt/base/utils.h
@@ -45,19 +45,19 @@ public:
     static QString resolvePathCase(QString path);
     static qulonglong filesystemFree(QString path);
     static qulonglong filesystemTotal(QString path);
-    static qulonglong filesystemSize(QString path, enum Size type);
+    static qulonglong filesystemClusterSize(QString path);
     static QString filesystemType(QString path);
     static QString findExecutable(QString name);
     static QString checkEnvironment(bool permission);
     static int compareVersionStrings(QString s1, QString s2);
     static QString trimVersionString(QString s);
-    static QString filesystemName(QString path);
+    static QString filesystemName(const QString &path);
     static QStringList mountpoints(enum MountpointsFilter type = MountpointsAll);
     static QString resolveDevicename(QString path);
     static QString resolveMountPoint(QString device);
     static QMap<QString, QList<int> > findRunningProcess(QStringList names);
     static QList<int> suspendProcess(QList<int> pidlist, bool suspend);
-    static bool ejectDevice(QString device);
+    static bool ejectDevice(const QString &device);
     static qint64 recursiveFolderSize(QString path);
 };
 
diff --git a/utils/rbutilqt/base/voicefile.cpp b/utils/rbutilqt/base/voicefile.cpp
index af5c94fd67..1daaa0b9a8 100644
--- a/utils/rbutilqt/base/voicefile.cpp
+++ b/utils/rbutilqt/base/voicefile.cpp
@@ -95,6 +95,7 @@ bool VoiceFileCreator::createVoiceFile()
                     emit logItem(tr("Extracted voice corrections file from installation"), LOGINFO);
                     corrFile = &corrfileT;
                 } else {
+                    // XXX try to fetch an updated file via voicecorrections_url ?
                     corrfileT.close();
                     emit logItem(tr("Using internal voice corrections file"), LOGINFO);
                     QFile corrfile(":/builtin/voice-corrections.txt");
@@ -266,11 +267,7 @@ void VoiceFileCreator::create(void)
     //read in downloaded file
     emit logItem(tr("Reading strings..."),LOGINFO);
     QTextStream in(&genlang);
-#if QT_VERSION < 0x060000
-    in.setCodec("UTF-8");
-#else
     in.setEncoding(QStringConverter::Utf8);
-#endif
     QString id, voice;
     bool idfound = false;
     bool voicefound=false;
diff --git a/utils/rbutilqt/base/zipinstaller.cpp b/utils/rbutilqt/base/zipinstaller.cpp
index 0b6b3c6787..f97adfb492 100644
--- a/utils/rbutilqt/base/zipinstaller.cpp
+++ b/utils/rbutilqt/base/zipinstaller.cpp
@@ -145,7 +145,7 @@ void ZipInstaller::downloadDone(QNetworkReply::NetworkError error)
         // cluster sizes on the player).
         if((qint64)Utils::filesystemFree(m_mountpoint)
                 < (zip.totalUncompressedSize(
-                       Utils::filesystemSize(m_mountpoint, Utils::FilesystemClusterSize))
+                       Utils::filesystemClusterSize(m_mountpoint))
                         + 1000000)) {
             emit logItem(tr("Not enough disk space! Aborting."), LOGERROR);
             emit logProgress(1, 1);
diff --git a/utils/rbutilqt/changelog.txt b/utils/rbutilqt/changelog.txt
index e2eb98cc76..d656142e69 100644
--- a/utils/rbutilqt/changelog.txt
+++ b/utils/rbutilqt/changelog.txt
@@ -55,3 +55,5 @@ Version 1.5.2
 * Generate additional talk clips for language name and 'invalid voice file'
 * When installing development builds, fall back to daily artefacts for non-firmware files
 * Where possible, extract voice corrections file from the actual device
+* Port TTS preview to QT6
+* Drop support for Qt5, now requires Qt6.
diff --git a/utils/rbutilqt/configure.cpp b/utils/rbutilqt/configure.cpp
index 422c16d222..7b6d634c3f 100644
--- a/utils/rbutilqt/configure.cpp
+++ b/utils/rbutilqt/configure.cpp
@@ -20,8 +20,9 @@
 #include <QProgressDialog>
 #include <QFileDialog>
 #include <QUrl>
-#if defined(QT_MULTIMEDIA_LIB) && (QT_VERSION < 0x060000)
-#include <QSound>
+
+#if defined(QT_MULTIMEDIA_LIB)
+#include <QSoundEffect>
 #endif
 
 #include "version.h"
@@ -38,8 +39,10 @@
 #include "comboboxviewdelegate.h"
 #if defined(Q_OS_WIN32)
 #if defined(UNICODE)
+#ifndef _UNICODE
 #define _UNICODE
 #endif
+#endif
 #include <tchar.h>
 #include <windows.h>
 #endif
@@ -449,7 +452,7 @@ void Config::updateTtsState(int index)
     {
         ui.configTTSstatus->setText(tr("Configuration OK"));
         ui.configTTSstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/go-next.svg")));
-#if defined(QT_MULTIMEDIA_LIB) && (QT_VERSION < 0x060000)
+#if defined(QT_MULTIMEDIA_LIB)
         ui.testTTS->setEnabled(true);
 #else
         ui.testTTS->setEnabled(false);
@@ -581,7 +584,10 @@ QString Config::languageName(const QString &qmFile)
 
     QString file = "rbutil_" + qmFile;
     if(!translator.load(file, programPath))
-        translator.load(file, ":/lang");
+        if (!translator.load(file, ":/lang")) {
+            LOG_ERROR() << "Failed to load translation:" << file;
+            return ("Failed to load translation:" + file);
+        }
 
     return translator.translate("Configure", "English",
         "This is the localized language name, i.e. your language.");
@@ -608,10 +614,16 @@ void Config::updateLanguage()
     QString absolutePath = QCoreApplication::instance()->applicationDirPath();
 
     if(!translator->load("rbutil_" + language, absolutePath))
-        translator->load("rbutil_" + language, ":/lang");
+        if (!translator->load("rbutil_" + language, ":/lang")) {
+            LOG_ERROR() << "Failed to load translation:" << ("rbutil_" + language);
+            return;
+        }
     if(!qttrans->load("qt_" + language,
-                QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
-        qttrans->load("qt_" + language, ":/lang");
+                QLibraryInfo::path(QLibraryInfo::TranslationsPath)))
+        if (!qttrans->load("qt_" + language, ":/lang")) {
+            LOG_ERROR() << "Failed to load translation:" << ("qt_" + language);
+            return;
+        }
 
     qApp->installTranslator(translator);
     qApp->installTranslator(qttrans);
@@ -899,7 +911,7 @@ void Config::configTts()
 
 void Config::testTts()
 {
-#if defined(QT_MULTIMEDIA_LIB) && (QT_VERSION < 0x060000)
+#if defined(QT_MULTIMEDIA_LIB)
     QString errstr;
     int index = ui.comboTts->currentIndex();
     TTSBase* tts;
@@ -946,7 +958,11 @@ void Config::testTts()
     }
     tts->stop();
     if(!filename.isEmpty()) {
-        QSound::play(filename);
+        QSoundEffect effect;
+        effect.setSource(QUrl::fromLocalFile(filename));
+        effect.setLoopCount(0);
+        effect.setVolume(1.0f);
+        effect.play();
     }
     ui.testTTS->setEnabled(true);
     delete tts; /* Config objects are never deleted (in fact, they are
@@ -986,4 +1002,3 @@ void Config::changeEvent(QEvent *e)
         QWidget::changeEvent(e);
     }
 }
-
diff --git a/utils/rbutilqt/encttscfggui.cpp b/utils/rbutilqt/encttscfggui.cpp
index e0f203bc1c..35e73ae907 100644
--- a/utils/rbutilqt/encttscfggui.cpp
+++ b/utils/rbutilqt/encttscfggui.cpp
@@ -7,7 +7,6 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2007 by Dominik Wenger
- *   $Id: encoders.h 17902 2008-06-30 22:09:45Z bluebrother $
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -124,7 +123,7 @@ QWidget* EncTtsCfgGui::createWidgets(EncTtsSetting* setting)
             value = spinBox;
 
             connect(spinBox, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
-                    this, [=](double value) {
+                    this, [=, this](double value) {
                         this->m_settingsWidgetsMap.key(spinBox)->setCurrent(value, false);
                     });
             connect(setting, &EncTtsSetting::updateGui, this,
@@ -146,7 +145,7 @@ QWidget* EncTtsCfgGui::createWidgets(EncTtsSetting* setting)
             spinBox->setValue(setting->current().toInt());
             value = spinBox;
             connect(spinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
-                    this, [=](int value) {
+                    this, [=, this](int value) {
                         this->m_settingsWidgetsMap.key(spinBox)->setCurrent(value, false);
                     });
             connect(setting, &EncTtsSetting::updateGui, this,
@@ -167,7 +166,7 @@ QWidget* EncTtsCfgGui::createWidgets(EncTtsSetting* setting)
             value = lineEdit;
 
             connect(lineEdit, &QLineEdit::textChanged,
-                    this, [=](QString value) {
+                    this, [=, this](QString value) {
                         this->m_settingsWidgetsMap.key(lineEdit)->setCurrent(value, false);
                     });
             connect(setting, &EncTtsSetting::updateGui, this,
@@ -199,7 +198,7 @@ QWidget* EncTtsCfgGui::createWidgets(EncTtsSetting* setting)
             int index = comboBox->findText(setting->current().toString());
             comboBox->setCurrentIndex(index);
             connect(comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-                    this, [=](int) {
+                    this, [=, this](int) {
                         this->m_settingsWidgetsMap.key(comboBox)->setCurrent(comboBox->currentText(), false);
                     });
             value = comboBox;
@@ -220,8 +219,8 @@ QWidget* EncTtsCfgGui::createWidgets(EncTtsSetting* setting)
             checkbox->setAccessibleName(setting->name());
             checkbox->setCheckState(setting->current().toBool() == true
                                     ? Qt::Checked : Qt::Unchecked);
-            connect(checkbox, &QCheckBox::stateChanged,
-                    this, [=](int value) {
+            connect(checkbox, &QCheckBox::checkStateChanged,
+                    this, [=, this](int value) {
                         this->m_settingsWidgetsMap.key(checkbox)->setCurrent(value, false);
                     });
             value = checkbox;
@@ -307,5 +306,3 @@ void EncTtsCfgGui::reject(void)
 {
     this->done(0);
 }
-
-
diff --git a/utils/rbutilqt/gui/changelog.cpp b/utils/rbutilqt/gui/changelog.cpp
index f256f3805c..291ab8af01 100644
--- a/utils/rbutilqt/gui/changelog.cpp
+++ b/utils/rbutilqt/gui/changelog.cpp
@@ -45,11 +45,7 @@ QString Changelog::parseChangelogFile(QString filename)
     QFile changelog(filename);
     changelog.open(QIODevice::ReadOnly);
     QTextStream c(&changelog);
-#if QT_VERSION < 0x060000
-    c.setCodec(QTextCodec::codecForName("UTF-8"));
-#else
     c.setEncoding(QStringConverter::Utf8);
-#endif
     QString text;
     while(!c.atEnd()) {
         QString line = c.readLine();
diff --git a/utils/rbutilqt/gui/selectiveinstallwidget.cpp b/utils/rbutilqt/gui/selectiveinstallwidget.cpp
index 811a7eeacf..1a81ae3d8f 100644
--- a/utils/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/utils/rbutilqt/gui/selectiveinstallwidget.cpp
@@ -187,14 +187,15 @@ void SelectiveInstallWidget::updateVoiceLangs()
             ui.voiceCombobox->addItem(it.value().toString(), it.key());
             LOG_INFO() << "available voices: adding" << it.key();
         }
-
     }
     // try to select the previously selected one again (if still present)
-    // TODO: Fall back to system language if not found, or english.
     int sel = ui.voiceCombobox->findData(current);
     if(sel >= 0)
         ui.voiceCombobox->setCurrentIndex(sel);
+    else
+        ui.voiceCombobox->setCurrentIndex(ui.voiceCombobox->findData("english"));
 
+    // TODO: Fall back to system language before the final "english" fallback.
 }
 
 
diff --git a/utils/rbutilqt/icons/players/agptekrocker-small.png b/utils/rbutilqt/icons/players/agptekrocker-small.png
new file mode 100644
index 0000000000..06eadec1d3
Binary files /dev/null and b/utils/rbutilqt/icons/players/agptekrocker-small.png differ
diff --git a/utils/rbutilqt/icons/players/aigoerosq-small.png b/utils/rbutilqt/icons/players/aigoerosq-small.png
new file mode 100644
index 0000000000..fcaf7b69e1
Binary files /dev/null and b/utils/rbutilqt/icons/players/aigoerosq-small.png differ
diff --git a/utils/rbutilqt/icons/players/erosqnative-small.png b/utils/rbutilqt/icons/players/erosqnative-small.png
new file mode 100644
index 0000000000..fcaf7b69e1
Binary files /dev/null and b/utils/rbutilqt/icons/players/erosqnative-small.png differ
diff --git a/utils/rbutilqt/icons/players/xduoox20-small.png b/utils/rbutilqt/icons/players/xduoox20-small.png
new file mode 100644
index 0000000000..f93bd5c9a0
Binary files /dev/null and b/utils/rbutilqt/icons/players/xduoox20-small.png differ
diff --git a/utils/rbutilqt/icons/players/xduoox3-small.png b/utils/rbutilqt/icons/players/xduoox3-small.png
new file mode 100644
index 0000000000..c3b6b373e5
Binary files /dev/null and b/utils/rbutilqt/icons/players/xduoox3-small.png differ
diff --git a/utils/rbutilqt/icons/players/xduoox3ii-small.png b/utils/rbutilqt/icons/players/xduoox3ii-small.png
new file mode 100644
index 0000000000..7aa01dfea5
Binary files /dev/null and b/utils/rbutilqt/icons/players/xduoox3ii-small.png differ
diff --git a/utils/rbutilqt/installtalkwindow.cpp b/utils/rbutilqt/installtalkwindow.cpp
index a3570196f5..c8bcdcec2e 100644
--- a/utils/rbutilqt/installtalkwindow.cpp
+++ b/utils/rbutilqt/installtalkwindow.cpp
@@ -110,11 +110,7 @@ void InstallTalkWindow::accept()
     talkcreator->setStripExtensions(ui.StripExtensions->isChecked());
     talkcreator->setTalkFolders(ui.talkFolders->isChecked());
     talkcreator->setTalkFiles(ui.talkFiles->isChecked());
-#if QT_VERSION >= 0x050e00
     talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",", Qt::SkipEmptyParts));
-#else
-    talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",", QString::SkipEmptyParts));
-#endif
 
     connect(talkcreator, &TalkFileCreator::done, logger, &ProgressLoggerGui::setFinished);
     connect(talkcreator, &TalkFileCreator::logItem, logger, &ProgressLoggerGui::addItem);
@@ -185,4 +181,3 @@ void InstallTalkWindow::changeEvent(QEvent *e)
         QWidget::changeEvent(e);
     }
 }
-
diff --git a/utils/rbutilqt/lame/lame.h b/utils/rbutilqt/lame/lame.h
index 0550b4b61c..03748afa58 100644
--- a/utils/rbutilqt/lame/lame.h
+++ b/utils/rbutilqt/lame/lame.h
@@ -19,7 +19,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/* $Id: lame.h,v 1.170.2.4 2009/01/18 15:44:28 robert Exp $ */
 
 #ifndef LAME_LAME_H
 #define LAME_LAME_H
diff --git a/utils/rbutilqt/lang/rbutil_cs.ts b/utils/rbutilqt/lang/rbutil_cs.ts
index 64f6ecb481..bc75a3da39 100644
--- a/utils/rbutilqt/lang/rbutil_cs.ts
+++ b/utils/rbutilqt/lang/rbutil_cs.ts
@@ -45,37 +45,37 @@
         <translation>Počítám celikost instalace ...</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="88"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation>Vyberte pojmenování zálohy</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="108"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation>Velikost instalace: %L1 %2</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="115"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation>Soubor už existuje</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation>Soubor se zálohou již existuje. Přepsat?</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="124"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation>Spouštím zálohování ...</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="143"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation>Zálohování úspěšné.</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="146"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation>Zálohování selhalo!</translation>
     </message>
@@ -582,47 +582,51 @@
 <context>
     <name>BootloaderInstallImx</name>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
         <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation>Instalace zavaděče vyžaduje kopii původního firmware Sandisk (soubor firmware.sb). Ten bude opatchován a instalován do vašeho přehrávače spolu se zavaděčem Rockboxu. Z právních důvodů si tento soubor musíte stáhnou sami. Navštivte prosím &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;fórum Sansa Sandisk&lt;/a&gt; nebo se podívejte na &lt;a href=&apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki stránku jak ho získat. &lt;br/&gt;Vyberte OK pro pokračování a vyberte umístění souboru ve vašem počítači.</translation>
+        <translation type="vanished">Instalace zavaděče vyžaduje kopii původního firmware Sandisk (soubor firmware.sb). Ten bude opatchován a instalován do vašeho přehrávače spolu se zavaděčem Rockboxu. Z právních důvodů si tento soubor musíte stáhnou sami. Navštivte prosím &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;fórum Sansa Sandisk&lt;/a&gt; nebo se podívejte na &lt;a href=&apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki stránku jak ho získat. &lt;br/&gt;Vyberte OK pro pokračování a vyberte umístění souboru ve vašem počítači.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation>Nepodařilo se přečíst původní firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation>Stahuji soubor zavaděče</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation>Patchuji soubor...</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation>Patchování původního firmware selhalo</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation>Soubor firmware úspěšně opatchován</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation>Zavaděč úspěšně nainstalován</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation>Opatchovaný zavaděč nemohl být nainstalován</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation>Pro odinstalaci proveďte běžnou aktualizaci s neupravovaným původním firmware.</translation>
     </message>
@@ -796,77 +800,77 @@ Viz https://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>Instalace zavaděče vyžaduje kopii původního firmware (soubor bin). Z právních důvodů si tento soubor musíte stáhnou sami. Podívejte se prosím do &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;příručky&lt;/a&gt; a na &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki stránku jak ho získat. &lt;br/&gt;Vyberte OK pro pokračování a vyberte umístění souboru ve vašem počítači.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation>Stahuji soubor zavaděče</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation>Nepodařilo se otevřít původní firmware.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation>Nelze přečíst původní firmware.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation>Načtený firmware nevypadá jako původní MPIO firmware.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation>Nelze otevřít výstupní soubor.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation>Nelze zapsat výstupní soubor.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation>Neznámá chyba číslo: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation>Nelze otevřít stažený zavaděč.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation>Místo pro zavaděč v OF souboru není prázdné.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation>Nelze přečíst stažený zavaděč.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation>Chybný kontrolní součet zavaděče.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation>Patchování původního firmware se nezdařilo: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation>Úspěch: Vytvořen modifikovaný firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation>Pro odinstalaci proveďte běžnou aktualizaci s neupravovaným původním firmware</translation>
     </message>
@@ -1333,127 +1337,127 @@ Viz https://www.rockbox.org/wiki/SansaE200Install
         <translation>Do přípojného bodu nelze zapisovat</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation>Nevybrán žádný přehrávač</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="204"/>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>Do zadané vyrovnávací paměti nelze zapisovat. Ponechejte prázdné pro nasměrování do dočasné složky systému.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="223"/>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>Budete muset opravit výše uvedené chyby, než budete moci pokračovat.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="226"/>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation>Chyba nastavení</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="310"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Aktuální velikost vyrovnávací paměti je %L1 kiB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="328"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation>Zobrazit skrytá zařízení</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="329"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation>Vybrali jste zobrazení zařízení, která jsou skrytá. Ta nejsou doporučena pro běžné uživatele. Pokračujte jen pokud víte, co děláte.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="438"/>
-        <location filename="../configure.cpp" line="904"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation>Chyba syntézy řeči</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="439"/>
-        <location filename="../configure.cpp" line="905"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>Spuštění vybrané syntézy řeči selhalo a nelze ji použít.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="445"/>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>Nastavení je v pořádku</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="484"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>Nastavení není platné</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="523"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation>Zjištění proxy</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="524"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation>Chybné nastavení proxy v systému!
 S tímto nastavením proxy nebude Rockbox Utilita fungovat. Ověřte, zda je v systému správně nastavena proxy. Skripty automatické konfigurace proxy (PAC) nejsou podporovány. Jestliže je váš systém používá, musíte proxy nastavit ručně.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="634"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation>Umístění vyrovnávací paměti</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="656"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation>%1 (%2 GiB of %3 GiB volné)</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="730"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation>Bylo zjištěno více zařízení. Odpojte prosím všechny nepotřebné a zkuste to znovu.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="733"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation>Zjištěná zařízení:</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="738"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation>(neznámé)</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="740"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation>%1 na %2</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation>Poznámka: Nezjištění připojených zařízení může být z více důvodů. Můžete mít méně připojených zařízení, než je v seznamu. V tomto případě nemusí být možné jednoznačně zjistit váš přehrávač.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="751"/>
-        <location filename="../configure.cpp" line="755"/>
-        <location filename="../configure.cpp" line="800"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation>Zjištění zařízení</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="773"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>Nalezen %1 v MTP režimu!
 Musíte přepnout váš přehrávač do MSC módu, aby instalace proběhla. </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="782"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation>Nalezen %1 &quot;MacPod&quot;!
@@ -1464,7 +1468,7 @@ Rockbox potřebuje k běhu Ipod naformátovaný jako FAT (tzv. &quot;WinPod&quot
         <translation type="obsolete">Fatální chyba</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="766"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
@@ -1477,100 +1481,100 @@ Je nám líto, Rockbox neběží na vašem přehrávači.</translation>
         <translation type="obsolete">Fatální chyba: přehrávač neslučitelný</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="853"/>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>Automatická detekce</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="854"/>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Nelze zjistit přípojný bod.
 Vyberte svůj přípojný bod ručně.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Nelze zjistit zařízení.
 Vyberte své zařízení a přípojný bod ručně.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="789"/>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation>Přehrávač má nekompatibilní souborový systém.
 Ujistěte se, že přehrávač je ve správném přípojném bodu a má souborový systém slučitelný s Rockboxem.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="797"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation>Při detekci přehrávače nastala neznámá chyba.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="864"/>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>Opravdu vymazat vyrovnávací paměť?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="865"/>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Chcete opravdu vymazat vyrovnávací paměť? Ujistěte se, že ano, protože se odstraní &lt;b&gt;veškeré&lt;/b&gt; soubory v tomto adresáři!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="873"/>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>Chybná cesta!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="874"/>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>Umístění vyrovnávací paměti je chybné. Přerušuji.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="911"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation>Nastavení syntézy řeči je chybné</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="912"/>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation>Nastavení syntézy řeči je chybné. 
 Prosím nastavte engine snytézy řeči.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="917"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation>Nelze spustit engine syntézy řeči.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="918"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation>Nelze spustit engine syntézy řeči.
 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="919"/>
-        <location filename="../configure.cpp" line="938"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation>
 Prosím nastavte engine syntézy řeči.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="933"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation>Hlasový test Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="936"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation>Nepodařil se hlasový test řetězce.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="937"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation>Nepodařil se hlasový test řetězce.
@@ -1797,7 +1801,7 @@ Prosím nastavte engine syntézy řeči.</translation>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Čeština</translation>
@@ -1859,18 +1863,18 @@ Prosím nastavte engine syntézy řeči.</translation>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="106"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation>Chyba syntézy řeči</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="107"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>Spuštění vybrané syntézy řeči selhalo a nelze ji použít.</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="111"/>
-        <location filename="../createvoicewindow.cpp" line="114"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Engine: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1878,32 +1882,32 @@ Prosím nastavte engine syntézy řeči.</translation>
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="44"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation>Čekání na engine...</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="91"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="94"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="257"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation>Procházet</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="272"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation>Obnovit</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="263"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation>Vyberte spustitelný soubor</translation>
     </message>
@@ -1972,18 +1976,18 @@ Prosím nastavte engine syntézy řeči.</translation>
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation>Verze</translation>
     </message>
     <message>
-        <location filename="../gui/infowidget.cpp" line="47"/>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation>Načítám, prosím čekejte...</translation>
     </message>
@@ -2175,27 +2179,27 @@ Prosím nastavte engine syntézy řeči.</translation>
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="339"/>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation>Stabilní (historická)</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="342"/>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation>Nepoužitelný</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="345"/>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation>Nestabilní</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="348"/>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation>Stabilní</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="351"/>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
@@ -2253,7 +2257,7 @@ Prosím nastavte engine syntézy řeči.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="616"/>
+        <location filename="../configure.cpp" line="621"/>
         <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -2331,33 +2335,33 @@ Prosím nastavte engine syntézy řeči.</translation>
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="262"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>Chyba sítě</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="304"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation>Použité knihovny</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="384"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>Nová instalace</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="385"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Toto je nová instalace nebo verze Rockbox Utility. Nyní se otevře nastavení programu.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="392"/>
-        <location filename="../rbutilqt.cpp" line="623"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>Chyba nastavení</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Vaše nastavení je neplatné. Pravděpodobně kvůli změně cesty k zařízení. Nyní se otevře okno nastavení, které vám dovolí opravit problém.</translation>
     </message>
@@ -2372,17 +2376,17 @@ Prosím nastavte engine syntézy řeči.</translation>
         <translation>Zdá se, že se pokoušite tento program spustit skrze Wine. Prosíme nedělejte to, může dojít k chybám. Použijte raději nativní Linuxový port.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="211"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation>Čekejte prosím, stahuji informace o sestavení ...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation>Chyba certifikátu</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="229"/>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2401,19 +2405,19 @@ Platný do: %5
 Dočasně důvěřovat certifikátu?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="261"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation>Nelze stáhnout informace o verzi!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="263"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation>Nelze stáhnout informace o verzi!
 Chyba sítě: %1. Prosím zkontrolujte vaše nastavení sítě a proxy.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="275"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation>Informace o sestavení staženy.</translation>
     </message>
@@ -2422,7 +2426,7 @@ Chyba sítě: %1. Prosím zkontrolujte vaše nastavení sítě a proxy.</transla
         <translation type="vanished">Potvrdit instalaci</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="563"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>Připojovací bod je špatně!</translation>
     </message>
@@ -2447,32 +2451,32 @@ Chyba sítě: %1. Prosím zkontrolujte vaše nastavení sítě a proxy.</transla
         <translation type="vanished">Opravdu chcete instalovat hlasové soubory?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="494"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>Potvrdit odinstalování</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="495"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Opravdu chcete odinstalovat zavaděč?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="507"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation>Pro toto zařízení není známý způsob odinstalace.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="714"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation>Je k dispozici aktualizace Rockbox Utility.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="717"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation>Rockbox Utilita je aktuální.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="549"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>Potvrdit instalaci</translation>
     </message>
@@ -2485,67 +2489,67 @@ Chyba sítě: %1. Prosím zkontrolujte vaše nastavení sítě a proxy.</transla
         <translation type="vanished">Je instalována vývojová verze Rockboxu. Předpřipravené hlasy jsou k dispozici jen pro stabilní vydání. Prosím vytvořte si hlas pomocí funkce &quot;Vytvoření hlasového souboru&quot;.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="519"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation>Rockbox Utilita nemůže instalovat zavaděč na váš přehrávač. Proveďte aktualizaci firmware způsobem používaným výrobcem vašeho přehrávače.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="522"/>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation>Důležité: Spusťte na vašem přehrávači původní firmware před tím, než použijete aktualizační postup vašeho výrobce.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="530"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation>Nenalezen zavaděč Rockboxu.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="550"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Opravdu chcete instalovat Rockbox Utilitu na váš přehrávač? Po instalaci ji můžete spustit z disku přehrávače.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="559"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>Instaluji Rockbox Utilitu</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="577"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Chyba instalace Rocxbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="581"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>Instalace uživatelských nastavení</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="585"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>Chyba instalace uživatelských nastavení</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="589"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Úspěšná instalace Rockbox Utility.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="624"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Vaše nastavení je neplatné. Prosím zkontrolujte nastavení, zda jsou všechny vybrané hodnoty správné.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="645"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation>Kontroluji aktualizace ...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="709"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation>Je k dispozici aktualizace Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="710"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation>&lt;b&gt;Je k dispozici nová verze Rockbox Utility&lt;/b&gt;&lt;br&gt;&lt;br&gt;Používáte verzi %1. Stáhněte si verzi %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</translation>
     </message>
@@ -2558,22 +2562,22 @@ Chyba sítě: %1. Prosím zkontrolujte vaše nastavení sítě a proxy.</transla
         <translation type="vanished">&lt;b&gt;Je k dispozici nová verze Rockbox Utility.&lt;/b&gt; &lt;br&gt;&lt;br&gt;Stáhněte si ji zde: &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="740"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation>Zařízení odebráno</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="741"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation>Zařízení úspěšně odebráno. Přehrávač můžete odpojit od počítače.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="745"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation>Odebrání selhalo</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="746"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation>Odpojení zařízení selhalo. Ujistěte se, že žádný program nepracuje se zařízením. Pokud odpojení opětovně selže, použijte funkci odpojení vašeho operačního systému,.</translation>
     </message>
@@ -3021,17 +3025,17 @@ Chyba sítě: %1. Prosím zkontrolujte vaše nastavení sítě a proxy.</transla
         <translation>Toto bude v budoucnosti další stabilní verze Rockboxu, isntalací pomůžete jejímu testování.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="127"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation>Stabilní vydání (Verze %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation>Vývojová verze (Revize %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="129"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation>Kandidát pro vydání (Revize %1)</translation>
     </message>
@@ -3051,115 +3055,115 @@ Chyba sítě: %1. Prosím zkontrolujte vaše nastavení sítě a proxy.</transla
         <translation>Není dostupný pro vybranou verzi</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation>Denní sestavení (%1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="158"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation>Vybraný přehrávač nepotřebuje zavaděč.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="163"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation>Rockbox potřebuje ke spuštění zavaděč. Jeho instalace je zapotřebí jen při první instalaci.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="236"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation>Špatný připojovací bod</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="294"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation>Není známý žádný způsob instalace.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="318"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="319"/>
         <source>Bootloader detected</source>
         <translation>Zavaděč nalezen</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="319"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="320"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation>Zavaděč je již instalován. Opravdu chcete přeinstalovat zavaděč?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="323"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="324"/>
         <source>Bootloader installation skipped</source>
         <translation>Instalace zavaděče přeskočena</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="337"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="338"/>
         <source>Create Bootloader backup</source>
         <translation>Vytváří se záloha zavaděče</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="338"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="339"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation>Můžete vytvořit zálohu původního souboru zavaděče. Stiskněte &quot;Ano&quot; pro výběr adresáře na vašem počítači, kam se má tento soubor uložit. Soubor bude umístěn do nového podadresáře &quot;%1&quot; vytvořeného v tomto adresáři.
 Stiskněte &quot;Ne&quot; pro přeskočení tohoto kroku.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="345"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="346"/>
         <source>Browse backup folder</source>
         <translation>Vybrat zálohovací adresář</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="357"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="358"/>
         <source>Prerequisites</source>
         <translation>Předpoklady</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="362"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="363"/>
         <source>Bootloader installation aborted</source>
         <translation>Instalace zavaděče přerušena</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="372"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="373"/>
         <source>Bootloader files (%1)</source>
         <translation>Soubory zavaděče (%1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="374"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="375"/>
         <source>All files (*)</source>
         <translation>Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="376"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="377"/>
         <source>Select firmware file</source>
         <translation>Vyberte soubor firmware</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="378"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="379"/>
         <source>Error opening firmware file</source>
         <translation>Chyba otevírání souboru firmware</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="384"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="385"/>
         <source>Error reading firmware file</source>
         <translation>Chyba čtení souboru firmware</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="394"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="395"/>
         <source>Backup error</source>
         <translation>Chyba zálohování</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="395"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="396"/>
         <source>Could not create backup file. Continue?</source>
         <translation>Nelze vytvořit soubor se zálohou. Pokračovat?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="418"/>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="430"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation>Nutné ruční kroky</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="652"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation>Vaše instalace nepotřebuje žádné dodatečné soubory, přeskakuji.</translation>
     </message>
@@ -3168,12 +3172,12 @@ Stiskněte &quot;Ne&quot; pro přeskočení tohoto kroku.</translation>
         <translation type="vanished">Vaše instalace nepotřebuje žádné herní soubory, přeskakuji.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="224"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation>Pokračovat s instalací?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation>Opravdu pokračovat?</translation>
     </message>
@@ -3553,22 +3557,22 @@ Stiskněte &quot;Ne&quot; pro přeskočení tohoto kroku.</translation>
         <translation>Vytváření .talk souboru dokončeno</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="248"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation>Kopírování souboru přerušeno</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="267"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Kopírování od %1 do %2 selhalo</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="289"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation>Čištění...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="300"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation>Dokončeno</translation>
     </message>
@@ -3775,7 +3779,7 @@ Kód HTTP odpovědi: %1</translation>
         <translation>Nevybráno žádné téma, přeskakuji</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="359"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>Připojovací bod je špatně!</translation>
     </message>
@@ -3890,87 +3894,102 @@ Jsou nutná administrátorská práva.&lt;/li&gt;</translation>
         <translation>nelze nalézt rockbox-info.txt</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
         <source>Extracted voice strings from installation</source>
         <translation>Řetězce řeči získané z instalace</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="100"/>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation>Získané řetězce řeči nejsou kompatibilní</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation>Nepodařilo se získat řetězce z instalace, stahuji</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="172"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation>Stahuji informace o hlasu...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="185"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Chyba stahování: HTTP chyba %1.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="192"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>Použit cachovaný soubor.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="195"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>Chyba stahování: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="200"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>Stahování dokončena.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="213"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>otevření staženého souboru selhalo</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="219"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation>Čtení řetězců...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="275"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>Stažený soubor byl prázdný!</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="301"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation>Vytváří se hlasový soubor...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="306"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>Chyba otevírání staženého souboru</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="317"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>Chyba při otevírání výstupního souboru</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="341"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>úspěšně vytvořeno.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="350"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation>Čištění...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="361"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation>Dokončeno</translation>
     </message>
@@ -3978,12 +3997,12 @@ Jsou nutná administrátorská práva.&lt;/li&gt;</translation>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>hotovo.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="78"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>Stahuji soubor %1.%2</translation>
     </message>
@@ -3996,59 +4015,59 @@ Jsou nutná administrátorská práva.&lt;/li&gt;</translation>
         <translation type="vanished">Použit cachovaný soubor.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>Chyba stahování: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="128"/>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>Stahování dokončeno.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="135"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>Rozbaluji soubor.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="156"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation>Rozbalení selhalo!</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="149"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>Není dost místa na disku! Přerušuji.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation>Instalace balíčku úspěšně dokončena.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="113"/>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation>Chyba stahování: nastala HTTP chyba %1
 %2</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="125"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation>Stahování dokončeno (použita vyrovnávací paměť).</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="168"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>Instaluji soubor.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="180"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>Instalace souboru selhala.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="193"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>Vytváření instalačního výpisu</translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_de.ts b/utils/rbutilqt/lang/rbutil_de.ts
index 1d5308581c..9c17153a8d 100644
--- a/utils/rbutilqt/lang/rbutil_de.ts
+++ b/utils/rbutilqt/lang/rbutil_de.ts
@@ -45,37 +45,37 @@
         <translation>Installationsgröße: berechne ...</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="88"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation>Dateiname für Sicherung auswählen</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="108"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation>Installationsgröße: %L1 %2</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="115"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation>Datei existiert</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation>Ausgewählte Sicherungsdatei bereits vorhanden. Überschreiben?</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="124"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation>Starte Sicherung ...</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="143"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation>Sicherung erfolgreich.</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="146"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation>Sicherung fehlgeschlagen!</translation>
     </message>
@@ -582,47 +582,51 @@
 <context>
     <name>BootloaderInstallImx</name>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
         <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation>Die Bootloader-Installation erfordert eine Datei der Originalfirmware (firmware.sb-Datei). Die Firmware-Datei wird angepasst und auf dem Gerät mit dem Rockbox-Bootloader installiert. Aus rechtlichen Gründen muss diese Datei separat heruntergeladen werden. Diese Datei ist im &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa-Forum&lt;/a&gt; zu finden und auf der &lt;a href=&apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; Wiki-Seite beschrieben.&lt;br/&gt;OK, um fortzufahren und die Datei auf dem Computer auszuwählen.</translation>
+        <translation type="vanished">Die Bootloader-Installation erfordert eine Datei der Originalfirmware (firmware.sb-Datei). Die Firmware-Datei wird angepasst und auf dem Gerät mit dem Rockbox-Bootloader installiert. Aus rechtlichen Gründen muss diese Datei separat heruntergeladen werden. Diese Datei ist im &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa-Forum&lt;/a&gt; zu finden und auf der &lt;a href=&apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; Wiki-Seite beschrieben.&lt;br/&gt;OK, um fortzufahren und die Datei auf dem Computer auszuwählen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation>Konnte Original-Firmware-Datei nicht lesen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation>Lade Bootloader-Datei herunter</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation>Patche Firmware ...</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation>Modifizieren der Firmware-Datei fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation>Firmware-Datei erfolgreich modifiziert</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation>Bootloader erfolgreich installiert</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation>Modifizierter Bootloader konnte nicht installiert werden</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation>Zum deinstallieren ein Upgrade mit einer unveränderten Originalfirmware-Datei durchführen.</translation>
     </message>
@@ -796,77 +800,77 @@ Siehe https://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>Die Bootloader-Installation benötigt eine Firmware-Datei der originalen Firmware (bin-Datei). Diese Datei muss aus rechtlichen Gründen separat heruntergeladen werden. Informationen, wie diese Datei heruntergeladen werden kann, ist im &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;Handbuch&lt;/a&gt; und der Wiki-Seite &lt;a href=&apos;https://www.rockbox.org/wiki/MPIO200Port&apos;&gt;MPIO200Port&lt;/a&gt; aufgeführt.&lt;br/&gt;OK, um fortzufahren und die Datei auf dem Computer auszuwählen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation>Lade Bootloader-Datei herunter</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation>Konnte Firmware-Datei nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation>Konnte Firmware-Datei nicht lesen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation>Geladene Firmware-Datei scheint keine MPIO Firmware-Datei zu sein.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation>Konnte Ausgabedatei nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation>Kann Ausgabedatei nicht schreiben.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation>Unbekannter Fehler Nummer: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation>Kann heruntergeladenen Bootloader nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation>Zielbereich für Bootloader in Original-Firmware nicht leer.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation>Konnte heruntergeladenen Bootloader nicht lesen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation>Prüfsummenfehler im Bootloader.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation>Patchen der Original-Firmware fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation>Erfolg: modifizierte Firmware-Datei erzeugt</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation>Zum deinstallieren ein Upgrade mit einer unveränderten Originalfirmware-Datei durchführen</translation>
     </message>
@@ -1230,70 +1234,70 @@ Siehe https://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="853"/>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>Automatische Erkennung</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="854"/>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Konnte Einhängepunkt nicht erkennen.
 Bitte manuell auswählen.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Konnte kein Gerät erkennen.
 Bitte Gerät und Einhängepunkt manuell auswählen.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="789"/>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation>Das Dateisystem auf dem Gerät ist inkompatibel.
 Bitte sicherstellen dass der korrekte Einhängepunkt ausgewählt ist und das Gerät ein Dateisystem benutzt das mit Rockbox kompatibel ist.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="797"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation>Ein unbekannter Fehler während der Erkennung ist aufgetreten.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="864"/>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>Cache wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="865"/>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Cache wirklich löschen? Unbedingt sicherstellen, dass die Enstellungen korrekt sind, dies löscht &lt;b&gt;alle&lt;/b&gt; Dateien im Cache-Ordner!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="873"/>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>Pfad fehlerhaft!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="874"/>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>Cache-Pfad ist ungültig. Abbruch.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="310"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Aktuelle Cachegröße ist %L1 kiB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="445"/>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>Konfiguration OK</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="484"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>Konfiguration UNGÜLTIG</translation>
     </message>
@@ -1323,117 +1327,117 @@ Bitte sicherstellen dass der korrekte Einhängepunkt ausgewählt ist und das Ger
         <translation>Einhängepunkt ist nicht schreibbar</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation>Kein Gerät ausgewählt</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="204"/>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>Cache-Pfad ist nicht schreibbar. Um auf den temporären Pfad des Systems zurückzusetzen, den Pfad leer lassen.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="223"/>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>Die Fehler müssen beseitigt werden um fortzufahren.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="226"/>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation>Konfigurationsfehler</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="328"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation>Zeige deaktivierte Geräte</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="329"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation>Deaktivierte Geräte werden jetzt angezeigt. Deaktivierte Geräte sind nicht für Anwender gedacht. Bitte diese Option nur benutzen, wenn die Folgen klar sind.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="438"/>
-        <location filename="../configure.cpp" line="904"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation>TTS-Fehler</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="439"/>
-        <location filename="../configure.cpp" line="905"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>Ausgewähltes TTS-System konnte nicht initialisiert werden. TTS-System kann nicht verwendet werden.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="523"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation>Proxy-Erkennung</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="524"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation>Die System-Proxy-Werte sind ungültig!
 Rockbox Utility kann mit diesen Proxy-Einstellungen nicht arbeiten. Bitte sicherstellen, dass die Proxy-Einstellungen im System korrekt sind. Hinweis: &quot;Proxy Auto-Konfiguration (PAC)&quot;-Skripte werden von Rockbox Utility nicht unterstützt. Sofern das System dies benutzt, muss der Proxy manuell angegeben werden.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="634"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation>Cache-Pfad einstellen</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="656"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation>%1 (%2 GiB von %3 GiB frei)</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="730"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation>Mehrere Geräte gefunden. Bitte alle bis auf eins entfernen und erneut versuchen.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="733"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation>Erkannte Geräte:</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="738"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation>(unbekannt)</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="740"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation>%1 an %2</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation>Hinweis: die Erkennung ist möglicherweise nicht eindeutig. Möglicherweise sind weniger Geräte verbunden sein wie angezeigt. Sollte nur ein Gerät angeschlossen sein ist es nicht möglich das Gerät eindeutig zu identifizieren.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="751"/>
-        <location filename="../configure.cpp" line="755"/>
-        <location filename="../configure.cpp" line="800"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation>Geräteerkennung</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="782"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation>%1 &quot;MacPod&quot; gefunden!
 Rockbox benötigt einen mit dem Dateisystem FAT formatierten Ipod (sogenannter &quot;WinPod&quot;).</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="773"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>%1 im MTP-Modus gefunden!
 Das Gerät muss für die Installation im MSC-Modus sein.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="766"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
@@ -1442,48 +1446,48 @@ Sorry, Rockbox doesn&apos;t run on your player.</source>
 Rockbox funktioniert auf diesem Gerät leider nicht.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="911"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation>TTS-Konfiguration ungültig</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="912"/>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation>TTS-Konfiguration ungültig. Bitte TTS-System konfigurieren.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="917"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation>Konnte TTS-System nicht starten.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="918"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation>Konnte TTS-System nicht starten.
 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="919"/>
-        <location filename="../configure.cpp" line="938"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation>
 Bitte TTS-System konfigurieren.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="933"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation>Rockbox Utility Sprachtest</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="936"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation>Konnte Teststring nicht sprechen.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="937"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation>Konnte Teststring nicht sprechen.
@@ -1702,7 +1706,7 @@ Bitte TTS-System konfigurieren.</translation>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Deutsch</translation>
@@ -1764,18 +1768,18 @@ Bitte TTS-System konfigurieren.</translation>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="106"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation>TTS-Fehler</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="107"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>Ausgewähltes TTS-System konnte nicht initialisiert werden. TTS-System kann nicht verwendet werden.</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="111"/>
-        <location filename="../createvoicewindow.cpp" line="114"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>TTS-System: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1783,32 +1787,32 @@ Bitte TTS-System konfigurieren.</translation>
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="44"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation>Warte auf Engine ...</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="91"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="94"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="257"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation>Durchsuchen</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="272"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation>Aktualisieren</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="263"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation>Ausführbare Datei auswählen</translation>
     </message>
@@ -1877,18 +1881,18 @@ Bitte TTS-System konfigurieren.</translation>
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="../gui/infowidget.cpp" line="47"/>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2018,27 +2022,27 @@ Bitte TTS-System konfigurieren.</translation>
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="337"/>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation>Stabil (Final)</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="340"/>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation>Unbenutzbar</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="343"/>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation>Instabil</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="346"/>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation>Stabil</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="349"/>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
@@ -2096,7 +2100,7 @@ Bitte TTS-System konfigurieren.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="616"/>
+        <location filename="../configure.cpp" line="621"/>
         <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -2113,94 +2117,60 @@ Bitte TTS-System konfigurieren.</translation>
         <translation>(Unbekannter Produktname)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation>Installation des Bootloader ist fast abgeschlossen. Zum Abschluss der Installation ist es &lt;b&gt;notwendig&lt;/b&gt;, die folgenden Schritte manuell auszuführen:</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Gerät sicher entfernen.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Gerät mit der Original-Firmware starten.&lt;/li&gt;&lt;li&gt;Ein Firmware-Update mit der Update-Funktion der Original-Firmware entsprechend der Anleitung des Geräts durchführen.&lt;/li&gt;&lt;b&gt;Wichtig:&lt;/b&gt;Das Firmware-Update ist ein kritischer Prozess, der nicht unterbrochen werden darf. &lt;b&gt;Bitte darauf achten, dass der Akku vor dem Starten des Updates geladen ist.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;Nach Abschluß des Updates das Gerät neu starten.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation>&lt;li&gt;Eine eventuell eingelegte microSD-Karte entfernen&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="131"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Das Gerät entfernen. Es wird einen Neustart und ein Update der Original-Firmware durchführen. Für Details bitte das Handbuch des Gerätes beachten.&lt;br/&gt;&lt;b&gt;Wichtig:&lt;/b&gt;Das Firmware-Update ist ein kritischer Prozess, der nicht unterbrochen werden darf. &lt;b&gt;Unbedingt vor dem Trennen darauf achten dass das Gerät aufgeladen ist.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;Nach Abschluß des Updates das Gerät neu starten.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation>&lt;li&gt;Gerät ausschalten&lt;/li&gt;&lt;li&gt;Ladegerät anstecken&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation>&lt;li&gt;USB und Stromkabel abziehen&lt;/li&gt;&lt;li&gt;&lt;i&gt;Power&lt;/i&gt; gedrückt halten, um das Gerät auszuschalten&lt;/li&gt;&lt;li&gt;Batterieschalter am Gerät umlegen&lt;/li&gt;&lt;li&gt;&lt;i&gt;Power&lt;/i&gt; halten, um Rockbox zu booten&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;Hinweis:&lt;/b&gt; andere Teile von Rockbox können problemlos vorher installiert werden, aber die genannten Schritte sind &lt;b&gt;notwendig&lt;/b&gt;, um die Installation abzuschließen!&lt;/p&gt;</translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="60"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="60"/>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="66"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="66"/>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="74"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="74"/>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="80"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="80"/>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="188"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="188"/>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="193"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="193"/>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
         <location filename="../quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip-1.2/quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip_/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation>ZIP / Unzip API Fehler %1</translation>
     </message>
@@ -2208,92 +2178,92 @@ Bitte TTS-System konfigurieren.</translation>
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="493"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>Entfernen bestätigen</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="494"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Bootloader wirklich entfernen?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="506"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation>Keine Deinstallationsmethode für dieses Gerät verfügbar.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="529"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation>Kein Rockbox-Bootloader gefunden.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="548"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>Installation bestätigen</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="549"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Rockbox Utility wirklich auf dem Gerät installieren? Nach der Installation kann es von dem Laufwerk des Geräts ausgeführt werden.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>Installiere Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="708"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation>Update von Rockbox Utility verfügbar</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="709"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation>&lt;b&gt;Neue Version von Rockbox Utility verfügbar.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Aktuell verwendete Version ist %1. Version %2 ist verfügbar unter &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="713"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation>Neue Version von Rockbox Utility verfügbar.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="716"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation>Rockbox Utility ist aktuell.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="739"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation>Gerät ausgeworfen</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="740"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation>Gerät erfolgreich ausgeworfen. Es kann jetzt vom PC getrennt werden.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="744"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation>Auswerfen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="745"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation>Auswerfen fehlgeschlagen. Bitte sicherstellen dass keine anderen Programme auf Dateien auf dem Gerät zugreifen. Falls das Auswerfen dann immer noch fehltschlägt bitte die Auswerf-Funktion des Computers benutzen.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>Falscher Einhängepunkt!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation>Zertifikatsfehler</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="229"/>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2312,48 +2282,48 @@ Gültig bis: %5
 Zertifikat temporär akzeptieren?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="518"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation>Rockbox Utility kann den Bootloader auf dem Gerät nicht deinstallieren. Bitte ein Firmware-Update mit Hilfe des Update-Verfahrens des Herstellers durchführen.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="521"/>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation>Wichtig: bitte darauf achten das Gerät vor dem Update in die Herstellerfirmware zu booten.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="576"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Fehler beim installieren von Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="580"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>Installiere Benutzerkonfiguration</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="584"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>Fehler beim installieren der Benutzerkonfiguration</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="588"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Rockbox Utility erfolgreich installiert.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="391"/>
-        <location filename="../rbutilqt.cpp" line="622"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>Konfigurationsfehler</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="623"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Die Konfiguration ist ungültig. Bitte im Konfigurationsdialog sicherstellen, dass die Einstellungen korrekt sind.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="384"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Dies ist eine neue Installation oder eine neue Version von Rockbox Utility. Der Konfigurationsdialog wird nun automatisch geöffnet, um das Programm zu konfigurieren oder die Einstellungen zu prüfen.</translation>
     </message>
@@ -2368,49 +2338,49 @@ Zertifikat temporär akzeptieren?</translation>
         <translation>Es scheint so, als ob dieses Programm mit Wine ausgeführt wird. Dies wird fehlschlagen. Unter Linux bitte die native Linux-Version verwenden.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="263"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation>Kann Versions-Informationen nicht laden.
 Netzwerkfehler: %1. Bitte Netzwerk- und Proxy-Einstellungen überprüfen.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="383"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>Neue Installation</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="392"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Die Konfiguration ist ungültig. Dies kommt wahrscheinlich von einem geänderten Gerätepfad. Der Konfigurationsdialog wird geöffnet, damit das Problem korrigiert werden kann.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="262"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>Netzwerkfehler</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="211"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation>Lade Informationen über Builds, bitte warten ...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="261"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation>Konnte Versionsinformationen nicht ermitteln!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="275"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation>Informationen über Builds heruntergeladen.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="304"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation>Verwendete Bibliotheken</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="644"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation>Prüfe auf Update ...</translation>
     </message>
@@ -2826,17 +2796,17 @@ Netzwerkfehler: %1. Bitte Netzwerk- und Proxy-Einstellungen überprüfen.</trans
         <translation>Dies wird die Basis der nächsten Rockbox-Version. Um testen zu helfen, diese Version installieren.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="127"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation>Stabiles Release (Version %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation>Entwicklungsversion (Revision %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="129"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation>Release-Kandidat (Revision %1)</translation>
     </message>
@@ -2856,27 +2826,27 @@ Netzwerkfehler: %1. Bitte Netzwerk- und Proxy-Einstellungen überprüfen.</trans
         <translation>Für ausgewählte Version nicht verfügbar</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation>Tägliche Version (%1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="158"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation>Das ausgewählte Gerät benötigt keinen Bootloader.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="163"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation>Der Bootloader ist notwendig, um Rockbox zu starten. Die Installation ist nur einmalig notwendig.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="236"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation>Einhängepunkt ist falsch</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="294"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation>Keine Installationsmethode bekannt.</translation>
     </message>
@@ -2958,22 +2928,23 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>Konnte Sicherungskopie-Datei nicht erzeugen. Fortfahren?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="420"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation>Manuelle Schritte erforderlich</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="641"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation>Installation benötigt keine zusätzlichen Dateien, überspringe.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="224"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation>Mit Installation fortfahren?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation>Wirklich fortfahren?</translation>
     </message>
@@ -3312,7 +3283,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>Lese Dateiliste...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="261"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Kopieren von %1 nach %2 fehlgeschlagen</translation>
     </message>
@@ -3327,17 +3298,17 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>Starte Erzeugung von Sprachdateien für Ordner %1</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="242"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation>Kopieren abgebrochen</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="283"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation>Räume auf ...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="294"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation>Fertig</translation>
     </message>
@@ -3443,82 +3414,82 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>Kein Theme ausgewählt</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="122"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Netzwerkfehler: %1
 Bitte Netzwerk- und Proxyeinstellungen überprüfen.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="135"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>Der folgende Fehler ist aufgetreten:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="141"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>Abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>lade Details für %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="217"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>lade Vorschau ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Autor:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
-        <location filename="../themesinstallwindow.cpp" line="233"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="235"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>Keine Beschreibung vorhanden</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="262"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>Keine Themevorschau vorhanden</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="290"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation>Auswählen</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="297"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>lade Theme-Informationen ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="325"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation>Keine Themen ausgewählt, überspringe</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="354"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>Einhängepunkt ungültig!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="234"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Beschreibung:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
@@ -3528,12 +3499,12 @@ Bitte Netzwerk- und Proxyeinstellungen überprüfen.</translation>
         <translation>keine Auswahl</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="178"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation>
             <numerusform>Download-Größe %L1 kiB (%n Element)</numerusform>
@@ -3541,7 +3512,7 @@ Bitte Netzwerk- und Proxyeinstellungen überprüfen.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="251"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>Laden der Vorschau fehlgeschlagen.
@@ -3653,62 +3624,77 @@ Administratorrechte sind notwendig.&lt;/li&gt;</translation>
         <translation>Erzeugen der Sprachdatei beginnt</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
         <source>Extracted voice strings from installation</source>
         <translation>Sprachinformationen aus Installation extrahiert</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="100"/>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation>Extrahierte Sprachinformationen sind inkompatibel</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation>Konnte Sprachinformationen nicht aus Installation extrahieren, lade herunter</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="185"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Fehler beim Herunterladen: HTTP Fehler %1.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="192"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>Datei aus Cache verwendet.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="195"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>Downloadfehler: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="200"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>Download abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="213"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>Konnte heruntergeladene Datei nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="276"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>Die heruntergeladene Datei war leer!</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="307"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>Konnte heruntergeladene Datei nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="318"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>Konnte Ausgabedatei nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="338"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>erfolgreich erzeugt.</translation>
     </message>
@@ -3718,27 +3704,27 @@ Administratorrechte sind notwendig.&lt;/li&gt;</translation>
         <translation>Konnte rockbox-info.txt nicht finden</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="172"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation>Lade Sprachinformationen herunter ...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="219"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation>Lese Strings ...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation>Erzeuge Sprachdateien ...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="347"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation>Räume auf ...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="358"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation>Fertig</translation>
     </message>
@@ -3746,52 +3732,52 @@ Administratorrechte sind notwendig.&lt;/li&gt;</translation>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>Abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="78"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>Herunterladen von Datei %1.%2</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>Downloadfehler: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="125"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished">Download abgeschlossen (Cache verwendet).</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="128"/>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>Download abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="135"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>Extrahiere Datei.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="156"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation>Extrahieren fehlgeschlagen!</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="168"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>Installiere Datei.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="180"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>Dateiinstallation fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="193"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>Erstelle Installationslog</translation>
     </message>
@@ -3800,19 +3786,19 @@ Administratorrechte sind notwendig.&lt;/li&gt;</translation>
         <translation type="vanished">Datei aus Cache verwendet.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation>Paket-Installation erfolgreich abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="113"/>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation>Fehler beim Herunterladen: HTTP Fehler %1
 %2</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="149"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>Nicht genügend Speicherplatz verfügbar! Abbruch.</translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_fi.ts b/utils/rbutilqt/lang/rbutil_fi.ts
index ac9914b978..ea670b126a 100644
--- a/utils/rbutilqt/lang/rbutil_fi.ts
+++ b/utils/rbutilqt/lang/rbutil_fi.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1" language="fi">
 <context>
     <name>BackupDialog</name>
     <message>
@@ -40,42 +40,42 @@
         <translation type="unfinished">&amp;Peruuta</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="70"/>
+        <location filename="../gui/backupdialog.cpp" line="69"/>
         <source>Installation size: calculating ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="89"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="109"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="117"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="125"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="144"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="147"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation type="unfinished">Varmuuskopiointi epäonnistui!</translation>
     </message>
@@ -129,95 +129,143 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BootloaderInstallBSPatch</name>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="65"/>
+        <source>Bootloader installation requires you to provide the correct verrsion of the original firmware file. This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/wiki/&apos;&gt;rockbox wiki&lt;/a&gt; pages on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="84"/>
+        <source>Could not read original firmware file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="90"/>
+        <source>Downloading bootloader file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="99"/>
+        <source>Patching file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="124"/>
+        <source>Patching the original firmware failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="130"/>
+        <source>Succesfully patched firmware file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="145"/>
+        <source>Bootloader successful installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="151"/>
+        <source>Patched bootloader could not be installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="161"/>
+        <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>BootloaderInstallBase</name>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="69"/>
         <source>Download error: received HTTP error %1.</source>
         <translation type="unfinished">Latausvirhe: HTTP-virhe %1.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="84"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="75"/>
         <source>Download error: %1</source>
         <translation type="unfinished">Latausvirhe: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="90"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="81"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="83"/>
         <source>Download finished.</source>
         <translation type="unfinished">Lataus valmis.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="112"/>
         <source>Creating backup of original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="115"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="114"/>
         <source>Creating backup folder failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="121"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="120"/>
         <source>Creating backup copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="124"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="123"/>
         <source>Backup created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="137"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="140"/>
         <source>Creating installation log</source>
         <translation type="unfinished">Luodaan lokitiedostoa asennuksesta</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="226"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="245"/>
         <source>Zip file format detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="257"/>
         <source>CAB file format detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="259"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="278"/>
         <source>Extracting firmware %1 from archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="266"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="285"/>
         <source>Error extracting firmware from archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="275"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="294"/>
         <source>Could not find firmware in archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="159"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="162"/>
         <source>Waiting for system to remount player</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="189"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="192"/>
         <source>Player remounted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="194"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="197"/>
         <source>Timeout on remount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="149"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="152"/>
         <source>Installation log created</source>
         <translation type="unfinished"></translation>
     </message>
@@ -481,47 +529,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="258"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="259"/>
         <source>Can&apos;t open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="259"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="260"/>
         <source>Can&apos;t open output file</source>
         <translation type="unfinished">Virhe avattaessa kohdetiedostoa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="260"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="261"/>
         <source>invalid file: header length wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="261"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="262"/>
         <source>invalid file: unrecognized header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="262"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="263"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="263"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="264"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="264"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="265"/>
         <source>invalid file: internal checksum error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="265"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="266"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="266"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="267"/>
         <source>unknown</source>
         <translation type="unfinished">tuntematon</translation>
     </message>
@@ -535,21 +583,21 @@
     <name>BootloaderInstallImx</name>
     <message>
         <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
-        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -582,111 +630,106 @@
 <context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="49"/>
-        <source>Error: can&apos;t allocate buffer memory!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="72"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
-        <location filename="../base/bootloaderinstallipod.cpp" line="151"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="143"/>
         <source>Failed to read firmware directory</source>
         <translation type="unfinished">Ohjelmistohakemistoa ei voitu lukea</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="69"/>
-        <location filename="../base/bootloaderinstallipod.cpp" line="156"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="61"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="148"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation type="unfinished">Tuntematon ohjelmiston versio (%1)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="75"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="67"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods. 
 See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="94"/>
-        <location filename="../base/bootloaderinstallipod.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="155"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="96"/>
         <source>Successfull added bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="115"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="107"/>
         <source>Failed to add bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="119"/>
         <source>Bootloader Installation complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="132"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="124"/>
         <source>Writing log aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="169"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>No bootloader detected.</source>
         <translation type="unfinished">Käynnistyslatainta ei havaittu.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="175"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="167"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="182"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="175"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="228"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="241"/>
         <source>Error: could not retrieve device name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="244"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
         <source>Error: no mountpoint specified!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="249"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="262"/>
         <source>Could not open Ipod: permission denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="253"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="266"/>
         <source>Could not open Ipod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="264"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="277"/>
         <source>No firmware partition on disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="90"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="82"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="134"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="258"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="271"/>
         <source>Error reading partition table - possibly not an Ipod</source>
         <translation type="unfinished"></translation>
     </message>
@@ -730,17 +773,17 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="99"/>
         <source>Checking for original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="103"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="104"/>
         <source>Error finding original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="115"/>
         <source>Rockbox bootloader successful removed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -748,112 +791,246 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BootloaderInstallS5l</name>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="61"/>
+        <source>Could not find mounted iPod.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="68"/>
+        <source>Downloading bootloader file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="113"/>
+        <source>Could not make DFU image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="119"/>
+        <source>Ejecting iPod...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="141"/>
+        <source>Action required:
+
+Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject functionality.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="151"/>
+        <source>Device successfully ejected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="171"/>
+        <source>Action required:
+
+Quit iTunes application.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="179"/>
+        <source>iTunes closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="192"/>
+        <source>Could not suspend iTunesHelper. Stop it using the Task Manager, and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="201"/>
+        <source>Waiting for HDD spin-down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="217"/>
+        <source>Waiting for DFU mode...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="218"/>
+        <source>Action required:
+
+Press and hold SELECT+MENU buttons, after about 12 seconds a new action will require you to release the buttons, DO IT QUICKLY, otherwise the process could fail.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="241"/>
+        <source>DFU mode detected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="243"/>
+        <source>Action required:
+
+Release SELECT+MENU buttons and wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="268"/>
+        <source>Device is not in DFU mode. It seems that the previous required action failed, please try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="275"/>
+        <source>Transfering DFU image...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="285"/>
+        <source>No valid DFU USB driver found.
+
+Install iTunes (or the Apple Device Driver) and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="294"/>
+        <source>Could not transfer DFU image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="299"/>
+        <source>DFU transfer completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="302"/>
+        <source>Restarting iPod, waiting for remount...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="321"/>
+        <source>Action required:
+
+Could not remount the device, try to do it manually. If the iPod didn&apos;t restart, force a reset by pressing SELECT+MENU buttons for about 5 seconds. If the problem could not be solved then click &apos;Abort&apos; to cancel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="333"/>
+        <source>Device remounted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="336"/>
+        <source>Bootloader successfully installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="338"/>
+        <source>Bootloader successfully uninstalled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="350"/>
+        <source>Could not resume iTunesHelper.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="368"/>
+        <source>Install aborted by user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="370"/>
+        <source>Uninstall aborted by user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="50"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="55"/>
-        <source>Searching for Sansa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="59"/>
-        <source>Permission for disc access denied!
-This is required to install the bootloader</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
-        <source>No Sansa detected!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="79"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="71"/>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="164"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -862,83 +1039,83 @@ See https://www.rockbox.org/wiki/SansaE200Install
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="102"/>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="189"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="87"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="174"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="114"/>
         <source>Successfully installed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="140"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="125"/>
         <source>Failed to install bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="138"/>
         <source>Bootloader Installation complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="143"/>
         <source>Writing log aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="244"/>
         <source>Error: could not retrieve device name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="254"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="260"/>
         <source>Can&apos;t find Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="259"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="265"/>
         <source>Could not open Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="264"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="270"/>
         <source>Could not read partition table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="271"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="277"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="195"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="180"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="202"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="188"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="83"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="111"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
         <source>Checking downloaded bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="170"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="155"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1018,99 +1195,99 @@ See https://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="322"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Nykyinen välimuistin koko on %L1 kt.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="340"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="341"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="448"/>
-        <location filename="../configure.cpp" line="914"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="449"/>
-        <location filename="../configure.cpp" line="915"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="485"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>Asetukset kunnossa</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="461"/>
-        <location filename="../configure.cpp" line="490"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>Vialliset asetukset</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="529"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="530"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="643"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="665"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="739"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="742"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="749"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="755"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="759"/>
-        <location filename="../configure.cpp" line="763"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
         <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="788"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation type="unfinished"></translation>
@@ -1120,53 +1297,53 @@ Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </sour
         <translation type="obsolete">Vakava virhe</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="774"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="921"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="922"/>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="927"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="928"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="929"/>
-        <location filename="../configure.cpp" line="948"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="943"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="946"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="947"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation type="unfinished"></translation>
@@ -1177,7 +1354,7 @@ Please configure TTS engine.</source>
         <translation>Automaattinen tunnistus</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="780"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation type="unfinished"></translation>
@@ -1190,7 +1367,7 @@ Select your Mountpoint manually.</source>
 Valitse liitospiste käsin.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="764"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Laitetta ei voitu tunnistaa
@@ -1228,32 +1405,32 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation>Välimuistin polku on epäkelpo. Keskeytetään.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="130"/>
+        <location filename="../configure.cpp" line="125"/>
         <source>The following errors occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="175"/>
+        <location filename="../configure.cpp" line="170"/>
         <source>No mountpoint given</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="179"/>
+        <location filename="../configure.cpp" line="174"/>
         <source>Mountpoint does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="183"/>
+        <location filename="../configure.cpp" line="178"/>
         <source>Mountpoint is not a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="187"/>
+        <location filename="../configure.cpp" line="182"/>
         <source>Mountpoint is not writeable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="202"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1296,7 +1473,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation>Valitse laitteesi &amp;tiedostojärjestelmästä</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="319"/>
+        <location filename="../configurefrm.ui" line="326"/>
         <source>&amp;Browse</source>
         <translation>&amp;Selaa</translation>
     </message>
@@ -1371,42 +1548,42 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="260"/>
+        <location filename="../configurefrm.ui" line="267"/>
         <source>&amp;Language</source>
         <translation>&amp;Kieli</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="274"/>
+        <location filename="../configurefrm.ui" line="281"/>
         <source>Cac&amp;he</source>
         <translation>V&amp;älimuisti</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="277"/>
+        <location filename="../configurefrm.ui" line="284"/>
         <source>Download cache settings</source>
         <translation>Välimuistin asetukset</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="283"/>
+        <location filename="../configurefrm.ui" line="290"/>
         <source>Rockbox Utility uses a local download cache to save network traffic. You can change the path to the cache and use it as local repository by enabling Offline mode.</source>
         <translation>Rockbox Utility käyttää paikallista välimuistia säästääkseen verkon käyttöä. Voit vaihtaa välimuistin polkua ja käyttää sitä varastona ottamalla yhteydettömän tilan käyttöön.</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="293"/>
+        <location filename="../configurefrm.ui" line="300"/>
         <source>Current cache size is %1</source>
         <translation>Nykyinen välimuistin koko on %1 kt</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="302"/>
+        <location filename="../configurefrm.ui" line="309"/>
         <source>P&amp;ath</source>
         <translation>Polku:</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="312"/>
+        <location filename="../configurefrm.ui" line="319"/>
         <source>Entering an invalid folder will reset the path to the systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="334"/>
+        <location filename="../configurefrm.ui" line="341"/>
         <source>Disable local &amp;download cache</source>
         <translation>Älä käytä välimuistia</translation>
     </message>
@@ -1415,73 +1592,73 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="obsolete">Yhteydetön tila</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="369"/>
+        <location filename="../configurefrm.ui" line="376"/>
         <source>Clean cache &amp;now</source>
         <translation>Tyhjennä välimuisti n&amp;yt</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="385"/>
+        <location filename="../configurefrm.ui" line="392"/>
         <source>&amp;TTS &amp;&amp; Encoder</source>
         <translation>Puhesyntetisaattori ja pakkaus</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="391"/>
+        <location filename="../configurefrm.ui" line="398"/>
         <source>TTS Engine</source>
         <translation>Puhesyntetisaattori</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="397"/>
+        <location filename="../configurefrm.ui" line="404"/>
         <source>&amp;Select TTS Engine</source>
         <translation>&amp;Valitse puhesyntetisaattori</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="410"/>
+        <location filename="../configurefrm.ui" line="417"/>
         <source>Configure TTS Engine</source>
         <translation>Määritä puhesyntetisaattorin asetukset</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="417"/>
-        <location filename="../configurefrm.ui" line="468"/>
+        <location filename="../configurefrm.ui" line="424"/>
+        <location filename="../configurefrm.ui" line="479"/>
         <source>Configuration invalid!</source>
         <translation>Vialliset asetukset</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="434"/>
+        <location filename="../configurefrm.ui" line="441"/>
         <source>Configure &amp;TTS</source>
         <translation>Määritä puhesyntetisaattorin asetukset</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="445"/>
+        <location filename="../configurefrm.ui" line="452"/>
         <source>Test TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="452"/>
+        <location filename="../configurefrm.ui" line="463"/>
         <source>&amp;Use string corrections for TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="462"/>
+        <location filename="../configurefrm.ui" line="473"/>
         <source>Encoder Engine</source>
         <translation>Pakkausohjelma</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="485"/>
+        <location filename="../configurefrm.ui" line="496"/>
         <source>Configure &amp;Enc</source>
         <translation>Määritä pakkauksen asetukset</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="496"/>
+        <location filename="../configurefrm.ui" line="507"/>
         <source>encoder name</source>
         <translation>pakkausohjelman nimi</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="536"/>
+        <location filename="../configurefrm.ui" line="547"/>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="547"/>
+        <location filename="../configurefrm.ui" line="558"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Peruuta</translation>
     </message>
@@ -1489,7 +1666,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="589"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Suomi</translation>
@@ -1513,12 +1690,12 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicefrm.ui" line="101"/>
+        <location filename="../createvoicefrm.ui" line="105"/>
         <source>Silence threshold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicefrm.ui" line="163"/>
+        <location filename="../createvoicefrm.ui" line="167"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1528,22 +1705,22 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation>Luontiasetukset</translation>
     </message>
     <message>
-        <location filename="../createvoicefrm.ui" line="68"/>
+        <location filename="../createvoicefrm.ui" line="72"/>
         <source>Change</source>
         <translation>Vaihda</translation>
     </message>
     <message>
-        <location filename="../createvoicefrm.ui" line="139"/>
+        <location filename="../createvoicefrm.ui" line="143"/>
         <source>&amp;Install</source>
         <translation>&amp;Asenna</translation>
     </message>
     <message>
-        <location filename="../createvoicefrm.ui" line="150"/>
+        <location filename="../createvoicefrm.ui" line="154"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Peruuta</translation>
     </message>
     <message>
-        <location filename="../createvoicefrm.ui" line="88"/>
+        <location filename="../createvoicefrm.ui" line="92"/>
         <source>Wavtrim Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1551,18 +1728,18 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="100"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="101"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="105"/>
-        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1570,32 +1747,32 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="45"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="95"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="98"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="197"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="205"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="377"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1603,12 +1780,12 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncoderExe</name>
     <message>
-        <location filename="../base/encoderexe.cpp" line="41"/>
+        <location filename="../base/encoderexe.cpp" line="37"/>
         <source>Path to Encoder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/encoderexe.cpp" line="43"/>
+        <location filename="../base/encoderexe.cpp" line="39"/>
         <source>Encoder options:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1616,23 +1793,23 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncoderLame</name>
     <message>
-        <location filename="../base/encoderlame.cpp" line="73"/>
-        <location filename="../base/encoderlame.cpp" line="83"/>
+        <location filename="../base/encoderlame.cpp" line="75"/>
+        <location filename="../base/encoderlame.cpp" line="85"/>
         <source>LAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/encoderlame.cpp" line="75"/>
+        <location filename="../base/encoderlame.cpp" line="77"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/encoderlame.cpp" line="79"/>
+        <location filename="../base/encoderlame.cpp" line="81"/>
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/encoderlame.cpp" line="83"/>
+        <location filename="../base/encoderlame.cpp" line="85"/>
         <source>Could not find libmp3lame!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1664,16 +1841,21 @@ Make sure you selected the correct mountpoint and the player is set up to use a
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="107"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation type="unfinished">Tiedosto</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="107"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation type="unfinished">Versio</translation>
     </message>
+    <message>
+        <location filename="../gui/infowidget.cpp" line="56"/>
+        <source>Loading, please wait ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InfoWidgetFrm</name>
@@ -1721,22 +1903,22 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installtalkfrm.ui" line="111"/>
+        <location filename="../installtalkfrm.ui" line="115"/>
         <source>Change</source>
         <translation>Vaihda</translation>
     </message>
     <message>
-        <location filename="../installtalkfrm.ui" line="118"/>
+        <location filename="../installtalkfrm.ui" line="122"/>
         <source>Ignore files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installtalkfrm.ui" line="128"/>
+        <location filename="../installtalkfrm.ui" line="132"/>
         <source>Skip existing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installtalkfrm.ui" line="170"/>
+        <location filename="../installtalkfrm.ui" line="174"/>
         <source>Select folders for Talkfile generation (Ctrl for multiselect)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1751,12 +1933,12 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation>Poista tiedostopäätteet</translation>
     </message>
     <message>
-        <location filename="../installtalkfrm.ui" line="143"/>
+        <location filename="../installtalkfrm.ui" line="147"/>
         <source>&amp;Install</source>
         <translation>&amp;Asenna</translation>
     </message>
     <message>
-        <location filename="../installtalkfrm.ui" line="154"/>
+        <location filename="../installtalkfrm.ui" line="158"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Peruuta</translation>
     </message>
@@ -1764,22 +1946,22 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="96"/>
+        <location filename="../installtalkwindow.cpp" line="95"/>
         <source>Empty selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="97"/>
+        <location filename="../installtalkwindow.cpp" line="96"/>
         <source>No files or folders selected. Please select files or folders first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="137"/>
+        <location filename="../installtalkwindow.cpp" line="140"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="138"/>
+        <location filename="../installtalkwindow.cpp" line="141"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1787,77 +1969,59 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>ManualWidget</name>
     <message>
-        <location filename="../gui/manualwidget.cpp" line="44"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
-        <translation type="unfinished">&lt;a href=&apos;%1&apos;&gt;PDF-ohjekirja (englanniksi)&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&apos;%1&apos;&gt;PDF-ohjekirja (englanniksi)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidget.cpp" line="46"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
-        <translation type="unfinished">&lt;a href=&apos;%1&apos;&gt;HTML-ohjekirja (aukeaa selaimessa)&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&apos;%1&apos;&gt;HTML-ohjekirja (aukeaa selaimessa)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidget.cpp" line="50"/>
         <source>Select a device for a link to the correct manual</source>
-        <translation type="unfinished">Valitse laitteesi oikean laitteen ohjetta varten</translation>
+        <translation type="obsolete">Valitse laitteesi oikean laitteen ohjetta varten</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidget.cpp" line="51"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
-        <translation type="unfinished">&lt;a href=&apos;%1&apos;&gt;Ohjekirjan yleiskuva&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&apos;%1&apos;&gt;Ohjekirjan yleiskuva&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidget.cpp" line="62"/>
         <source>Confirm download</source>
-        <translation type="unfinished">Vahvista lataus</translation>
+        <translation type="obsolete">Vahvista lataus</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidget.cpp" line="63"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
-        <translation type="unfinished">Haluatko varmasti ladata ohjekirjan? Ohjekirja tallennetaan soittimeesi.</translation>
+        <translation type="obsolete">Haluatko varmasti ladata ohjekirjan? Ohjekirja tallennetaan soittimeesi.</translation>
     </message>
 </context>
 <context>
     <name>ManualWidgetFrm</name>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="14"/>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="20"/>
         <source>Read the manual</source>
-        <translation type="unfinished">Lue ohjekirjaa</translation>
+        <translation type="obsolete">Lue ohjekirjaa</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="26"/>
         <source>PDF manual</source>
-        <translation type="unfinished">PDF-ohjekirja</translation>
+        <translation type="obsolete">PDF-ohjekirja</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="39"/>
         <source>HTML manual</source>
-        <translation type="unfinished">HTML-ohjekirja</translation>
+        <translation type="obsolete">HTML-ohjekirja</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="55"/>
         <source>Download the manual</source>
-        <translation type="unfinished">Lataa ohjekirja</translation>
+        <translation type="obsolete">Lataa ohjekirja</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="63"/>
         <source>&amp;PDF version</source>
-        <translation type="unfinished">&amp;PDF-versio</translation>
+        <translation type="obsolete">&amp;PDF-versio</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="70"/>
         <source>&amp;HTML version (zip file)</source>
-        <translation type="unfinished">&amp;HTML-versio (zip-pakattu)</translation>
+        <translation type="obsolete">&amp;HTML-versio (zip-pakattu)</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="92"/>
         <source>Down&amp;load</source>
-        <translation type="unfinished">&amp;Lataa</translation>
+        <translation type="obsolete">&amp;Lataa</translation>
     </message>
 </context>
 <context>
@@ -1873,6 +2037,34 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PlayerBuildInfo</name>
+    <message>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
+        <source>Stable (Retired)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
+        <source>Unusable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
+        <source>Unstable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
+        <source>Stable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PreviewFrm</name>
     <message>
@@ -1884,23 +2076,23 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>ProgressLoggerFrm</name>
     <message>
-        <location filename="../progressloggerfrm.ui" line="13"/>
-        <location filename="../progressloggerfrm.ui" line="19"/>
+        <location filename="../progressloggerfrm.ui" line="18"/>
+        <location filename="../progressloggerfrm.ui" line="24"/>
         <source>Progress</source>
         <translation>Eteneminen</translation>
     </message>
     <message>
-        <location filename="../progressloggerfrm.ui" line="58"/>
+        <location filename="../progressloggerfrm.ui" line="63"/>
         <source>Save Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../progressloggerfrm.ui" line="82"/>
+        <location filename="../progressloggerfrm.ui" line="87"/>
         <source>&amp;Abort</source>
         <translation>&amp;Keskeytä</translation>
     </message>
     <message>
-        <location filename="../progressloggerfrm.ui" line="32"/>
+        <location filename="../progressloggerfrm.ui" line="37"/>
         <source>progresswindow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1908,17 +2100,17 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="122"/>
+        <location filename="../progressloggergui.cpp" line="117"/>
         <source>&amp;Ok</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="146"/>
+        <location filename="../progressloggergui.cpp" line="141"/>
         <source>Save system trace log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="104"/>
+        <location filename="../progressloggergui.cpp" line="99"/>
         <source>&amp;Abort</source>
         <translation>&amp;Keskeytä</translation>
     </message>
@@ -1926,61 +2118,69 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="625"/>
-        <location filename="../main.cpp" line="83"/>
+        <location filename="../configure.cpp" line="621"/>
+        <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
-        <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.
-----------
-This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
+        <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="385"/>
+        <location filename="../base/system.cpp" line="333"/>
         <source>(unknown vendor name) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="403"/>
+        <location filename="../base/system.cpp" line="351"/>
         <source>(unknown product name)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="91"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="102"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="103"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="114"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,7 +2188,7 @@ This string is used to indicate the writing direction. Translate it to &quot;RTL
 <context>
     <name>QuaZipFile</name>
     <message>
-        <location filename="../quazip/quazipfile.cpp" line="141"/>
+        <location filename="../quazip/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1996,214 +2196,217 @@ This string is used to indicate the writing direction. Translate it to &quot;RTL
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="329"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>Uusi asennus</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="330"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Tämä on uusi asennus tai uusi versio. Asetusikkuna aukeaa ja voit tehdä ja tarkistaa asetukset.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="337"/>
-        <location filename="../rbutilqt.cpp" line="642"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>Asetusvirhe</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="338"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Asetuksesi eivät ole kunnossa. Yleensä tämä johtuu vaihtuneesta laitteen osoitteesta. Asetusikkuna aukeaa, voit korjata asetukset siitä.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="224"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="235"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
+        <source>Certificate error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../rbutilqt.cpp" line="230"/>
+        <source>%1
+
+Issuer: %2
+Subject: %3
+Valid since: %4
+Valid until: %5
+
+Temporarily trust certificate?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="237"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="249"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="450"/>
         <source>Confirm Installation</source>
-        <translation>Vahvista asennus</translation>
+        <translation type="vanished">Vahvista asennus</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="582"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>Liitospiste on väärin!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="430"/>
-        <source>No Rockbox installation found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="416"/>
         <source>Warning</source>
-        <translation>Varoitus</translation>
+        <translation type="vanished">Varoitus</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="417"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
-        <translation>Ohjelma lataa tietoja uusista versioista. Yritä uudelleen hetken päästä.</translation>
+        <translation type="vanished">Ohjelma lataa tietoja uusista versioista. Yritä uudelleen hetken päästä.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="431"/>
-        <source>Could not determine the installed Rockbox version. Please install a Rockbox build before installing voice files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="451"/>
         <source>Do you really want to install the voice file?</source>
-        <translation>Haluatko varmasti asentaa äänitiedoston?</translation>
+        <translation type="vanished">Haluatko varmasti asentaa äänitiedoston?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="439"/>
-        <source>No voice file available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="440"/>
-        <source>The installed version of Rockbox is a development version. Pre-built voices are only available for release versions of Rockbox. Please generate a voice yourself using the &quot;Create voice file&quot; functionality.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="512"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>Vahvista asennuksen poisto</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="513"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Haluatko varmasti poistaa käynnistyslataimen?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="528"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="542"/>
-        <source>Rockbox Utility can not uninstall the bootloader on this target. Try a normal firmware update to remove the booloader.</source>
+        <location filename="../rbutilqt.cpp" line="305"/>
+        <source>Libraries used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="550"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
+        <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../rbutilqt.cpp" line="523"/>
+        <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="568"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>Vahvista asennus</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="569"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Haluatko varmasti asentaa Rockbox Utilityn soittimeesi? Asennuksen jälkeen voit ajaa sen soittimeltasi.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="578"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>Asennetaan Rockbox Utilityä</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="596"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Virhe asennettaessa Rockbox Utilityä</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="600"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>Asennetaan käyttäjän asetuksia</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="604"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>Virhe asennettaessa käyttäjän asetuksia</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="608"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Rockbox Utility asennettu.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="643"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="664"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="729"/>
-        <source>RockboxUtility Update available</source>
+        <location filename="../rbutilqt.cpp" line="710"/>
+        <source>Rockbox Utility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="730"/>
-        <source>&lt;b&gt;New RockboxUtility Version available.&lt;/b&gt; &lt;br&gt;&lt;br&gt;Download it from here: &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</source>
+        <location filename="../rbutilqt.cpp" line="711"/>
+        <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="733"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="736"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="759"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="760"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="764"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="765"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="110"/>
+        <location filename="../rbutilqt.cpp" line="104"/>
         <source>Wine detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="111"/>
+        <location filename="../rbutilqt.cpp" line="105"/>
         <source>It seems you are trying to run this program under Wine. Please don&apos;t do this, running under Wine will fail. Use the native Linux binary instead.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="236"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2216,307 +2419,308 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation>Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="31"/>
+        <location filename="../rbutilqtfrm.ui" line="59"/>
         <source>Device</source>
         <translation>Laite</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="92"/>
+        <location filename="../rbutilqtfrm.ui" line="120"/>
         <source>&amp;Change</source>
         <translation>&amp;Vaihda</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="163"/>
+        <location filename="../rbutilqtfrm.ui" line="166"/>
         <source>Welcome</source>
         <translation>Tervetuloa</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="160"/>
-        <location filename="../rbutilqtfrm.ui" line="658"/>
+        <location filename="../rbutilqtfrm.ui" line="163"/>
+        <location filename="../rbutilqtfrm.ui" line="620"/>
         <source>&amp;Installation</source>
         <translation>&amp;Asennus</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="168"/>
-        <location filename="../rbutilqtfrm.ui" line="450"/>
+        <location filename="../rbutilqtfrm.ui" line="171"/>
+        <location filename="../rbutilqtfrm.ui" line="413"/>
         <source>&amp;Accessibility</source>
         <translation>Helppokäytt&amp;ötoiminnot</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="171"/>
+        <location filename="../rbutilqtfrm.ui" line="174"/>
         <source>Install accessibility add-ons</source>
         <translation>Asenna helppokäyttötoiminnot</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="177"/>
         <source>Install Voice files</source>
-        <translation>Asenna äänitiedostot</translation>
+        <translation type="vanished">Asenna äänitiedostot</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="194"/>
         <source>&lt;b&gt;Install Voice file&lt;/b&gt;&lt;br/&gt;Voice files are needed to make Rockbox speak the user interface. Speaking is enabled by default, so if you installed the voice file Rockbox will speak.</source>
-        <translation>&lt;b&gt;Asenna äänitiedosto&lt;/b&gt;&lt;br/&gt;Äänitiedostoja tarvitaan, jos haluat Rockboxin puhuvan käyttöliittymän kohdat ääneen. Puhe on päällä oletuksena, joten pelkkien tiedostojen lataaminen riittää.</translation>
+        <translation type="vanished">&lt;b&gt;Asenna äänitiedosto&lt;/b&gt;&lt;br/&gt;Äänitiedostoja tarvitaan, jos haluat Rockboxin puhuvan käyttöliittymän kohdat ääneen. Puhe on päällä oletuksena, joten pelkkien tiedostojen lataaminen riittää.</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="204"/>
+        <location filename="../rbutilqtfrm.ui" line="180"/>
         <source>Install Talk files</source>
         <translation>Asenna puhetiedostoja</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="221"/>
+        <location filename="../rbutilqtfrm.ui" line="197"/>
         <source>&lt;b&gt;Create Talk Files&lt;/b&gt;&lt;br/&gt;Talkfiles are needed to let Rockbox speak File and Foldernames</source>
         <translation>&lt;b&gt;Luo puhetiedostoja&lt;/b&gt;&lt;br/&gt;Puhetiedostoja tarvitaan, jos haluat Rockboxin puhuvan tiedosto- ja hakemistonimet</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="254"/>
+        <location filename="../rbutilqtfrm.ui" line="230"/>
         <source>Create Voice files</source>
         <translation>Luo äänitiedostot</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="271"/>
+        <location filename="../rbutilqtfrm.ui" line="247"/>
         <source>&lt;b&gt;Create Voice file&lt;/b&gt;&lt;br/&gt;Voice files are needed to make Rockbox speak the  user interface. Speaking is enabled by default, so
  if you installed the voice file Rockbox will speak.</source>
         <translation>&lt;b&gt;Luo äänitiedosto&lt;/b&gt;&lt;br/&gt;Äänitiedostoja tarvitaan, jos haluat Rockboxin puhuvan käyttöliittymän kohdat ääneen. Puhe on päällä oletuksena, joten pelkkien tiedostojen lataaminen riittää.</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="458"/>
+        <location filename="../rbutilqtfrm.ui" line="420"/>
         <source>&amp;Uninstallation</source>
         <translation>Po&amp;isto</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="286"/>
-        <location filename="../rbutilqtfrm.ui" line="319"/>
+        <location filename="../rbutilqtfrm.ui" line="262"/>
+        <location filename="../rbutilqtfrm.ui" line="295"/>
         <source>Uninstall Rockbox</source>
         <translation>Poista Rockbox</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="121"/>
+        <location filename="../rbutilqtfrm.ui" line="149"/>
         <source>mountpoint unknown or invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="114"/>
+        <location filename="../rbutilqtfrm.ui" line="142"/>
         <source>Mountpoint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="72"/>
+        <location filename="../rbutilqtfrm.ui" line="100"/>
         <source>device unknown or invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="65"/>
+        <location filename="../rbutilqtfrm.ui" line="93"/>
         <source>Device:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="283"/>
+        <location filename="../rbutilqtfrm.ui" line="259"/>
         <source>Backup &amp;&amp; &amp;Uninstallation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="292"/>
+        <location filename="../rbutilqtfrm.ui" line="268"/>
         <source>Uninstall Bootloader</source>
         <translation>Poista käynnistyslatain</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="309"/>
+        <location filename="../rbutilqtfrm.ui" line="285"/>
         <source>&lt;b&gt;Remove the bootloader&lt;/b&gt;&lt;br/&gt;After removing the bootloader you won&apos;t be able to start Rockbox.</source>
         <translation>&lt;b&gt;Poista käynnistyslatain&lt;/b&gt;&lt;br/&gt;Poistamisen jälkeen et enää voi käynnistää Rockboxia.</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="336"/>
+        <location filename="../rbutilqtfrm.ui" line="312"/>
         <source>&lt;b&gt;Uninstall Rockbox from your audio player.&lt;/b&gt;&lt;br/&gt;This will leave the bootloader in place (you need to remove it manually).</source>
         <translation>&lt;b&gt;Poista Rockbox soittimestasi.&lt;/b&gt;&lt;br/&gt;Tämä jättää käynnistyslataimen (voit poistaa sen käsin).</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="349"/>
+        <location filename="../rbutilqtfrm.ui" line="325"/>
         <source>Backup</source>
         <translation type="unfinished">Varmuuskopioi</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="366"/>
+        <location filename="../rbutilqtfrm.ui" line="342"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Backup current installation.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Create a backup by archiving the contents of the Rockbox installation folder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="393"/>
         <source>&amp;Manual</source>
-        <translation>O&amp;hjekirja</translation>
+        <translation type="vanished">O&amp;hjekirja</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="396"/>
         <source>View and download the manual</source>
-        <translation>Näytä ja lataa ohjekirja</translation>
+        <translation type="vanished">Näytä ja lataa ohjekirja</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="401"/>
+        <location filename="../rbutilqtfrm.ui" line="369"/>
         <source>Inf&amp;o</source>
         <translation>Tieto&amp;ja</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="419"/>
+        <location filename="../rbutilqtfrm.ui" line="387"/>
         <source>&amp;File</source>
         <translation>&amp;Tiedosto</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="653"/>
+        <location filename="../rbutilqtfrm.ui" line="615"/>
         <source>System &amp;Trace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="446"/>
+        <location filename="../rbutilqtfrm.ui" line="409"/>
         <source>Action&amp;s</source>
         <translation>Toiminnot</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="474"/>
+        <location filename="../rbutilqtfrm.ui" line="43"/>
+        <source>Welcome to Rockbox Utility, the installation and housekeeping tool for Rockbox.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../rbutilqtfrm.ui" line="46"/>
+        <source>Rockbox Logo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../rbutilqtfrm.ui" line="436"/>
         <source>Empty local download cache</source>
         <translation>Tyhjennä välimuisti</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="479"/>
+        <location filename="../rbutilqtfrm.ui" line="441"/>
         <source>Install Rockbox Utility on player</source>
         <translation>Asenna Rockbox Utility soittimeen</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="484"/>
+        <location filename="../rbutilqtfrm.ui" line="446"/>
         <source>&amp;Configure</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="489"/>
+        <location filename="../rbutilqtfrm.ui" line="451"/>
         <source>E&amp;xit</source>
         <translation>Poistu</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="492"/>
+        <location filename="../rbutilqtfrm.ui" line="454"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="497"/>
+        <location filename="../rbutilqtfrm.ui" line="459"/>
         <source>&amp;About</source>
         <translation>Tietoja</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="502"/>
+        <location filename="../rbutilqtfrm.ui" line="464"/>
         <source>About &amp;Qt</source>
         <translation>Tietoja QT:stä</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="428"/>
-        <location filename="../rbutilqtfrm.ui" line="507"/>
+        <location filename="../rbutilqtfrm.ui" line="396"/>
+        <location filename="../rbutilqtfrm.ui" line="469"/>
         <source>&amp;Help</source>
         <translation>Ohje</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="103"/>
+        <location filename="../rbutilqtfrm.ui" line="131"/>
         <source>&amp;Eject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="432"/>
-        <source>&amp;Troubleshoot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="512"/>
+        <location filename="../rbutilqtfrm.ui" line="474"/>
         <source>Info</source>
         <translation>Tietoja</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="521"/>
+        <location filename="../rbutilqtfrm.ui" line="483"/>
         <source>&amp;Complete Installation</source>
         <translation>Täysasennus</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="539"/>
+        <location filename="../rbutilqtfrm.ui" line="501"/>
         <source>Install &amp;Bootloader</source>
         <translation>Asenna käynnistyslatain</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="548"/>
+        <location filename="../rbutilqtfrm.ui" line="510"/>
         <source>Install &amp;Rockbox</source>
         <translation>Asenna Rockbox</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="557"/>
+        <location filename="../rbutilqtfrm.ui" line="519"/>
         <source>Install &amp;Fonts Package</source>
         <translation>Asenna fonttipaketti</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="566"/>
+        <location filename="../rbutilqtfrm.ui" line="528"/>
         <source>Install &amp;Themes</source>
         <translation>Asenna teemoja</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="575"/>
+        <location filename="../rbutilqtfrm.ui" line="537"/>
         <source>Install &amp;Game Files</source>
         <translation>Asenna pelitiedostot</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="584"/>
+        <location filename="../rbutilqtfrm.ui" line="546"/>
         <source>&amp;Install Voice File</source>
         <translation>Asenna äänitiedostot</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="593"/>
+        <location filename="../rbutilqtfrm.ui" line="555"/>
         <source>Create &amp;Talk Files</source>
         <translation>Luo äänitiedostot</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="602"/>
+        <location filename="../rbutilqtfrm.ui" line="564"/>
         <source>Remove &amp;bootloader</source>
         <translation>Poista käynnistyslatain</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="611"/>
+        <location filename="../rbutilqtfrm.ui" line="573"/>
         <source>Uninstall &amp;Rockbox</source>
         <translation>Poista Rockbox</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="616"/>
+        <location filename="../rbutilqtfrm.ui" line="578"/>
         <source>Read PDF manual</source>
         <translation>Lue PDF-ohjekirjaa</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="621"/>
+        <location filename="../rbutilqtfrm.ui" line="583"/>
         <source>Read HTML manual</source>
         <translation>Lue HTML-ohjekirjaa</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="626"/>
+        <location filename="../rbutilqtfrm.ui" line="588"/>
         <source>Download PDF manual</source>
         <translation>Lataa PDF-ohjekirja</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="631"/>
+        <location filename="../rbutilqtfrm.ui" line="593"/>
         <source>Download HTML manual (zip)</source>
         <translation>Lataa HTML-ohjekirja (zip-pakattu)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="640"/>
+        <location filename="../rbutilqtfrm.ui" line="602"/>
         <source>Create &amp;Voice File</source>
         <translation>Luo äänitiedosto</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="643"/>
+        <location filename="../rbutilqtfrm.ui" line="605"/>
         <source>Create Voice File</source>
         <translation>Luo äänitiedosto</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="648"/>
+        <location filename="../rbutilqtfrm.ui" line="610"/>
         <source>&amp;System Info</source>
         <translation>Järjestelmän tiedot</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="663"/>
+        <location filename="../rbutilqtfrm.ui" line="625"/>
         <source>Show &amp;Changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="530"/>
+        <location filename="../rbutilqtfrm.ui" line="492"/>
         <source>&amp;Minimal Installation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2549,198 +2753,239 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="80"/>
-        <source>The main Rockbox firmware.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="90"/>
-        <source>Fonts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="104"/>
-        <source>&amp;Rockbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="124"/>
-        <source>Some game plugins require additional files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="140"/>
-        <source>Additional fonts for the User Interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="156"/>
-        <source>The bootloader is required for starting Rockbox. Only necessary for first time install.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="166"/>
-        <source>Game Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="177"/>
-        <source>Customize</source>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="151"/>
+        <source>Some plugins require additional data files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/selectiveinstallwidgetfrm.ui" line="188"/>
+        <source>Install prerendered voice file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="195"/>
+        <source>Plugin Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="222"/>
+        <source>&amp;Manual</source>
+        <translation type="unfinished">O&amp;hjekirja</translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="233"/>
+        <source>&amp;Voice File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="253"/>
+        <source>The main Rockbox firmware.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="115"/>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="74"/>
+        <source>&amp;Rockbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="178"/>
+        <source>Additional fonts for the User Interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="135"/>
+        <source>The bootloader is required for starting Rockbox. Only necessary for first time install.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="161"/>
+        <source>Customize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="104"/>
         <source>Themes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="205"/>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="94"/>
         <source>Themes allow adjusting the user interface of Rockbox. Use &quot;Customize&quot; to select themes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="250"/>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="263"/>
+        <source>Save a copy of the manual on the player.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="292"/>
         <source>&amp;Install</source>
         <translation type="unfinished">&amp;Asenna</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="67"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="78"/>
         <source>This is the latest stable release available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="70"/>
-        <source>The development version is updated on every code change. Last update was on %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="74"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="88"/>
         <source>This will eventually become the next Rockbox version. Install it to help testing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="100"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="104"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="108"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="83"/>
+        <source>The development version is updated on every code change.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="93"/>
+        <source>Daily updated development version.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="100"/>
+        <source>Not available for the selected version</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <source>Daily Build (%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="136"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="183"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="239"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="266"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="319"/>
         <source>Bootloader detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="267"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="320"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="271"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="324"/>
         <source>Bootloader installation skipped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="284"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="338"/>
         <source>Create Bootloader backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="285"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="339"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="292"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="346"/>
         <source>Browse backup folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="304"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="358"/>
         <source>Prerequisites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="309"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="363"/>
         <source>Bootloader installation aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="319"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="373"/>
         <source>Bootloader files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="321"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="375"/>
         <source>All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="323"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="377"/>
         <source>Select firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="325"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="379"/>
         <source>Error opening firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="331"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="385"/>
         <source>Error reading firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="341"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="395"/>
         <source>Backup error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="342"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="396"/>
         <source>Could not create backup file. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="366"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="171"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
+        <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="172"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2748,40 +2993,12 @@ Press &quot;No&quot; to skip this step.</source>
         <source>Aborted!</source>
         <translation type="obsolete">Keskeytetty!</translation>
     </message>
-    <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="490"/>
-        <source>Your installation doesn&apos;t require game files, skipping.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ServerInfo</name>
-    <message>
-        <location filename="../base/serverinfo.cpp" line="117"/>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/serverinfo.cpp" line="121"/>
-        <source>Unusable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/serverinfo.cpp" line="124"/>
-        <source>Unstable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/serverinfo.cpp" line="127"/>
-        <source>Stable</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SysTrace</name>
     <message>
-        <location filename="../systrace.cpp" line="98"/>
-        <location filename="../systrace.cpp" line="107"/>
+        <location filename="../systrace.cpp" line="100"/>
+        <location filename="../systrace.cpp" line="109"/>
         <source>Save system trace log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2822,62 +3039,62 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>Sysinfo</name>
     <message>
-        <location filename="../sysinfo.cpp" line="45"/>
+        <location filename="../sysinfo.cpp" line="46"/>
         <source>&lt;b&gt;OS&lt;/b&gt;&lt;br/&gt;</source>
         <translation>&lt;b&gt;Käyttöjärjestelmä&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="46"/>
+        <location filename="../sysinfo.cpp" line="47"/>
         <source>&lt;b&gt;Username&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="48"/>
+        <location filename="../sysinfo.cpp" line="49"/>
         <source>&lt;b&gt;Permissions&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="50"/>
+        <location filename="../sysinfo.cpp" line="51"/>
         <source>&lt;b&gt;Attached USB devices&lt;/b&gt;&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="54"/>
+        <location filename="../sysinfo.cpp" line="55"/>
         <source>VID: %1 PID: %2, %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="63"/>
+        <location filename="../sysinfo.cpp" line="64"/>
         <source>Filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="66"/>
+        <location filename="../sysinfo.cpp" line="67"/>
         <source>Mountpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="66"/>
+        <location filename="../sysinfo.cpp" line="67"/>
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="67"/>
+        <location filename="../sysinfo.cpp" line="68"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="67"/>
+        <location filename="../sysinfo.cpp" line="68"/>
         <source>Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="68"/>
-        <source>Cluster Size</source>
+        <location filename="../sysinfo.cpp" line="69"/>
+        <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="70"/>
+        <location filename="../sysinfo.cpp" line="71"/>
         <source>&lt;tr&gt;&lt;td&gt;%1&lt;/td&gt;&lt;td&gt;%4&lt;/td&gt;&lt;td&gt;%2 GiB&lt;/td&gt;&lt;td&gt;%3 GiB&lt;/td&gt;&lt;td&gt;%5&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2895,7 +3112,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>&amp;Päivitä</translation>
     </message>
     <message>
-        <location filename="../sysinfofrm.ui" line="45"/>
+        <location filename="../sysinfofrm.ui" line="46"/>
         <source>&amp;OK</source>
         <translation></translation>
     </message>
@@ -2903,28 +3120,27 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>System</name>
     <message>
-        <location filename="../base/system.cpp" line="121"/>
+        <location filename="../base/system.cpp" line="117"/>
         <source>Guest</source>
         <translation type="unfinished">Vieras</translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="124"/>
+        <location filename="../base/system.cpp" line="120"/>
         <source>Admin</source>
         <translation type="unfinished">Pääkäyttäjä</translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="127"/>
+        <location filename="../base/system.cpp" line="123"/>
         <source>User</source>
         <translation type="unfinished">Käyttäjä</translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="130"/>
+        <location filename="../base/system.cpp" line="126"/>
         <source>Error</source>
         <translation type="unfinished">Virhe</translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="278"/>
-        <location filename="../base/system.cpp" line="323"/>
+        <location filename="../base/system.cpp" line="273"/>
         <source>(no description available)</source>
         <translation type="unfinished">(ei kuvausta saatavilla)</translation>
     </message>
@@ -2932,42 +3148,52 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TTSBase</name>
     <message>
-        <location filename="../base/ttsbase.cpp" line="45"/>
+        <location filename="../base/ttsbase.cpp" line="47"/>
         <source>Espeak TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="47"/>
-        <source>Flite TTS Engine</source>
+        <location filename="../base/ttsbase.cpp" line="48"/>
+        <source>Espeak-ng TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="48"/>
-        <source>Swift TTS Engine</source>
+        <location filename="../base/ttsbase.cpp" line="49"/>
+        <source>Mimic TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../base/ttsbase.cpp" line="51"/>
+        <source>Flite TTS Engine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/ttsbase.cpp" line="52"/>
+        <source>Swift TTS Engine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/ttsbase.cpp" line="55"/>
         <source>SAPI4 TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="53"/>
+        <location filename="../base/ttsbase.cpp" line="57"/>
         <source>SAPI5 TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="54"/>
+        <location filename="../base/ttsbase.cpp" line="58"/>
         <source>MS Speech Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="57"/>
+        <location filename="../base/ttsbase.cpp" line="61"/>
         <source>Festival TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="60"/>
+        <location filename="../base/ttsbase.cpp" line="64"/>
         <source>OS X System Engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3041,40 +3267,45 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsfestival.cpp" line="67"/>
+        <location filename="../base/ttsfestival.cpp" line="69"/>
         <source>Voice description:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../base/ttsfestival.cpp" line="173"/>
+        <source>Festival could not be started</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TTSSapi</name>
     <message>
-        <location filename="../base/ttssapi.cpp" line="49"/>
+        <location filename="../base/ttssapi.cpp" line="46"/>
         <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttssapi.cpp" line="56"/>
+        <location filename="../base/ttssapi.cpp" line="53"/>
         <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttssapi.cpp" line="68"/>
+        <location filename="../base/ttssapi.cpp" line="65"/>
         <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttssapi.cpp" line="71"/>
+        <location filename="../base/ttssapi.cpp" line="68"/>
         <source>Options:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttssapi.cpp" line="115"/>
+        <location filename="../base/ttssapi.cpp" line="112"/>
         <source>Could not copy the SAPI script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttssapi.cpp" line="133"/>
+        <location filename="../base/ttssapi.cpp" line="130"/>
         <source>Could not start SAPI process</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3082,22 +3313,22 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../base/talkfile.cpp" line="68"/>
+        <location filename="../base/talkfile.cpp" line="66"/>
         <source>Copying Talkfiles...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="240"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="280"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="291"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3112,7 +3343,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="80"/>
+        <location filename="../base/talkfile.cpp" line="78"/>
         <source>Finished creating Talk files</source>
         <translation>Puhetiedostojen luonti valmis</translation>
     </message>
@@ -3122,7 +3353,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="259"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3130,18 +3361,18 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TalkGenerator</name>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="39"/>
+        <location filename="../base/talkgenerator.cpp" line="38"/>
         <source>Starting TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="44"/>
-        <location filename="../base/talkgenerator.cpp" line="51"/>
+        <location filename="../base/talkgenerator.cpp" line="43"/>
+        <location filename="../base/talkgenerator.cpp" line="50"/>
         <source>Init of TTS engine failed</source>
         <translation type="unfinished">Puhesyntetisaattorin alustus epäonnistui</translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="58"/>
+        <location filename="../base/talkgenerator.cpp" line="57"/>
         <source>Starting Encoder Engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3166,18 +3397,18 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="162"/>
-        <location filename="../base/talkgenerator.cpp" line="167"/>
+        <location filename="../base/talkgenerator.cpp" line="163"/>
+        <location filename="../base/talkgenerator.cpp" line="168"/>
         <source>Voicing of %1 failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="211"/>
+        <location filename="../base/talkgenerator.cpp" line="212"/>
         <source>Encoding aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="239"/>
+        <location filename="../base/talkgenerator.cpp" line="240"/>
         <source>Encoding of %1 failed</source>
         <translation type="unfinished">Tiedoston %1 pakkaus epäonnistui</translation>
     </message>
@@ -3210,7 +3441,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>&amp;Asenna</translation>
     </message>
     <message>
-        <location filename="../themesinstallfrm.ui" line="125"/>
+        <location filename="../themesinstallfrm.ui" line="126"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Peruuta</translation>
     </message>
@@ -3223,109 +3454,110 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="40"/>
+        <location filename="../themesinstallwindow.cpp" line="41"/>
         <source>no theme selected</source>
         <translation>ei teemaa valittu</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="125"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Verkkovirhe: %1
 Tarkista verkko- ja välityspalvelinasetukset.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="138"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>seuraava virhe tapahtui:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="144"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>valmis.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="211"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>haetaan lisätietoja teemalle %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>haetaan esikatselukuvaa ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="227"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Tekijä:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="228"/>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="229"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Versio:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Kuvaus:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>ei kuvausta</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="260"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>ei esikatselukuvaa</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="289"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="296"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>haetaan teemojen tietoja ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="326"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="356"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>Liitospiste on väärin!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="41"/>
+        <location filename="../themesinstallwindow.cpp" line="42"/>
         <source>no selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="181"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
+            <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="248"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -3374,7 +3606,7 @@ HTTP response code: %1</source>
         <translation>Asennetut osat</translation>
     </message>
     <message>
-        <location filename="../uninstallfrm.ui" line="138"/>
+        <location filename="../uninstallfrm.ui" line="139"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Peruuta</translation>
     </message>
@@ -3382,7 +3614,7 @@ HTTP response code: %1</source>
 <context>
     <name>Uninstaller</name>
     <message>
-        <location filename="../base/uninstall.cpp" line="109"/>
+        <location filename="../base/uninstall.cpp" line="115"/>
         <source>Uninstallation finished</source>
         <translation>Poisto valmis</translation>
     </message>
@@ -3403,7 +3635,7 @@ HTTP response code: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/uninstall.cpp" line="80"/>
+        <location filename="../base/uninstall.cpp" line="81"/>
         <source>Could not delete %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3411,18 +3643,18 @@ HTTP response code: %1</source>
 <context>
     <name>Utils</name>
     <message>
-        <location filename="../base/utils.cpp" line="312"/>
+        <location filename="../base/utils.cpp" line="375"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/utils.cpp" line="324"/>
+        <location filename="../base/utils.cpp" line="387"/>
         <source>&lt;li&gt;Target mismatch detected.&lt;br/&gt;Installed target: %1&lt;br/&gt;Selected target: %2.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/utils.cpp" line="331"/>
+        <location filename="../base/utils.cpp" line="396"/>
         <source>Problem detected:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3435,87 +3667,102 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>Aloitetaan äänitiedostojen luontia</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
-        <source>Extracted voice strings from installation</source>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
+        <source>Extracted voice strings from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="171"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="184"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Latausvirhe: HTTP-virhe %1.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="191"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>Käytetään välimuistissa olevaa tiedostoa.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="194"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>Latausvirhe: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="199"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>Lataus valmis.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="212"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>ladattua tiedostoa ei voitu avata</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="218"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="297"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="342"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="353"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="271"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>Ladattu tiedosto oli tyhjä!</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>Virhe avattaessa ladattua tiedostoa</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="313"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>Virhe avattaessa kohdetiedostoa</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="333"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>luotu.</translation>
     </message>
@@ -3538,57 +3785,66 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="80"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>Ladataan tiedostoa %1.%2</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
-        <translation>Latausvirhe: HTTP-virhe %1.</translation>
+        <translation type="vanished">Latausvirhe: HTTP-virhe %1.</translation>
+    </message>
+    <message>
+        <source>Cached file used.</source>
+        <translation type="vanished">Käytetään välimuistissa olevaa tiedostoa.</translation>
+    </message>
+    <message>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
+        <source>Download error: received HTTP error %1
+%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../base/zipinstaller.cpp" line="121"/>
-        <source>Cached file used.</source>
-        <translation>Käytetään välimuistissa olevaa tiedostoa.</translation>
-    </message>
-    <message>
-        <location filename="../base/zipinstaller.cpp" line="123"/>
         <source>Download error: %1</source>
         <translation>Latausvirhe: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="127"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
+        <source>Download finished (cache used).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>Lataus valmis.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="133"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>Puretaan tiedostoa.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="153"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="162"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>Asennetaan tiedostoa.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="173"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>Tiedoston asentaminen epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="186"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>Luodaan lokitiedostoa asennuksesta</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="146"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3623,7 +3879,7 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <source>The Rockbox Utility</source>
         <translation></translation>
     </message>
-    <message utf8="true">
+    <message>
         <location filename="../aboutbox.ui" line="54"/>
         <source>Installer and housekeeping utility for the Rockbox open source digital audio player firmware.&lt;br/&gt;© The Rockbox Team.&lt;br/&gt;Released under the GNU General Public License v2.&lt;br/&gt;Uses icons by the &lt;a href=&quot;http://tango.freedesktop.org/&quot;&gt;Tango Project&lt;/a&gt;.&lt;br/&gt;&lt;center&gt;&lt;a href=&quot;https://www.rockbox.org&quot;&gt;https://www.rockbox.org&lt;/a&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
@@ -3635,7 +3891,7 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
     </message>
     <message>
         <location filename="../aboutbox.ui" line="132"/>
-        <source>&amp;Speex License</source>
+        <source>L&amp;ibraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/utils/rbutilqt/lang/rbutil_fr.ts b/utils/rbutilqt/lang/rbutil_fr.ts
index b907e446db..da7c181ef0 100644
--- a/utils/rbutilqt/lang/rbutil_fr.ts
+++ b/utils/rbutilqt/lang/rbutil_fr.ts
@@ -45,37 +45,37 @@
         <translation>Taille de l&apos;installation: calcul en cours...</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="88"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation>Sélectionnez un fichier de sauvegarde</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="108"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation>Taille de l&apos;installation: %L1 %2</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="115"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation>Fichier existant</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation>Le fichier sélectionné existe déjà. Voulez-vous vraiment l&apos;écraser ?</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="124"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation>Démarrage de la sauvegarde ...</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="143"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation>Sauvegarde effectuée avec succès.</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="146"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation>La sauvegarde a échoué !</translation>
     </message>
@@ -586,47 +586,51 @@
 <context>
     <name>BootloaderInstallImx</name>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
         <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation>L&apos;installation du bootloader nécessite que vous fournissiez une copie du firmware original de Sandisk (fichier firmware.sb). Ce firmware sera alors modifié et installé sur votre lecteur avec le bootloader de Rockbox. Vous devez télécharger ce fichier par vous-même pour des raisons légales. Veuillez vous référer au &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Forums de Sansa&lt;/a&gt; ou à la page wiki &lt;a href=&apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; pour obtenir ce fichier.&lt;br/&gt;Appuyez sur Ok pour continuer et parcourir les fichiers sur votre ordinateur pour indiquer le fichier du firmware.</translation>
+        <translation type="vanished">L&apos;installation du bootloader nécessite que vous fournissiez une copie du firmware original de Sandisk (fichier firmware.sb). Ce firmware sera alors modifié et installé sur votre lecteur avec le bootloader de Rockbox. Vous devez télécharger ce fichier par vous-même pour des raisons légales. Veuillez vous référer au &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Forums de Sansa&lt;/a&gt; ou à la page wiki &lt;a href=&apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; pour obtenir ce fichier.&lt;br/&gt;Appuyez sur Ok pour continuer et parcourir les fichiers sur votre ordinateur pour indiquer le fichier du firmware.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation>Impossible de lire le fichier du firmware original</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation>Téléchargement du bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation>Modification du firmware...</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation>Erreur lors de la modification du firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation>Le firmware a été modifié avec succès</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation>Le bootloader a été installé avec succès</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation>L&apos;installation du bootloader modifié a échouée</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation>Pour le désinstaller, faites une mise à jour normale avec un firmware non modifié.</translation>
     </message>
@@ -801,77 +805,77 @@ Veuillez vous référer à https://www.rockbox.org/wiki/IpodConversionToFAT32</t
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>L&apos;installation du bootloader nécessite que vous fournissiez un fichier contenant le firmware original (fichier bin). Vous devez télécharger ce fichier par vous-même pour des raisons légales. Veuillez vous référer au &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manuel&lt;/a&gt; et à la page wiki &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; pour obtenir ce fichier.&lt;br/&gt;Appuyez sur Ok pour continuer et parcourir les fichiers sur votre ordinateur pour indiquer le fichier du firmware.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation>Téléchargement du fichier bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation>Impossible d&apos;ouvrir le fichier du firmware original.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation>Impossible de lire le fichier du firmware original.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation>Le contenu du fichier du firmware original ne ressemble pas à un firmware MPIO.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation>Impossible d&apos;ouvrir le fichier de sortie.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation>Impossible d&apos;écrire le fichier de sortie.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation>Erreur inconnue: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation>Impossible d&apos;ouvrir le fichier du bootloader téléchargé.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation>Pas de place libre pour le bootloader dans le firmware original.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation>Impossible de lire le fichier du bootloader téléchargé.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation>La vérification de la somme de contrôle du bootloader a échoué.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation>Erreur lors de la modification du firmware: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation>Le firmware a été modifié avec succès</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation>Pour le désinstaller, faites une mise à jour normale avec un firmware non modifié</translation>
     </message>
@@ -1223,41 +1227,41 @@ Veuillez vous référer à https://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="328"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation>Afficher les cibles d&apos;installation désactivées</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="329"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation>Vous venez d&apos;activer l&apos;affichage des cibles d&apos;installations indiquées comme inactives. Cette option n&apos;est pas recommandée pour l&apos;utilisateur final. Vous êtes encouragé à utiliser celle-ci uniquement si vous savez ce que vous faites.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="523"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation>Détection du proxy</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="524"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation>Les paramètres système Proxy sont non valides !
 L&apos;Utilitaire Rockbox ne peut pas fonctionner avec ces réglages proxy. Vérifier que le proxy soit correctement paramétré. Notez que les scripts &quot;proxy auto-config (PAC)&quot; ne sont pas supportés. Si votre système en utilise vous devez effectuer un paramétrage manuel.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="634"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation>Sélectionner le chemin vers le cache</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="782"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation>%1 &quot;MacPod&quot; détecté !
 Rockbox ne peut fonctionner que sur un Ipod utilisant le système de fichier FAT (aussi appelé un &quot;WinPod&quot;).</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="773"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translatorcomment>Pour effectuer l&apos;installation, il est nécessaire de mettre votre lecteur audio en mode MSC </translatorcomment>
@@ -1269,7 +1273,7 @@ Pour effectuer l&apos;installation, il est nécessaire de mettre votre lecteur a
         <translation type="obsolete">Cette installation échouera tant que vous n&apos;aurez pas modifié cela!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="766"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
@@ -1282,149 +1286,149 @@ Désolé, Rockbox ne fonctionne pas sur votre lecteur audio.</translation>
         <translation type="obsolete">Erreur fatale: le lecteur audio est incompatible</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="853"/>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>Autodétection</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="854"/>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Impossible de détecter un point de montage.
 Veuillez sélectionner manuellement le point de montage.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Impossible de détecter le périphérique.
 Veuillez sélectionner manuellement le type de périphérique et le point de montage.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="438"/>
-        <location filename="../configure.cpp" line="904"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation>Erreur TTS</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="439"/>
-        <location filename="../configure.cpp" line="905"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>L&apos;initialisation du TTS sélectionné a échoué. Vous ne pouvez pas utiliser ce TTS. </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="656"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation>%1 (%2 GiB libres sur %3 GiB)</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="730"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation>Plusieurs périphériques ont été détectés. Veuillez déconnecter tous les lecteurs sauf un et essayer à nouveau s&apos;il vous plait.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="733"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation>Périphériques détectés:</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="738"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation>(inconnu)</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="740"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation>%1 à %2</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation>Note: la détection des périphériques connectés n&apos;est pas toujours fiable. Il peut y avoir moins de périphériques connectés qu&apos;indiqué. Dans ce cas, détecter votre lecteur de manière parfaitement fiable peut s&apos;avérer impossible. </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="751"/>
-        <location filename="../configure.cpp" line="755"/>
-        <location filename="../configure.cpp" line="800"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation>Détection de périphérique</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="789"/>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation>Le lecteur contient un système de fichier incompatible.
 Vérifiez que vous avez sélectionné le bon point de montage et que le baladeur est paramétré pour utiliser un système de fichier compatible avec Rockbox.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="797"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation>Une erreur inconnue s&apos;est produite pendant la détection du lecteur.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="864"/>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>Supprimer le cache ?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="865"/>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Voulez-vous supprimer le cache ? Vérifier bien que ce paramètre est correct car il supprimera &lt;b&gt;tous&lt;/b&gt; les fichiers de ce répertoire !</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="873"/>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>Chemin incorrect !</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="874"/>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>Le chemin du cache est invalide. Annulation.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="911"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation>La configuration du moteur TTS est incorrecte</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="912"/>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation>La configuration du moteur TTS est incorrecte.
 Veuillez configurer le moteur TTS.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="917"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation>Impossible lancer le moteur TTS.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="918"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation>Impossible lancer le moteur TTS.
 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="919"/>
-        <location filename="../configure.cpp" line="938"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation>
 Veuillez configurer le moteur TTS.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="933"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation>Test de la synthèse vocale de l&apos;utilitaire Rockbox</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="936"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation>Impossible de synthétiser la phrase de test.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="937"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation>Impossible de synthétiser la phrase de test.</translation>
@@ -1434,19 +1438,19 @@ Veuillez configurer le moteur TTS.</translation>
         <translation type="obsolete">Erreur fatale</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="310"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>La taille actuelle du cache est %L1 ko.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="445"/>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>La configuration est correcte</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="484"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>La configuration est incorrecte</translation>
     </message>
@@ -1476,22 +1480,22 @@ Veuillez configurer le moteur TTS.</translation>
         <translation>Le point de montage n&apos;est pas accessible en écriture</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation>Aucun lecteur audio sélectionné</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="204"/>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>Le chemin vers le cache n&apos;est pas accessible en écriture. Vous pouvez laisser le chemin vide pour utiliser le dossier temporaire par défaut de votre système.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="223"/>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>Vous devez corriger les erreurs suivantes avant de pouvoir continuer.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="226"/>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation>Erreur de configuration</translation>
     </message>
@@ -1719,7 +1723,7 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Français</translation>
@@ -1781,18 +1785,18 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="106"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation>Erreur TTS</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="107"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>L&apos;initialisation du TTS sélectionné a échoué. Vous ne pouvez pas utiliser ce TTS.</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="111"/>
-        <location filename="../createvoicewindow.cpp" line="114"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Moteur: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1800,32 +1804,32 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="44"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation>En attente du moteur d&apos;encodage...</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="91"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="94"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="257"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation>Parcourir</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="272"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation>Rafraîchir</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="263"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation>Sélectionner l&apos;exécutable</translation>
     </message>
@@ -1894,18 +1898,18 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="../gui/infowidget.cpp" line="47"/>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2101,27 +2105,27 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="337"/>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="340"/>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation type="unfinished">Inutilisable</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="343"/>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation type="unfinished">Instable</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="346"/>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation type="unfinished">Stable</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="349"/>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation type="unfinished">Inconnu</translation>
     </message>
@@ -2179,7 +2183,7 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="616"/>
+        <location filename="../configure.cpp" line="621"/>
         <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -2197,94 +2201,60 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
         <translation>(Nom du produit inconnu)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation>L&apos;installation du bootloader est presque complète. Vous &lt;b&gt;devez&lt;/b&gt; réaliser les étapes suivantes manuellement:</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Débranchez votre lecteur audio en toute sécurité.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Redémarrez votre lecteur audio dans le firmware original.&lt;/li&gt;&lt;li&gt;Faites une mise à jour du logiciel en utilisant la fonctionnalité du firmware original. Veuillez vous référer au manuel du lecteur pour plus de détails.&lt;br/&gt;&lt;b&gt;Note importante:&lt;/b&gt;la mise à jour du logiciel est une étape critique qui ne doit en aucun cas être interrompue. &lt;b&gt;Assurez-vous que votre lecteur audio est rechargé avant de lancer une mise à jour.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;Une fois la mise à jour effectuée, redémarrez votre lecteur audio.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation>&lt;li&gt;Retirez toute card microSD insérée&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="131"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Déconnectez votre lecteur audio. Celui-ci va redémarrer et faire une mise à jour du logiciel. Veuillez vous référer au manuel du lecteur pour plus de détails.&lt;br/&gt;&lt;b&gt;Note importante:&lt;/b&gt; la mise à jour du logiciel est une étape critique qui ne doit en aucun cas être interrompue. &lt;b&gt;Assurez-vous que votre lecteur est rechargé avant de le déconnecter.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;Une fois la mise à jour effectuée, redémarrez votre lecteur.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation>&lt;li&gt;Éteignez votre lecteur audio&lt;/li&gt;&lt;li&gt;Insérer le chargeur&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation>Débranchez le cable USB et celui d&apos;alimentation&lt;/li&gt;&lt;li&gt;Maintenez le &lt;i&gt;Bouton d&apos;alimentation&lt;/i&gt; pressé pour éteindre le lecteur&lt;/li&gt;&lt;li&gt;Basculez l&apos;interrupteur&lt;/li&gt;&lt;li&gt;Maintenez le &lt;i&gt;Bouton d&apos;alimentation&lt;/i&gt; pressé pour démarrer Rockbox&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;Remarque:&lt;/b&gt; Vous pouvez commencer par installer d&apos;autres parties de Rockbox, mais n&apos;oubliez pas que les étapes suivantes sont &lt;b&gt;nécessaire&lt;/b&gt; pour finir l&apos;installation !&lt;/p&gt;</translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="60"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="60"/>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="66"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="66"/>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="74"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="74"/>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="80"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="80"/>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="188"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="188"/>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="193"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="193"/>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
         <location filename="../quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip-1.2/quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip_/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation>Erreur de l&apos;API ZIP/UNZIP : %1</translation>
     </message>
@@ -2292,17 +2262,17 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="211"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation>Téléchargement des informations de version, veuillez patienter...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="261"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation>Impossible de récupérer les informations de version !</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="275"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation>Le téléchargement des informations de version est terminé.</translation>
     </message>
@@ -2311,7 +2281,7 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
         <translation type="vanished">Confirmation de l&apos;installation</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>Le point de montage est erroné !</translation>
     </message>
@@ -2336,17 +2306,17 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
         <translation type="vanished">La version de Rockbox installée est une version de dévelopement. Des fichiers de voix précalculés sont uniquement disponible pour les versions stables de Rockbox. Veuillez générer des fichiers de voix en utilisant la fonctionnalité &quot;Création de fichiers de voix&quot;.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="493"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>Confirmation de la désinstallation</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="494"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Etes-vous sûr de vouloir désinstaller le bootloader ?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="506"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation>Aucune méthode de désinstallation n&apos;est connue pour cette plateforme.</translation>
     </message>
@@ -2355,57 +2325,57 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
         <translation type="vanished">L&apos;utilitaire Rockbox ne peut pas désinstaller le bootloader. Essayez de faire une mise à jour normale du firmware pour supprimer le bootloader.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="529"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation>Le bootloader de Rockbox n&apos;a pas été trouvé.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="548"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>Confirmation de l&apos;installation</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="549"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Etes-vous sûr de vouloir installer l&apos;utilitaire Rockbox sur votre lecteur audio ? Après l&apos;installation vous pourrez le lancer depuis le disque dur de votre lecteur audio.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>Installation de l&apos;utilitaire Rockbox</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="576"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Erreur pendant l&apos;installation de l&apos;utilitaire Rockbox</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="580"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>Installation de la configuration utilisateur</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="584"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>Erreur pendant l&apos;installation de la configuration utilisateur</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="588"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Installation de l&apos;utilitaire Rockbox terminée avec succès.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="644"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation>Vérification des mises à jour...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="708"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="709"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2418,63 +2388,63 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
         <translation type="vanished">&lt;b&gt;Une nouvelle version de l&apos;utilitaire de Rockbox est disponible.&lt;/b&gt; &lt;br&gt;&lt;br&gt;Vous pouvez la télécharger ici: &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="713"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation>Une nouvelle version de l&apos;utilitaire Rockbox est disponible.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="716"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation>L&apos;utilitaire Rockbox est à jour.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="739"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation>Périphérique éjecté</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="740"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation>Périphérique éjecté avec succès. Vous pouvez maintenant déconnecter le lecteur du PC.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="744"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation>L&apos;éjection a échoué</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="745"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation>L&apos;éjection du périphérique a échoué. Veuillez vérifier que les fichiers sur le lecteur ne sont pas utilisés par un autre programme. Si l&apos;éjection échoue à nouveau, veuillez utiliser la fonction d&apos;éjection de votre ordinateur s&apos;il vous plait.  </translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="391"/>
-        <location filename="../rbutilqt.cpp" line="622"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>Erreur de configuration</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="304"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="518"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="521"/>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="623"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Votre configuration est invalide. Veuillez vérifier dans la fenêtre de configuration que les valeurs sélectionnées soient correctes.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="384"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Ceci est une nouvelle installation de l&apos;utilitaire Rockbox, ou l&apos;installation d&apos;une nouvelle version. La fenêtre de configuration va s&apos;ouvrir pour vous permettre de paramétrer le programme ou de vérifier les réglages.</translation>
     </message>
@@ -2489,12 +2459,12 @@ pour télécharger tous les fichiers néecessaires dans le cache.&lt;/p&gt;</tra
         <translation>Il semblerait que vous essayiez de faire fonctionner ce programme avec Wine. Ne faites pas cela car cela va échouer. Utilisez la version native pour Linux à la place.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="229"/>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2506,7 +2476,7 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="263"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation>Impossible de récupérer les informations de version.
@@ -2521,17 +2491,17 @@ Erreur réseau: %1. Veuillez vérifier vos paramètres réseau et proxy.</transl
         <translation type="vanished">L&apos;application est encore en train de télécharger les informations sur les dernières versions. Veuillez réessayer dans un instant.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="383"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>Nouvelle installation</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="392"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Votre configuration est invalide. Ceci est probablement dû à un changement du chemin du périphérique. La fenêtre de configuration va s&apos;ouvrir pour vous permettre de corriger le problème.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="262"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>Erreur de réseau</translation>
     </message>
@@ -2979,17 +2949,17 @@ Erreur réseau: %1. Veuillez vérifier vos paramètres réseau et proxy.</transl
         <translation>Cette version est vouée à devenir la prochaine version stable. Installez-là pour la tester.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="127"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation>Version stable (Version %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation>Version de dévelopement (Révision %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="129"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation>Version pré-stable (Révision %1)</translation>
     </message>
@@ -3009,27 +2979,27 @@ Erreur réseau: %1. Veuillez vérifier vos paramètres réseau et proxy.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="158"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation>Le lecteur audio sélectionné ne nécessite pas l&apos;installation d&apos;un bootloader.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="163"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation>Le bootloader est nécessaire pour démarrer Rockbox. Son installation n&apos;est nécessaire que lors de la première installation.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="236"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation>Le point de montage est erroné</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="294"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation>Aucune méthode d&apos;installation n&apos;est connue.</translation>
     </message>
@@ -3110,22 +3080,23 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>Impossible de créer une sauvegarde. Voulez-vous poursuivre ?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="420"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation>Des étapes manuelles sont nécessaires</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="641"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="224"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation>Continuer l&apos;installation ?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation>Êtes vous sûr de vouloir poursuivre ?</translation>
     </message>
@@ -3489,17 +3460,17 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>Copie des fichiers d&apos;annonce...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="242"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation>Copie du fichier annulée</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="283"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation>Nettoyage...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="294"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation>Terminé</translation>
     </message>
@@ -3524,7 +3495,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>Lecture de la liste des fichiers...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="261"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>La copie de %1 vers %2 a échoué</translation>
     </message>
@@ -3630,82 +3601,82 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>pas de thème sélectionné</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="122"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Erreur réseau: %1.
 Veuillez vérifier vos paramètres réseau et proxy.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="135"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>L&apos;erreur suivante s&apos;est produite :
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="141"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>terminé.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>récupération des détails pour %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="217"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>récupération de l&apos;aperçu ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Auteur:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
-        <location filename="../themesinstallwindow.cpp" line="233"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="234"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="235"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>pas de description</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="262"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>pas d&apos;aperçu du thème</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="290"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation>Sélectionner</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="297"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>récupération des informations sur le thème ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="325"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation>Aucun thème sélectionné, étape ignorée</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="354"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>Le point de montage est incorrect !</translation>
     </message>
@@ -3715,12 +3686,12 @@ Veuillez vérifier vos paramètres réseau et proxy.</translation>
         <translation>Aucune sélection</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="178"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation>Informations</translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation>
             <numerusform>Taille du téléchargement: %L1 Kio (%n élément)</numerusform>
@@ -3728,7 +3699,7 @@ Veuillez vérifier vos paramètres réseau et proxy.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="251"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>La récupération d&apos;un aperçu du thème a échoué.
@@ -3840,87 +3811,102 @@ Les privilèges administrateur sont requis.&lt;/li&gt;</translation>
         <translation>Démarrage de la génération du fichier de voix</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
         <source>Extracted voice strings from installation</source>
         <translation>Fichiers de voix extrait depuis l&apos;installation</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="100"/>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation>Les fichiers de voix extraits sont incompatibles</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation>Impossible d&apos;extraire les fichiers de voix depuis l&apos;installation, téléchargement</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="172"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation>Téléchargement des informations d&apos;annonces...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="185"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Erreur de téléchargement: Erreur HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="192"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>Fichier en cache utilisé.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="195"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>Erreur de téléchargement: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="200"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>Téléchargement terminé.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="213"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>Impossible d&apos;ouvrir le fichier téléchargé</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="219"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation>Lecture des phrases...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation>Création des fichiers de voix...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="347"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation>Nettoyage...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="358"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation>Terminé</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="276"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>Le fichier téléchargé est vide !</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="307"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>Erreur lors de l&apos;ouverture du fichier téléchargé</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="318"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>Erreur lors de l&apos;ouverture du fichier de sortie</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="338"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>Créé avec succès.</translation>
     </message>
@@ -3933,17 +3919,17 @@ Les privilèges administrateur sont requis.&lt;/li&gt;</translation>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>terminé.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation>Le paquet a été installé avec succès.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="78"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>Téléchargement du fichier %1.%2</translation>
     </message>
@@ -3956,54 +3942,54 @@ Les privilèges administrateur sont requis.&lt;/li&gt;</translation>
         <translation type="vanished">Fichier en cache utilisé.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="113"/>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation type="unfinished">Erreur de téléchargement: Erreur HTTP %1. {1
 %2?}</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>Erreur de téléchargement: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="125"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished">Téléchargement terminé (la version du cache a été utilisée).</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="128"/>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>Téléchargement terminé.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="135"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>Extraction du fichier.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="156"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation>L&apos;extraction a échoué !</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="168"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>Installation du fichier.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="180"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>L&apos;installation du fichier a échoué.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="193"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>Création du journal d&apos;installation</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="149"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>Espace disque insuffisant ! Abandon.</translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_gr.ts b/utils/rbutilqt/lang/rbutil_gr.ts
index a815cd9739..a4d1e9ca70 100644
--- a/utils/rbutilqt/lang/rbutil_gr.ts
+++ b/utils/rbutilqt/lang/rbutil_gr.ts
@@ -45,37 +45,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="88"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="108"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="115"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="124"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="143"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="146"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation type="unfinished">Αποτυχία αντίγραφου ασφάλειας!</translation>
     </message>
@@ -583,46 +583,46 @@
     <name>BootloaderInstallImx</name>
     <message>
         <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
-        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished">Λήψη αρχείου bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation type="unfinished">Η εγκατάσταση του Rockbox bootloader ολοκληρώθηκε με επιτυχία.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -795,77 +795,77 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished">Λήψη αρχείου bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">Επιτυχία: Τροποποιημένο αρχείο firmware δημιουργήθηκε</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1216,99 +1216,99 @@ See https://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="310"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Το μέγεθος της τρέχουσας προσωρινής μνήμης είναι %L1 kiB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="328"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="329"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="438"/>
-        <location filename="../configure.cpp" line="904"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="439"/>
-        <location filename="../configure.cpp" line="905"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="445"/>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>Ρυθμίσεις εντάξει</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="484"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>Μη επιτρεπτές ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="523"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="524"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="634"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="656"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="730"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="733"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="738"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="740"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="751"/>
-        <location filename="../configure.cpp" line="755"/>
-        <location filename="../configure.cpp" line="800"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="782"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation type="unfinished"></translation>
@@ -1318,110 +1318,110 @@ Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </sour
         <translation type="obsolete">Κρίσιμο σφάλμα</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="766"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="911"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="912"/>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="917"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="918"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="919"/>
-        <location filename="../configure.cpp" line="938"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="933"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="936"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="937"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="853"/>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>Αυτόματος εντοπισμός</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="773"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="854"/>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Δεν εντοπίστηκε κάποιο σημείο προσάρτησης.
 Επιλέξτε το σημείο προσάρτησης χειροκίνητα.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Δεν εντοπίστηκε κάποια συσκευή.
 Επιλέξτε τη συσκευή σας και το σημείο προσάρτησης χειροκίνητα.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="789"/>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="797"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="864"/>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>Σίγουρα διαγραφή προσωρινής μνήμης;</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="865"/>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Θέλετε σίγουρα να διαγραφεί η προσωρινή μνήμη; Κάντε απόλυτα σίγουρο ότι αυτή η επιλογή είναι σωστή καθώς θα αφαιρεθούν &lt;b&gt;όλα&lt;/b&gt; τα αρχεία και οι φάκελοι!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="873"/>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>Λάθος διαδρομή!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="874"/>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>Η διαδρομή της προσωρινής μνήμης δεν είναι επιτρεπτή. Ακύρωση.</translation>
     </message>
@@ -1451,22 +1451,22 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="204"/>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="223"/>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="226"/>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation type="unfinished">Σφάλμα ρυθμίσεων</translation>
     </message>
@@ -1694,7 +1694,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Ελληνικά</translation>
@@ -1756,18 +1756,18 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="106"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="107"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="111"/>
-        <location filename="../createvoicewindow.cpp" line="114"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1775,32 +1775,32 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="44"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="91"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="94"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="257"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="272"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="263"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1869,18 +1869,18 @@ Make sure you selected the correct mountpoint and the player is set up to use a
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation type="unfinished">Αρχείο</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation type="unfinished">Έκδοση</translation>
     </message>
     <message>
-        <location filename="../gui/infowidget.cpp" line="47"/>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2068,27 +2068,27 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="337"/>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="340"/>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="343"/>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="346"/>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="349"/>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2146,7 +2146,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="616"/>
+        <location filename="../configure.cpp" line="621"/>
         <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -2163,94 +2163,60 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation type="unfinished">Η εγκατάσταση του bootloader σχεδόν ολοκληρώθηκε. &lt;b&gt;Απαιτείται&lt;/b&gt; να κάνετε τα ακόλουθα βήματα χειροκίνητα:</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Κάντε ασφαλή κατάργηση της συσκευή σας.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="131"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Απενεργοποιήστε τη συσκευή&lt;/li&gt;&lt;li&gt;Εισάγετε το φορτιστή&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Αφαιρέστε το καλώδιο USB και το φορτιστή/li&gt;&lt;li&gt;Κρατήστε το κουμπί &lt;i&gt; Ενεργοποίησης&lt;/i&gt; για να απενεργοποιήσετε τη συσκευή&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;Κρατήστε το κουμπί &lt;i&gt; Ενεργοποίησης&lt;/ι&gt; για να ξεκινήσετε το Rockbox&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;Σημείωση:&lt;/b&gt; Μπορείτε να εγκαταστήσετε και άλλα μέρη πρώτα, αλλά τα παραπάνω βήματα &lt;b&gt;απαιτούνται&lt;/b&gt; για να ολοκληρώσετε την εγκατάσταση!&lt;/p&gt;</translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="60"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="60"/>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="66"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="66"/>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="74"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="74"/>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="80"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="80"/>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="188"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="188"/>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="193"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="193"/>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
         <location filename="../quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip-1.2/quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip_/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2258,23 +2224,23 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="383"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>Νέα εγκατάσταση</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="384"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Αυτή είναι μια καινούργια εγκατάσταση του Rockbox Utility ή πρόκειται για μια νέα έκδοση. Το παράθυρο ρυθμίσεων θα εμφανισθεί τώρα για να σας επιτρέψει να παραμετροποιήσετε το πρόγραμμα ή να δείτε ξανά τις ρυθμίσεις σας. </translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="391"/>
-        <location filename="../rbutilqt.cpp" line="622"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>Σφάλμα ρυθμίσεων</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="392"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Οι ρυθμίσεις σας δεν είναι έγκυρες. Πιθανότατα αυτό συμβαίνει λόγο αλλαγής διαδρομής της συσκευής. Το παράθυρο ρυθμίσεων θα εμφανισθεί τώρα για να σας επιτρέψει να διορθώσετε το πρόβλημα.</translation>
     </message>
@@ -2289,17 +2255,17 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="211"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="229"/>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2311,18 +2277,18 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="261"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="263"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="275"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2331,7 +2297,7 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">Επαλήθευση εγκατάστασης</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>Το σημείο προσάρτησης είναι λάθος!</translation>
     </message>
@@ -2348,127 +2314,127 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">Θέλετε σίγουρα να εγκαταστήσετε το αρχείο φωνής;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="493"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>Επαλήθευση απεγκατάστασης</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="494"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Θέλετε σίγουρα να απεγκαταστήσετε το bootloader;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="506"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="304"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="518"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="521"/>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="529"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="548"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>Επαλήθευση εγκατάστασης</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="549"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Θέλετε σίγουρα να εγκαταστήσετε το Rockbox Utility στη συσκευή σας; Μετά την εγκατάσταση θα μπορείτε να το τρέξετε από το σκληρό δίσκο της συσκευής σας.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>Εγκατάσταση Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="576"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Σφάλμα εγκατάστασης Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="580"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>Εγκατάσταση ρυθμίσεων χρήστη</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="584"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>Σφάλμα εγκατάστασης ρυθμίσεων χρήστη</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="588"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Επιτυχία εγκατάστασης Rockbox Utility.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="623"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Οι ρυθμίσεις σας δεν είναι έγκυρες. Παρακαλώ δείτε το παράθυρο ρυθμίσεων και σιγουρευτείτε ότι οι επιλεγμένες τιμές είναι σωστές.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="644"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="708"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="709"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="713"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="716"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="739"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="740"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="744"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="745"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="262"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>Σφάλμα δικτύου</translation>
     </message>
@@ -2901,17 +2867,17 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="127"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="129"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2931,27 +2897,27 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="158"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="163"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="236"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="294"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation type="unfinished">Δεν είναι γνωστή κάποια μέθοδος εγκατάστασης.</translation>
     </message>
@@ -3033,22 +2999,23 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished">Δεν ήταν δυνατή η δημιουργία αντίγραφου ασφαλείας. Συνέχεια;</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="420"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation type="unfinished">Απαιτούνται χειροκίνητα βήματα</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="641"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="224"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation type="unfinished">Σίγουρα θέλετε να συνεχίσετε;</translation>
     </message>
@@ -3391,17 +3358,17 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="242"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="283"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="294"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3416,7 +3383,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="261"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Η αντιγραφή του %1 στο %2 απέτυχε</translation>
     </message>
@@ -3522,82 +3489,82 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>Δεν υπάρχει επιλεγμένο θέμα</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="122"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Σφάλμα δικτύου: %1.
 Παρακαλώ ελέγξτε τις ρυθμίσεις δικτύου.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="135"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>Εμφανίσθηκε το παρακάτω σφάλμα:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="141"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>Ολοκληρώθηκε.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>Λήψη λεπτομερειών για %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="217"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>Λήψη προεπισκόπησης...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Συντάκτης:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
-        <location filename="../themesinstallwindow.cpp" line="233"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>Άγνωστο</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Έκδοση:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="234"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Περιγραφή:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="235"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>Δεν υπάρχει περιγραφή</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="262"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>Δεν υπάρχει προεπισκόπηση θέματος</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="290"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="297"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>Λήψη πληροφοριών θέματος...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="325"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="354"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>Το σημείο προσάρτησης είναι λάθος!</translation>
     </message>
@@ -3607,12 +3574,12 @@ Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="178"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -3620,7 +3587,7 @@ Please check your network and proxy settings.</source>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="251"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -3731,87 +3698,102 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>Εκκίνηση δημιουργίας αρχείου φωνής</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
-        <source>Extracted voice strings from installation</source>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
+        <source>Extracted voice strings from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="172"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="185"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Σφάλμα λήψης: σφάλμα HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="192"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>Χρησιμοποιήθηκε προσωρινά αποθηκευμένο αρχείο.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="195"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>Σφάλμα λήψης: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="200"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>Η λήψη ολοκληρώθηκε.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="213"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>Το άνοιγμα του ληφθέν αρχείου απέτυχε</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="219"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="347"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="358"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="276"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>Το ληφθέν αρχείο ήταν άδειο!</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="307"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>Σφάλμα ανοίγματος ληφθέν αρχείου</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="318"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>Σφάλμα ανοίγματος αρχείου εξόδου</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="338"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>Επιτυχής δημιουργία.</translation>
     </message>
@@ -3824,17 +3806,17 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>Ολοκληρώθηκε.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="78"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>Λήψη αρχείου %1. %2</translation>
     </message>
@@ -3847,54 +3829,54 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="vanished">Χρήση αρχείου προσωρινής μνήμης.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="113"/>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation type="unfinished">Σφάλμα λήψης: σφάλμα HTTP %1. {1
 %2?}</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>Σφάλμα λήψης: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="125"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished">Η λήψη ολοκληρώθηκε (χρήση προσωρινής μνήμης λήψεων).</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="128"/>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>Η λήψη ολοκληρώθηκε.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="135"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>Εξαγωγή αρχείου.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="156"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="168"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>Εγκατάσταση αρχείου.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="180"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>Εγκατάσταση αρχείου απέτυχε.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="193"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>Δημιουργία αρχείου καταγραφής εγκατάστασης</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="149"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>Δεν υπάρχει αρκετός χώρος στο δίσκο. Ματαίωση.</translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_he.ts b/utils/rbutilqt/lang/rbutil_he.ts
index 6065dad519..93f1c6861e 100644
--- a/utils/rbutilqt/lang/rbutil_he.ts
+++ b/utils/rbutilqt/lang/rbutil_he.ts
@@ -45,37 +45,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="88"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished">בחר את שם קובץ הגיבוי</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="108"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="115"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="124"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="143"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="146"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation type="unfinished">הגיבוי נכשל!</translation>
     </message>
@@ -583,46 +583,46 @@
     <name>BootloaderInstallImx</name>
     <message>
         <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
-        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished">מוריד את קובץ מנהל האיתחול</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation type="unfinished">מנהל האיתחול הותקן בהצלחה</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -796,77 +796,77 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished">מוריד את קובץ מנהל האיתחול</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">הצלחה: קובץ קושחה מוסגל נוצר</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished">כדי להסיר את ההתקנה, בצע שדרוג רגיל עם קובץ קושחה מקורי שלא נעשה בו שינוי</translation>
     </message>
@@ -1218,100 +1218,100 @@ See https://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="310"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>גודל זכרון מטמון נוכחי הוא %L1 kiB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="328"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation>מציג נגנים שאינם מאופשרים</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="329"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation>אפשרת הצגת נגנים המסומנים כלא מאופשרים. נגנים אלו אינם מומלצים למשתמשי קצה. אנא השתמש באפשרות זו רק אם אתה יודע מה אתה עושה.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="438"/>
-        <location filename="../configure.cpp" line="904"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="439"/>
-        <location filename="../configure.cpp" line="905"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="445"/>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>ההגדרות תקינות</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="484"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>ההגדרות אינן תקינות</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="523"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation>זיהוי פרוקסי</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="524"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation>הגדרות הפרוקסי של המערכת אינן תקינות
 תוכנת השירות של רוקבוקס אינה יכולה לעבוד עם הגדרות פרוקסי אלו. אנא וודא שהגדרות הפרוקסי של המערכת הינן נכונות. שים לב שהגדרות פרוקסי אוטומאטיות (proxy auto config - PAC) אינן נתמכות על ידי תוכנה זו. אם אלו הן הגדרות המערכת שלך עליך להשתמש בהגדרות פרוקסי ידניות.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="634"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation>קבע נתיב מטמון</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="656"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="730"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="733"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="738"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="740"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="751"/>
-        <location filename="../configure.cpp" line="755"/>
-        <location filename="../configure.cpp" line="800"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="782"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation>נמצא %1 &quot;MacPod&quot;!
@@ -1322,7 +1322,7 @@ Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </sour
         <translation type="obsolete">טעות מכרעת</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="766"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
@@ -1335,107 +1335,107 @@ Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="obsolete">תקלה מכרעת: נגן לא תואם</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="911"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation>הגדרות מנוע דיבור אינן תקינות</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="912"/>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation>הגדרות מנוע דיבור אינן תקינות.
 אנא הגדר את תצורת מנוע הדיבור.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="917"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation>לא מצליח להתחיל את מנוע הדיבור.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="918"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation>לא מצליח להתחיל את מנוע הדיבור.
 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="919"/>
-        <location filename="../configure.cpp" line="938"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation>
 אנא הגדר את תצורת מנוע הדיבור.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="933"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation>בדיקת דיבור של תוכנת השרות של רוקבוקס</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="936"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation>לא מצליח להקריא את מחרוזת הבדיקה.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="937"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation>לא מצליח להקריא את מחרוזת הבדיקה.
 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="853"/>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>זיהוי אוטומטי</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="773"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="854"/>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>לא מזהה נקודת עגינה.
 בחר את נקודת העגינה ידנית.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>לא מזהה נגן.
 בחר את הנגן ונקודת העגינה ידנית.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="789"/>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="797"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="864"/>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>באמת למחוק את המטמון?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="865"/>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>האם באמת ברצונך למחוק את המטמון? אנא וודא שברצונך לבצע פעולה זו נכונה, כיוון שהיא תמחק את &lt;b&gt;כל&lt;/b&gt; הקבצים בספרייה זו!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="873"/>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>נתיב שגוי!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="874"/>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>נתיב זכרון המטמון שגוי. מבטל.</translation>
     </message>
@@ -1465,22 +1465,22 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation>נקודת העגינה אינה ניתנת לכתיבה</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation>לא נבחר כל נגן</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="204"/>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>נתיב המטמון אינו ניתן לכתיבה. השאר את הנתיב ריק על מנת להשתמש בנתיב הקבצים הזמניים לפי ברירת המחדל של המערכת.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="223"/>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>עליך לתקן את השגיאות לעיל לפני שאתה יכול להמשיך.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="226"/>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation>שגיאת הגדרות</translation>
     </message>
@@ -1705,7 +1705,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>עברית</translation>
@@ -1767,18 +1767,18 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="106"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="107"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="111"/>
-        <location filename="../createvoicewindow.cpp" line="114"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1786,32 +1786,32 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="44"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation>ממתין למנוע...</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="91"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation>אישור</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="94"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="257"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation>עיין</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="272"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation>רענן</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="263"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1880,18 +1880,18 @@ Make sure you selected the correct mountpoint and the player is set up to use a
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation type="unfinished">קובץ</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation type="unfinished">גירסה</translation>
     </message>
     <message>
-        <location filename="../gui/infowidget.cpp" line="47"/>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2079,27 +2079,27 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="337"/>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="340"/>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation type="unfinished">לא שמיש</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="343"/>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation type="unfinished">לא יציב</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="346"/>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation type="unfinished">יציב</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="349"/>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation type="unfinished">לא ידוע</translation>
     </message>
@@ -2157,7 +2157,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="616"/>
+        <location filename="../configure.cpp" line="621"/>
         <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -2174,94 +2174,60 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation type="unfinished">התקנת מנהל האיתחול כמעט הסתיימה. ההתקנה &lt;b&gt;מחייבת&lt;/b&gt; שתבצע את הצעדים הבאים באופן ידני:</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;נתק את הנגן שלך בזהירות.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="131"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation type="unfinished">&lt;/il&gt;כבה את הנגן&lt;li&gt;&lt;/il&gt;הכנס את המטען&lt;li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation type="unfinished">&lt;/il&gt;נתן את ה- USB ואת ספקי הכח&lt;li&gt;לחץ על &lt;i&gt;Power&lt;/i&gt; על מנת לכבות את הנגן&lt;/il&gt;&lt;li&gt;הזז את מתג הסוללה על הנגן&lt;/il&gt;&lt;li&gt;לחץ על &lt;i&gt;Power&lt;/i&gt; כדי לאתחל לתוך רוקבוקס&lt;/il&gt;&lt;li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;שים לב:&lt;/b&gt; אתה יכול להתקין חלקים אחרים קודם לכן ללא חשש, אבל הצעדים לעיל הינם &lt;b&gt;נדרשים&lt;/b&gt; על מנת לסיים את ההתקנה!&lt;/p&gt;</translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="60"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="60"/>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="66"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="66"/>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="74"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="74"/>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="80"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="80"/>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="188"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="188"/>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="193"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="193"/>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
         <location filename="../quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip-1.2/quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip_/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2269,17 +2235,17 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="211"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation>מוריד מידע גירסאות, אנא המתן...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="229"/>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2291,65 +2257,65 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="261"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation>לא מצליח לקבל את מידע הגירסאות!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="263"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation>לא מצליח להשיג מידע גירסה.
 שגיאת רשת: %1. אנא בדוק את הרשת והגדרות הפרוקסי.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="304"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="383"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>התקנה חדשה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="384"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>זוהי התקנה חדשה של תוכנת השירות של רוקבוקס, או גירסה חדשה. תיבת השיח של ההגדרות תיפתח כעת על מנת לאפשר לך להגדיר את התוכנית, או לעבור על ההגדרות הקיימות.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="391"/>
-        <location filename="../rbutilqt.cpp" line="622"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>שגיאת הגדרות</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="392"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>ההגדרות שלך שגויות. לרוב הדבר נובע מכך שהנתיב לנגן השתנה. תיבת השיח של ההגדרות תיפתח כעת, על מנת לאפשר לך לתקן את הבעיה.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="518"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="521"/>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="708"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="709"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="275"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation>הורדת מידע הגירסאות הסתיימה.</translation>
     </message>
@@ -2358,7 +2324,7 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">אשר התקנה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>נקודת העגינה הינה שגויה!</translation>
     </message>
@@ -2375,67 +2341,67 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">האם באמת ברצונך להתקין את קובץ הקראת התפריטים?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="493"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>אשר הסרת התקנה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="494"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>האם באמת ברצונך להסיר את מנהל האיתחול?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="506"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="529"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="548"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>אשר התקנה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="549"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>האם באמת ברצונך להתקין את תוכנית השרות של רוקבוקס לנגן שלך? לאחר ההתקנה תוכל להריץ אותה מהתקן האיחסון של הנגן.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>מתקין את תוכנת השרות של רוקבוקס</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="576"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>שגיאה בהתקנת תוכנת השרות של רוקבוקס</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="580"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>מתקין הגדרות משתמש</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="584"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>שגיאה בהתקנת הגדרות משתמש</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="588"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>התקנת תוכנית השרות של רוקבוקס הסתיימה בהצלחה.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="623"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>ההגדרות שלך שגויות. אנא עבור לתיבת השיח של ההגדרות וודא שהערכים הנכונים נבחרו.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="644"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2448,37 +2414,37 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">&lt;b&gt;קיימת גירסה חדשה של תוכנית השרות&lt;/b&gt; &lt;br&gt;&lt;br&gt;ניתן להורידה מכאן: &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="713"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="716"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="739"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="740"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="744"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="745"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="262"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>שגיאת רשת</translation>
     </message>
@@ -2924,17 +2890,17 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="127"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="129"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2954,27 +2920,27 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="158"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="163"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="236"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="294"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation type="unfinished">אין שיטת התקנה ידועה.</translation>
     </message>
@@ -3056,22 +3022,23 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished">לא מצליח ליצור קובץ גיבוי. להמשיך?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="420"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation type="unfinished">צעדים ידניים נדרשים</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="641"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="224"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation type="unfinished">באמת להמשיך?</translation>
     </message>
@@ -3433,17 +3400,17 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>מעתיק קבצי הקראת התפריטים...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="242"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation>העתקת קובץ בוטלה</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="283"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation>מנקה...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="294"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation>הסתיים</translation>
     </message>
@@ -3458,7 +3425,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="261"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>העתקת %1 ל- %2 נכשלה</translation>
     </message>
@@ -3565,85 +3532,85 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>לא נבחרה ערכת נושא</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="122"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>תקלת רשת: %1.
 אנא בדוק את הגדרות הרשת והפרוקסי שלך.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="135"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>השגיאה הבאה התרחשה:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="141"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>הסתיים.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>טוען פרטים עבור %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="217"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>טוען תצוגה מקדימה...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translatorcomment>Keep in English</translatorcomment>
         <translation>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
-        <location filename="../themesinstallwindow.cpp" line="233"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translatorcomment>Keep in English</translatorcomment>
         <translation>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="234"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translatorcomment>Keep in English</translatorcomment>
         <translation>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="235"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>אין תיאור</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="262"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>אין תצוגה מקדימה של ערכת נושא</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="290"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="297"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>מוריד מידע על ערכות הנושא...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="325"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="354"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>נקודת העגינה הינה שגויה!</translation>
     </message>
@@ -3653,12 +3620,12 @@ Please check your network and proxy settings.</source>
         <translation>אין בחירה</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="178"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation>מידע</translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation>
             <numerusform>גודל הורדה kiB %L1 (פריט אחד)</numerusform>
@@ -3666,7 +3633,7 @@ Please check your network and proxy settings.</source>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="251"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>נכשלה תצורגה מקדימה של ערכת נושא.
@@ -3778,87 +3745,102 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>מתחיל ביצירת קבצי הקראה</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
-        <source>Extracted voice strings from installation</source>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
+        <source>Extracted voice strings from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="172"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation>מוריד מידע קול...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="185"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>כשלון בהורדה: התקבלה שגיאת HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="192"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>נעשה שימוש בקובץ הנמצא במטמון.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="195"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>שגיאת הורדה: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="200"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>הורדה הסתיימה.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="213"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>פתיחת הקובץ שירד נכשלה</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="219"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation>קורא מחרוזות...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation>יוצר קבצי הקראה...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="347"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation>מנקה...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="358"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation>הסתיים</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="276"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>הקובץ שירד היה ריק!</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="307"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>שגיאה בפתיחת הקובץ שירד</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="318"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>שגיאה בפתיחת קובץ הפלט</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="338"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>נוצר בהצלחה.</translation>
     </message>
@@ -3871,17 +3853,17 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>הסתיים.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="78"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>מוריד קובץ %1.%2</translation>
     </message>
@@ -3894,54 +3876,54 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="vanished">נעשה שימוש בקובץ מהמטמון.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="113"/>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation type="unfinished">שגיאת הורדה: התקבלה שגיאת %1 HTTP. {1
 %2?}</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>שגיאת הורדה: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="125"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished">הורדה הסתיימה (נעשה שימוש במטמון).</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="128"/>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>הורדה הסתיימה.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="135"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>פורס קובץ.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="156"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="168"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>מתקין קובץ.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="180"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>התקנת קובץ נכשלה.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="193"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>יוצר קובץ רישום של ההתקנה</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="149"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>אין מספיק מקום בדיסק! מבטל.</translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_it.ts b/utils/rbutilqt/lang/rbutil_it.ts
index d806334b1b..075037a0ab 100644
--- a/utils/rbutilqt/lang/rbutil_it.ts
+++ b/utils/rbutilqt/lang/rbutil_it.ts
@@ -45,37 +45,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="88"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished">Scegliere un nome per il file di backup</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="108"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="115"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="124"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="143"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="146"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation type="unfinished">Backup fallito!</translation>
     </message>
@@ -583,46 +583,46 @@
     <name>BootloaderInstallImx</name>
     <message>
         <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
-        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation type="unfinished">Bootloader installato con successo</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -795,77 +795,77 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">Firmware modificato creato con successo</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1241,119 +1241,119 @@ Vedi https://www.rockbox.org/wiki/SansaE200Install
         <translation>Il Mountpoint non è scrivibile</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation>Nessun player selezionato</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="204"/>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>Percorso cache non scrivibile.Lasciare in bianco per usare il percorso temporaneo di default.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="223"/>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>Occorre correggere gli errori sopraelencati prima di continuare.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="226"/>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation>errore nella configurazione</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="310"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>La dimensione corrente della cache è %L1 kiB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="328"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="329"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="438"/>
-        <location filename="../configure.cpp" line="904"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="439"/>
-        <location filename="../configure.cpp" line="905"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="445"/>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>Configurazione OK</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="484"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>Configurazione NON VALIDA</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="523"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="524"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="634"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="656"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="730"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="733"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="738"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="740"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="751"/>
-        <location filename="../configure.cpp" line="755"/>
-        <location filename="../configure.cpp" line="800"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="782"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation type="unfinished"></translation>
@@ -1363,108 +1363,108 @@ Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </sour
         <translation type="obsolete">Errore fatale</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="766"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="911"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="912"/>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="917"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="918"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="919"/>
-        <location filename="../configure.cpp" line="938"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="933"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="936"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="937"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="853"/>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>Riconoscimento automatico</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="773"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="854"/>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Impossibile individuare un Mountpoint.Selezionare un Mountpoint manualmente.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Impossibile individuare il dispositivo.Selezionare il dispositivo e il Mountpoint manualmente.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="789"/>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="797"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="864"/>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>Cancellare veramente la cache?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="865"/>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Si vuole cancellare veramente la cache? Assicurarsi che questa impostazione sia corretta poichè cancellarà&lt;b&gt;tutti&lt;/b&gt;i files in questa cartella!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="873"/>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>Percorso nonvalido!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="874"/>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>Il percorso per la cache non è valido.Interruzione in corso.</translation>
     </message>
@@ -1685,7 +1685,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Italiano</translation>
@@ -1747,18 +1747,18 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="106"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="107"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="111"/>
-        <location filename="../createvoicewindow.cpp" line="114"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1766,32 +1766,32 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="44"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation>In attesa di un motore...</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="91"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="94"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="257"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation>Esplora</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="272"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation>Aggiorna</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="263"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1860,18 +1860,18 @@ Make sure you selected the correct mountpoint and the player is set up to use a
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation type="unfinished">File</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation type="unfinished">Versione</translation>
     </message>
     <message>
-        <location filename="../gui/infowidget.cpp" line="47"/>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2059,27 +2059,27 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="337"/>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="340"/>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="343"/>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="346"/>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="349"/>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2137,7 +2137,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="616"/>
+        <location filename="../configure.cpp" line="621"/>
         <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -2154,94 +2154,60 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation type="unfinished">l&apos;installazione del bootloader è quasi completa. Per continuare &lt;b&gt;occorre&lt;/b&gt; che tu faccia le seguenti operazioni manualmente:</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Rimuovi il tuo player in maniera sicura.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="131"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Spegni il player&lt;/li&gt;&lt;li&gt;Inserisci il caricabatterie&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Stacca il cavo USB&lt;/li&gt;&lt;li&gt;Tieni premuto il tasto&lt;i&gt;Power&lt;/i&gt;per spegnere il player&lt;/li&gt;&lt;li&gt;Sposta l&apos;interruttore della batteria sul player&lt;/li&gt;&lt;li&gt;Tieni premuto &lt;i&gt;Power&lt;/i&gt; per avviare Rockbox&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt;Puoi installare in tutta sicurezza prima le altre componenti, ma i passi precedenti &lt;b&gt;sono indispensabili&lt;/b&gt;per concludere l&apos;installazione!&lt;/p&gt;</translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="60"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="60"/>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="66"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="66"/>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="74"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="74"/>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="80"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="80"/>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="188"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="188"/>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="193"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="193"/>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
         <location filename="../quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip-1.2/quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip_/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2249,33 +2215,33 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="262"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>Errore Rete</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="304"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="383"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>Nuova installazione</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="384"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Questa è una nuova installazione di Rockbox, o una nuova versione. Si aprirà una finestra che permetterà di impostare il programma o rivedere le tue impostazioni.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="391"/>
-        <location filename="../rbutilqt.cpp" line="622"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>Errore  nella configurazione</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="392"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>La tua configurazione non è valida. Questo spesso è causato da un cambiamento nel percorso del dispositivo. Si aprirà una finestra che permetterà di correggere il problema.</translation>
     </message>
@@ -2290,17 +2256,17 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="211"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="229"/>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2312,18 +2278,18 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="261"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="263"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="275"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2332,7 +2298,7 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">Conferma installazione</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>Punto di Mount errato!</translation>
     </message>
@@ -2349,117 +2315,117 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">Vuoi installare il file voce?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="493"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>Conferma disinstallazione</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="494"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Vuoi realmente disinstallare il bootloader?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="506"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="713"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="716"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="548"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>Conferma installazione</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="518"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="521"/>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="529"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="549"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Vuoi installare la Rockbox utility nel tuo player ? Dopo l&apos;installazione potrai avviarla dal disco del tuo player.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>Installazione Rockbox Utility in corso</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="576"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Errore nell&apos;installare l&apos;utility Rockbox</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="580"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>Installazione configurazione utente in corso</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="584"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>Errore nell&apos;installare la configurazione utente</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="588"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Rockbox Utility installata con successo.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="623"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>La tua configurazione non è valida. Per favore torna alla finestra per la configurazione e assicurati che i valori corretti siano selezionati.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="644"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="708"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="709"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="739"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="740"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="744"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="745"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2891,17 +2857,17 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="127"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="129"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2921,27 +2887,27 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="158"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="163"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="236"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="294"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation type="unfinished">Nessun metodo di installazione conosciuto.</translation>
     </message>
@@ -3023,22 +2989,23 @@ Premi &quot;No&quot; per saltare questo passo.</translation>
         <translation type="unfinished">Impossibile creare un backup. Continuare comunque?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="420"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation type="unfinished">Richiesto intervento manuale</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="641"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="224"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation type="unfinished">Vuoi continuare veramente?</translation>
     </message>
@@ -3381,17 +3348,17 @@ Premi &quot;No&quot; per saltare questo passo.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="242"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="283"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="294"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3406,7 +3373,7 @@ Premi &quot;No&quot; per saltare questo passo.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="261"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Copia di %1 in %2 fallita</translation>
     </message>
@@ -3517,29 +3484,29 @@ Premi &quot;No&quot; per saltare questo passo.</translation>
         <translation>Nessuna scelta</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="122"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Errore rete: %1. Per favore controlla le impostazioni di rete e del proxy.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="135"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>E&apos; sorto il seguente errore: %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="141"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>fatto.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="178"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation>Informazioni</translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation>
             <numerusform>Grandezza download %L1 kiB (%n oggetti)</numerusform>
@@ -3547,69 +3514,69 @@ Please check your network and proxy settings.</source>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>download dettagli per %1 in corso</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="217"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>download anteprima in corso...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Autore:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
-        <location filename="../themesinstallwindow.cpp" line="233"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>Sconosciuto</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Versione:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="234"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Descrizione:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="235"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>nessuna descrizione</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="251"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>Download anteprima tema fallita. Codice di risposta HTTP: %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="262"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>nessuna anteprima disponibile</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="290"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="297"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>download info sul tema in corso...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="325"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="354"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>Mount point errato!</translation>
     </message>
@@ -3724,87 +3691,102 @@ Sono necessari i privilegi di amministratore.&lt;/li&gt;</translation>
         <translation>Impossibile trovare rockbox-info.txt</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
-        <source>Extracted voice strings from installation</source>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
+        <source>Extracted voice strings from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="172"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="185"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Errore nel download: errore HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="192"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>Usato file in cache.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="195"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>Errore nel download: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="200"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>Download concluso.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="213"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>Impossibile aprire il file scaricato</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="219"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="347"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="358"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="276"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>Il file scaricato era vuoto!</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="307"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>Errore nell&apos;apertura del file scaricato</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="318"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>Errore nell&apos;apertura del file in outpt</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="338"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>Creato con successo.</translation>
     </message>
@@ -3812,12 +3794,12 @@ Sono necessari i privilegi di amministratore.&lt;/li&gt;</translation>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>Fatto.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="78"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>Download file in corso %1.%2</translation>
     </message>
@@ -3830,59 +3812,59 @@ Sono necessari i privilegi di amministratore.&lt;/li&gt;</translation>
         <translation type="vanished">Usato file in cache.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>Errore Download: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="128"/>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>Download concluso.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="135"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>Estrazione file in corso.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="156"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="149"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>Spazio du disco insufficente! Interruzione in corso.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="113"/>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation type="unfinished">Errore durante il download: errore HTTP %1. {1
 %2?}</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="125"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished">Download concluso (cache usata).</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="168"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>Installazione file in corso.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="180"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>Installazione file fallita.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="193"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>Creazione log dell&apos;installazione in corso</translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_ja.ts b/utils/rbutilqt/lang/rbutil_ja.ts
index b214ec035b..247edde3a3 100644
--- a/utils/rbutilqt/lang/rbutil_ja.ts
+++ b/utils/rbutilqt/lang/rbutil_ja.ts
@@ -45,37 +45,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="88"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished">バックアップファイルの選択</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="108"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="115"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="124"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="143"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="146"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation type="unfinished">バックアップが失敗しました!</translation>
     </message>
@@ -583,46 +583,46 @@
     <name>BootloaderInstallImx</name>
     <message>
         <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
-        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished">ブートローダをダウンロードしています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation type="unfinished">ブートローダのインストールが成功しました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -796,77 +796,77 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished">ブートローダをダウンロードしています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">成功: 変更されたファームウェアが作成されました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished">アンインストールは、改変されていないオリジナルのファームウェアを用いて通常の方法でファームウェアの更新を行って下さい</translation>
     </message>
@@ -1218,57 +1218,57 @@ https://www.rockbox.org/wiki/SansaE200Install を参照して下さい
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="853"/>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>自動検出</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="854"/>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>マウントポイントが検出できませんでした。
 マウントポイントを手動で選択して下さい。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>デバイスが検出できませんでした。
 デバイスおよびマウントポイントを手動で選択して下さい。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="789"/>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="797"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="864"/>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>本当にキャッシュを削除していいですか?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="865"/>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>本当にキャッシュを削除しますか?  このフォルダに含まれる&lt;b&gt;全ての&lt;/b&gt;ファイルを削除しますので、絶対に正しい値を設定して下さい!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="873"/>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>パスが間違っています!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="874"/>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>キャッシュのパスが不正です。処理を中止します。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="310"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>現在のキャッシュサイズは、%L1 kiB です。</translation>
     </message>
@@ -1277,14 +1277,14 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="obsolete">致命的なエラー</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="445"/>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>設定OK</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="484"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>不正な設定</translation>
     </message>
@@ -1314,116 +1314,116 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation>マウントポイントが書き込み禁止です</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation>プレイヤーが選択されていません</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="204"/>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>キャッシュのパスが書き込み禁止です。デフォルトのシステムテンポラリパスを空にします。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="223"/>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>処理を続行する前に、上記のエラーを修正する必要があります。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="226"/>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation>設定エラー</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="328"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation>推奨されないプレイヤーの表示</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="329"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation>あなたは推奨されないプレイヤーを表示するように変更しました。推奨外のプレイヤーは、一般的なユーザにはお勧めできません。どんなことがおきても、あなたが対処できる場合に限りこのオプションを有効にして下さい。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="438"/>
-        <location filename="../configure.cpp" line="904"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="439"/>
-        <location filename="../configure.cpp" line="905"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="523"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation>プロキシの検出</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="524"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation>システムのプロキシ設定は正しくありません
 Rockbox Utility は、このプロキシの設定では動作できません。システムのプロキシ設定を正しく設定して下さい。注意 &quot;proxy auto-config (PAC)&quot; スクリプトは、 Rockbox Utility ではサポートされていません。もし、あなたが使用しているシステムがこれを使用しているならば、手動でプロキシの設定を行う必要があります。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="634"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation>キャッシュのパスを設定して下さい</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="656"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="730"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="733"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="738"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="740"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="751"/>
-        <location filename="../configure.cpp" line="755"/>
-        <location filename="../configure.cpp" line="800"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="782"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation>%1 Macintosh 専用の iPod が見つかりました。
 Rockbox を実行するには、FAT 形式でフォーマットされた iPod (&quot;WinMad&quot;)が必要です。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="773"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="766"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
@@ -1436,49 +1436,49 @@ Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="obsolete">致命的なエラー: 互換性のないプレイヤーです</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="911"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation>TTS の設定が不正です</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="912"/>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation>TTS の設定が不正です
 TTSエンジンの設定を行って下さい。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="917"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation>TTS エンジンが実行できませんでした。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="918"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation>TTS エンジンが実行できませんでした。
 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="919"/>
-        <location filename="../configure.cpp" line="938"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation>
 TTSエンジンの設定を行って下さい。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="933"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation>Rockbox Utility Voice Test</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="936"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation>ボイスのテストができませんでした。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="937"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation>ボイスのテストができませんでした。
@@ -1705,7 +1705,7 @@ TTSエンジンの設定を行って下さい。</translation>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>日本語</translation>
@@ -1767,18 +1767,18 @@ TTSエンジンの設定を行って下さい。</translation>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="106"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="107"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="111"/>
-        <location filename="../createvoicewindow.cpp" line="114"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1786,32 +1786,32 @@ TTSエンジンの設定を行って下さい。</translation>
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="44"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation>エンコードエンジンを待っています...</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="91"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="94"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="257"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation>参照</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="272"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation>更新</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="263"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1880,18 +1880,18 @@ TTSエンジンの設定を行って下さい。</translation>
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation type="unfinished">ファイル</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation type="unfinished">バージョン</translation>
     </message>
     <message>
-        <location filename="../gui/infowidget.cpp" line="47"/>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2079,27 +2079,27 @@ TTSエンジンの設定を行って下さい。</translation>
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="337"/>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="340"/>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation type="unfinished">使用不可能</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="343"/>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation type="unfinished">不安定版</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="346"/>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation type="unfinished">安定版</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="349"/>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation type="unfinished">不明</translation>
     </message>
@@ -2157,7 +2157,7 @@ TTSエンジンの設定を行って下さい。</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="616"/>
+        <location filename="../configure.cpp" line="621"/>
         <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -2174,94 +2174,60 @@ TTSエンジンの設定を行って下さい。</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation type="unfinished">ブートローダのインストールは、ほとんど完了していますが、以下のことを手動で行う&lt;b&gt;必要があります&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;プレイヤーを安全に取り外します。&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="131"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;プレイヤーの電源を落として下さい&lt;/li&gt;&lt;li&gt;充電器に接続して下さい&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;USBおよび充電器から取り外して下さい&lt;/li&gt;&lt;li&gt;プレイヤーの電源を落として下さい&lt;/li&gt;&lt;li&gt;電源スイッチを切り替えて下さい&lt;/li&gt;&lt;li&gt;電源スイッチを入れ、Rockboxを起動して下さい&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt; 他のインストールを行うことができますが、インストールを完了させるためには、上記のことを行う&lt;b&gt;必要があります!&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="60"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="60"/>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="66"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="66"/>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="74"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="74"/>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="80"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="80"/>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="188"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="188"/>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="193"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="193"/>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
         <location filename="../quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip-1.2/quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip_/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2277,17 +2243,17 @@ TTSエンジンの設定を行って下さい。</translation>
         <translation type="vanished">ボイスファイルのインストールを本当に行いますか?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="493"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>アンインストールの確認</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="494"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>ブートローダのアンインストールを本当に行いますか?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="506"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation>このプレイヤーに対するアンインストール方法は不明です。</translation>
     </message>
@@ -2296,103 +2262,103 @@ TTSエンジンの設定を行って下さい。</translation>
         <translation type="vanished">Rockbox Utility は、このプレイヤーに対して、ブートローダをアンインストールすることができません。通常のファームウェアのアップデート処理を行って、ブートローダを削除して下さい。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="529"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="548"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>インストールの確認</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="549"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Rockbox Utilityをプレイヤーにインストールしてもいいですか? インストール後、プレイヤーのハードディスクから実行して下さい。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>Rockbox Utilityをインストールしています</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="708"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="709"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="713"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="716"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="739"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="740"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="744"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="745"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>マウントポイントが間違っています!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="576"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Rockbox Utilityのインストール中にエラーが発生しました</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="580"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>ユーザ設定をインストールしています</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="584"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>ユーザ設定のインストール中にエラーが発生しました</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="588"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Rockbox Utilityのインストールが成功しました。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="391"/>
-        <location filename="../rbutilqt.cpp" line="622"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>設定エラー</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="623"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>設定が正しくありません。設定ダイアログを表示し、選択された値が正しいか確認して下さい。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="384"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>これは、新規にインストール、または、新しいバージョンに更新された Rockbox Utility です。プログラムのセットアップを許可したり、または、設定を見直すために設定ダイアログが表示されることがあります。</translation>
     </message>
@@ -2407,7 +2373,7 @@ TTSエンジンの設定を行って下さい。</translation>
         <translation>Wine 上でこのプログラムを動かそうとしている様に思えます。Wine 上では処理が失敗するので、Wine 上で実行しないで下さい。代わりに Linux で動くバイナリを用いて下さい。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="263"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation>バージョン情報が取得できません。
@@ -2422,32 +2388,32 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">そのアプリケーションは、新規ビルドに対する情報をまだダウンロードしています。もう少し経ちましたら、再度行って下さい。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="383"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>新規インストール</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="392"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>設定が正しくありません。たぶん、デバイスのパスが変更されているのが原因です。問題を修正できるように、設定ダイアログが表示されます。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="262"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>ネットワークエラー</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="211"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation>ビルド情報をダウンロードしています。お待ち下さい...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="229"/>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2459,32 +2425,32 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="261"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation>バージョン情報を取得することができませんでした!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="275"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation>ビルド情報のダウンロードが完了しました。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="304"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="518"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="521"/>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="644"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2928,17 +2894,17 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="127"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="129"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2958,27 +2924,27 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="158"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="163"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="236"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="294"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation type="unfinished">インストール方法が不明です。</translation>
     </message>
@@ -3060,22 +3026,23 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished">バックアップファイルが作成されませんでした。続行しますか?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="420"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation type="unfinished">手動で行う必要があります</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="641"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="224"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation type="unfinished">本当に続行しますか?</translation>
     </message>
@@ -3437,7 +3404,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>ファイルリストを読み込んでいます...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="261"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>%1 から %2 にファイルをコピーすることに失敗しました</translation>
     </message>
@@ -3452,17 +3419,17 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="242"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation>ファイルのコピーが失敗しました</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="283"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation>不要なファイルを削除しています...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="294"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation>終了しました</translation>
     </message>
@@ -3568,82 +3535,82 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>テーマが選択されていません</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="122"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>ネットワークエラー: %1.
 ネットワークおよびプロキシーの設定を確認して下さい。</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="135"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>以下のエラーが発生しました:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="141"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>終了しました。</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>%1 の説明を取得しています</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="217"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>プレビューを取得しています...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;制作者:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
-        <location filename="../themesinstallwindow.cpp" line="233"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>不明</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;バージョン:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="235"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>説明はありません</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="262"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>テーマのプレビューはありません</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="290"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="297"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>テーマの情報を取得しています...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="325"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="354"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>マウントポイントが間違っています!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="234"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;説明:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
@@ -3653,19 +3620,19 @@ Please check your network and proxy settings.</source>
         <translation>選択されていません</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="178"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation>情報</translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation>
             <numerusform>ダウンロードサイズ %L1 kiB (%n アイテム)</numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="251"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>テーマのプレビュー画像の取得に失敗しました。
@@ -3777,62 +3744,77 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>ボイスファイルの作成を開始しています</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
-        <source>Extracted voice strings from installation</source>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
+        <source>Extracted voice strings from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="185"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>ダウンロードエラー: HTTP 受信のエラー %1.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="192"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>キャッシュファイルを使用しました。</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="195"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>ダウンロードエラー: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="200"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>ダウンロードが終了しました。</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="213"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>ダウンロードしたファイルが開けませんでした</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="276"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>ダウンロードしたファイルが空です!</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="307"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>ダウンロードしたファイルの読み込みエラー</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="318"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>出力ファイルの出力時のエラー</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="338"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>正常に作成されました。</translation>
     </message>
@@ -3842,27 +3824,27 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>rockbox-info.txt が見つかりませんでした</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="172"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation>ボイス情報をダウンロードしています...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="219"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation>文字列を読み込んでいます...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation>ボイスファイルを作成しています...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="347"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation>不要なファイルを削除しています...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="358"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation>終了しました</translation>
     </message>
@@ -3870,12 +3852,12 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>終了しました。</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="78"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>%1.%2 をダウンロードしています</translation>
     </message>
@@ -3884,42 +3866,42 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="vanished">ダウンロードエラー: HTTP 受信のエラー %1.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>ダウンロードエラー: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="125"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished">ダウンロードが終了しました (キャッシュの使用)。</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="128"/>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>ダウンロードが終了しました。</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="135"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>解凍しています。</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="156"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="168"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>ファイルをインストールしています。</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="180"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>ファイルのインストールに失敗しました。</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="193"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>インストール時のログを作成しています</translation>
     </message>
@@ -3928,19 +3910,19 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="vanished">キャッシュファイルを使用しました。</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="113"/>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation type="unfinished">ダウンロードエラー: HTTP 受信のエラー %1. {1
 %2?}</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="149"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>ディスクの空き領域が足りません! 処理を中止します。</translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_ko.ts b/utils/rbutilqt/lang/rbutil_ko.ts
index 618de19718..c1223623fd 100644
--- a/utils/rbutilqt/lang/rbutil_ko.ts
+++ b/utils/rbutilqt/lang/rbutil_ko.ts
@@ -45,37 +45,37 @@
         <translation>설치 크기: 계산 중...</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="88"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation>백업 파일이름 선택</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="108"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation>설치 크기: %L1 %2</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="115"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation>파일 존재함</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation>선택한 백업 파일이 이미 존재합니다. 덮어쓸까요?</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="124"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation>백업 시작 중...</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="143"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation>백업에 성공했습니다.</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="146"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation>백업에 실패했습니다!</translation>
     </message>
@@ -582,47 +582,51 @@
 <context>
     <name>BootloaderInstallImx</name>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
         <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation>부트로더를 설치하려면 원래 Sandisk 펌웨어(firmware.sb 파일) 사본을 제공해야 합니다. 이 파일은 Rockbox 부트로더로 패치되어 플레이어에 설치됩니다. 법적 이유로 이 파일은 직접 다운로드해야 합니다. 이 파일을 얻는 방법은 &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa 포럼&lt;/a&gt;을 찾아보거나 &lt;a href=&apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; 위키 페이지를 참조하세요.&lt;br/&gt; 계속해서 컴퓨터에서 펌웨어 파일을 검색하려면 확인을 누르세요.</translation>
+        <translation type="vanished">부트로더를 설치하려면 원래 Sandisk 펌웨어(firmware.sb 파일) 사본을 제공해야 합니다. 이 파일은 Rockbox 부트로더로 패치되어 플레이어에 설치됩니다. 법적 이유로 이 파일은 직접 다운로드해야 합니다. 이 파일을 얻는 방법은 &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa 포럼&lt;/a&gt;을 찾아보거나 &lt;a href=&apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; 위키 페이지를 참조하세요.&lt;br/&gt; 계속해서 컴퓨터에서 펌웨어 파일을 검색하려면 확인을 누르세요.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation>기존 펌웨어 파일을 읽을 수 없음</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation>부트로더 파일 다운로드</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation>파일 패치 중 ...</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation>기존 펌웨어 패치에 실패함</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation>펌웨어 파일을 성공적으로 패치함</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation>부트로더가 성공적으로 설치됨</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation>패치된 부트로더를 설치할 수 없음</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation>설치 제거하려면 수정되지 않은 기존 펌웨어로 일반적인 업그레이드를 실행하세요.</translation>
     </message>
@@ -631,7 +635,7 @@
     <name>BootloaderInstallIpod</name>
     <message>
         <source>Error: can&apos;t allocate buffer memory!</source>
-        <translation>오류: 버퍼 메모리를 할당할 수 없습니다!</translation>
+        <translation type="vanished">오류: 버퍼 메모리를 할당할 수 없습니다!</translation>
     </message>
     <message>
         <location filename="../base/bootloaderinstallipod.cpp" line="72"/>
@@ -651,10 +655,9 @@
         <translation>펌웨어 (%1)의 알 수 없는 버전 번호</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="67"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
-        <translation>경고: 이것은 MacPod이며, 록박스는 WinPod에서만 실행됩니다.
+        <translation type="vanished">경고: 이것은 MacPod이며, 록박스는 WinPod에서만 실행됩니다.
 https://www.rockbox.org/wiki/IpodConversionToFAT32 참고</translation>
     </message>
     <message>
@@ -728,6 +731,12 @@ https://www.rockbox.org/wiki/IpodConversionToFAT32 참고</translation>
         <source>Installing Rockbox bootloader</source>
         <translation>록박스 부트로더 설치</translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="67"/>
+        <source>Warning: This is a MacPod, Rockbox only runs on WinPods. 
+See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../base/bootloaderinstallipod.cpp" line="134"/>
         <source>Uninstalling bootloader</source>
@@ -796,77 +805,77 @@ https://www.rockbox.org/wiki/IpodConversionToFAT32 참고</translation>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>부트로더를 설치하려면 원본 펌웨어의 펌웨어 파일(bin 파일)을 제공해야 합니다. 법적인 이유로 이 파일을 직접 다운로드해야 합니다. 이 파일을 얻는 방법은 &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;설명서&lt;/a&gt; 및 &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; 위키 페이지를 참조하세요. &lt;br/&gt; 계속해서 컴퓨터에서 펌웨어 파일을 검색하려면 확인을 누르세요.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation>부트로더 파일 다운로드 중</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation>기존 펌웨어를 열 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation>원래 펌웨어를 읽을 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation>로드된 펌웨어 파일이 MPIO 기존 펌웨어 파일과 다릅니다.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation>출력 파일을 열 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation>출력 파일을 쓸 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation>알 수 없는 오류 번호: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation>다운로드한 부트로더를 열 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation>OF 파일의 부트로더 위치가 비어 있지 않습니다.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation>다운로드한 부트로더를 읽을 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation>부트로더 체크섬 오류입니다.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation>기존 펌웨어 패치 실패: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation>성공: 수정된 펌웨어 파일이 생성됨</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation>제거하려면 수정되지 않은 기존 펌웨어로 일반 업그레이드를 수행</translation>
     </message>
@@ -1042,17 +1051,17 @@ Could not remount the device, try to do it manually. If the iPod didn&apos;t res
     </message>
     <message>
         <source>Searching for Sansa</source>
-        <translation>Sansa를 찾는 중</translation>
+        <translation type="vanished">Sansa를 찾는 중</translation>
     </message>
     <message>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
-        <translation>디스크 접근 권한이 거부되었습니다!
+        <translation type="vanished">디스크 접근 권한이 거부되었습니다!
 부트로더를 설치하는 데 필요함</translation>
     </message>
     <message>
         <source>No Sansa detected!</source>
-        <translation>Sansa가 감지되지 않았습니다!</translation>
+        <translation type="vanished">Sansa가 감지되지 않았습니다!</translation>
     </message>
     <message>
         <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
@@ -1230,70 +1239,76 @@ https://www.rockbox.org/wiki/SansaE200Install 참고
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="853"/>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>자동 감지</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="854"/>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>마운트 지점을 감지할 수 없습니다.
 마운트 지점을 수동으로 선택하세요.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>장치를 감지할 수 없습니다.
 장치와 마운트 지점을 수동으로 선택하세요.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="789"/>
+        <location filename="../configure.cpp" line="787"/>
+        <source>%1 &quot;MacPod&quot; found!
+Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation>플레이어에 호환되지 않는 파일시스템이 포함되어 있습니다.
 올바른 마운트 지점을 선택했는지, 플레이어가 록박스와 호환되는 파일 시스템을 사용하도록 설정되었는지 확인하세요.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="797"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation>플레이어 감지 중에 알 수 없는 오류가 발생했습니다.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="864"/>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>정말 캐시를 삭제합니까?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="865"/>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>캐시를 삭제합니까? 이 폴더의 &lt;b&gt;모든&lt;/b&gt; 파일이 제거되므로 이 설정이 올바른지 반드시 확인하세요!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="873"/>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>경로가 잘못되었습니다!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="874"/>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>캐시 경로가 잘못되었습니다. 중단하는 중입니다.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="310"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>현재 캐시 크기는 %L1 kiB입니다.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="445"/>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>구성 확인</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="484"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>구성이 잘못됨</translation>
     </message>
@@ -1323,117 +1338,122 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation>마운트 지점에 쓸 수 없음</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation>선택한 플레이어가 없음</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="204"/>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>캐시 경로에 쓸 수 없습니다. 시스템 임시 경로를 기본값으로 지정하려면 경로를 비워 두세요.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="223"/>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>계속하려면 위의 오류를 수정해야 합니다.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="226"/>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation>구성 오류</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="328"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation>비활성화된 대상 표시</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="329"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation>비활성화된 것으로 표시된 대상 표시를 활성화했습니다. 비활성화된 대상은 최종 사용자에게 권장되지 않습니다. 현재 수행 중인 작업을 알고 있는 경우에만 이 옵션을 사용하세요.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="438"/>
-        <location filename="../configure.cpp" line="904"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation>TTS 오류</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="439"/>
-        <location filename="../configure.cpp" line="905"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>선택한 TTS를 초기화하는 데 실패했습니다. 이 TTS를 사용할 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="523"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation>프록시 감지</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="524"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation>시스템 프록시 설정이 잘못되었습니다!
 록박스 유틸리티는 이 프록시 설정으로 작동할 수 없습니다. 시스템 프록시가 올바르게 설정되었는지 확인하세요. 스크립트를 지원하지 않습니다. 록박스 유틸리티는 &quot;프록시 자동 구성(PAC)&quot; 시스템에서 이를 사용하는 경우 수동 프록시 설정을 사용해야 합니다.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="634"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation>캐시 경로 설정</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="656"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation>%1 (%3 GiB 중 %2 GiB 여유)</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="730"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation>여러 장치가 감지되었습니다. 하나를 제외한 모든 플레이어를 분리하고 다시 시도하세요.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="733"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation>감지된 장치:</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="738"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation>(알 수 없음)</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="740"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation>%2의 1%</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation>참고: 연결된 장치를 감지하는 것은 모호할 수 있습니다. 나열된 것보다 연결된 장치가 적을 수 있습니다. 이 경우 플레이어를 모호하지 않게 감지할 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="751"/>
-        <location filename="../configure.cpp" line="755"/>
-        <location filename="../configure.cpp" line="800"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation>장치 감지</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="782"/>
+        <location filename="../configure.cpp" line="917"/>
+        <source>TTS configuration invalid. 
+ Please configure TTS engine.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 &quot;MacPod&quot;를 찾았습니다!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
-        <translation>%1 &quot;MacPod&quot; gefunden!
+        <translation type="vanished">%1 &quot;MacPod&quot; gefunden!
 록박스를 실행하려면 FAT 형식의 아이팟(소위 &quot;WinPod&quot;)이 필요합니다.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="773"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>MTP 모드에서 %1 찾았습니다!
 설치를 위해 플레이어를 MSC 모드로 변경해야 합니다.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="766"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
@@ -1442,49 +1462,48 @@ Sorry, Rockbox doesn&apos;t run on your player.</source>
 죄송합니다. 록박스가 플레이어에서 실행되지 않습니다.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="911"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation>TTS 구성이 잘못됨</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="912"/>
         <source>TTS configuration invalid.
  Please configure TTS engine.</source>
-        <translation>TTS 구성이 잘못되었습니다.
+        <translation type="vanished">TTS 구성이 잘못되었습니다.
  TTS 엔진을 구성하세요.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="917"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation>TTS 엔진을 시작할 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="918"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation>TTS 엔진을 시작할 수 없습니다.
 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="919"/>
-        <location filename="../configure.cpp" line="938"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation>
 TTS 엔진을 구성하세요.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="933"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation>록박스 유틸리티 음성 테스트</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="936"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation>테스트 문자열을 음성으로 출력할 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="937"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation>테스트 문자열을 음성으로 출력할 수 없습니다.
@@ -1703,7 +1722,7 @@ TTS 엔진을 구성하세요.</translation>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>한국어</translation>
@@ -1765,18 +1784,18 @@ TTS 엔진을 구성하세요.</translation>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="106"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation>TTS 오류</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="107"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>선택한 TTS를 초기화하지 못했습니다. 이 TTS를 사용할 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="111"/>
-        <location filename="../createvoicewindow.cpp" line="114"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>TTS 엔진: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1784,34 +1803,38 @@ TTS 엔진을 구성하세요.</translation>
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="44"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation>엔진을 기다리는 중...</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="91"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation>확인</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="94"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="257"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation>찾아보기</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="272"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
+        <source>Select executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation>새로고침</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="263"/>
         <source>Select excutable</source>
-        <translation>실행 선택</translation>
+        <translation type="vanished">실행 선택</translation>
     </message>
 </context>
 <context>
@@ -1878,18 +1901,18 @@ TTS 엔진을 구성하세요.</translation>
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation>파일</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation>버전</translation>
     </message>
     <message>
-        <location filename="../gui/infowidget.cpp" line="47"/>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation>로딩 중 입니다. 잠시만 기다려주세요...</translation>
     </message>
@@ -2019,27 +2042,27 @@ TTS 엔진을 구성하세요.</translation>
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="337"/>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation>안정 (사용 중지됨)</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="340"/>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation>사용 불가r</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="343"/>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation>불안정</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="346"/>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation>안정</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="349"/>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation>알 수 없음</translation>
     </message>
@@ -2097,7 +2120,7 @@ TTS 엔진을 구성하세요.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="616"/>
+        <location filename="../configure.cpp" line="621"/>
         <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -2114,42 +2137,52 @@ TTS 엔진을 구성하세요.</translation>
         <translation>(알 수 없는 제품 이름)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation>부트로더 설치가 거의 완료되었습니다. 설치를 위해서는 다음 단계를 수동으로 수행하는 것이 &lt;b&gt;필요&lt;/b&gt;합니다:</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;플레이어를 안전하게 제거하세요.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;플레이어를 기존 펌웨어로 재부팅합니다.&lt;/li&gt;&lt;li&gt;원래 펌웨어의 업데이트 기능을 사용하여 펌웨어 업그레이드를 수행합니다. 자세한 내용은 플레이어 설명서를 참조하세요.&lt;/li&gt;&lt;b&gt;중요:&lt;/b&gt;펌웨어 업데이트는 중단되어서는 안 되는 중요한 프로세스입니다. &lt;b&gt;펌웨어 업데이트 프로세스를 시작하기 전에 플레이어가 충전되어 있는지 확인하십시오.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;펌웨어가 업데이트된 후 플레이어를 재부팅합니다.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation>&lt;li&gt;이전에 연결한 마이크로SD 카드 제거&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="131"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;플레이어를 분리합니다. 플레이어가 재부팅되고 원래 펌웨어가 업데이트됩니다. 자세한 내용은 플레이어 설명서를 참조하세요.&lt;br/&gt;&lt;b&gt;중요:&lt;/b&gt;펌웨어 업데이트는 중단되어서는 안 되는 중요한 프로세스입니다. &lt;b&gt;플레이어를 분리하기 전에 플레이어가 충전되었는지 확인하세요.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;펌웨어가 업데이트되면 플레이어를 재부팅하세요.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation>&lt;li&gt;플레이어 끄기&lt;/li&gt;&lt;li&gt;충전기 연결&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation>&lt;li&gt;USB와 전원 어댑터를 분리&lt;/li&gt;&lt;li&gt;플레이어를 끄려면 &lt;i&gt;전원&lt;/i&gt; 버튼을 길게 누름&lt;/li&gt;&lt;li&gt;플레이어의 배터리 스위치 전환&lt;/li&gt;&lt;li&gt;록박스로 부팅하려면 &lt;i&gt;전원&lt;/i&gt; 버튼을 을 누름&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;참고:&lt;/b&gt; 다른 부분을 먼저 안전하게 설치할 수 있지만, 위의 단계는 설치를 완료하는데 &lt;b&gt;필요&lt;/b&gt;합니다!&lt;/p&gt;</translation>
     </message>
@@ -2157,51 +2190,37 @@ TTS 엔진을 구성하세요.</translation>
 <context>
     <name>QuaGzipFile</name>
     <message>
-        <location filename="../quazip/quagzipfile.cpp" line="60"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="60"/>
         <source>QIODevice::Append is not supported for GZIP</source>
-        <translation>QIODevice::Append는 GZIP에서 지원되지 않음</translation>
+        <translation type="vanished">QIODevice::Append는 GZIP에서 지원되지 않음</translation>
     </message>
     <message>
-        <location filename="../quazip/quagzipfile.cpp" line="66"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="66"/>
         <source>Opening gzip for both reading and writing is not supported</source>
-        <translation>읽기와 쓰기를 위해 gzip을 여는 것은 지원되지 않음</translation>
+        <translation type="vanished">읽기와 쓰기를 위해 gzip을 여는 것은 지원되지 않음</translation>
     </message>
     <message>
-        <location filename="../quazip/quagzipfile.cpp" line="74"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="74"/>
         <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation>gzip은 읽기 또는 쓰기를 위해 열 수 있습니다. 어떤 것이 맞나요?</translation>
+        <translation type="vanished">gzip은 읽기 또는 쓰기를 위해 열 수 있습니다. 어떤 것이 맞나요?</translation>
     </message>
     <message>
-        <location filename="../quazip/quagzipfile.cpp" line="80"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="80"/>
         <source>Could not gzopen() file</source>
-        <translation>gzopen() 파일을 열 수 없음</translation>
+        <translation type="vanished">gzopen() 파일을 열 수 없음</translation>
     </message>
 </context>
 <context>
     <name>QuaZIODevice</name>
     <message>
-        <location filename="../quazip/quaziodevice.cpp" line="188"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="188"/>
         <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation>QIODevice::Append는 QuaZIODevice에서 지원되지 않음</translation>
+        <translation type="vanished">QIODevice::Append는 QuaZIODevice에서 지원되지 않음</translation>
     </message>
     <message>
-        <location filename="../quazip/quaziodevice.cpp" line="193"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="193"/>
         <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation>QIODevice::ReadWrite는 QuaZIODevice에서 지원되지 않음</translation>
+        <translation type="vanished">QIODevice::ReadWrite는 QuaZIODevice에서 지원되지 않음</translation>
     </message>
 </context>
 <context>
     <name>QuaZipFile</name>
     <message>
         <location filename="../quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip-1.2/quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip_/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation>ZIP/Unzip API 오류 %1</translation>
     </message>
@@ -2209,92 +2228,92 @@ TTS 엔진을 구성하세요.</translation>
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="493"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>설치 제거 확인</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="494"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>정말 부트로더를 제거할까요?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="506"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation>이 대상에 대한 제거 방법은 알려져 있지 않습니다.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="529"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation>록박스 부트로더를 찾을 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="548"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>설치 확인</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="549"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>플레이어에 록박스 유틸리티를 설치하시겠습니까? 설치 후 플레이어의 하드 드라이브에서 실행할 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>록박스 유틸리티 설치</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="708"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation>록박스 유틸리티 업데이트 사용 가능</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="709"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation>&lt;b&gt;새로운 록박스 유틸리티 버전이 출시되었습니다.&lt;/b&gt;&lt;br&gt;&lt;br&gt;현재 버전 %1을 사용하고 있습니다. 버전 %2를 &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;에서 받으세요.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="713"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation>록박스 유틸리티의 새 버전이 출시되었습니다.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="716"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation>록박스 유틸리티가 최신 버전입니다.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="739"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation>장치 꺼내짐</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="740"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation>장치가 성공적으로 꺼졌습니다. 이제 PC에서 플레이어 연결을 끊을 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="744"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation>꺼내기 실패</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="745"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation>장치를 꺼내지 못했습니다. 장치의 파일에 접속하는 프로그램이 없는지 확인하세요. 여전히 꺼내기에 실패하면 컴퓨터의 꺼내기 기능을 사용하세요.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>마운트 지점이 잘못되었습니다!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation>인증서 오류</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="229"/>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2313,48 +2332,48 @@ Eigentümer: %3
 인증서를 일시적으로 신뢰할까요?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="518"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation>록박스 유틸리티는 플레이어의 부트로더를 제거할 수 없습니다. 플레이어 공급업체의 펌웨어 업데이트 프로세스를 사용하여 펌웨어 업데이트를 수행하세요.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="521"/>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation>중요: 공급업체의 펌웨어 업데이트 프로세스를 사용하기 전에 플레이어를 원래 펌웨어로 부팅해야 합니다.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="576"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>록박스 유틸리티 설치 오류</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="580"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>사용자 구성 설치</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="584"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>사용자 구성 설치 오류</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="588"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>록박스 유틸리티를 성공적으로 설치했습니다.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="391"/>
-        <location filename="../rbutilqt.cpp" line="622"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>구성 오류</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="623"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>구성이 잘못되었습니다. 구성 대화 상자로 이동하여 선택한 값이 올바른지 확인하세요.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="384"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>록박스 유틸리티를 새로 설치하거나 새 버전을 설치하는 것입니다. 이제 프로그램을 설정하거나 설정을 검토할 수 있는 구성 대화 상자가 열립니다.</translation>
     </message>
@@ -2369,49 +2388,49 @@ Eigentümer: %3
         <translation>이 프로그램을 Wine에서 실행하려는 것 같습니다. 이렇게 하지 마십시오. Wine에서 실행하면 실패합니다. 대신 기본 리눅스 바이너리를 사용하세요.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="263"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation>버전 정보를 가져올 수 없습니다.
 네트워크 오류: %1입니다. 네트워크 및 프록시 설정을 확인하세요.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="383"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>새로운 설치</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="392"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>구성이 잘못되었습니다. 이는 장치 경로가 변경되었기 때문일 가능성이 높습니다. 이제 문제를 해결할 수 있는 구성 대화 상자가 열립니다.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="262"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>네트워크 오류</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="211"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation>빌드 정보를 다운로드하는 중이므로, 잠시 기다려 주세요...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="261"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation>버전 정보를 얻을 수 없습니다!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="275"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation>빌드 정보 다운로드가 완료되었습니다.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="304"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation>사용된 라이브러리</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="644"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation>업데이트 확인 중...</translation>
     </message>
@@ -2827,17 +2846,17 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation>이것은 결국 다음 록박스 버전이 될 것입니다. 테스트에 도움이 되도록 설치하세요.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="127"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation>안정적 릴리스 (버전 %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation>개발 버전 (리비전 %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="129"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation>릴리스 후보 (리비전 %1)</translation>
     </message>
@@ -2857,27 +2876,27 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation>선택한 버전에서는 사용할 수 없음</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation>일일 빌드 (%1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="158"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation>선택한 플레이어에는 부트로더가 필요하지 않습니다.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="163"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation>부트로더는 록박스를 시작하는 데 필요합니다. 부트로더 설치는 처음 설치할 때만 필요합니다.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="236"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation>마운트 지점이 잘못됨</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="294"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation>알려진 설치 방법이 없습니다.</translation>
     </message>
@@ -2959,22 +2978,23 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>백업 파일을 생성할 수 없습니다. 계속할까요?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="420"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation>수동 단계 필요</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="641"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation>설치에는 플러그인 데이터 파일이 필요하지 않으므로, 건너뜁니다.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="224"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation>설치를 계속할까요?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation>정말 계속할까요?</translation>
     </message>
@@ -3313,7 +3333,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>파일목록 읽는 중...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="261"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>%1을(를) %2(으)로 복사 실패함</translation>
     </message>
@@ -3328,17 +3348,17 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>%1 폴더에 대한 Talk 파일 생성 시작</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="242"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation>파일 복사 중단됨</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="283"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation>지우기 중...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="294"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation>완료함</translation>
     </message>
@@ -3444,82 +3464,82 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>선택한 테마 없음</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="122"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>네트워크 오류: %1입니다.
 네트워크 및 프록시 설정을 확인하세요.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="135"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>다음 오류가 발생했습니다:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="141"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>완료하였습니다.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>%1 세부 정보를 가져오는 중</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="217"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>미리보기를 가져오는 중...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;제작자:&lt;/b&gt; %1&lt;시간/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
-        <location filename="../themesinstallwindow.cpp" line="233"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>알 수 없음</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;버전:&lt;/b&gt; %1&lt;시간/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="235"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>설명 없음</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="262"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>테마 미리보기 없음</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="290"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation>선택</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="297"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>테마 정보를 가져오는 중...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="325"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation>선택된 테마가 없으므로, 건너뜀</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="354"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>마운트 지점이 잘못되었습니다!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="234"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;설명:&lt;/b&gt; %1&lt;시간/&gt;</translation>
     </message>
@@ -3529,19 +3549,19 @@ Please check your network and proxy settings.</source>
         <translation>선택 없음</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="178"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation>정보</translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
-	<translation>
+        <translation>
             <numerusform>다운로드 크기 %L1 kiB (%n개 항목)</numerusform>
-	</translation>
+        </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="251"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>테마 미리보기를 가져오지 못했습니다.
@@ -3653,62 +3673,77 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>음성 파일 생성 시작</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
         <source>Extracted voice strings from installation</source>
         <translation>설치에서 추출된 음성 문자열</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="100"/>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation>추출된 음성 문자열이 호환되지 않음</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation>설치, 다운로드에서 문자열을 검색할 수 없음</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="185"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>다운로드 오류: HTTP 오류 %1을(를) 받았습니다.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="192"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>캐시된 파일이 사용되었습니다.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="195"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>다운로드 오류: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="200"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>다운로드가 완료되었습니다</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="213"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>다운로드한 파일을 열기 실패함</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="276"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>다운로드한 파일이 비어 있었습니다!</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="307"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>다운로드한 파일을 여는 동안 오류 발생</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="318"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>출력 파일을 여는 동안 오류 발생</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="338"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>성공적으로 생성되었습니다.</translation>
     </message>
@@ -3718,27 +3753,27 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>rockbox-info.txt를 찾을 수 없음</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="172"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation>음성 정보 다운로드 중...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="219"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation>문자열 읽는 중...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation>음성 파일 생성 중...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="347"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation>지우는 중...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="358"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation>완료됨</translation>
     </message>
@@ -3746,73 +3781,73 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>완료하였습니다.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="78"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>file %1.%2 다운로드</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>다운로드 오류: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="125"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation>다운로드가 완료되었습니다. (캐시가 사용됨)</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="128"/>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>다운로드가 완료되었습니다.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="135"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>파일 추출 중입니다.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="156"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation>추출에 실패했습니다!</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="168"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>파일을 설치합니다.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="180"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>파일 설치에 실패했습니다.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="193"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>설치 로그 생성</translation>
     </message>
     <message>
         <source>Cached file used.</source>
-        <translation>캐시된 파일을 사용했습니다.</translation>
+        <translation type="vanished">캐시된 파일을 사용했습니다.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation>패키지 설치가 성공적으로 완료되었습니다.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="113"/>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation>다운로드 오류: HTTP 오류 %1 발생
 %2</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="149"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>디스크 공간이 부족합니다! 중단합니다.</translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_nl.ts b/utils/rbutilqt/lang/rbutil_nl.ts
index 36bafbbc9e..e5312ce2a2 100644
--- a/utils/rbutilqt/lang/rbutil_nl.ts
+++ b/utils/rbutilqt/lang/rbutil_nl.ts
@@ -45,37 +45,37 @@
         <translation>Installatiegrootte: berekenen ...</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="88"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation>Selecteer backup bestandsnaam</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="108"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation>Installatiegrootte: %L1 %2</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="115"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation>Bestand bestaat</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation>Het geselecteerde backup-bestand bestaat al. Overschrijven?</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="124"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation>Starten backup ...</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="143"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation>Backup succesvol.</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="146"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation>Backup mislukt!</translation>
     </message>
@@ -586,47 +586,51 @@
 <context>
     <name>BootloaderInstallImx</name>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
         <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation>Voor installatie van de bootloader is het nodig dat u een kopie van de originele Sandisk firmware (firmware.sb bestand) aanlevert. Dit bestand zal aangepast en dan geïnstalleerd worden op uw speler. U moet dit bestand zelf downloaden om juridische redenen. Ga naar &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; of kijk op de &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wikipagina hoe u dit bestand kan verkrijgen.&lt;br/&gt;Druk Ok om door te gaan en om op uw computer te bladeren naar het firmware bestand.</translation>
+        <translation type="vanished">Voor installatie van de bootloader is het nodig dat u een kopie van de originele Sandisk firmware (firmware.sb bestand) aanlevert. Dit bestand zal aangepast en dan geïnstalleerd worden op uw speler. U moet dit bestand zelf downloaden om juridische redenen. Ga naar &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; of kijk op de &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wikipagina hoe u dit bestand kan verkrijgen.&lt;br/&gt;Druk Ok om door te gaan en om op uw computer te bladeren naar het firmware bestand.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation>Kon origineel firmware-bestand niet lezen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation>Bezig met downloaden van Bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation>Bezig met aanpassen bestand...</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation>Aanpassen van het originele firmware-bestand is mislukt</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation>Firmware-bestand is met succes aangepast</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation>Bootloader succesvol geïnstalleerd</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation>Aangepaste bootloader kon niet geïnstalleerd worden</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation>Voor deïnstallatie, voer een normale upgrade uit met een ongewijzigde originele firmware.</translation>
     </message>
@@ -800,77 +804,77 @@ Zie https://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>Voor installatie van de bootloader is het nodig dat u een kopie van de originele firmware (bin bestand) aanlevert. Dit bestand zal aangepast worden en dan geïnstalleerd op uw speler, samen met de rockbox bootloader. U moet dit bestand zelf downloaden om juridische redenen. Kijk op &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; of op &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; en de &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wikipagina hoe u dit bestand kan verkrijgen.&lt;br/&gt;Druk Ok om door te gaan en om op uw computer te bladeren naar het firmware bestand.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation>Bezig met downloaden van Bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation>Kon originele firmware niet openen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation>Kon originele firmware niet lezen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation>De geladen firmware lijkt niet op een MPIO origineel firmware-bestand.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation>Kon uitvoerbestand niet openen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation>Kon niet schrijven naar uitvoerbestand.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation>Onbekende foutcode: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation>Kon ge-downloade bootloader niet openen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation>Plek voor bootloader in de OF is niet leeg.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation>Kon ge-downloade bootloader niet lezen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation>Controlesom van bootloader fout.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation>Aanpassen van originele firmware mislukt: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation>Succes: gemodificeerde Firmware aangemaakt</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation>Voer een normale upgrade met een originele firmware uit, om te deïnstalleren</translation>
     </message>
@@ -1221,41 +1225,41 @@ Zie https://www.rockbox.org/wiki/SansaE200Install</translation>
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="328"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation>Uitgeschakelde spelers tonen</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="329"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation>U heeft zojuist gekozen om spelers te tonen die als uitgeschakeld zijn gemarkeerd. Deze spelers worden niet aanbevolen voor eindgebruikers. Gebruik deze optie alleen als u weet waar u mee bezig bent.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="523"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation>Proxy-detectie</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="524"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation>The systeemproxy-detectie instellingen zijn ongeldig!
 Rockbox Utility kan niet werken met deze instellingen. Stel de systeemproxy-instellingen juist in. Let op: &quot;proxy auto-config (PAC)&quot; scripts worden niet ondersteund door Rockbox Utility. Wanneer uw systeem dit gebruikt, moet u handmatige proxy-instellingen gebruiken.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="634"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation>Stel cache-locatie in</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="782"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation>%1 &quot;MacPod&quot; gevonden!
 Rockbox heeft een FAT-geformattered Ipod (een zogenaamde &quot;WinPod&quot;) nodig om te kunnen draaien.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="773"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>%1 in MTP modus gevonden!
@@ -1266,7 +1270,7 @@ U moet uw speler in MSC modus zetten voor installatie.</translation>
         <translation type="obsolete">Installatie zal mislukken totdat u dit aanpast!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="766"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
@@ -1279,149 +1283,149 @@ Sorry, Rockbox werkt niet op uw speler.</translation>
         <translation type="obsolete">Fataal: speler incompatibel</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="853"/>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>Autoherkenning</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="854"/>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Kon geen Mountpunt herkennen.
 Gelieve uw Mountpunt manueel te selecteren.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Kon geen apparaat herkennen.
 Selecteer uw apparaat en Mountpunt manueel.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="438"/>
-        <location filename="../configure.cpp" line="904"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation>TTS-fout</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="439"/>
-        <location filename="../configure.cpp" line="905"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>Het initialiseren van de gekozen TTS is mislukt. Deze TTS kan niet gebruikt worden.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="656"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="730"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation>Er zijn meerdere apparaten gedetecteerd. Ontkoppel alle spelers op een na en probeer opnieuw.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="733"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation>Gedetecteerde apparaten:</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="738"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation>(onbekend)</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="740"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation>Let op: het detecteren van aangesloten apparaten is niet altijd betrouwbaar. Er zijn mogelijk minder apparaten aangesloten dan aangegeven. In dat geval is het misschien niet mogelijk om uw speler betrouwbaar te detecteren.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="751"/>
-        <location filename="../configure.cpp" line="755"/>
-        <location filename="../configure.cpp" line="800"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation>Apparaatdetectie</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="789"/>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation>De speler bevat een incompatibel bestandsysteem.
 Controleer dat het juiste MountPoint geselecteerd is en dat de speler geconfigureerd is met een bestandsysteem dat compatibel is met Rockbox.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="797"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation>Een onbekende fout is opgetreden tijdens detectie van de speler.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="864"/>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>Wilt u zeker de cache ledigen?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="865"/>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Wilt u zeker de cache ledigen? Wees absoluut zeker dat deze instelling correct is aangezien het &lt;b&gt;alle&lt;/b&gt; bestanden in deze map zal verwijderen!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="873"/>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>Pad is verkeerd!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="874"/>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>Het cache pad is ongeldig. Bezig met afbreken.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="911"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation>TTS configuratie ongeldig</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="912"/>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation>TTS configuratie ongeldig.
 Gelieve de TTS engine te configureren.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="917"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation>Kon TTS niet starten.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="936"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation>Kon testzin niet uitspreken.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="918"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation>Kon de TTS engine niet starten.
 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="919"/>
-        <location filename="../configure.cpp" line="938"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation>
 Gelieve de TTS engine te configureren.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="933"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation>Rockbox Utility stemtest</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="937"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation>Kon de test zin niet inspreken.
@@ -1432,19 +1436,19 @@ Gelieve de TTS engine te configureren.</translation>
         <translation type="obsolete">Fatale fout</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="310"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Huidige cache grootte is %L1 kiB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="445"/>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>Configuratie OK</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="484"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>Configuratie ONGELDIG</translation>
     </message>
@@ -1474,22 +1478,22 @@ Gelieve de TTS engine te configureren.</translation>
         <translation>Aankoppelpunt is niet beschrijfbaar</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation>Geen speler geselecteerd</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="204"/>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>Cache pad is niet schrijfbaar. Laat het pad leeg om het systeemsstandaard tijdelijke pad te gebruiken.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="223"/>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>U moet de bovenstaande fouten herstellen vooraleer verder te gaan.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="226"/>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation>Configuratie fout</translation>
     </message>
@@ -1716,7 +1720,7 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Nederlands</translation>
@@ -1778,18 +1782,18 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="106"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation>TTS-fout</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="107"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>Het initialiseren van de gekozen TTS is mislukt. Deze TTS kan niet gebruikt worden.</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="111"/>
-        <location filename="../createvoicewindow.cpp" line="114"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Engine: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1797,32 +1801,32 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="44"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation>Bezig met wachten op de engine...</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="91"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="94"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="257"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation>Bladeren</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="272"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation>Vernieuwen</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="263"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation>Selecteer programma</translation>
     </message>
@@ -1891,18 +1895,18 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation>Bestand</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation>Versie</translation>
     </message>
     <message>
-        <location filename="../gui/infowidget.cpp" line="47"/>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2098,27 +2102,27 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="337"/>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="340"/>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation type="unfinished">Onbruikbaar</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="343"/>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation type="unfinished">Onstabiel</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="346"/>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation type="unfinished">Stabiel</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="349"/>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation type="unfinished">Onbekend</translation>
     </message>
@@ -2176,7 +2180,7 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="616"/>
+        <location filename="../configure.cpp" line="621"/>
         <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -2193,94 +2197,60 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
         <translation>(onbekende productnaam)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation>Bootloader installatie is bijna voltooid. De installatie &lt;b&gt;vereist&lt;/b&gt; dat u de volgende stappen handmatig uitvoert:</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Verwijder veilig uw speler.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Herstart uw speler en ga naar de originele firmware.&lt;/li&gt;&lt;li&gt;Voer een firmware-upgrade uit met de updatefunctionaliteit van de originele firmware. Kijk in de handleiding van uw speler voor details.&lt;br/&gt;&lt;b&gt;Belangrijk:&lt;/b&gt; De firmware-upgrade is een kritiek proces dat niet onderbroken mag worden.&lt;b&gt;Verzeker u ervan dat de speler is opgeladen voordat het firmware-upgrade proces wordt gestart.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;Herstart uw speler nadat de firmware-upgrade is voltooid.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation>&lt;li&gt;Verwijder eventuele ingestoken microSD kaart&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="131"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Koppel uw speler los. De speler zal opnieuw opstarten en een upgrade van de originele firmware uitvoeren. Kijk in de handleiding van uw speler voor details.&lt;br/&gt;&lt;b&gt;Belangrijk:&lt;/b&gt; De firmware-upgrade is een kritiek proces dat niet onderbroken mag worden. &lt;b&gt;Verzeker u ervan dat de speler is opgeladen voordat het firmware-upgrade proces wordt gestart.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;Herstart uw speler nadat de firmware-upgrade is voltooid.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation>&lt;li&gt;Zet de speler uit&lt;/li&gt;&lt;li&gt;Steek de oplader erin&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation>&lt;li&gt;Ontkoppel USB en stroomadapters&lt;/li&gt;&lt;li&gt;Hou &lt;i&gt;Power&lt;/i&gt; ingedrukt om de speler uit te schakelen&lt;/li&gt;&lt;li&gt;Zet de batterij schakelaar uit en aan op de speler&lt;/li&gt;&lt;li&gt;Hou &lt;i&gt;Power&lt;/i&gt; ingedrukt om in Rockbox op te starten&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;Noot:&lt;/b&gt; U kan veilig andere delen eerst installeren, maar de hierboven vermelde stappen zijn &lt;b&gt;vereist&lt;/b&gt; om de installatie te voltooien!&lt;/p&gt;</translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="60"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="60"/>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="66"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="66"/>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="74"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="74"/>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="80"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="80"/>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="188"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="188"/>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="193"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="193"/>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
         <location filename="../quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip-1.2/quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip_/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation>ZIP/UNZIP API-fout %1</translation>
     </message>
@@ -2288,17 +2258,17 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="211"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation>Bezig met downloaden van build informatie, wachten aub...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="261"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation>Kan versie-informatie niet verkrijgen!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="275"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation>Downloaden van build informatie voltooid.</translation>
     </message>
@@ -2307,7 +2277,7 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
         <translation type="vanished">Bevestig Installatie</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>Mount punt is verkeerd!</translation>
     </message>
@@ -2332,17 +2302,17 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
         <translation type="vanished">De geïnstalleerde versie van Rockbox is een development-versie. Voorgenerereerde spraakbestanden zijn alleen beschikbaar voor release-versies van Rockbox. U kunt een spraakbestand genereren met de &quot;Creëer spraakbestanden&quot; functionaliteit.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="493"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>Bevestig Deïnstallatie</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="494"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Wilt u zeker de Bootloader deïnstalleren?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="506"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation>Geen deïnstallatiemethode voor de speler gevonden.</translation>
     </message>
@@ -2351,57 +2321,57 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
         <translation type="vanished">Rockbox Utility kon de bootloader van deze speler niet deïnstalleren. Probeer een normale firmware update om de bootloader te verwijderen.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="529"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation>Geen Rockbox bootloader gevonden.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="548"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>Bevestig installatie</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="549"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Wilt u zeker Rockbox Utility installeren op uw speler? Na installatie kan u het opstarten vanaf  de harde schijf van uw speler.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>Bezig met installeren van Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="576"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Fout tijdens installeren van Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="580"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>Bezig met installeren van gebruikerconfiguratie</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="584"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>Fout tijdens installeren van gebruikersconfiguratie</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="588"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Rockbox Utility is succesvol geïnstalleerd.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="644"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation>Controleren op een update...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="708"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="709"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2414,63 +2384,63 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
         <translation type="vanished">&lt;b&gt;Nieuwe versie Rockbox Utility beschikbaar.&lt;/b&gt; &lt;br&gt;&lt;br&gt;Download het hier: &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="713"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation>Nieuwe versie van Rockbox Utility beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="716"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation>Rockbox Utility is de meest actuele versie.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="739"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation>Apparaat ontkoppeld</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="740"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation>Apparaat succesvol ontkoppeld. U kunt nu de speler van de PC loskoppelen.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="744"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation>Ontkoppelen mislukt</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="745"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation>Ontkoppelen van het apparaat mislukt. Controleer dat er geen programma&apos;s zijn die bestanden op het apparaat benaderen. Als ontkoppelen dan nog steeds mislukt, gebruik dan de ontkoppelfunctie van de computer.  </translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="391"/>
-        <location filename="../rbutilqt.cpp" line="622"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>Configuratie fout</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="304"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="518"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="521"/>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="623"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Uw configuratie is ongeldig. Gelieve naar het configuratie scherm te gaan en de juiste instellingen te gebruiken.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="384"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Dit is een nieuwe installatie van Rockbox Utility, of een nieuwe versie. Het configuratie scherm zal nu openen, zodat u het programma kan instellen, of uw instellingen nakijken.</translation>
     </message>
@@ -2485,12 +2455,12 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
         <translation>Het lijkt erop dat u dit programma onder Wine draait. Doe dit alstublieft niet, draaien onder Wine zal mislukken. Gebruik in plaats daarvan de Linux applicatie.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="229"/>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2502,7 +2472,7 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="263"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation>Can versie-informatie niet ophalen.
@@ -2517,17 +2487,17 @@ Netwerkfout: %1. Controleer uw netwerk- en proxy-instellingen.</translation>
         <translation type="vanished">Deze applicatie is nog steeds bezig met informatie over nieuwe Builds te downloaden. Gelieve binnen een korte periode opnieuw te proberen.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="383"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>Nieuwe installatie</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="392"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Uw configuratie is ongeldig. Dit komt waarschijnlijk door een veranderd apparaat pad. Het configuratie scherm zal nu openen zodat u de fout kan herstellen.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="262"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>Netwerk fout</translation>
     </message>
@@ -2975,17 +2945,17 @@ Netwerkfout: %1. Controleer uw netwerk- en proxy-instellingen.</translation>
         <translation>Dit wordt uiteindelijk de volgende Rockbox-versie. Installeer deze om te helpen met testen.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="127"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation>Stabiele release (Versie %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation>Development-versie (Revisie %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="129"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation>Release Candidate (Revisie %1)</translation>
     </message>
@@ -3005,27 +2975,27 @@ Netwerkfout: %1. Controleer uw netwerk- en proxy-instellingen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="158"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation>De gekozen speler heeft geen bootloader nodig.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="163"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation>De bootloader is vereist voor het starten van Rockbox. Installatie van de bootloader is alleen nodig tijdens de eerste installatie.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="236"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation>Koppelpunt is onjuist</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="294"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation>Geen installatie methode bekend.</translation>
     </message>
@@ -3107,22 +3077,23 @@ Kies &quot;Nee&quot; om deze stap over te slaan.</translation>
         <translation>Kon geen backup maken. Verdergaan?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="420"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation>Handmatige stappen zijn genoodzaakt</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="641"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="224"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation>Doorgaan met installatie?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation>Wilt u zeker verdergaan?</translation>
     </message>
@@ -3502,22 +3473,22 @@ Kies &quot;Nee&quot; om deze stap over te slaan.</translation>
         <translation>Bezig met kopiëren van Talk bestanden...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="242"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation>Kopiëren afgebroken</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="261"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Kopiëren van %1 naar %2 mislukt</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="283"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation>Opruimen...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="294"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation>Voltooid</translation>
     </message>
@@ -3623,82 +3594,82 @@ Kies &quot;Nee&quot; om deze stap over te slaan.</translation>
         <translation>geen thema geselecteerd</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="122"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Netwerk fout: %1.
 Gelieve uw netwerk en proxy instellingen te bekijken.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="135"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>de volgende fout is opgetreden:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="141"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>klaar.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>bezig met ophalen van details voor %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="217"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>bezig met ophalen van voorbeeld...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Auteur :&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
-        <location filename="../themesinstallwindow.cpp" line="233"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Versie:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="234"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Beschrijving:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="235"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>geen beschrijving</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="262"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>geen thema voorbeeld</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="290"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation>Selecteer</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="297"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>bezig met ophalen van thema informatie...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="325"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation>Geen thema&apos;s geselecteerd, overslaan</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="354"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>Mount punt is verkeerd!</translation>
     </message>
@@ -3708,12 +3679,12 @@ Gelieve uw netwerk en proxy instellingen te bekijken.</translation>
         <translation>geen selectie</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="178"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation>
             <numerusform>Download grootte %L1 kiB (%n item)</numerusform>
@@ -3721,7 +3692,7 @@ Gelieve uw netwerk en proxy instellingen te bekijken.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="251"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>Ophalen van thema voorbeeld mislukt.\nHTTP respons code: %1</translation>
@@ -3832,87 +3803,102 @@ Administrator privileges zijn nodig.&lt;/li&gt;</translation>
         <translation>Bezig met starten van spraakbestanden generatie</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
         <source>Extracted voice strings from installation</source>
         <translation>Spraak-strings zijn uitgepakt van installatie</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="100"/>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation>Uitgepakte spraak-strings zijn incompatibel</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation>Strings konden niet uit installatie verkregen worden, worden gedownload</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="172"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation>Downloaden van steminformatie...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="185"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Download fout: HTTP fout %1.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="192"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>Gecached bestand gebruikt.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="195"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>Download fout : %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="200"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>Download voltooid.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="213"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>kon gedownload bestand niet openen</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="219"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation>Bezig met inlezen van zinnen...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation>Bezig met aanmaken van spraakbestanden...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="347"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation>Opruimen...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="358"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation>Voltooid</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="276"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>Het gedownloadede bestand was leeg!</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="307"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>Fout bij openen van gedownload bestand</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="318"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>Fout bij openen van output bestand</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="338"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>succesvol gecreëerd.</translation>
     </message>
@@ -3925,17 +3911,17 @@ Administrator privileges zijn nodig.&lt;/li&gt;</translation>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>klaar.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation>Installatie van pakket succesvol afgerond.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="78"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>Bezig met downloaden van bestand %1.%2</translation>
     </message>
@@ -3948,54 +3934,54 @@ Administrator privileges zijn nodig.&lt;/li&gt;</translation>
         <translation type="vanished">Gecached bestand gebruikt.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="113"/>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation type="unfinished">Download fout: HTTP fout %1. {1
 %2?}</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>Download fout : %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="125"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished">Download voltooid (cache gebruikt).</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="128"/>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>Download voltooid.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="135"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>Bezig met uitpakken van bestand.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="156"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation>Uitpakken mislukt!</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="168"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>Bezig met installeren van bestand.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="180"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>Installeren van bestand mislukt.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="193"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>Bezig met creëren van installatie log</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="149"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>Niet genoeg schijfruimte! Bezig met afbreken.</translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_pl.ts b/utils/rbutilqt/lang/rbutil_pl.ts
index e953da920b..be09ef5614 100644
--- a/utils/rbutilqt/lang/rbutil_pl.ts
+++ b/utils/rbutilqt/lang/rbutil_pl.ts
@@ -45,37 +45,37 @@
         <translation type="unfinished">Rozmiar archiwum: obliczanie...</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="88"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished">Wybierz nazwę dla kopii</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="108"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation type="unfinished">Rozmiar archiwum: %L1 %2</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="115"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation type="unfinished">Plik istnieje</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation type="unfinished">Plik kopii zapasowej o takiej nazwie już istnieje. Zamienić obecną wersję na nową?</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="124"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation type="unfinished">Rozpoczynanie wykonywania kopii zapasowej...</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="143"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation type="unfinished">Kopia zapasowa wykonana pomyślnie.</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="146"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation type="unfinished">Nie udało się wykonać kopii zapasowej!</translation>
     </message>
@@ -586,47 +586,51 @@
 <context>
     <name>BootloaderInstallImx</name>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
         <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation type="unfinished">Instalacja bootloadera wymaga oryginalnego pliku firmware dostarczanego przez Sandisk (plik sb). Oryginalny plik zostanie zmodyfikowany tak aby zawierał bootloader rockboxa, a następnie zostanie wgrany do urządzenia. Oryginalny firmware musisz pobrać samodzielnie z powodów licencyjnych. Proszę przejdź pod adres &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;forum Sansy&lt;/a&gt; lub zapoznaj się ze stroną wiki o &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt;, gdzie dowiesz się jak pobrać plik.&lt;/br&gt;Naciśnij Ok aby kontynuować.</translation>
+        <translation type="obsolete">Instalacja bootloadera wymaga oryginalnego pliku firmware dostarczanego przez Sandisk (plik sb). Oryginalny plik zostanie zmodyfikowany tak aby zawierał bootloader rockboxa, a następnie zostanie wgrany do urządzenia. Oryginalny firmware musisz pobrać samodzielnie z powodów licencyjnych. Proszę przejdź pod adres &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;forum Sansy&lt;/a&gt; lub zapoznaj się ze stroną wiki o &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt;, gdzie dowiesz się jak pobrać plik.&lt;/br&gt;Naciśnij Ok aby kontynuować.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation type="unfinished">Nie można wczytać oryginalnego pliku firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished">Pobieranie pliku bootloadera</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation type="unfinished">Patchowanie pliku...</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation type="unfinished">Patchowanie pliku oryginalnego firmware zakończone niepowodzeniem</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation type="unfinished">Oryginalny plik firmware spatchowany pomyślnie</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation type="unfinished">Bootloader zainstalowany pomyślnie</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation type="unfinished">Spatchowany plik bootloadera nie może być zainstalowany</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation type="unfinished">Aby odinstalować, przeprowadź standardową aktualizację oryginalnym firmware.</translation>
     </message>
@@ -800,77 +804,77 @@ Zobacz https://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished">Instalacja bootloadera wymaga dostarczenia oryginalnego pliku firmware (plik binarny). Oryginalny firmware musisz pobrać samodzielnie z powodów licencyjnych. Proszę zapoznaj się z &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;instrukcją&lt;/a&gt; oraz stroną wiki o &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt;, gdzie dowiesz się jak pobrać plik.&lt;/br&gt;Naciśnij Ok aby kontynuować.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation>Pobieranie pliku bootloadera</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation>Nie można otworzyć pliku z oryginalnym firmware.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation>Nie można czytać z pliku oryginalnego firmware.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation>Wskazany plik nie wygląda na oryginalny firmware MPIO.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation>Nie można otworzyć pliku wyjściowego.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation>Nie można zapisać do pliku wyjściowego.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation>Nieznany błąd nr: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished">Nie można otworzyć pobranego bootloadera.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation>Miejsce na bootloader w oryginalnym pliku nie jest puste.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation>Nie można czytać z pobranego pliku bootloadera.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation>Błąd sumy kontrolnej.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation>Modyfikacja oryginalnego firmware nie powiodła się: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation>Sukces: utowrzono zmodyfikowany plik z firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished">Aby odinstalować bootloadera, przeprowadź normalny proces aktualizacji używając oryginalnego, niemodyfikowanego pliku z firmware</translation>
     </message>
@@ -1247,120 +1251,120 @@ Zobacz https://www.rockbox.org/wiki/SansaE200Install
         <translation type="unfinished">Nie można zapisać do punktu montowania</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation>Nie wybrano urządzenia</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="204"/>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>Nie można nic zapisać do bufora. Zmień ścieżkę na domyślną aby wykorzystać bufor systemowy.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="223"/>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>Musisz usunąć powyższe błędy zanim będziesz mógł kontynuować operację.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="226"/>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation>Błąd konfiguracji</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="310"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Rozmiar bufora to %L1 kB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="328"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation type="unfinished">Pokazywanie urządzeń zablokowanych</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="329"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation type="unfinished">Właśnie wybrałeś pokazywanie urządzeń zablokowanych.  Używanie Rockbox Utility z tymi odtwarzaczami nie jest zalecane dla zwykłych użytkowników. Użyj tej opcji jedynie jeśli dobrze wiesz co robisz.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="438"/>
-        <location filename="../configure.cpp" line="904"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation type="unfinished">Błąd TTS</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="439"/>
-        <location filename="../configure.cpp" line="905"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished">Wybrany silnik TTS nie mógł zostać zainicjowany. Nie możesz wybrać tego silnika TTS.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="445"/>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>Konfiguracja jest poprawna</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="484"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>Niepoprawna konfiguracja</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="523"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation>Wykrywanie proxy</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="524"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation>Globalne ustawienia Proxy są nieprawidłowe!
 Rockbox Utility nie może pracować z tymi ustawieniami. Proszę sprawdź, że ustawienia są poprawne. Skrypty PAC (proxy auto-config) nie są obsługiwane przez Rockbox Utility. Jeżeli korzystasz z takich skryptów, musisz użyć ustawień ręcznych.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="634"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation>Ustaw ścieżkę do bufora</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="656"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation type="unfinished">%1 (%2 GiB z %3 GiB wolnego)</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="730"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation type="unfinished">Wykryto wiele urządzeń. Prosze odłącz urządzenia pozostawiając tylko jedno i spróbuj ponownie.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="733"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation type="unfinished">Wykryte urządzenia:</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="738"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation type="unfinished">(nieznany)</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="740"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation type="unfinished">%1 przy %2</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation type="unfinished">Uwaga: wykrywanie podłączonych urządzeń nie zawsze może być pewne. Możesz mieć mniej urządzeń podłączonych niż wyświetlonych na liście. W tym przypadku może nie być możliwym wykryć twój odtwarzacz z całkowitą pewnością.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="751"/>
-        <location filename="../configure.cpp" line="755"/>
-        <location filename="../configure.cpp" line="800"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation type="unfinished">Wykrywanie urządzenia</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="782"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation>znaleziono \&quot;MaxPod\&quot; %1!
@@ -1371,7 +1375,7 @@ Rockbox obsługuje wyłącznie Ipody z systemem plików FAT (tak zwane \&quot;Wi
         <translation type="obsolete">Błąd krytyczny</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="766"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
@@ -1384,87 +1388,87 @@ Niestety, Rockbox nie działa na tym urządzeniu.</translation>
         <translation type="obsolete">Uwaga: nieobsługiwane urządznie</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="853"/>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>Autodetekcja</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="854"/>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Nie można wykryć punktu montowania.
 Wybierz ręcznie punkt montowania.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Nie mozna wykryć urządzenia.
 Wybierz ręcznie urządzenie i punkt montowania.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="789"/>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation type="unfinished">Odtwarzacz zawiera niekompatybilny system plików.
 Upewnij się że wybrałeś prawidłowy punkt montowania i że odtwarzacz jest ustawiony na działanie w systemie plików kompatybilnym z Rockboxem.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="797"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation type="unfinished">Wystąpił nieznany błąd podczas wykrywania odtwarzacza.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="864"/>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>Na pewno opróżnić bufor?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="865"/>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Czy na pewno chcesz wyczyścić bufor? Upewnij się że ustawienia są poprawne gdyż zostaną usunięte &lt;b&gt;wszystkie&lt;/b&gt; pliki z tego folderu!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="873"/>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>Błędna ścieżka!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="874"/>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>Nieprawidłowa ścieżka do bufora. Anulowanie.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="911"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation>Niepoprawna kofiguracja silnika TTS</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="912"/>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation>Niepoprawna konfiguracja silnika TTS.
 Prosze skonfigurować silnik TTS.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="917"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation>Nie mozna zainicjować silnika TTS.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="936"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation type="unfinished">Nie można nadać głosu ścieżce testowej.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="918"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation>Nie można zainicjować silnika TTS.
 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="773"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>znaleziono %1 w trybie MTP!
@@ -1475,20 +1479,20 @@ Musisz przełączyć swój odtwarzacz w tryb MSC aby kontynuować instalację.</
         <translation type="obsolete">Dopóki nie zmienisz tego ustawienia instalacja nie powiedzie się!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="919"/>
-        <location filename="../configure.cpp" line="938"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation>
 Prosze skonfigurować silnik TTS.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="933"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation>Test Głosu Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="937"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation type="unfinished">Nie można nadać głosu ścieżce testowej.</translation>
@@ -1714,7 +1718,7 @@ Prosze skonfigurować silnik TTS.</translation>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Polski</translation>
@@ -1776,18 +1780,18 @@ Prosze skonfigurować silnik TTS.</translation>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="106"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation>Błąd TTS</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="107"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>Wybrany silnik TTS nie mógł zostać zainicjowany. Nie możesz wybrać tego silnika TTS.</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="111"/>
-        <location filename="../createvoicewindow.cpp" line="114"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Silnik: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1795,32 +1799,32 @@ Prosze skonfigurować silnik TTS.</translation>
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="44"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation>Czekaj na silnik...</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="91"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="94"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="257"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="272"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation>Odśwież</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="263"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation>Wybierz plik wykonywalny</translation>
     </message>
@@ -1889,18 +1893,18 @@ Prosze skonfigurować silnik TTS.</translation>
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation>Wersja</translation>
     </message>
     <message>
-        <location filename="../gui/infowidget.cpp" line="47"/>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2096,27 +2100,27 @@ Prosze skonfigurować silnik TTS.</translation>
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="337"/>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="340"/>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation type="unfinished">Nieużyteczny</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="343"/>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation type="unfinished">Niestabilny</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="346"/>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation type="unfinished">Stabilny</translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="349"/>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation type="unfinished">Nieznany</translation>
     </message>
@@ -2174,7 +2178,7 @@ Prosze skonfigurować silnik TTS.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="616"/>
+        <location filename="../configure.cpp" line="621"/>
         <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -2191,94 +2195,60 @@ Prosze skonfigurować silnik TTS.</translation>
         <translation>(nieznanane urządzenie)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation type="unfinished">Instalacja bootloadera została prawie ukończona. Dokończenie instalacji &lt;b&gt;wymaga&lt;/b&gt; aby nastepujące kroki zostały wykonane samodzielnie:</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Odłącz bezpiecznie swoje urządzenie.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Uruchom ponownie odtwarzacz na oryginalnym firmware.&lt;/li&gt;&lt;li&gt;Przeprowadź aktualizację używając funkcji zawartej w oryginalnym oprogramowaniu. Prosze sprawdzić instrukcję obsługi odtwarzacza aby uzyskać więcej szczegółów.&lt;br/&gt;&lt;b&gt;Ważne:&lt;/b&gt; aktualizacja oprogramowania jest procesem krytycznym, który nie może zostać przerwany. &lt;b&gt;Upewnij się, że przed przeprowadzeniem aktualizacji bateria odtwarzacza będzie w pełni naładowana.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;Po aktualizacji firmware, ponownie uruchom urządzenie.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Wyjmij jakąkolwiek poprzednio włożoną kartę microSD&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="131"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Odłącz urządzenie. Odtwarzacz uruchomi się ponownie i przeprowadzi aktualizację do oryginalnego oprogramowania. Prosze sprawdzić instrukcję obsługi odtwarzacza aby uzyskać więcej szczegółów.&lt;br/&gt;&lt;b&gt;Ważne:&lt;/b&gt; aktualizacja oprogramowania jest procesem krytycznym, który nie może zostać przerwany. &lt;b&gt;Upewnij się, że przed odłączeniem bateria odtwarzacza będzie w pełni naładowana.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;Po aktualizacji firmware, ponownie uruchom urządzenie.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Wyłącz odtwarzacz&lt;/li&gt;&lt;li&gt;Podłącz ładowarkę do urządzenia&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Odłącz od USB i zasilaczy&lt;/li&gt;&lt;li&gt;Przytrzymaj &lt;i&gt;przycisk włączania&lt;/i&gt; aby wyłączyć odtwarzacz&lt;/li&gt;&lt;li&gt;Zmień położenie włącznika baterii na urządzeniu&lt;/li&gt;&lt;li&gt;Przytrzymaj &lt;i&gt;przycisk włączania&lt;/i&gt; aby uruchomić Rockboxa&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;Uwaga:&lt;/b&gt; Możesz najpierw zainstalować inne składniki, ale powyższe kroki są &lt;b&gt;wymagane&lt;/b&gt; do zakończenia instalacji!&lt;/p&gt;</translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="60"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="60"/>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="66"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="66"/>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="74"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="74"/>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="80"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="80"/>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="188"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="188"/>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="193"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="193"/>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
         <location filename="../quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip-1.2/quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip_/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation>błąd ZIP/UNZIP API %1</translation>
     </message>
@@ -2286,17 +2256,17 @@ Prosze skonfigurować silnik TTS.</translation>
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="211"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation>Pobieranie informacji o buildzie, prosze czekać...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="229"/>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2308,63 +2278,63 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="261"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation>Nie można pobrać informacji!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="262"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>Błąd połączenia</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="304"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="383"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>Nowa instalacja</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="384"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="391"/>
-        <location filename="../rbutilqt.cpp" line="622"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>Błąd konfiguracji</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="392"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Twoja konfiguracja jest niewłaściwa. Prawdopodobnie spowodowane jest to zmianą ścieżki do urządzenia. Zostanie teraz otwarte okno konfiguracji, w którym zmienisz ustawienia.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="518"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="521"/>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="708"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="709"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="275"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation>Skończono pobieranie informacji.</translation>
     </message>
@@ -2379,7 +2349,7 @@ Temporarily trust certificate?</source>
         <translation>Wygląda na to, że uruchomiłeś ten program przy pomocy Wine. Program tak uruchomiony może nie działać poprawnie. Użyj natywnej wersji linuxowej.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="263"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation>Nie można pobrać informacji o wersji.
@@ -2390,7 +2360,7 @@ Problem z połączeniem sieciowym: %1. Sprawdź ustawienia sieciowe oraz konfigu
         <translation type="vanished">Potwierdź instalację</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>Błędny punkt montowania!</translation>
     </message>
@@ -2415,17 +2385,17 @@ Problem z połączeniem sieciowym: %1. Sprawdź ustawienia sieciowe oraz konfigu
         <translation type="vanished">Czy na pewno chcesz zainstalować pliki głosowe?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="493"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>Potwierdź usunięcie</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="494"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Czy na pewno chcesz odinstalowac bootloadera?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="506"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation>Nie obsługiwana metoda odinstalowania dla tego odtwarzacza.</translation>
     </message>
@@ -2434,17 +2404,17 @@ Problem z połączeniem sieciowym: %1. Sprawdź ustawienia sieciowe oraz konfigu
         <translation type="vanished">Rockbox Utility nie obsługuje usuwania bootloadera na tym urządzeniu. Przeprowadź normalną procedurę uaktualnienia firmware aby usunąć bootloader.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="713"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation>Dostępna nowa wersja Rockbox Utility.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="716"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation>Rockbox Utility jest aktualne.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="548"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>Potwierdź instalację</translation>
     </message>
@@ -2457,47 +2427,47 @@ Problem z połączeniem sieciowym: %1. Sprawdź ustawienia sieciowe oraz konfigu
         <translation type="vanished">Zainstalowana wersja Rockboxa jest wersją rozwojową. Wcześniej utworzone pliki głosowe są dostępne tylko dla oficjalnych wydań Rockboxa. Możesz samodzielnie wygenerować plik głosowy .voice  dzięki opcji &quot;Stwórz plik głosowy&quot;.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="529"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation type="unfinished">Nie znaleziono bootloadera Rockboxa.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="549"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Czy na pewno chcesz zainstalować Rockbox Utility na urządzeniu? Po instalacji mozesz uruchomić aplikację z dysku urządzenia.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>Instalowanie Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="576"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Błąd podczas instalacji Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="580"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>Instalowanie konfiguracji użytkownika</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="584"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>Błąd instalacji konfiguracji użytkownika</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="588"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Rockbox Utility zainstalowano pomyślnie.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="623"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Twoja konfiguracja jest nieprawidłowa. Przejdź do okna konfiguracji i upewnij się że wybrane wartości są poprawne.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="644"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation>Sprawdzanie aktualizacji...</translation>
     </message>
@@ -2510,22 +2480,22 @@ Problem z połączeniem sieciowym: %1. Sprawdź ustawienia sieciowe oraz konfigu
         <translation type="vanished">&lt;b&gt;Dostępna jest nowa wersja programu.&lt;/b&gt; &lt;br&gt;&lt;br&gt;Pobierz go z: &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="739"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation type="unfinished">Urządzenie wysunięto</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="740"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation type="unfinished">Urządzenie zostało pomyślnie wysunięte. Możesz teraz odłączyć odtwarzać od komputera.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="744"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation type="unfinished">Wysuwanie zakończone niepowodzeniem</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="745"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation type="unfinished">Wysuwanie urządzenia zakończyło się niepowodzeniem. Proszę upewnij się, że żadne programy nie próbują uzyskać dostępu do urządzenia.Jeśli wysuwanie dalej zakończy się niepowodzeniem użyj wysuwania systemowego.</translation>
     </message>
@@ -2973,17 +2943,17 @@ Problem z połączeniem sieciowym: %1. Sprawdź ustawienia sieciowe oraz konfigu
         <translation type="unfinished">To ostatecznie będzie  następne wydanie Rockboxa. Zainstaluj aby pomóc w testach.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="127"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation type="unfinished">Wydanie stabilne (Wersja %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation type="unfinished">Wersja rozwojowa (Rewizja %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="129"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation type="unfinished">Kandydat do wydania (Rewizja %1)</translation>
     </message>
@@ -3003,27 +2973,27 @@ Problem z połączeniem sieciowym: %1. Sprawdź ustawienia sieciowe oraz konfigu
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="158"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation type="unfinished">Wybrany odtwarzacz nie potrzebuje bootloadera.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="163"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation type="unfinished">Bootloader jest wymagany aby Rockbox mógł być uruchomiony na urządzeniu. Instalacja bootloadera jest wymagana tylko za pierwszym razem.</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="236"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation type="unfinished">Nieprawidłowy punkt montowania</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="294"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation type="unfinished">Nieznana metoda instalacji.</translation>
     </message>
@@ -3105,22 +3075,23 @@ Naciśnij &quot;Nie&quot; aby pominąć ten etap.</translation>
         <translation type="unfinished">Nie można stworzyć kopii. Kontynuować?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="420"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation type="unfinished">Dalsze kroki wymagają samodzielnego działania</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="641"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="224"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation type="unfinished">Kontynuować instalację?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation type="unfinished">Na pewno kontynuować?</translation>
     </message>
@@ -3504,22 +3475,22 @@ Naciśnij &quot;Nie&quot; aby pominąć ten etap.</translation>
         <translation>Tworzenie plików .talk zostało zakończone</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="242"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation>Kopiowanie anulowane</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="261"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Kopiowanie %1 do %2 nie powiodło się</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="283"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation>Czyszczenie...</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="294"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation>Zakończono</translation>
     </message>
@@ -3630,30 +3601,30 @@ Naciśnij &quot;Nie&quot; aby pominąć ten etap.</translation>
         <translation type="unfinished">nic nie wybrano</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="122"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Błąd połączenia: %1.
 Sprawdź połączenia sieciowe i ustawienia serwera proxy.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="135"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>wystapił nastepujący błąd: %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="141"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>zrobione.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="178"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation>Informacje</translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation>
             <numerusform>Rozmiar %L1 kB (%n plik)</numerusform>
@@ -3662,70 +3633,70 @@ Sprawdź połączenia sieciowe i ustawienia serwera proxy.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>zbieranie informacji dla %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="217"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>przygotowywanie podglądu...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Autor:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
-        <location filename="../themesinstallwindow.cpp" line="233"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>nieznany</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Wersja:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="234"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Opis:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="235"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>brak opisu</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="251"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>Błąd pobierania obrazka stylu.
 Odpowiedź z serwera HTTP: %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="262"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>brak podglądu</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="290"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation>Wybierz</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="297"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>pobieranie informacji o stylach...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="325"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation type="unfinished">Nie wybrano żadnego stylu, pomijanie</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="354"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>Zły punkt montowania!</translation>
     </message>
@@ -3840,87 +3811,102 @@ Wymagane są prawa administratora.&lt;/li&gt;</translation>
         <translation>nie mozna znaleźć rockbox-info.txt</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
         <source>Extracted voice strings from installation</source>
         <translation type="unfinished">Wyodrębniono ścieżki głosowe z instalacji</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="100"/>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation type="unfinished">Wyodrębnione ścieżki głosowe są niekompatybilne</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation type="unfinished">Nie można znaleźć ścieżek w instalacji, pobieranie</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="172"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation>Pobieranie info...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="185"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Błąd pobierania: błąd serwera HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="192"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>Użycie pliku z bufora.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="195"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>Błąd pobierania: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="200"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>Pobieranie zakończone.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="213"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>nie można otworzyć pobranego pliku</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="219"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation>Czytanie ścieżek...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="276"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>Pobrany plik jest pusty!</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation>Tworzenie plików głosowych...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="307"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>Błąd otwarcia pobranego pliku</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="318"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>Błąd otwarcia pliku wyjściowego</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="338"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>stworzono pomyślnie.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="347"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation>Czyszczenie...</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="358"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation>Zakończono</translation>
     </message>
@@ -3928,12 +3914,12 @@ Wymagane są prawa administratora.&lt;/li&gt;</translation>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>zrobione.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="78"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>Pobieranie pliku %1.%2</translation>
     </message>
@@ -3946,59 +3932,59 @@ Wymagane są prawa administratora.&lt;/li&gt;</translation>
         <translation type="vanished">Użycie pliku z bufora.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>Błąd pobierania: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="128"/>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>Pobieranie zakończone.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="135"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>Wypakowywanie.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="156"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation>Rozpakowanie nie powiodło się!</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="149"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation type="unfinished">Brak wystarczającego miejsca na dysku! Przerywanie instalacji.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation type="unfinished">Instalowanie pakietu zakończone powodzeniem.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="113"/>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation type="unfinished">Błąd pobierania: błąd serwera HTTP %1. {1
 %2?}</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="125"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished">Pobieranie zakończone (użyto bufora).</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="168"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>Instalowanie.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="180"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>Instalacja niepomyślna.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="193"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation type="unfinished">Tworzenie dziennika zdarzeń instalacji</translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_pt.ts b/utils/rbutilqt/lang/rbutil_pt.ts
index 4db0136afe..44d652d6ac 100644
--- a/utils/rbutilqt/lang/rbutil_pt.ts
+++ b/utils/rbutilqt/lang/rbutil_pt.ts
@@ -45,37 +45,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="88"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="108"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="115"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="124"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="143"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="146"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation type="unfinished">Falha na cópia de segurança!</translation>
     </message>
@@ -583,46 +583,46 @@
     <name>BootloaderInstallImx</name>
     <message>
         <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
-        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished">Transferindo rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation type="unfinished">Rotina de arranque instalada com sucesso</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -795,77 +795,77 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished">Transferindo rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">Sucesso: ficheiro de firmware modificado criado</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1217,99 +1217,99 @@ Veja https://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="310"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Tamanho actual da cache é %L1 kiB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="328"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="329"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="438"/>
-        <location filename="../configure.cpp" line="904"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="439"/>
-        <location filename="../configure.cpp" line="905"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="445"/>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>Configuração OK</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="484"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>Configuração INVÁLIDA</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="523"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="524"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="634"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="656"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="730"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="733"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="738"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="740"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="751"/>
-        <location filename="../configure.cpp" line="755"/>
-        <location filename="../configure.cpp" line="800"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="782"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation type="unfinished"></translation>
@@ -1319,110 +1319,110 @@ Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </sour
         <translation type="obsolete">Erro fatal</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="766"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="911"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="912"/>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="917"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="918"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="919"/>
-        <location filename="../configure.cpp" line="938"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="933"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="936"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="937"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="853"/>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>Auto-detecção</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="773"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="854"/>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Não consegiu detectar um ponto de montagem.
 Seleccione um ponto de montagem manualmente.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Não consegiu detectar um dispositivo.
 Seleccione um dispositivo e um ponto de montagem manualmente.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="789"/>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="797"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="864"/>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>Eliminar mesmo a cache?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="865"/>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Quer mesmo eliminar a cache? Verique que esta opção está correcta já que irá remover &lt;b&gt;todos&lt;/b&gt; os ficheiros nesta directoria!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="873"/>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>Caminho incorrecto!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="874"/>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>O caminho da cache é inválido. A abortar.</translation>
     </message>
@@ -1452,22 +1452,22 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="204"/>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="223"/>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="226"/>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation type="unfinished">Erro de Configuração</translation>
     </message>
@@ -1692,7 +1692,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Português (Portugal)</translation>
@@ -1754,18 +1754,18 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="106"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="107"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="111"/>
-        <location filename="../createvoicewindow.cpp" line="114"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1773,32 +1773,32 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="44"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="91"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="94"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="257"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="272"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="263"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1867,18 +1867,18 @@ Make sure you selected the correct mountpoint and the player is set up to use a
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation type="unfinished">Ficheiro</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation type="unfinished">Versão</translation>
     </message>
     <message>
-        <location filename="../gui/infowidget.cpp" line="47"/>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2066,27 +2066,27 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="337"/>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="340"/>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="343"/>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="346"/>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="349"/>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2144,7 +2144,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="616"/>
+        <location filename="../configure.cpp" line="621"/>
         <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -2161,94 +2161,60 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation type="unfinished">Instalação da rotina de arranque está quase completa. A instalação &lt;b&gt;necessita&lt;/b&gt; que faça os passos seguintes manualmente:</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Remova com segurança o seu reprodutor.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="131"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Desligue o reprodutor&lt;/li&gt;&lt;li&gt;Insira o carregador&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Desconecte o USB  e carregadores&lt;/li&gt;&lt;li&gt;Pressione &lt;i&gt;Power&lt;/i&gt; para desligar o reprodutor&lt;/li&gt;&lt;li&gt;Alterne o interruptor da bateria no reprodutor&lt;/li&gt;&lt;li&gt;Pressione &lt;i&gt;Power&lt;/i&gt; para arrancar com o Rockbox&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Pode instalar com segurança outras partes primeiro, mas os passos acima são &lt;b&gt;necessários&lt;/b&gt; para terminar a instalação!&lt;/p&gt;</translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="60"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="60"/>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="66"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="66"/>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="74"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="74"/>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="80"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="80"/>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="188"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="188"/>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="193"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="193"/>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
         <location filename="../quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip-1.2/quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip_/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2256,48 +2222,48 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="262"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>Erro de rede</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="304"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="383"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>Nova instalação</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="384"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Esta é uma nova instalação do Rockbox Utility, ou uma nova versão. O diálogo de configuração irá agora abrir para permitir-lhe configurar o programa, ou rever as suas definições.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="391"/>
-        <location filename="../rbutilqt.cpp" line="622"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>Erro de Configuração</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="392"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>A sua configuração é inválida. Isto é provalvelmente devido a uma mudança do caminho do dispositivo. O diálogo de configuração irá agora abrir para permitir-lhe corrigir o problema.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="211"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="229"/>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2309,18 +2275,18 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="261"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="263"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="275"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2329,7 +2295,7 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">Confirmar Instalação</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>Ponto de montagem está errado!</translation>
     </message>
@@ -2346,117 +2312,117 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">Deseja instalar o ficheiro de voz?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="493"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>Confirmar Desinstalação</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="494"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Quer mesmo desinstalar a Rotina de Arranque?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="506"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="713"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="716"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="548"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>Confirmar instalação</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="518"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="521"/>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="529"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="549"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Deseja instalar o Rockbox Utility no reprodutor? Após a instalação pode corrê-lo do disco rígido do reprodutor.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>Instalando Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="576"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Erro ao instalar Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="580"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>Instalando a configuração do utilizador</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="584"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>Erro ao instalar a configuração do utilizador</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="588"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Rockbox Utility instalado com sucesso.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="623"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>A sua configuração é inválida. Por favor, vá ao diálogo de configuração e verifique que os valores inseridos estão correctos.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="644"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="708"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="709"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="739"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="740"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="744"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="745"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2899,17 +2865,17 @@ se instalou o ficheiro de voz, o Rockbox irá falar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="127"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="129"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2929,27 +2895,27 @@ se instalou o ficheiro de voz, o Rockbox irá falar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="158"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="163"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="236"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="294"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation type="unfinished">Nenhum método de instalação conhecido.</translation>
     </message>
@@ -3031,22 +2997,23 @@ Pressione &quot;No&quot; para passar este passo.</translation>
         <translation type="unfinished">Falha na criação da cópia de segurança. Continuar?</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="420"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation type="unfinished">Passos manuais necessários</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="641"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="224"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation type="unfinished">Quer mesmo continuar?</translation>
     </message>
@@ -3389,17 +3356,17 @@ Pressione &quot;No&quot; para passar este passo.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="242"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="283"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="294"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3414,7 +3381,7 @@ Pressione &quot;No&quot; para passar este passo.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="261"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Cópia de %1 para %2 falhou</translation>
     </message>
@@ -3520,82 +3487,82 @@ Pressione &quot;No&quot; para passar este passo.</translation>
         <translation>nehum tema seleccionado</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="122"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Erro de rede:%1
 Por favor, verifique as suas definições de rede e do proxy.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="135"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>o erro seguinte ocorreu:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="141"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>completo.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>transferindo detalhes para %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="217"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>transferindo pré-visualização ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Autor:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
-        <location filename="../themesinstallwindow.cpp" line="233"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Versão:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="234"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Descrição:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="235"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>sem descrição</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="262"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>sem pré-visualização do tema</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="290"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="297"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>transferindo informação dos temas ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="325"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="354"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>Ponto de omntagem está incorrecto!</translation>
     </message>
@@ -3605,12 +3572,12 @@ Por favor, verifique as suas definições de rede e do proxy.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="178"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -3618,7 +3585,7 @@ Por favor, verifique as suas definições de rede e do proxy.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="251"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -3729,87 +3696,102 @@ Previlégios de administrador são necessários.&lt;/li&gt;</translation>
         <translation>Iniciando geração dos ficheiros de voz</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
-        <source>Extracted voice strings from installation</source>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
+        <source>Extracted voice strings from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="172"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="185"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Erro de transferência: recebido erro de HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="192"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>Ficheiro da cache usado.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="195"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>Erro de transferência: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="200"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>Tranferência terminada.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="213"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>falha ao abrir ficheiro transferido</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="219"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="347"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="358"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="276"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>O ficheiro transferido estava vazio!</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="307"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>Erro ao abrir ficheiro transferido</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="318"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>Erro ao abrir o ficheiro de saída</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="338"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>criado com sucesso.</translation>
     </message>
@@ -3822,12 +3804,12 @@ Previlégios de administrador são necessários.&lt;/li&gt;</translation>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>completo.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="78"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>Transferindo  ficheiro %1.%2</translation>
     </message>
@@ -3840,59 +3822,59 @@ Previlégios de administrador são necessários.&lt;/li&gt;</translation>
         <translation type="vanished">Ficheiro de cache usado.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>Erro de transferência: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="128"/>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>Tranferência terminada.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="135"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>Extraindo ficheiro.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="156"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="149"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>Sem espaço suficiente em disco! A abortar.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="113"/>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation type="unfinished">Erro de transferência: recebido erro de HTTP %1. {1
 %2?}</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="125"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished">Tranferência terminada (cache usada).</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="168"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>instanlando ficheiro.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="180"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>Falha na instalação do ficheiro.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="193"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>Criando registo da instalação</translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_pt_BR.ts b/utils/rbutilqt/lang/rbutil_pt_BR.ts
index 1c63fb1884..11798b877e 100644
--- a/utils/rbutilqt/lang/rbutil_pt_BR.ts
+++ b/utils/rbutilqt/lang/rbutil_pt_BR.ts
@@ -4,62 +4,78 @@
 <context>
     <name>BackupDialog</name>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="17"/>
+        <location filename="../gui/backupdialogfrm.ui" line="43"/>
         <source>Backup</source>
         <translation type="unfinished">Cópia de Segurança</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="33"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This dialog will create a backup by archiving the contents of the Rockbox installation on the player into a zip file. This will include installed themes and settings stored below the .rockbox folder on the player.&lt;/p&gt;&lt;p&gt;The backup filename will be created based on the installed version. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="49"/>
         <source>Size: unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="56"/>
         <source>Backup to: unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="76"/>
         <source>&amp;Change</source>
         <translation type="unfinished">M&amp;odificar</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="116"/>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="127"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="69"/>
         <source>Installation size: calculating ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished">Selecione Nome do Arquivo da Cópia de Segurança</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation type="unfinished">Cópia de segurança falhou!</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -67,38 +83,48 @@
 <context>
     <name>BootloaderInstallAms</name>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="58"/>
         <source>Downloading bootloader file</source>
         <translation>Transferindo arquivo do inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallams.cpp" line="113"/>
         <source>Could not load %1</source>
         <translation>Não foi possível carregar %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="137"/>
         <source>Patching Firmware...</source>
         <translation>Aplicando correção no Firmware...</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="148"/>
         <source>Could not open %1 for writing</source>
         <translation>Não foi possível abrir %1 para escrita</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="161"/>
         <source>Could not write firmware file</source>
         <translation>Não foi possível escrever o arquivo de firmware</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="177"/>
         <source>Success: modified firmware file created</source>
         <translation>Sucesso: criado arquivo de firmware modificado</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="127"/>
         <source>No room to insert bootloader, try another firmware version</source>
         <translation>Impossível inserir o inicializador, tente outra versão do firmware</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="185"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation>Para desinstalar, faça uma atualização normal com um firmware original não modificado</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (bin file). This firmware file will be patched and then installed to your player along with the rockbox bootloader. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/SansaAMS&apos;&gt;SansaAMS&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;&lt;b&gt;Note:&lt;/b&gt; This file is not present on your player and will disappear automatically after installing it.&lt;br/&gt;&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -106,38 +132,47 @@
 <context>
     <name>BootloaderInstallBSPatch</name>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="65"/>
         <source>Bootloader installation requires you to provide the correct verrsion of the original firmware file. This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/wiki/&apos;&gt;rockbox wiki&lt;/a&gt; pages on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="84"/>
         <source>Could not read original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="90"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished">Transferindo arquivo do inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="99"/>
         <source>Patching file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="124"/>
         <source>Patching the original firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="130"/>
         <source>Succesfully patched firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="145"/>
         <source>Bootloader successful installed</source>
         <translation type="unfinished">Inicializador instalado com sucesso</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="151"/>
         <source>Patched bootloader could not be installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="161"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -145,74 +180,92 @@
 <context>
     <name>BootloaderInstallBase</name>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="69"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Erro na transferência: recebeu erro HTTP %1.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="75"/>
         <source>Download error: %1</source>
         <translation>Erro na transferência: %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="81"/>
         <source>Download finished (cache used).</source>
         <translation>Transferência finalizada (cache usado).</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="83"/>
         <source>Download finished.</source>
         <translation>Transferência finalizada.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="112"/>
         <source>Creating backup of original firmware file.</source>
         <translation>Criando cópia de segurança do firmware original.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="114"/>
         <source>Creating backup folder failed</source>
         <translation>Falha ao criar cópia de segurança da pasta</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="120"/>
         <source>Creating backup copy failed.</source>
         <translation>Falha ao criar cópia da cópia de segurança.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="123"/>
         <source>Backup created.</source>
         <translation>Cópia de segurança criada.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="140"/>
         <source>Creating installation log</source>
         <translation>Criando registro da instalação</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="152"/>
         <source>Installation log created</source>
         <translation>Registro de instalação criado</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="162"/>
         <source>Waiting for system to remount player</source>
         <translation>Espere pelo sistema para remontar o reprodutor</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="192"/>
         <source>Player remounted</source>
         <translation>Reprodutor remontando</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="197"/>
         <source>Timeout on remount</source>
         <translation>Tempo de espera ao remontar</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="245"/>
         <source>Zip file format detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="278"/>
         <source>Extracting firmware %1 from archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="285"/>
         <source>Error extracting firmware from archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="294"/>
         <source>Could not find firmware in archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="257"/>
         <source>CAB file format detected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -220,62 +273,77 @@
 <context>
     <name>BootloaderInstallChinaChip</name>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (HXF file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/OndaVX747#Download_and_extract_a_recent_ve&apos;&gt;OndaVX747&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>A instalação do inicializador requer que você forneça um arquivo de firmware do firmware original (arquivo HXF). Você precisa baixar esse arquivo manualmente, devido a motivos legais. Por favor, consulte o &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; e a página wiki do &lt;a href=&apos;https://www.rockbox.org/wiki/OndaVX747#Download_and_extract_a_recent_ve&apos;&gt;OndaVX747&lt;/a&gt; para saber como obter este arquivo.&lt;br/&gt;Pressione Ok para continuar e procure em seu computador pelo arquivo de firmware.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="50"/>
         <source>Downloading bootloader file</source>
         <translation>Transferindo arquivo do inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="75"/>
         <source>Could not open firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="78"/>
         <source>Could not open bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="81"/>
         <source>Could not allocate memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="84"/>
         <source>Could not load firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="87"/>
         <source>File is not a valid ChinaChip firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="90"/>
         <source>Could not find ccpmp.bin in input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="93"/>
         <source>Could not open backup file for ccpmp.bin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="96"/>
         <source>Could not write backup file for ccpmp.bin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="99"/>
         <source>Could not load bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="102"/>
         <source>Could not get current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="105"/>
         <source>Could not open output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="108"/>
         <source>Could not write output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="111"/>
         <source>Unexpected error from chinachippatcher</source>
         <translation type="unfinished"></translation>
     </message>
@@ -283,46 +351,57 @@
 <context>
     <name>BootloaderInstallFile</name>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="34"/>
         <source>Downloading bootloader</source>
         <translation>Transferindo inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="43"/>
         <source>Installing Rockbox bootloader</source>
         <translation>Instalando inicializador do Rockbox</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="75"/>
         <source>Error accessing output folder</source>
         <translation>Erro ao acessar pasta de saída</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="94"/>
         <source>Bootloader successful installed</source>
         <translation>Inicializador instalado com sucesso</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="111"/>
         <source>Removing Rockbox bootloader</source>
         <translation>Removendo inicializador do Rockbox</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="115"/>
         <source>No original firmware file found.</source>
         <translation>Nenhum firmware original encontrado.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="121"/>
         <source>Can&apos;t remove Rockbox bootloader file.</source>
         <translation>Não é possível remover o arquivo do inicializador do Rockbox.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="126"/>
         <source>Can&apos;t restore bootloader file.</source>
         <translation>Não é possível restaurar o arquivo do inicializador.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="130"/>
         <source>Original bootloader restored successfully.</source>
         <translation>Inicializador original restaurado com sucesso.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="89"/>
         <source>A firmware file is already present on player</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="97"/>
         <source>Copying modified firmware file failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -330,138 +409,172 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="50"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>A instalação do inicializador requer que você forneça um arquivo contendo o firmware original (arquivo hex). Devido a rasões legais, você precisa transferir esse arquivo por conta própria. Por favor, consulte o &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; e a página wiki do &lt;a href=&apos;https://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; para saber como obter esse arquivo.&lt;br/&gt; Pressione OK para continuar e procure em seu computador por esse arquivo do firmware.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="69"/>
         <source>checking MD5 hash of input file ...</source>
         <translation>verificando o hash MD5 do arquivo de entrada ...</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="80"/>
         <source>Could not verify original firmware file</source>
         <translation>Não foi possível verificar o firmware original</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="95"/>
         <source>Firmware file not recognized.</source>
         <translation>Arquivo de firmware não reconhecido.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="99"/>
         <source>MD5 hash ok</source>
         <translation>Hash MD5 ok</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="106"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation>Arquivo de firmware não corresponde ao reprodutor selecionado.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="111"/>
         <source>Descrambling file</source>
         <translation>Organizando arquivo</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="119"/>
         <source>Error in descramble: %1</source>
         <translation>Erro ao organizar: %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="124"/>
         <source>Downloading bootloader file</source>
         <translation>Transferindo arquivo do inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="134"/>
         <source>Adding bootloader to firmware file</source>
         <translation>Adicionando o inicializador ao firmware</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>could not open input file</source>
         <translation>não foi possível abrir o arquivo de entrada</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>reading header failed</source>
         <translation>leitura de cabeçalho falhou</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>reading firmware failed</source>
         <translation>leitura de firmware falhou</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>can&apos;t open bootloader file</source>
         <translation>Não é possível abrir o arquivo do inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>reading bootloader file failed</source>
         <translation>leitura do arquivo do inicializador falhou</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
         <source>can&apos;t open output file</source>
         <translation>Não é possível abrir o arquivo de saída</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="178"/>
         <source>writing output file failed</source>
         <translation>escrita do arquivo de saída falhou</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="180"/>
         <source>Error in patching: %1</source>
         <translation>Erro ao corrigir: %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="191"/>
         <source>Error in scramble: %1</source>
         <translation>Erro ao misturar: %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="206"/>
         <source>Checking modified firmware file</source>
         <translation>Verificando o firmware modificado</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="208"/>
         <source>Error: modified file checksum wrong</source>
         <translation>Erro: checksum do arquivo modificado incorreto</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="220"/>
         <source>Success: modified firmware file created</source>
         <translation>Sucesso: criado arquivo de firmware modificado</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="259"/>
         <source>Can&apos;t open input file</source>
         <translation>Não é possível abrir o arquivo de entrada</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="260"/>
         <source>Can&apos;t open output file</source>
         <translation>Não é possível abrir o arquivo de saída</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="261"/>
         <source>invalid file: header length wrong</source>
         <translation>arquivo inválido: tamanho do cabeçalho incorreto</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="262"/>
         <source>invalid file: unrecognized header</source>
         <translation>arquivo inválido: cabeçalho não reconhecido</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="263"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation>arquivo inválido: campo incorreto &quot;length&quot;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="264"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation>arquivo inválido: campo incorreto &quot;length2&quot;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="265"/>
         <source>invalid file: internal checksum error</source>
         <translation>arquivo inválido: erro de checksum interno</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="266"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation>arquivo inválido: campo incorreto &quot;length3&quot;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="267"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="237"/>
         <source>Uninstallation not possible, only installation info removed</source>
         <translation>A desistalação não é possível, apenas a remoção de informação de instalação</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
         <source>A firmware file is already present on player</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="223"/>
         <source>Copying modified firmware file failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -469,38 +582,47 @@
 <context>
     <name>BootloaderInstallImx</name>
     <message>
-        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished">Transferindo arquivo do inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation type="unfinished">Inicializador instalado com sucesso</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -512,84 +634,107 @@
         <translation type="vanished">Erro: não é possível alocar memoria buffer!</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="72"/>
         <source>Downloading bootloader file</source>
         <translation>Transferindo arquivo do inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="82"/>
         <source>Installing Rockbox bootloader</source>
         <translation>Instalando inicializador do Rockbox</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="143"/>
         <source>Failed to read firmware directory</source>
         <translation>Falhou ao ler diretório do firmware</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="61"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="148"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation>Número de versão desconhecido no firmware (%1)</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="155"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation>Não foi possível abrir o Ipod em modo R/W (Leitura/Escrita)</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="96"/>
         <source>Successfull added bootloader</source>
         <translation>Inicializador adicionado com sucesso</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="107"/>
         <source>Failed to add bootloader</source>
         <translation>Falhou ao adicionar o inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="134"/>
         <source>Uninstalling bootloader</source>
         <translation>Desinstalando o inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>No bootloader detected.</source>
         <translation>Nenhum inicializador detectado.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="167"/>
         <source>Successfully removed bootloader</source>
         <translation>Inicializador removido com sucesso</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="175"/>
         <source>Removing bootloader failed.</source>
         <translation>Falhou ao remover o inicializador.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="266"/>
         <source>Could not open Ipod</source>
         <translation>Não foi possível abrir o Ipod</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="271"/>
         <source>Error reading partition table - possibly not an Ipod</source>
         <translation>Erro lendo tabela de partição - possivelmente não é um Ipod</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="277"/>
         <source>No firmware partition on disk</source>
         <translation>Nenhuma partição de firmware no disco</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="67"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods. 
 See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation>Atenção: Este é um MacPod, O Rockbox roda somente em WinPods.
 Veja https://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="119"/>
         <source>Bootloader Installation complete.</source>
         <translation>Instalação do Inicializador completada.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="124"/>
         <source>Writing log aborted</source>
         <translation>Abortada a escrita do log</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
         <source>Error: no mountpoint specified!</source>
         <translation>Erro: nenhum ponto de montagem especificado!</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="262"/>
         <source>Could not open Ipod: permission denied</source>
         <translation>Não foi possível abrir o Ipod: permissão negada</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="241"/>
         <source>Error: could not retrieve device name</source>
         <translation>Erro: não foi possível encontrar o nome do dispositivo</translation>
     </message>
@@ -597,42 +742,53 @@ Veja https://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
 <context>
     <name>BootloaderInstallMi4</name>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="34"/>
         <source>Downloading bootloader</source>
         <translation>Transferir inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="43"/>
         <source>Installing Rockbox bootloader</source>
         <translation>Instalando inicializador do Rockbox</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="71"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="79"/>
         <source>Bootloader successful installed</source>
         <translation>Inicializador instalado com sucesso</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="91"/>
         <source>Checking for Rockbox bootloader</source>
         <translation>Verificando pelo inicializador do Rockbox</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="93"/>
         <source>No Rockbox bootloader found</source>
         <translation>Nenhum inicializador do Rockbox encontrado</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="99"/>
         <source>Checking for original firmware file</source>
         <translation>Verificando por arquivo de firmware original</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="104"/>
         <source>Error finding original firmware file</source>
         <translation>Erro procurando arquivo de firmware original</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="115"/>
         <source>Rockbox bootloader successful removed</source>
         <translation>Inicializador do Rockbox removido com sucesso</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="66"/>
         <source>A firmware file is already present on player</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="74"/>
         <source>Copying modified firmware file failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -640,62 +796,77 @@ Veja https://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>A instalação do inicializador requer que você forneça um arquivo de firmware do firmware original (arquivo bin). Você precisa baixar esse arquivo manualmente, devido a motivos legais. Por favor, consulte o &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; e a página wiki do &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; para saber como obter este arquivo.&lt;br/&gt;Pressione Ok para continuar e procure em seu computador pelo arquivo de firmware.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation>Transferindo arquivo do inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation>Não foi possível abrir o firmware original.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation>Não foi possível ler o firmware original.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation>Não foi possível transferir o inicializador.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation>O espaço para o inicializador no arquivo OF não está vazio.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation>Não foi possível ler o inicializador transferido.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation>Erro no checksum do inicializador.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation>Falhou ao aplicar correção no firmware original: %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation>Sucesso: criado arquivo de firmware modificado</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation>Para desinstalar, faça uma atualização normal com um firmware original não modificado</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation>O arquivo de firmware carregado não se parece com um arquivo de firmware MPIO original.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation>Não foi possível abrir o arquivo de saída.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation>Não foi possível escrever o arquivo de saída.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation>Erro desconhecido número: %1</translation>
     </message>
@@ -703,122 +874,149 @@ Veja https://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
 <context>
     <name>BootloaderInstallS5l</name>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="61"/>
         <source>Could not find mounted iPod.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="68"/>
         <source>Downloading bootloader file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="113"/>
         <source>Could not make DFU image.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="119"/>
         <source>Ejecting iPod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="141"/>
         <source>Action required:
 
 Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject functionality.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="151"/>
         <source>Device successfully ejected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="171"/>
         <source>Action required:
 
 Quit iTunes application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="179"/>
         <source>iTunes closed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="192"/>
         <source>Could not suspend iTunesHelper. Stop it using the Task Manager, and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="201"/>
         <source>Waiting for HDD spin-down...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="217"/>
         <source>Waiting for DFU mode...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="218"/>
         <source>Action required:
 
 Press and hold SELECT+MENU buttons, after about 12 seconds a new action will require you to release the buttons, DO IT QUICKLY, otherwise the process could fail.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="241"/>
         <source>DFU mode detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="243"/>
         <source>Action required:
 
 Release SELECT+MENU buttons and wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="268"/>
         <source>Device is not in DFU mode. It seems that the previous required action failed, please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="275"/>
         <source>Transfering DFU image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="285"/>
         <source>No valid DFU USB driver found.
 
 Install iTunes (or the Apple Device Driver) and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="294"/>
         <source>Could not transfer DFU image.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="299"/>
         <source>DFU transfer completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="302"/>
         <source>Restarting iPod, waiting for remount...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="321"/>
         <source>Action required:
 
 Could not remount the device, try to do it manually. If the iPod didn&apos;t restart, force a reset by pressing SELECT+MENU buttons for about 5 seconds. If the problem could not be solved then click &apos;Abort&apos; to cancel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="333"/>
         <source>Device remounted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="336"/>
         <source>Bootloader successfully installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="338"/>
         <source>Bootloader successfully uninstalled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="350"/>
         <source>Could not resume iTunesHelper.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="368"/>
         <source>Install aborted by user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="370"/>
         <source>Uninstall aborted by user.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -826,6 +1024,7 @@ Could not remount the device, try to do it manually. If the iPod didn&apos;t res
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation>Erro: não é possível alocar memoria buffer!</translation>
     </message>
@@ -844,14 +1043,18 @@ Isto é necessário para instalar o inicializador</translation>
         <translation type="vanished">Nenhum Sansa detectado!</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Downloading bootloader file</source>
         <translation>Transferindo arquivo do inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="83"/>
         <source>Installing Rockbox bootloader</source>
         <translation>Instalando o inicializador do Rockbox</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="164"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -863,62 +1066,78 @@ sansapatcher pela primeira vez.
 Veja https://www.rockbox.org/wiki/SansaE200Install</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="87"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="174"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation>Não foi possível abrir o Sansa em modo R/W (Leitura/Escrita)</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
         <source>Checking downloaded bootloader</source>
         <translation>Verificando inicializador transferido</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation>Inicializador não confere! Abortando.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="114"/>
         <source>Successfully installed bootloader</source>
         <translation>Inicializador instalado com sucesso</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="125"/>
         <source>Failed to install bootloader</source>
         <translation>Falhou ao instalar o inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="155"/>
         <source>Uninstalling bootloader</source>
         <translation>Desinstalando o inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="180"/>
         <source>Successfully removed bootloader</source>
         <translation>Inicializador removido com sucesso</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="188"/>
         <source>Removing bootloader failed.</source>
         <translation>Falhou ao remover o inicializador.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="260"/>
         <source>Can&apos;t find Sansa</source>
         <translation>Não pode encontrar o Sansa</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="265"/>
         <source>Could not open Sansa</source>
         <translation>Não foi possível abrir o Sansa</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="270"/>
         <source>Could not read partition table</source>
         <translation>Não foi possível ler a tabela de partição</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="277"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation>Disco não é um Sansa (Erro %1), abortando.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="138"/>
         <source>Bootloader Installation complete.</source>
         <translation>Instalação do Inicializador completada.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="143"/>
         <source>Writing log aborted</source>
         <translation>Abortada a escrita do log</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="244"/>
         <source>Error: could not retrieve device name</source>
         <translation>Erro: não foi possível encontrar o nome do dispositivo</translation>
     </message>
@@ -926,42 +1145,53 @@ Veja https://www.rockbox.org/wiki/SansaE200Install</translation>
 <context>
     <name>BootloaderInstallTcc</name>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="50"/>
         <source>Downloading bootloader file</source>
         <translation>Transferindo arquivo do inicializador</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="82"/>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="99"/>
         <source>Could not load %1</source>
         <translation>Não foi possível carregar %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="90"/>
         <source>Unknown OF file used: %1</source>
         <translation>Arquivo OF usado desconhecido: %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="104"/>
         <source>Patching Firmware...</source>
         <translation>Aplicando correção no Firmware...</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="117"/>
         <source>Could not open %1 for writing</source>
         <translation>Não foi possível abrir %1 para escrita</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="126"/>
         <source>Could not write firmware file</source>
         <translation>Não foi possível escrever o arquivo de firmware</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="131"/>
         <source>Success: modified firmware file created</source>
         <translation>Sucesso: criado arquivo de firmware modificado</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/CowonD2Info&apos;&gt;CowonD2Info&lt;/a&gt; wiki page on how to obtain the file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>A instalação do inicializador requer que você forneça um arquivo de firmware do firmware original (arquivo bin). Você precisa baixar esse arquivo manualmente, devido a motivos legais. Por favor, consulte o &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; e a página wiki do &lt;a href=&apos;https://www.rockbox.org/wiki/SansaAMS&apos;&gt;SansaAMS&lt;/a&gt; para saber como obter este arquivo.&lt;br/&gt;Pressione Ok para continuar e procure em seu computador pelo arquivo de firmware.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="111"/>
         <source>Could not patch firmware</source>
         <translation>Não foi possível escrever o arquivo de firmware</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="151"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation>Para desinstalar, faça uma atualização normal com um firmware original não modificado</translation>
     </message>
@@ -969,14 +1199,17 @@ Veja https://www.rockbox.org/wiki/SansaE200Install</translation>
 <context>
     <name>Changelog</name>
     <message>
+        <location filename="../gui/changelogfrm.ui" line="17"/>
         <source>Changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/changelogfrm.ui" line="39"/>
         <source>Show on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/changelogfrm.ui" line="46"/>
         <source>&amp;Ok</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
@@ -984,50 +1217,64 @@ Veja https://www.rockbox.org/wiki/SansaE200Install</translation>
 <context>
     <name>Config</name>
     <message>
+        <location filename="../configure.cpp" line="125"/>
         <source>The following errors occurred:</source>
         <translation>Os seguintes erros ocorreram:</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="170"/>
         <source>No mountpoint given</source>
         <translation>Não foi fornecido nenhum ponto de montagem</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="174"/>
         <source>Mountpoint does not exist</source>
         <translation>O ponto de montagem não existe</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="178"/>
         <source>Mountpoint is not a directory.</source>
         <translation>O ponto de montagem não é um diretório.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="182"/>
         <source>Mountpoint is not writeable</source>
         <translation>O ponto de montagem não tem permissão de escrita</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation>Nenhum reprodutor selecionado</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>Não se pode escrever no caminho do cache. Deixe o caminho em branco para usar o caminho temporário padrão do sistema.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>Você precisa corrigir os erros acima antes de continuar.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation>Erro de configuração</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>O tamanho atual do cache é %L1 kiB.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>Configuração OK</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>Configuração INVÁLIDA</translation>
     </message>
@@ -1036,38 +1283,46 @@ Veja https://www.rockbox.org/wiki/SansaE200Install</translation>
         <translation type="obsolete">Erro fatal</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>Autodetecção</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Não foi possível detectar um Ponto de Montagem.
 Selecione o Ponto de Montagem manualmente.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Não foi possível detectar um dispositivo.
 Selecione seu dispositivo e Ponto de Montagem manualmente.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>Realmente apagar o cache?</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Você realmente quer apagar o cache? Tenha certeza absoluta que esta opção está correta já que ela removerá &lt;b&gt;todos&lt;/b&gt; os arquivos nesta pasta!</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>Caminho incorreto!</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>O caminho para o cache é inválido. Abortando.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
@@ -1080,118 +1335,149 @@ Desculpe, o Rockbox não funciona no seu reprodutor.</translation>
         <translation type="obsolete">Fatal: reprodutor incompatível</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation>Configuração TTS inválida</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation>Configuração TTS inválida.
 Por favor, configure o motor TTS.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation>Não foi possível iniciar o motor TTS.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation>Não foi possível iniciar o motor TTS.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation>
 Por favor, configure o motor TTS.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation>Teste de Voz do Utilitário Rockbox</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation>Não foi possível criar voz para a string de teste.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation>Não foi possível criar voz para a string de teste.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation>Mostrando alvos desabilitados</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation>Você acaba de habilitar mostrar alvos que estão marcados como desabilitado. Alvos desabilitado não são recomendados para usuários finais. Por favor, use está opção apenas se você sabe o que está fazendo.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation>Definir Caminho do Cache</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation>%1 encontrado &quot;MacPod&quot;!
 O Rockbox precisa de um Ipod formatado como FAT (chamado de &quot;WinPod&quot;) para funcionar.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation>Detecção de Proxy</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation>As configurações de Proxy do Sistema são inválidas!
 O Utilitário Rockbox não funciona com estas configurações de proxy. Certifique-se que o proxy do sistema esteja configurado corretamente. Note que scripts &quot;proxy auto-config (PAC)&quot; não são suportados pelo Utilitário Rockbox. Se seu sistema usa um desses scripts você precisa configurar o proxy manualmente.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1199,98 +1485,122 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>ConfigForm</name>
     <message>
+        <location filename="../configurefrm.ui" line="14"/>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="20"/>
         <source>Configure Rockbox Utility</source>
         <translation>Configurar Utilitário Rockbox</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="35"/>
         <source>&amp;Device</source>
         <translation>&amp;Dispositivo</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="41"/>
         <source>Select your device in the &amp;filesystem</source>
         <translation>Selecione seu dispositivo no sis&amp;tema de arquivos</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="326"/>
         <source>&amp;Browse</source>
         <translation>&amp;Navegar</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="72"/>
         <source>&amp;Select your audio player</source>
         <translation>&amp;Selecione seu reprodutor de audio</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="114"/>
         <source>&amp;Autodetect</source>
         <translation>&amp;Autodetectar</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="136"/>
         <source>&amp;Proxy</source>
         <translation>&amp;Proxy</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="142"/>
         <source>&amp;No Proxy</source>
         <translation>&amp;Sem Proxy</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="152"/>
         <source>Use S&amp;ystem values</source>
         <translation>Usar valores do s&amp;istema</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="159"/>
         <source>&amp;Manual Proxy settings</source>
         <translation>Configurações de Proxy &amp;manuais</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="166"/>
         <source>Proxy Values</source>
         <translation>Valores de Proxy</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="172"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hospedeiro:</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="182"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="199"/>
         <source>&amp;Username</source>
         <translation>&amp;Usuário</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="209"/>
         <source>Pass&amp;word</source>
         <translation>&amp;Senha</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="267"/>
         <source>&amp;Language</source>
         <translation>&amp;Idioma</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="281"/>
         <source>Cac&amp;he</source>
         <translation>Cac&amp;he</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="284"/>
         <source>Download cache settings</source>
         <translation>Configurações de cache de transferência</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="290"/>
         <source>Rockbox Utility uses a local download cache to save network traffic. You can change the path to the cache and use it as local repository by enabling Offline mode.</source>
         <translation>O Utilitário Rockbox usa um cache de transferência local para economizar tráfego de rede. Você pode mudar o caminho para o cache e usá-lo como repositório local habilitando o modo Offline.</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="300"/>
         <source>Current cache size is %1</source>
         <translation>O tamanho atual do cache é %1</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="309"/>
         <source>P&amp;ath</source>
         <translation>C&amp;aminho</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="319"/>
         <source>Entering an invalid folder will reset the path to the systems temporary path.</source>
         <translation>Informando uma pasta inválida irá limpar o caminho para o sistema temporário.</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="341"/>
         <source>Disable local &amp;download cache</source>
         <translation>&amp;Desabilitar cache local de transferência</translation>
     </message>
@@ -1303,70 +1613,88 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="obsolete">Modo o&amp;ffline</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="376"/>
         <source>Clean cache &amp;now</source>
         <translation>Limpar cache a&amp;gora</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="392"/>
         <source>&amp;TTS &amp;&amp; Encoder</source>
         <translation>Codificador &amp;&amp; &amp;TTS</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="398"/>
         <source>TTS Engine</source>
         <translation>Motor TTS</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="404"/>
         <source>&amp;Select TTS Engine</source>
         <translation>&amp;Selecione o Motor TTS</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="417"/>
         <source>Configure TTS Engine</source>
         <translation>Configurar o Motor TTS</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="424"/>
+        <location filename="../configurefrm.ui" line="479"/>
         <source>Configuration invalid!</source>
         <translation>Configuração inválida!</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="441"/>
         <source>Configure &amp;TTS</source>
         <translation>Configurar &amp;TTS</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="473"/>
         <source>Encoder Engine</source>
         <translation>Motor do Codificador</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="496"/>
         <source>Configure &amp;Enc</source>
         <translation>Configurar &amp;Codificador</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="507"/>
         <source>encoder name</source>
         <translation>nome do codificador</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="547"/>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="558"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="452"/>
         <source>Test TTS</source>
         <translation>Testar TTS</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="95"/>
         <source>Show disabled targets</source>
         <translation>Mostrar alvos desabilitados</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="58"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished">&amp;Atualizar</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="463"/>
         <source>&amp;Use string corrections for TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="219"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1374,6 +1702,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>Configure</name>
     <message>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Português (Brasil)</translation>
@@ -1382,42 +1711,52 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>CreateVoiceFrm</name>
     <message>
+        <location filename="../createvoicefrm.ui" line="17"/>
         <source>Create Voice File</source>
         <translation>Criar Arquivo de Voz</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="42"/>
         <source>Select the Language you want to generate a voicefile for:</source>
         <translation>Selecione o Idioma para o qual você quer gerar um arquivo de voz:</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="167"/>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="49"/>
         <source>Generation settings</source>
         <translation>Configurações para a geração</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="72"/>
         <source>Change</source>
         <translation>Modificar</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="143"/>
         <source>&amp;Install</source>
         <translation>&amp;Instalar</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="154"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="92"/>
         <source>Wavtrim Threshold</source>
         <translation>Limiar Wavtrim</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="55"/>
         <source>TTS:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="105"/>
         <source>Silence threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1425,14 +1764,18 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>CreateVoiceWindow</name>
     <message>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1440,30 +1783,32 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <source></source>
-        <translation></translation>
-    </message>
-    <message>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation>Esperando pelo motor...</translation>
     </message>
     <message>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation>Navegar</translation>
     </message>
     <message>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation>Atualizar</translation>
     </message>
     <message>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1471,10 +1816,12 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncoderExe</name>
     <message>
+        <location filename="../base/encoderexe.cpp" line="37"/>
         <source>Path to Encoder:</source>
         <translation type="unfinished">Caminho para o Codificador:</translation>
     </message>
     <message>
+        <location filename="../base/encoderexe.cpp" line="39"/>
         <source>Encoder options:</source>
         <translation type="unfinished">Opções do codificador:</translation>
     </message>
@@ -1482,18 +1829,23 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncoderLame</name>
     <message>
+        <location filename="../base/encoderlame.cpp" line="75"/>
+        <location filename="../base/encoderlame.cpp" line="85"/>
         <source>LAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/encoderlame.cpp" line="77"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/encoderlame.cpp" line="81"/>
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/encoderlame.cpp" line="85"/>
         <source>Could not find libmp3lame!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1501,18 +1853,22 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncoderRbSpeex</name>
     <message>
+        <location filename="../base/encoderrbspeex.cpp" line="34"/>
         <source>Volume:</source>
         <translation type="unfinished">Volume:</translation>
     </message>
     <message>
+        <location filename="../base/encoderrbspeex.cpp" line="36"/>
         <source>Quality:</source>
         <translation type="unfinished">Qualidade:</translation>
     </message>
     <message>
+        <location filename="../base/encoderrbspeex.cpp" line="38"/>
         <source>Complexity:</source>
         <translation type="unfinished">Complexidade:</translation>
     </message>
     <message>
+        <location filename="../base/encoderrbspeex.cpp" line="40"/>
         <source>Use Narrowband:</source>
         <translation type="unfinished">Usar Banda Extreita:</translation>
     </message>
@@ -1520,14 +1876,19 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>InfoWidget</name>
     <message>
+        <location filename="../gui/infowidget.cpp" line="30"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation type="unfinished">Arquivo</translation>
     </message>
     <message>
+        <location filename="../gui/infowidget.cpp" line="30"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation type="unfinished">Versão</translation>
     </message>
     <message>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1535,14 +1896,17 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>InfoWidgetFrm</name>
     <message>
+        <location filename="../gui/infowidgetfrm.ui" line="20"/>
         <source>Currently installed packages.&lt;br/&gt;&lt;b&gt;Note:&lt;/b&gt; if you manually installed packages this might not be correct!</source>
         <translation type="unfinished">Pacotes instalados atualmente.&lt;br/&gt;&lt;b&gt;Nota:&lt;/b&gt; se você instalou pacotes manualmente, isto pode não estar correto!</translation>
     </message>
     <message>
+        <location filename="../gui/infowidgetfrm.ui" line="14"/>
         <source>Info</source>
         <translation type="unfinished">Informação</translation>
     </message>
     <message>
+        <location filename="../gui/infowidgetfrm.ui" line="34"/>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1550,54 +1914,67 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>InstallTalkFrm</name>
     <message>
+        <location filename="../installtalkfrm.ui" line="17"/>
         <source>Install Talk Files</source>
         <translation>Instalar Arquivos Talk</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="78"/>
         <source>TTS profile:</source>
         <translation>Perfil TTS:</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="115"/>
         <source>Change</source>
         <translation>Modificar</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="36"/>
         <source>Generation options</source>
         <translation>Opções para a geração</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="42"/>
         <source>Strip Extensions</source>
         <translation>Retirar Extensões</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="147"/>
         <source>&amp;Install</source>
         <translation>&amp;Instalar</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="158"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="52"/>
         <source>Generate for files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="85"/>
         <source>Generate for folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="95"/>
         <source>Recurse into folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="122"/>
         <source>Ignore files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="132"/>
         <source>Skip existing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="174"/>
         <source>Select folders for Talkfile generation (Ctrl for multiselect)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1605,18 +1982,22 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>InstallTalkWindow</name>
     <message>
+        <location filename="../installtalkwindow.cpp" line="95"/>
         <source>Empty selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../installtalkwindow.cpp" line="96"/>
         <source>No files or folders selected. Please select files or folders first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../installtalkwindow.cpp" line="140"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../installtalkwindow.cpp" line="141"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1682,10 +2063,12 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>MsPackUtil</name>
     <message>
+        <location filename="../base/mspackutil.cpp" line="101"/>
         <source>Creating output path failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/mspackutil.cpp" line="109"/>
         <source>Error during CAB operation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1693,22 +2076,27 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>PlayerBuildInfo</name>
     <message>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation type="unfinished">Inutilizável</translation>
     </message>
     <message>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation type="unfinished">Instável</translation>
     </message>
     <message>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation type="unfinished">Estável</translation>
     </message>
     <message>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation type="unfinished">Desconhecido</translation>
     </message>
@@ -1716,6 +2104,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>PreviewFrm</name>
     <message>
+        <location filename="../previewfrm.ui" line="16"/>
         <source>Preview</source>
         <translation>Previsão</translation>
     </message>
@@ -1723,18 +2112,23 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>ProgressLoggerFrm</name>
     <message>
+        <location filename="../progressloggerfrm.ui" line="18"/>
+        <location filename="../progressloggerfrm.ui" line="24"/>
         <source>Progress</source>
         <translation>Progresso</translation>
     </message>
     <message>
+        <location filename="../progressloggerfrm.ui" line="37"/>
         <source>progresswindow</source>
         <translation>janeladeprogresso</translation>
     </message>
     <message>
+        <location filename="../progressloggerfrm.ui" line="87"/>
         <source>&amp;Abort</source>
         <translation>&amp;Abortar</translation>
     </message>
     <message>
+        <location filename="../progressloggerfrm.ui" line="63"/>
         <source>Save Log</source>
         <translation>Salvar Log</translation>
     </message>
@@ -1742,14 +2136,17 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>ProgressLoggerGui</name>
     <message>
+        <location filename="../progressloggergui.cpp" line="99"/>
         <source>&amp;Abort</source>
         <translation>&amp;Abortar</translation>
     </message>
     <message>
+        <location filename="../progressloggergui.cpp" line="117"/>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
+        <location filename="../progressloggergui.cpp" line="141"/>
         <source>Save system trace log</source>
         <translation>Salvar trace log do sistema</translation>
     </message>
@@ -1757,84 +2154,77 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../configure.cpp" line="621"/>
+        <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
         <translation>LTR</translation>
     </message>
     <message>
+        <location filename="../base/system.cpp" line="333"/>
         <source>(unknown vendor name) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/system.cpp" line="351"/>
         <source>(unknown product name)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation type="unfinished">A instalação do inicializador está quase completa. A instalação &lt;b&gt;requer&lt;/b&gt; que você execute os seguintes passos manualmente:</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Remova seu reprodutor de forma segura.&lt;/li&gt;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Desligue o reprodutor&lt;/li&gt;&lt;li&gt;Insira o carregador&lt;/li&gt;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation type="unfinished">&lt;li&gt;Desconecte os adaptadores USB e de alimentação&lt;/li&gt;&lt;li&gt;Pressione &lt;i&gt;Power&lt;/i&gt; para desligar o reprodutor&lt;/li&gt;&lt;li&gt;Alterne o interruptor da bateria no reprodutor&lt;/li&gt;&lt;li&gt;Pressione &lt;i&gt;Power&lt;/i&gt; para iniciar com o Rockbox&lt;/li&gt;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Você pode, de forma segura, instalar outros componentes primeiro, porém, os passos acima são &lt;b&gt;necessários&lt;/b&gt; para se finalizar a instalação!&lt;/p&gt;</translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
+        <location filename="../quazip/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1842,22 +2232,28 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>RbUtilQt</name>
     <message>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>Erro de rede</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>Nova instalação</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Esta é uma nova instalação do Utilitário Rockbox, ou uma nova versão. A janela de configuração abrirá agora para permitir que você configure o programa, ou revise suas configurações.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>Erro de configuração</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Sua configuração é inválida. Isto é geralmente causado por uma mudança no caminho do dispositivo. A janela de configuração abrirá agora para permitir que você corrija o problema.</translation>
     </message>
@@ -1866,6 +2262,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="vanished">Confirmar Instalação</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>O ponto de montagem está incorreto!</translation>
     </message>
@@ -1882,54 +2279,67 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="vanished">Você realmente quer instalar o arquivo de voz?</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>Confirmar Desinstalação</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Você realmente quer desinstalar o Inicializador?</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>Confirmar Instalação</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Você realmente quer instalar o Utilitário Rockbox em seu reprodutor? Depois da instalação você pode executá-lo a partir do disco rígido do reprodutor.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>Instalando o Utilitário Rockbox</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Erro instalando o Utilitário Rockbox</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>Instalando configuração do usuário</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>Erro instalando configuração do usuário</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Utilitário Rockbox instalado com sucesso.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Sua configuração é inválida. Por favor, vá a janela de configuração e certifique-se de selecionar os valores corretos.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation>Baixando informação de compilação, por favor espere...</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation>Não é possível obter informação da versão!</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation>Baixar informação de compilação finalizada.</translation>
     </message>
@@ -1942,20 +2352,24 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="vanished">&lt;b&gt;Nova versão do RockboxUtility disponível.&lt;/b&gt; &lt;br&gt;&lt;br&gt;Baixá-la daqui: &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="104"/>
         <source>Wine detected!</source>
         <translation>Detectado Wine!</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="105"/>
         <source>It seems you are trying to run this program under Wine. Please don&apos;t do this, running under Wine will fail. Use the native Linux binary instead.</source>
         <translation>Parece que você está tentando rodar este programa sob o Wine. Por favor não faça isso, rodar sob o Wine irá falhar. Ao invés disso, use um Linux nativo.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation>Não é possível obter informação de versão.
 Erro de rede: %1. Por favor, verifique sua configuração de rede e proxy.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation>Não é conhecido método de desistalação deste alvo.</translation>
     </message>
@@ -1972,42 +2386,52 @@ Erro de rede: %1. Por favor, verifique sua configuração de rede e proxy.</tran
         <translation type="vanished">Não foi possível determinar a versão do Rockbox instalada. Por favor, instale uma compilação do Rockbox antes de instalar arquivos de voz.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation>Procurando atualizações...</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation>Nova versão do Utilitário Rockbox disponível.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation>O Utilitário Rockbox está atualizado.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2019,22 +2443,27 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2042,30 +2471,39 @@ Temporarily trust certificate?</source>
 <context>
     <name>RbUtilQtFrm</name>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="14"/>
         <source>Rockbox Utility</source>
         <translation>Utilitário Rockbox</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="59"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="120"/>
         <source>&amp;Change</source>
         <translation>M&amp;odificar</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="166"/>
         <source>Welcome</source>
         <translation>Bem-vindo</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="163"/>
+        <location filename="../rbutilqtfrm.ui" line="620"/>
         <source>&amp;Installation</source>
         <translation>Ins&amp;talação</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="171"/>
+        <location filename="../rbutilqtfrm.ui" line="413"/>
         <source>&amp;Accessibility</source>
         <translation>Acessi&amp;bilidade</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="174"/>
         <source>Install accessibility add-ons</source>
         <translation>Instalar complementos de acessibilidade</translation>
     </message>
@@ -2078,40 +2516,50 @@ Temporarily trust certificate?</source>
         <translation type="vanished">&lt;b&gt;Instalar arquivos de Voz&lt;/b&gt;&lt;br/&gt;Os arquivos de Voz são necessários para que o Rockbox fale a interface do usuário. A fala é habilitada por padrão, logo, se você instalar o arquivo de voz, o Rockbox falará.</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="180"/>
         <source>Install Talk files</source>
         <translation>Instalar arquivos Talk</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="197"/>
         <source>&lt;b&gt;Create Talk Files&lt;/b&gt;&lt;br/&gt;Talkfiles are needed to let Rockbox speak File and Foldernames</source>
         <translation>&lt;b&gt;Criar Arquivos Talk&lt;/b&gt;&lt;br/&gt;Os Arquivos Talk são necessários para permitir ao Rockbox falar os Nomes dos Arquivos e Pasta</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="230"/>
         <source>Create Voice files</source>
         <translation>Criar arquivos de Voz</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="247"/>
         <source>&lt;b&gt;Create Voice file&lt;/b&gt;&lt;br/&gt;Voice files are needed to make Rockbox speak the  user interface. Speaking is enabled by default, so
  if you installed the voice file Rockbox will speak.</source>
         <translation>&lt;b&gt;Criar arquivo de Voz&lt;/b&gt;&lt;br/&gt;Os arquivos de Voz são necessários para permitir ao Rockbox falar a interface do usuário. A Fala é habilitada por padrão, logo,
 se você instalar o arquivo de voz, o Rockbox falará.</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="420"/>
         <source>&amp;Uninstallation</source>
         <translation>&amp;Desinstalação</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="262"/>
+        <location filename="../rbutilqtfrm.ui" line="295"/>
         <source>Uninstall Rockbox</source>
         <translation>Desinstalar Rockbox</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="268"/>
         <source>Uninstall Bootloader</source>
         <translation>Desinstalar Inicializador</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="285"/>
         <source>&lt;b&gt;Remove the bootloader&lt;/b&gt;&lt;br/&gt;After removing the bootloader you won&apos;t be able to start Rockbox.</source>
         <translation>&lt;b&gt;Remover o inicializador&lt;/b&gt;&lt;br/&gt;Após remover o inicializador você não poderá iniciar o Rockbox.</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="312"/>
         <source>&lt;b&gt;Uninstall Rockbox from your audio player.&lt;/b&gt;&lt;br/&gt;This will leave the bootloader in place (you need to remove it manually).</source>
         <translation>&lt;b&gt;Desinstalar o Rockbox do seu reprodutor de audio.&lt;/b&gt;&lt;br/&gt;Esta opção não remove o inicializador (você deve removê-lo manualmente).</translation>
     </message>
@@ -2124,122 +2572,153 @@ se você instalar o arquivo de voz, o Rockbox falará.</translation>
         <translation type="vanished">Visualizar e transferir o manual</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="369"/>
         <source>Inf&amp;o</source>
         <translation>Inf&amp;ormação</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="387"/>
         <source>&amp;File</source>
         <translation>&amp;Arquivo</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="409"/>
         <source>Action&amp;s</source>
         <translation>Açõe&amp;s</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="436"/>
         <source>Empty local download cache</source>
         <translation>Limpar cache de transferência local</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="441"/>
         <source>Install Rockbox Utility on player</source>
         <translation>Instalar Utilitário Rockbox no reprodutor</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="446"/>
         <source>&amp;Configure</source>
         <translation>&amp;Configurar</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="451"/>
         <source>E&amp;xit</source>
         <translation>Sai&amp;r</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="454"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="459"/>
         <source>&amp;About</source>
         <translation>S&amp;obre</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="464"/>
         <source>About &amp;Qt</source>
         <translation>Sobre &amp;Qt</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="396"/>
+        <location filename="../rbutilqtfrm.ui" line="469"/>
         <source>&amp;Help</source>
         <translation>A&amp;juda</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="474"/>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="483"/>
         <source>&amp;Complete Installation</source>
         <translation>&amp;Instalação Completa</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="492"/>
         <source>&amp;Minimal Installation</source>
         <translation>Instalação &amp;Mínima</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="501"/>
         <source>Install &amp;Bootloader</source>
         <translation>Instalar &amp;Inicializador</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="510"/>
         <source>Install &amp;Rockbox</source>
         <translation>Instalar &amp;Rockbox</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="519"/>
         <source>Install &amp;Fonts Package</source>
         <translation>Instalar Pacotes de &amp;Fontes</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="528"/>
         <source>Install &amp;Themes</source>
         <translation>Instalar &amp;Temas</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="537"/>
         <source>Install &amp;Game Files</source>
         <translation>Instalar Arquivos de &amp;Jogos</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="546"/>
         <source>&amp;Install Voice File</source>
         <translation>&amp;Instalar Arquivo de Voz</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="555"/>
         <source>Create &amp;Talk Files</source>
         <translation>Criar Arquivos &amp;Talk</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="564"/>
         <source>Remove &amp;bootloader</source>
         <translation>Remover &amp;Inicializador</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="573"/>
         <source>Uninstall &amp;Rockbox</source>
         <translation>Desinstalar &amp;Rockbox</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="578"/>
         <source>Read PDF manual</source>
         <translation>Ler Manual PDF</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="583"/>
         <source>Read HTML manual</source>
         <translation>Ler Manual HTML</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="588"/>
         <source>Download PDF manual</source>
         <translation>Transferir manual PDF</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="593"/>
         <source>Download HTML manual (zip)</source>
         <translation>Transferir manual HTML (zip)</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="602"/>
         <source>Create &amp;Voice File</source>
         <translation>Criar Arquivo de &amp;Voz</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="605"/>
         <source>Create Voice File</source>
         <translation>Criar Arquivo de Voz</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="610"/>
         <source>&amp;System Info</source>
         <translation>Informação do &amp;Sistema</translation>
     </message>
@@ -2248,50 +2727,62 @@ se você instalar o arquivo de voz, o Rockbox falará.</translation>
         <translation type="vanished">&amp;Relatar Falhas</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="615"/>
         <source>System &amp;Trace</source>
         <translation>&amp;Trace do Sistema</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="149"/>
         <source>mountpoint unknown or invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="142"/>
         <source>Mountpoint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="100"/>
         <source>device unknown or invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="93"/>
         <source>Device:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="259"/>
         <source>Backup &amp;&amp; &amp;Uninstallation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="325"/>
         <source>Backup</source>
         <translation type="unfinished">Cópia de Segurança</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="342"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Backup current installation.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Create a backup by archiving the contents of the Rockbox installation folder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="131"/>
         <source>&amp;Eject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="625"/>
         <source>Show &amp;Changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="43"/>
         <source>Welcome to Rockbox Utility, the installation and housekeeping tool for Rockbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="46"/>
         <source>Rockbox Logo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2299,164 +2790,205 @@ se você instalar o arquivo de voz, o Rockbox falará.</translation>
 <context>
     <name>SelectiveInstallWidget</name>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="26"/>
         <source>Rockbox version to install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="35"/>
         <source>Version information not available yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="54"/>
         <source>Rockbox components to install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="60"/>
         <source>&amp;Bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="253"/>
         <source>The main Rockbox firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="115"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="74"/>
         <source>&amp;Rockbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="178"/>
         <source>Additional fonts for the User Interface.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="135"/>
         <source>The bootloader is required for starting Rockbox. Only necessary for first time install.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="161"/>
         <source>Customize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="104"/>
         <source>Themes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="94"/>
         <source>Themes allow adjusting the user interface of Rockbox. Use &quot;Customize&quot; to select themes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="292"/>
         <source>&amp;Install</source>
         <translation type="unfinished">&amp;Instalar</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="78"/>
         <source>This is the latest stable release available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="88"/>
         <source>This will eventually become the next Rockbox version. Install it to help testing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation type="unfinished">Nenhum método de instalação conhecido.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="319"/>
         <source>Bootloader detected</source>
         <translation type="unfinished">Detectado Inicializador</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="320"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation type="unfinished">Inicializador já instalado. Você quer reinstalar o inicializador?</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="324"/>
         <source>Bootloader installation skipped</source>
         <translation type="unfinished">Instalação do Inicializador ignorada</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="338"/>
         <source>Create Bootloader backup</source>
         <translation type="unfinished">Criar cópia de segurança do Inicializador</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="339"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished">Você pode criar uma cópia de segurança do arquivo original do inicializador. Pressione &quot;Sim&quot; para selecionar a pasta de saída no seu computador, onde salvar o arquivo. O arquivo será colocado em uma nova pasta &quot;%1&quot; criada dentro da pasta selecionada.
 Pressione &quot;Não&quot; para pular esse passo.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="346"/>
         <source>Browse backup folder</source>
         <translation type="unfinished">Navegar na pasta de cópia de segurança</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="358"/>
         <source>Prerequisites</source>
         <translation type="unfinished">Pré-requisitos</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="363"/>
         <source>Bootloader installation aborted</source>
         <translation type="unfinished">Instalação do Inicializador abortada</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="373"/>
         <source>Bootloader files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="375"/>
         <source>All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="377"/>
         <source>Select firmware file</source>
         <translation type="unfinished">Selecione o arquivo de firmware</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="379"/>
         <source>Error opening firmware file</source>
         <translation type="unfinished">Erro abrindo arquivo de firmware</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="385"/>
         <source>Error reading firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="395"/>
         <source>Backup error</source>
         <translation type="unfinished">Erro na cópia de segurança</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="396"/>
         <source>Could not create backup file. Continue?</source>
         <translation type="unfinished">Não foi possível criar o arquivo de cópia de segurança. Continuar?</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation type="unfinished">Passo manual requerido</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation type="unfinished">Realmente continuar?</translation>
     </message>
@@ -2465,50 +2997,62 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
         <translation type="obsolete">Abortado!</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="20"/>
         <source>Selective Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="151"/>
         <source>Some plugins require additional data files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="188"/>
         <source>Install prerendered voice file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="195"/>
         <source>Plugin Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="222"/>
         <source>&amp;Manual</source>
         <translation type="unfinished">&amp;Manual</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="233"/>
         <source>&amp;Voice File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="263"/>
         <source>Save a copy of the manual on the player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="83"/>
         <source>The development version is updated on every code change.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="93"/>
         <source>Daily updated development version.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="100"/>
         <source>Not available for the selected version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2535,6 +3079,8 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>SysTrace</name>
     <message>
+        <location filename="../systrace.cpp" line="100"/>
+        <location filename="../systrace.cpp" line="109"/>
         <source>Save system trace log</source>
         <translation>Salvar trace log do sistema</translation>
     </message>
@@ -2542,26 +3088,32 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>SysTraceFrm</name>
     <message>
+        <location filename="../systracefrm.ui" line="14"/>
         <source>System Trace</source>
         <translation>Trace do Sistema</translation>
     </message>
     <message>
+        <location filename="../systracefrm.ui" line="20"/>
         <source>System State trace</source>
         <translation>Trace do Estado do Sistema</translation>
     </message>
     <message>
+        <location filename="../systracefrm.ui" line="46"/>
         <source>&amp;Close</source>
         <translation>Fecha&amp;r</translation>
     </message>
     <message>
+        <location filename="../systracefrm.ui" line="57"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvar</translation>
     </message>
     <message>
+        <location filename="../systracefrm.ui" line="68"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Atualizar</translation>
     </message>
     <message>
+        <location filename="../systracefrm.ui" line="79"/>
         <source>Save &amp;previous</source>
         <translation>Salvar &amp;anterior</translation>
     </message>
@@ -2569,50 +3121,62 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>Sysinfo</name>
     <message>
+        <location filename="../sysinfo.cpp" line="46"/>
         <source>&lt;b&gt;OS&lt;/b&gt;&lt;br/&gt;</source>
         <translation>&lt;b&gt;SO&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="47"/>
         <source>&lt;b&gt;Username&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Usuário&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="49"/>
         <source>&lt;b&gt;Permissions&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Permissões&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="51"/>
         <source>&lt;b&gt;Attached USB devices&lt;/b&gt;&lt;br/&gt;</source>
         <translation>&lt;b&gt;Dispositivo USB conectado&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="55"/>
         <source>VID: %1 PID: %2, %3</source>
         <translation>VID: %1 PID: %2, %3</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="64"/>
         <source>Filesystem</source>
         <translation>Sistema de arquivos</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="67"/>
         <source>Mountpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="67"/>
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="68"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="68"/>
         <source>Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="71"/>
         <source>&lt;tr&gt;&lt;td&gt;%1&lt;/td&gt;&lt;td&gt;%4&lt;/td&gt;&lt;td&gt;%2 GiB&lt;/td&gt;&lt;td&gt;%3 GiB&lt;/td&gt;&lt;td&gt;%5&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="69"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2620,14 +3184,17 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>SysinfoFrm</name>
     <message>
+        <location filename="../sysinfofrm.ui" line="13"/>
         <source>System Info</source>
         <translation>Informação do Sistema</translation>
     </message>
     <message>
+        <location filename="../sysinfofrm.ui" line="22"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Atualizar</translation>
     </message>
     <message>
+        <location filename="../sysinfofrm.ui" line="46"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
@@ -2635,22 +3202,27 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>System</name>
     <message>
+        <location filename="../base/system.cpp" line="117"/>
         <source>Guest</source>
         <translation>Convidado</translation>
     </message>
     <message>
+        <location filename="../base/system.cpp" line="120"/>
         <source>Admin</source>
         <translation>Administrador</translation>
     </message>
     <message>
+        <location filename="../base/system.cpp" line="123"/>
         <source>User</source>
         <translation>Usuário</translation>
     </message>
     <message>
+        <location filename="../base/system.cpp" line="126"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
+        <location filename="../base/system.cpp" line="273"/>
         <source>(no description available)</source>
         <translation>(nenhuma descrição disponível)</translation>
     </message>
@@ -2658,42 +3230,52 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>TTSBase</name>
     <message>
+        <location filename="../base/ttsbase.cpp" line="47"/>
         <source>Espeak TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="51"/>
         <source>Flite TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="52"/>
         <source>Swift TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="61"/>
         <source>Festival TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="64"/>
         <source>OS X System Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="55"/>
         <source>SAPI4 TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="57"/>
         <source>SAPI5 TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="58"/>
         <source>MS Speech Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="48"/>
         <source>Espeak-ng TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="49"/>
         <source>Mimic TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2701,22 +3283,27 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>TTSCarbon</name>
     <message>
+        <location filename="../base/ttscarbon.cpp" line="139"/>
         <source>Voice:</source>
         <translation>Voz:</translation>
     </message>
     <message>
+        <location filename="../base/ttscarbon.cpp" line="145"/>
         <source>Speed (words/min):</source>
         <translation>Velocidade (palavras/min):</translation>
     </message>
     <message>
+        <location filename="../base/ttscarbon.cpp" line="222"/>
         <source>Could not voice string</source>
         <translation>Não foi possível criar a string de voz</translation>
     </message>
     <message>
+        <location filename="../base/ttscarbon.cpp" line="232"/>
         <source>Could not convert intermediate file</source>
         <translation>Não foi possível converter o arquivo intermediário</translation>
     </message>
     <message>
+        <location filename="../base/ttscarbon.cpp" line="152"/>
         <source>Pitch (0 for default):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2724,14 +3311,17 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>TTSExes</name>
     <message>
+        <location filename="../base/ttsexes.cpp" line="44"/>
         <source>Path to TTS engine:</source>
         <translation>Caminho para o motor TTS:</translation>
     </message>
     <message>
+        <location filename="../base/ttsexes.cpp" line="46"/>
         <source>TTS engine options:</source>
         <translation>Opções do motor TTS:</translation>
     </message>
     <message>
+        <location filename="../base/ttsexes.cpp" line="78"/>
         <source>TTS executable not found</source>
         <translation>Executável TTS não encontrado</translation>
     </message>
@@ -2739,26 +3329,32 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>TTSFestival</name>
     <message>
+        <location filename="../base/ttsfestival.cpp" line="53"/>
         <source>Path to Festival client:</source>
         <translation>Caminho para o criente Festival:</translation>
     </message>
     <message>
+        <location filename="../base/ttsfestival.cpp" line="58"/>
         <source>Voice:</source>
         <translation>Voz:</translation>
     </message>
     <message>
+        <location filename="../base/ttsfestival.cpp" line="69"/>
         <source>Voice description:</source>
         <translation>Descrição de voz:</translation>
     </message>
     <message>
+        <location filename="../base/ttsfestival.cpp" line="207"/>
         <source>engine could not voice string</source>
         <translation>o motor não pode criar a voz para a string</translation>
     </message>
     <message>
+        <location filename="../base/ttsfestival.cpp" line="290"/>
         <source>No description available</source>
         <translation>Nenhuma descrição disponível</translation>
     </message>
     <message>
+        <location filename="../base/ttsfestival.cpp" line="173"/>
         <source>Festival could not be started</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2766,26 +3362,32 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>TTSSapi</name>
     <message>
+        <location filename="../base/ttssapi.cpp" line="46"/>
         <source>Language:</source>
         <translation>Idioma:</translation>
     </message>
     <message>
+        <location filename="../base/ttssapi.cpp" line="53"/>
         <source>Voice:</source>
         <translation>Voz:</translation>
     </message>
     <message>
+        <location filename="../base/ttssapi.cpp" line="65"/>
         <source>Speed:</source>
         <translation>Velocidade:</translation>
     </message>
     <message>
+        <location filename="../base/ttssapi.cpp" line="68"/>
         <source>Options:</source>
         <translation>Opções:</translation>
     </message>
     <message>
+        <location filename="../base/ttssapi.cpp" line="112"/>
         <source>Could not copy the SAPI script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ttssapi.cpp" line="130"/>
         <source>Could not start SAPI process</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2793,38 +3395,47 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>TalkFileCreator</name>
     <message>
+        <location filename="../base/talkfile.cpp" line="42"/>
         <source>Reading Filelist...</source>
         <translation>Lendo Lista de Arquivos...</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="45"/>
         <source>Talk file creation aborted</source>
         <translation>Criação de arquivo Talk abortada</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="78"/>
         <source>Finished creating Talk files</source>
         <translation>Criação de arquivos Talk finalizada</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Cópia de %1 para %2 falhou</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="66"/>
         <source>Copying Talkfiles...</source>
         <translation>Copiando arquivos Talk...</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation>Cópia de arquivo abortada</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation>Finalizado</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation>Limpando...</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="36"/>
         <source>Starting Talk file generation for folder %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2832,42 +3443,54 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>TalkGenerator</name>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="38"/>
         <source>Starting TTS Engine</source>
         <translation>Iniciando motor TTS</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="43"/>
+        <location filename="../base/talkgenerator.cpp" line="50"/>
         <source>Init of TTS engine failed</source>
         <translation>Falhou ao iniciar o motor TTS</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="57"/>
         <source>Starting Encoder Engine</source>
         <translation>Iniciando Motor Codificador</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="62"/>
         <source>Init of Encoder engine failed</source>
         <translation>Falhou ao iniciar o motor Codificador</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="72"/>
         <source>Voicing entries...</source>
         <translation>Vocalizando entradas...</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="87"/>
         <source>Encoding files...</source>
         <translation>Codificando arquivos...</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="126"/>
         <source>Voicing aborted</source>
         <translation>Vocalização abortada</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="163"/>
+        <location filename="../base/talkgenerator.cpp" line="168"/>
         <source>Voicing of %1 failed: %2</source>
         <translation>Vocalização de %1 falhou: %2</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="212"/>
         <source>Encoding aborted</source>
         <translation>Codificação abortada</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="240"/>
         <source>Encoding of %1 failed</source>
         <translation>Codificação de %1 falhou</translation>
     </message>
@@ -2875,30 +3498,37 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>ThemeInstallFrm</name>
     <message>
+        <location filename="../themesinstallfrm.ui" line="13"/>
         <source>Theme Installation</source>
         <translation>Instalação de Tema</translation>
     </message>
     <message>
+        <location filename="../themesinstallfrm.ui" line="48"/>
         <source>Selected Theme</source>
         <translation>Tema selecionado</translation>
     </message>
     <message>
+        <location filename="../themesinstallfrm.ui" line="73"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
+        <location filename="../themesinstallfrm.ui" line="83"/>
         <source>Download size:</source>
         <translation>Tamanho:</translation>
     </message>
     <message>
+        <location filename="../themesinstallfrm.ui" line="93"/>
         <source>Hold Ctrl to select multiple item, Shift for a range</source>
         <translation>Pressione Ctrl para selecionar múltiplos itens, Shift para um intervalo</translation>
     </message>
     <message>
+        <location filename="../themesinstallfrm.ui" line="115"/>
         <source>&amp;Install</source>
         <translation>&amp;Instalar</translation>
     </message>
     <message>
+        <location filename="../themesinstallfrm.ui" line="126"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
@@ -2906,80 +3536,99 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
 <context>
     <name>ThemesInstallWindow</name>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="41"/>
         <source>no theme selected</source>
         <translation>nenhum tema selecionado</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="42"/>
         <source>no selection</source>
         <translation>nenhuma seleção</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Erro de rede: %1.
 Por favor, verifique suas configurações de rede e proxy.</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>o seguinte erro ocorreu:
 %1</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>feito.</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>transferindo detalhes para %1</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>transferindo pré-visualização ...</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Autor:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Versão:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Descrição:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>sem descrição</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>Falha ao obter pré-visualização do tema.
 código de resposta HTTP: %1</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>sem pré-visualização do tema</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>obtendo infomação dos temas ...</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>O ponto de montagem está incorreto!</translation>
     </message>
     <message numerus="yes">
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation>
             <numerusform>Tamanho %L1 kiB (%n item)</numerusform>
@@ -2987,10 +3636,12 @@ código de resposta HTTP: %1</translation>
         </translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2998,38 +3649,47 @@ código de resposta HTTP: %1</translation>
 <context>
     <name>UninstallFrm</name>
     <message>
+        <location filename="../uninstallfrm.ui" line="16"/>
         <source>Uninstall Rockbox</source>
         <translation>Desinstalar Rockbox</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="35"/>
         <source>Please select the Uninstallation Method</source>
         <translation>Por favor, selecione o Método de Desinstalação</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="45"/>
         <source>Uninstallation Method</source>
         <translation>Método de Desinstalação</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="51"/>
         <source>Complete Uninstallation</source>
         <translation>Desinstalação Completa</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="58"/>
         <source>Smart Uninstallation</source>
         <translation>Desinstalação Inteligente</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="68"/>
         <source>Please select what you want to uninstall</source>
         <translation>Por favor, selecione o que você quer desinstalar</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="78"/>
         <source>Installed Parts</source>
         <translation>Partes Instaladas</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="128"/>
         <source>&amp;Uninstall</source>
         <translation>&amp;Desinstalar</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="139"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
@@ -3037,22 +3697,28 @@ código de resposta HTTP: %1</translation>
 <context>
     <name>Uninstaller</name>
     <message>
+        <location filename="../base/uninstall.cpp" line="32"/>
+        <location filename="../base/uninstall.cpp" line="43"/>
         <source>Starting Uninstallation</source>
         <translation>Iniciando Desinstalação</translation>
     </message>
     <message>
+        <location filename="../base/uninstall.cpp" line="36"/>
         <source>Finished Uninstallation</source>
         <translation>Desinstalação Finalizada</translation>
     </message>
     <message>
+        <location filename="../base/uninstall.cpp" line="115"/>
         <source>Uninstallation finished</source>
         <translation>Desinstalação finalizada</translation>
     </message>
     <message>
+        <location filename="../base/uninstall.cpp" line="49"/>
         <source>Uninstalling %1...</source>
         <translation>Desinstalando %1...</translation>
     </message>
     <message>
+        <location filename="../base/uninstall.cpp" line="81"/>
         <source>Could not delete %1</source>
         <translation>Não foi possível apagar %1</translation>
     </message>
@@ -3060,16 +3726,19 @@ código de resposta HTTP: %1</translation>
 <context>
     <name>Utils</name>
     <message>
+        <location filename="../base/utils.cpp" line="375"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Permissões insuficientes para a instalação do carregador.
 É necessário privilégios de administrator.&lt;/li&gt;</translation>
     </message>
     <message>
+        <location filename="../base/utils.cpp" line="396"/>
         <source>Problem detected:</source>
         <translation>Problema detectado:</translation>
     </message>
     <message>
+        <location filename="../base/utils.cpp" line="387"/>
         <source>&lt;li&gt;Target mismatch detected.&lt;br/&gt;Installed target: %1&lt;br/&gt;Selected target: %2.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3077,78 +3746,112 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>VoiceFileCreator</name>
     <message>
+        <location filename="../base/voicefile.cpp" line="43"/>
         <source>Starting Voicefile generation</source>
         <translation>Iniciando geração do arquivo de voz</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="56"/>
         <source>could not find rockbox-info.txt</source>
         <translation>não foi possível encontrar rockbox-info.txt</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Erro de transferência: recebido erro HTTP %1.</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>Arquivo de cache usado.</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>Erro de transferência: %1</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>Transferência finalizada.</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>falha ao abrir arquivo transferido</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>O arquivo transferido estava vazio!</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>Erro abrindo arquivo transferido</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>Erro abrindo arquivo de saída</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>criado com sucesso.</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation>Baixando informação de voz...</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation>Lendo strings...</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation>Criando arquivos de voz...</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation>Limpando...</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation>Finalizado</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
         <source>Extracted voice strings from installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3156,10 +3859,12 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>ZipInstaller</name>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>feito.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>Transferindo arquivo %1.%2</translation>
     </message>
@@ -3172,48 +3877,59 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="vanished">Arquivo de cache usado.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>Erro de transferência: %1</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>Transferência finalizada.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>Extraindo arquivo.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>Sem espaço em disco suficiente! Abortando.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>Instalando arquivo.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>Falhou instalando arquivo.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>Criando registro da instalação</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation type="unfinished">Erro de transferência: recebido erro HTTP %1. {1
 %2?}</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished">Transferência finalizada (cache usado).</translation>
     </message>
@@ -3221,14 +3937,17 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>ZipUtil</name>
     <message>
+        <location filename="../base/ziputil.cpp" line="125"/>
         <source>Creating output path failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ziputil.cpp" line="132"/>
         <source>Creating output file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ziputil.cpp" line="141"/>
         <source>Error during Zip operation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3236,30 +3955,37 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>aboutBox</name>
     <message>
+        <location filename="../aboutbox.ui" line="14"/>
         <source>About Rockbox Utility</source>
         <translation>Sobre o Utilitário Rockbox</translation>
     </message>
     <message>
+        <location filename="../aboutbox.ui" line="32"/>
         <source>The Rockbox Utility</source>
         <translation>O Utilitário Rockbox</translation>
     </message>
     <message>
+        <location filename="../aboutbox.ui" line="74"/>
         <source>&amp;Credits</source>
         <translation>&amp;Créditos</translation>
     </message>
     <message>
+        <location filename="../aboutbox.ui" line="106"/>
         <source>&amp;License</source>
         <translation>&amp;Licença</translation>
     </message>
     <message>
+        <location filename="../aboutbox.ui" line="158"/>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
+        <location filename="../aboutbox.ui" line="54"/>
         <source>Installer and housekeeping utility for the Rockbox open source digital audio player firmware.&lt;br/&gt;© The Rockbox Team.&lt;br/&gt;Released under the GNU General Public License v2.&lt;br/&gt;Uses icons by the &lt;a href=&quot;http://tango.freedesktop.org/&quot;&gt;Tango Project&lt;/a&gt;.&lt;br/&gt;&lt;center&gt;&lt;a href=&quot;https://www.rockbox.org&quot;&gt;https://www.rockbox.org&lt;/a&gt;&lt;/center&gt;</source>
         <translation>Utilitário instalador e de manutenção para o firmware de código aberto de reprodutores digitais de música Rockbox.&lt;br/&gt;© The Rockbox Team.&lt;br/&gt;Released under the GNU General Public License v2.&lt;br/&gt;Uses icons by the &lt;a href=&quot;http://tango.freedesktop.org/&quot;&gt;Tango Project&lt;/a&gt;.&lt;br/&gt;&lt;center&gt;&lt;a href=&quot;https://www.rockbox.org&quot;&gt;https://www.rockbox.org&lt;/a&gt;&lt;/center&gt;</translation>
     </message>
     <message>
+        <location filename="../aboutbox.ui" line="132"/>
         <source>L&amp;ibraries</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_ru.ts b/utils/rbutilqt/lang/rbutil_ru.ts
index 365ccfb30b..aec30a697f 100644
--- a/utils/rbutilqt/lang/rbutil_ru.ts
+++ b/utils/rbutilqt/lang/rbutil_ru.ts
@@ -4,62 +4,78 @@
 <context>
     <name>BackupDialog</name>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="17"/>
+        <location filename="../gui/backupdialogfrm.ui" line="43"/>
         <source>Backup</source>
         <translation>Резервная копия</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="33"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This dialog will create a backup by archiving the contents of the Rockbox installation on the player into a zip file. This will include installed themes and settings stored below the .rockbox folder on the player.&lt;/p&gt;&lt;p&gt;The backup filename will be created based on the installed version. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Здесь можно создать резервную копию текущей установки Rockbox и упаковать её в ZIP-файл. Это также касается установленных тем и настроек, находящихся в папке .rockbox на Вашем плеере.&lt;/p&gt;&lt;p&gt;Название файла резервной копии будет соответствовать установленной версии прошивки.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="49"/>
         <source>Size: unknown</source>
         <translation>Размер: неизвестен</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="56"/>
         <source>Backup to: unknown</source>
         <translation>Создать в: неизвстно</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="76"/>
         <source>&amp;Change</source>
         <translation>&amp;Изменить</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="116"/>
         <source>&amp;Backup</source>
         <translation>&amp;Создать копию</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialogfrm.ui" line="127"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="69"/>
         <source>Installation size: calculating ...</source>
         <translation>Размер установки: вычисляется...</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation>Выберите название файла резервной копии</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation>Размер установки: %L1 %2</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation>Начало копии ...</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation>Резервная копия удалась.</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation>Не удалось создать резервную копию!</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation>Файл уже существует</translation>
     </message>
     <message>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation>Такой файл уже существует. Заменить?</translation>
     </message>
@@ -67,34 +83,43 @@
 <context>
     <name>BootloaderInstallAms</name>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="58"/>
         <source>Downloading bootloader file</source>
         <translation>Скачивается файл загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallams.cpp" line="113"/>
         <source>Could not load %1</source>
         <translation>Не удалось загрузить %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="137"/>
         <source>Patching Firmware...</source>
         <translation>Изменяется прошивка...</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="148"/>
         <source>Could not open %1 for writing</source>
         <translation>Не удалось открыть %1 для записи</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="161"/>
         <source>Could not write firmware file</source>
         <translation>Сбой записи файла прошивки</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="177"/>
         <source>Success: modified firmware file created</source>
         <translation>Изменённая прошивка успешно создана</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="127"/>
         <source>No room to insert bootloader, try another firmware version</source>
         <translation>Нет места для записи загрузчика, попробуйте другую версию прошивки</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="185"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation>Для удаления выполните нормальное обновление с неизменённой фирменной прошивкой</translation>
     </message>
@@ -103,6 +128,7 @@
         <translation type="obsolete">Установка загрузчика потребует от вас копию оригинальной прошивки Sandisk\&apos;а (bin файл). Эта прошивка будет пропатчена и затем установлена в ваш плеер вместе с зарузчиком Rockbox\&apos;а. По причинам легальности данного действия вам нужно будет самим скачать загрузчик. Зайдите на &lt;a href=\&apos;http://forums.sandisk.com/sansa/\&apos;&gt;Sansa Forums\&apos;&lt;/a&gt; или обратитесь к &lt;a href=\&apos;https://www.rockbox.org/manual.shtml\&apos;&gt;инструкции&lt;/a&gt; и вики-странице &lt;a href=\&apos;https://www.rockbox.org/wiki/SansaAMS\&apos;&gt;SansaAMS&lt;/a&gt; за помощью с получением файла.&lt;br/&gt;Нажмите ОК чтобы продолжить и выбрать файл прошивки.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallams.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (bin file). This firmware file will be patched and then installed to your player along with the rockbox bootloader. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/SansaAMS&apos;&gt;SansaAMS&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;&lt;b&gt;Note:&lt;/b&gt; This file is not present on your player and will disappear automatically after installing it.&lt;br/&gt;&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>Установка загрузчика потребует от вас копию оригинальной прошивки от Sandisk (bin-файл). Эта прошивка будет пропатчена, а затем установлена на ваш плеер вместе с зарузчиком Rockbox\&apos;а. По законным причинам, Вам необходимо скачать файл самостоятельно. Зайдите на &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;форумы Sansa&lt;/a&gt; или читайте &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;инструкцию&lt;/a&gt; и вики-страничку &lt;a href=&apos;https://www.rockbox.org/wiki/SansaAMS&apos;&gt;SansaAMS&lt;/a&gt; о том, как получить файл.&lt;br/&gt;Нажмите ОК чтобы продолжить и выбрать файл прошивки.</translation>
     </message>
@@ -110,38 +136,47 @@
 <context>
     <name>BootloaderInstallBSPatch</name>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="65"/>
         <source>Bootloader installation requires you to provide the correct verrsion of the original firmware file. This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/wiki/&apos;&gt;rockbox wiki&lt;/a&gt; pages on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="84"/>
         <source>Could not read original firmware file</source>
         <translation type="unfinished">Не удалось прочитать фирменную прошивку</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="90"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="99"/>
         <source>Patching file...</source>
         <translation type="unfinished">Изменяется прошивка...</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="124"/>
         <source>Patching the original firmware failed</source>
         <translation type="unfinished">Сбой патчирования фирменной прошивки</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="130"/>
         <source>Succesfully patched firmware file</source>
         <translation type="unfinished">Прошивка успешно пропатчена</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="145"/>
         <source>Bootloader successful installed</source>
         <translation type="unfinished">Загрузчик успешно установлен</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="151"/>
         <source>Patched bootloader could not be installed</source>
         <translation type="unfinished">Не удалось установить пропатченный загрузчик</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="161"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation type="unfinished">Для удаления выполните нормальное обновление с неизменённой фирменной прошивкой.</translation>
     </message>
@@ -149,74 +184,92 @@
 <context>
     <name>BootloaderInstallBase</name>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="69"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Ошибка при скачивании: ошибка HTTP %1.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="75"/>
         <source>Download error: %1</source>
         <translation>Ошибка при скачивании: %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="81"/>
         <source>Download finished (cache used).</source>
         <translation>Скачивание завершено (из кэша).</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="83"/>
         <source>Download finished.</source>
         <translation>Скачивание завершено.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="112"/>
         <source>Creating backup of original firmware file.</source>
         <translation>Создаётся резервная копия фирменной прошивки.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="114"/>
         <source>Creating backup folder failed</source>
         <translation>Сбой при попытке создания папки резервной копии</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="120"/>
         <source>Creating backup copy failed.</source>
         <translation>Сбой при попытке создания резервной копии.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="123"/>
         <source>Backup created.</source>
         <translation>Резервная копия создана.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="140"/>
         <source>Creating installation log</source>
         <translation>Создаётся журнал установки</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="152"/>
         <source>Installation log created</source>
         <translation>Журнал установки создан</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="162"/>
         <source>Waiting for system to remount player</source>
         <translation>Ожидание, пока система заново смонтирует плеер</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="192"/>
         <source>Player remounted</source>
         <translation>Плеер смонтирован</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="197"/>
         <source>Timeout on remount</source>
         <translation>Время ожидания для монтирования истекло</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="245"/>
         <source>Zip file format detected</source>
         <translation>Обнаружен формат ZIP</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="278"/>
         <source>Extracting firmware %1 from archive</source>
         <translation>Извлекается прошивка %1 из архива</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="285"/>
         <source>Error extracting firmware from archive</source>
         <translation>Ошибка при извлечении прошивки</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="294"/>
         <source>Could not find firmware in archive</source>
         <translation>Прошивка в архиве не найдена</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="257"/>
         <source>CAB file format detected</source>
         <translation>Обнаружен формат CAB</translation>
     </message>
@@ -224,62 +277,77 @@
 <context>
     <name>BootloaderInstallChinaChip</name>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (HXF file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/OndaVX747#Download_and_extract_a_recent_ve&apos;&gt;OndaVX747&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>Чтобы установить загрузчик, требуется файл фирменной прошивки (HXF-файл). По законодательным причинам, этот файл вам необходимо скачать самостоятельно. О том, как получить этот файл, смотрите в &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;руководстве по эксплуатации&lt;/a&gt; и на &lt;a href=&apos;https://www.rockbox.org/wiki/OndaVX747#Download_and_extract_a_recent_ve&apos;&gt;вики-страничке OndaVX747&lt;/a&gt;. &lt;br/&gt; Нажмине на ОК, чтобы продолжить и указать путь к прошивке на Вашем компьютере.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="50"/>
         <source>Downloading bootloader file</source>
         <translation>Скачивается файл загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="75"/>
         <source>Could not open firmware file</source>
         <translation>Не удалось открыть файл прошивки</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="78"/>
         <source>Could not open bootloader file</source>
         <translation>Не удалось открыть файл загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="81"/>
         <source>Could not allocate memory</source>
         <translation>Не удалось выделить память</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="84"/>
         <source>Could not load firmware file</source>
         <translation>Не удалось загрузить файл прошивки</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="87"/>
         <source>File is not a valid ChinaChip firmware</source>
         <translation>Файл не является годной прошивкой ChinaChip</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="90"/>
         <source>Could not find ccpmp.bin in input file</source>
         <translation>ccpmp.bin во входном файле не найден</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="93"/>
         <source>Could not open backup file for ccpmp.bin</source>
         <translation>Не удалось открыть резервную копию для ccpmp.bin</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="96"/>
         <source>Could not write backup file for ccpmp.bin</source>
         <translation>Не удалось записать резервную копию для ccpmp.bin</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="99"/>
         <source>Could not load bootloader file</source>
         <translation>Не удалось считать файл загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="102"/>
         <source>Could not get current time</source>
         <translation>Не удалось получить текущее время</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="105"/>
         <source>Could not open output file</source>
         <translation>Не удалось открыть выходной файл</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="108"/>
         <source>Could not write output file</source>
         <translation>Не удалось записать выходной файл</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="111"/>
         <source>Unexpected error from chinachippatcher</source>
         <translation>Неожиданный сбой chinachippatcher</translation>
     </message>
@@ -287,46 +355,57 @@
 <context>
     <name>BootloaderInstallFile</name>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="34"/>
         <source>Downloading bootloader</source>
         <translation>Скачивается загрузчик</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="43"/>
         <source>Installing Rockbox bootloader</source>
         <translation>Устанавливается загрузчик Rockbox</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="75"/>
         <source>Error accessing output folder</source>
         <translation>Ошибка доступа к выходной папке</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="111"/>
         <source>Removing Rockbox bootloader</source>
         <translation>Удаляется загрузчик Rockbox</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="115"/>
         <source>No original firmware file found.</source>
         <translation>Не найдено фирменной прошивки.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="121"/>
         <source>Can&apos;t remove Rockbox bootloader file.</source>
         <translation>Не удалось удалить файл загрузчика Rockbox.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="126"/>
         <source>Can&apos;t restore bootloader file.</source>
         <translation>Не удалось восстановить файл загрузчика.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="130"/>
         <source>Original bootloader restored successfully.</source>
         <translation>Фирменный загрузчик успешно восстановлен.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="94"/>
         <source>Bootloader successful installed</source>
         <translation>Загрузчик успешно установлен</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="89"/>
         <source>A firmware file is already present on player</source>
         <translation>Файл прошивки уже присутствует на плеере</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallfile.cpp" line="97"/>
         <source>Copying modified firmware file failed</source>
         <translation>Не удалось скопировать изменённый файл прошивки</translation>
     </message>
@@ -334,138 +413,172 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="69"/>
         <source>checking MD5 hash of input file ...</source>
         <translation>проверка хэша MD5 входного файла ...</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="80"/>
         <source>Could not verify original firmware file</source>
         <translation>Не удалось проверить фирменную прошивку</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="95"/>
         <source>Firmware file not recognized.</source>
         <translation>Файл прошивки не распознан.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="99"/>
         <source>MD5 hash ok</source>
         <translation>Хэш MD5 проверен</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="106"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation>Прошивка не соответствует указанному плееру.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="111"/>
         <source>Descrambling file</source>
         <translation>Расшифровка файла</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="119"/>
         <source>Error in descramble: %1</source>
         <translation>Ошибка при расшифровке: %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="124"/>
         <source>Downloading bootloader file</source>
         <translation>Скачивается файл загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="134"/>
         <source>Adding bootloader to firmware file</source>
         <translation>Добавляется загрузчик к прошивке</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>could not open input file</source>
         <translation>Не удалось открыть входной файл</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>reading header failed</source>
         <translation>Сбой чтения заголовка</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>reading firmware failed</source>
         <translation>Сбой чтения прошивки</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>can&apos;t open bootloader file</source>
         <translation>Не удалось открыть файл загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>reading bootloader file failed</source>
         <translation>Сбой чтения файла загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
         <source>can&apos;t open output file</source>
         <translation>Не удалось открыть выходной файл</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="178"/>
         <source>writing output file failed</source>
         <translation>Сбой записи выходного файла</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="180"/>
         <source>Error in patching: %1</source>
         <translation>Ошибка применения патча: %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="191"/>
         <source>Error in scramble: %1</source>
         <translation>Ошибка кодирования: %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="206"/>
         <source>Checking modified firmware file</source>
         <translation>Проверка изменённой прошивки</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="208"/>
         <source>Error: modified file checksum wrong</source>
         <translation>Ошибка: неверная контрольная сумма изменённого файла</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="220"/>
         <source>Success: modified firmware file created</source>
         <translation>Изменённая прошивка успешно создана</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="259"/>
         <source>Can&apos;t open input file</source>
         <translation>Не удалось открыть входной файл</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="260"/>
         <source>Can&apos;t open output file</source>
         <translation>Не удалось открыть выходной вайл</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="261"/>
         <source>invalid file: header length wrong</source>
         <translation>Неверный файл: неверная длина заголовка</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="262"/>
         <source>invalid file: unrecognized header</source>
         <translation>Неверный файл: неопознанный заголовок</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="263"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation>Неверный файл: неверное поле &quot;длина&quot;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="264"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation>Неверный файл: неверное поле &quot;длина2&quot;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="265"/>
         <source>invalid file: internal checksum error</source>
         <translation>Неверный файл: ошибка во внутренней контрольной сумме</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="267"/>
         <source>unknown</source>
         <translation>неизвестная ошибка</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="50"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>Для установки загрузчика требуется файл прошивки с фирменной прошивкой (hex-файл). По законодательным причинам, вам необходимо скачать этот файл самостоятельно. Как найти этот файл, смотрите в &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;руководстве по экслуатации&lt;/a&gt; и на вики-странице &lt;a href=&apos;https://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt;.&lt;br/&gt;Чтобы продолжить, нажмите на OK и укажите файл прошивки на компьютере.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="266"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation>Неверный файл: неверное поле &quot;длина3&quot;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="237"/>
         <source>Uninstallation not possible, only installation info removed</source>
         <translation>Полное удаление невозможно, удалена только информация об установке</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
         <source>A firmware file is already present on player</source>
         <translation>Файл прошивки уже присутствует на плеере</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="223"/>
         <source>Copying modified firmware file failed</source>
         <translation>Не удалось скопировать изменённый файл прошивки</translation>
     </message>
@@ -474,37 +587,50 @@
     <name>BootloaderInstallImx</name>
     <message>
         <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation>Установка загрузчика потребует от вас копию оригинальной прошивки от Sandisk (файл firmware.sb). Эта прошивка будет пропатчена, а затем установлена на ваш плеер вместе с зарузчиком Rockbox. По законным причинам, Вам необходимо скачать файл самостоятельно. Зайдите на &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;форумы Sansa&lt;/a&gt; или читайте вики-страничку &lt;a href=&apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; о том, как получить файл.&lt;br/&gt;Нажмите ОК чтобы продолжить и выбрать файл прошивки.</translation>
+        <translation type="vanished">Установка загрузчика потребует от вас копию оригинальной прошивки от Sandisk (файл firmware.sb). Эта прошивка будет пропатчена, а затем установлена на ваш плеер вместе с зарузчиком Rockbox. По законным причинам, Вам необходимо скачать файл самостоятельно. Зайдите на &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;форумы Sansa&lt;/a&gt; или читайте вики-страничку &lt;a href=&apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; о том, как получить файл.&lt;br/&gt;Нажмите ОК чтобы продолжить и выбрать файл прошивки.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation>Не удалось прочитать фирменную прошивку</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation>Скачивается файл загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation>Изменяется прошивка...</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation>Сбой патчирования фирменной прошивки</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation>Прошивка успешно пропатчена</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation>Загрузчик успешно установлен</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation>Не удалось установить пропатченный загрузчик</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation>Для удаления выполните нормальное обновление с неизменённой фирменной прошивкой.</translation>
     </message>
@@ -516,84 +642,107 @@
         <translation type="vanished">Ошибка: не удалось выделить буферную память!</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="72"/>
         <source>Downloading bootloader file</source>
         <translation>Скачивается файл заргузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="143"/>
         <source>Failed to read firmware directory</source>
         <translation>Сбой чтения папки микропрограммы</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="61"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="148"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation>Неизвестный номер версии прошивки (%1)</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="155"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation>Не удалось открыть iPod в режиме записи</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="107"/>
         <source>Failed to add bootloader</source>
         <translation>Сбой установки загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>No bootloader detected.</source>
         <translation>Загрузчика не обнаружено.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="167"/>
         <source>Successfully removed bootloader</source>
         <translation>Загрузчик успешно удалён</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="175"/>
         <source>Removing bootloader failed.</source>
         <translation>Сбой удаления загрузчика.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="266"/>
         <source>Could not open Ipod</source>
         <translation>Не удалось открыть iPod</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="277"/>
         <source>No firmware partition on disk</source>
         <translation>Не найдено раздела прошивки на диске</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="82"/>
         <source>Installing Rockbox bootloader</source>
         <translation>Установка загрузчика Rockbox</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="134"/>
         <source>Uninstalling bootloader</source>
         <translation>Удаление загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="271"/>
         <source>Error reading partition table - possibly not an Ipod</source>
         <translation>Сбой чтения таблицы разделов - возможно, это не iPod</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="67"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods. 
 See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation>Предупреждение: это - MacPod, Rockbox работает только на WinPod&apos;ах.
 См. https://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="96"/>
         <source>Successfull added bootloader</source>
         <translation>Загрузчик успешно добавлен</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="119"/>
         <source>Bootloader Installation complete.</source>
         <translation>Установка загрузчика завершена.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="124"/>
         <source>Writing log aborted</source>
         <translation>Запись журнала отменена</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
         <source>Error: no mountpoint specified!</source>
         <translation>Ошибка: не указано точки монтирования!</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="262"/>
         <source>Could not open Ipod: permission denied</source>
         <translation>Не удалось открыть iPod: доступ запрещён</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="241"/>
         <source>Error: could not retrieve device name</source>
         <translation>Ошибка: не удалось найти название устройства</translation>
     </message>
@@ -601,42 +750,53 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallMi4</name>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="34"/>
         <source>Downloading bootloader</source>
         <translation>Скачивается загрузчик</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="43"/>
         <source>Installing Rockbox bootloader</source>
         <translation>Устанавливается загрузчик Rockbox</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="71"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="79"/>
         <source>Bootloader successful installed</source>
         <translation>Загрузчик успешно установлен</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="91"/>
         <source>Checking for Rockbox bootloader</source>
         <translation>Проверяется наличие загрузчика Rockbox</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="93"/>
         <source>No Rockbox bootloader found</source>
         <translation>Загрузчик Rockbox не найден</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="99"/>
         <source>Checking for original firmware file</source>
         <translation>Проверяется наличие фирменной прошивки</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="104"/>
         <source>Error finding original firmware file</source>
         <translation>Фирменной прошивки не найдено</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="115"/>
         <source>Rockbox bootloader successful removed</source>
         <translation>Загрузчик Rockbox успешно удалён</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="66"/>
         <source>A firmware file is already present on player</source>
         <translation>Файл прошивки уже присутствует на плеере</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="74"/>
         <source>Copying modified firmware file failed</source>
         <translation>Не удалось скопировать изменённый файл прошивки</translation>
     </message>
@@ -644,62 +804,77 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>Для установки загрузчика требуется файл прошивки с фирменной микропрограммой (hex-файл). По законодательным причинам, вам необходимо скачать этот файл самостоятельно. Как найти этот файл, смотрите в &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;руководстве по экслуатации&lt;/a&gt; и на вики-странице &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt;.&lt;br/&gt;Чтобы продолжить, нажмите на OK и укажите файл прошивки на компьютере.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation>Скачивается файл загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation>Не удалось открыть фирменную прошивку.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation>Не удалось прочитать фирменную прошивку.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation>Не удалось открыть скачаный загрузчик.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation>Место для загрузчика в фирменной прошивке не пустое.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation>Не удалось прочитать полученный загрузчик.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation>Ошибка в контрольной сумме загрузчика.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation>Сбой патчирования фирменной прошивки: %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation>Изменённая прошивка успешно создана</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation>Для удаления выполните нормальное обновление с неизменённой фирменной прошивкой</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation>Загруженная прошивка не похожа на фирменную прошивку MPIO.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation>Не удалось открыть выходной вайл.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation>Сбой записи выходного файла.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation>Неизвестная ошибка номер %1</translation>
     </message>
@@ -707,122 +882,149 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallS5l</name>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="61"/>
         <source>Could not find mounted iPod.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="68"/>
         <source>Downloading bootloader file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="113"/>
         <source>Could not make DFU image.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="119"/>
         <source>Ejecting iPod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="141"/>
         <source>Action required:
 
 Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject functionality.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="151"/>
         <source>Device successfully ejected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="171"/>
         <source>Action required:
 
 Quit iTunes application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="179"/>
         <source>iTunes closed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="192"/>
         <source>Could not suspend iTunesHelper. Stop it using the Task Manager, and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="201"/>
         <source>Waiting for HDD spin-down...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="217"/>
         <source>Waiting for DFU mode...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="218"/>
         <source>Action required:
 
 Press and hold SELECT+MENU buttons, after about 12 seconds a new action will require you to release the buttons, DO IT QUICKLY, otherwise the process could fail.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="241"/>
         <source>DFU mode detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="243"/>
         <source>Action required:
 
 Release SELECT+MENU buttons and wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="268"/>
         <source>Device is not in DFU mode. It seems that the previous required action failed, please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="275"/>
         <source>Transfering DFU image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="285"/>
         <source>No valid DFU USB driver found.
 
 Install iTunes (or the Apple Device Driver) and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="294"/>
         <source>Could not transfer DFU image.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="299"/>
         <source>DFU transfer completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="302"/>
         <source>Restarting iPod, waiting for remount...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="321"/>
         <source>Action required:
 
 Could not remount the device, try to do it manually. If the iPod didn&apos;t restart, force a reset by pressing SELECT+MENU buttons for about 5 seconds. If the problem could not be solved then click &apos;Abort&apos; to cancel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="333"/>
         <source>Device remounted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="336"/>
         <source>Bootloader successfully installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="338"/>
         <source>Bootloader successfully uninstalled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="350"/>
         <source>Could not resume iTunesHelper.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="368"/>
         <source>Install aborted by user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="370"/>
         <source>Uninstall aborted by user.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -830,6 +1032,7 @@ Could not remount the device, try to do it manually. If the iPod didn&apos;t res
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation>Ошибка: не удалось выделить буферную память!</translation>
     </message>
@@ -848,10 +1051,13 @@ This is required to install the bootloader</source>
         <translation type="vanished">Не найдено плеера Sansa!</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Downloading bootloader file</source>
         <translation>Скачивается файл загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="164"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -863,66 +1069,83 @@ See https://www.rockbox.org/wiki/SansaE200Install
 См. https://www.rockbox.org/wiki/SansaE200Install</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="87"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="174"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation>Не удалось открыть плеер в режиме записи</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="114"/>
         <source>Successfully installed bootloader</source>
         <translation>Загрузчик успешно установлен</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="125"/>
         <source>Failed to install bootloader</source>
         <translation>Сбой при установке загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="260"/>
         <source>Can&apos;t find Sansa</source>
         <translation>Не удалось найти плеер Sansa</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="265"/>
         <source>Could not open Sansa</source>
         <translation>Не удалось открыть плеер Sansa</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="270"/>
         <source>Could not read partition table</source>
         <translation>Не удалось прочитать таблицу разделов</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="277"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation>Диск не принадлежит плееру Sansa (Ошибка %1), отмена.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="180"/>
         <source>Successfully removed bootloader</source>
         <translation>Загручик успешно удалён</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="188"/>
         <source>Removing bootloader failed.</source>
         <translation>Сбой удаления загрузчика.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="83"/>
         <source>Installing Rockbox bootloader</source>
         <translation>Установка загрузчика Rockbox</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
         <source>Checking downloaded bootloader</source>
         <translation>Проверка скаченного загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation>Загрузчик не соответствует! Отмена.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="155"/>
         <source>Uninstalling bootloader</source>
         <translation>Удаление загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="138"/>
         <source>Bootloader Installation complete.</source>
         <translation>Установка загрузчика завершена.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="143"/>
         <source>Writing log aborted</source>
         <translation>Запись журнала отменена</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="244"/>
         <source>Error: could not retrieve device name</source>
         <translation>Ошибка: не удалось найти имя устройства</translation>
     </message>
@@ -930,42 +1153,53 @@ See https://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>BootloaderInstallTcc</name>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="50"/>
         <source>Downloading bootloader file</source>
         <translation>Скачивается файл загрузчика</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="82"/>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="99"/>
         <source>Could not load %1</source>
         <translation>Не удалось загрузить %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="90"/>
         <source>Unknown OF file used: %1</source>
         <translation>Используется неизвестный файл фирменной прошивки: %1</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="104"/>
         <source>Patching Firmware...</source>
         <translation>Изменяется прошивка...</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="117"/>
         <source>Could not open %1 for writing</source>
         <translation>Не удалось открыть %1 для записи</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="126"/>
         <source>Could not write firmware file</source>
         <translation>Сбой записи файла прошиви</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="131"/>
         <source>Success: modified firmware file created</source>
         <translation>Изменённый файл прошивки успешно создан</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/CowonD2Info&apos;&gt;CowonD2Info&lt;/a&gt; wiki page on how to obtain the file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>Для установки загрузчика требуется файл прошивки с фирменной микропрограммой (hex-файл). По законодательным причинам, вам необходимо скачать этот файл самостоятельно. Как найти этот файл, смотрите в &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;руководстве по экслуатации&lt;/a&gt; и на вики-странице &lt;a href=&apos;https://www.rockbox.org/wiki/CowonD2Info&apos;&gt;CowonD2Info&lt;/a&gt;.&lt;br/&gt;Чтобы продолжить, нажмите на OK и укажите файл прошивки на компьютере.</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="111"/>
         <source>Could not patch firmware</source>
         <translation>Сбой записи файла прошивки</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="151"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation>Для удаления выполните нормальное обновление с неизменённой фирменной прошивкой</translation>
     </message>
@@ -973,14 +1207,17 @@ See https://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Changelog</name>
     <message>
+        <location filename="../gui/changelogfrm.ui" line="17"/>
         <source>Changelog</source>
         <translation>История изменений</translation>
     </message>
     <message>
+        <location filename="../gui/changelogfrm.ui" line="39"/>
         <source>Show on startup</source>
         <translation>Показать при запуске</translation>
     </message>
     <message>
+        <location filename="../gui/changelogfrm.ui" line="46"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
@@ -988,34 +1225,41 @@ See https://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>Автоопределение</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Не удалось определить точку монтирования
 Укажите её вручную.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Не удалось определить устройство.
 Укажите устройство и точку монтирования вручную.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>Удалить кэш?</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Вы дейсвительно хотите удалить кэш? Эта операция удалит &lt;b&gt;все&lt;/b&gt; файлы из этой папки!</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>Неверный путь!</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>Неверный путь кэша. Отмена.</translation>
     </message>
@@ -1024,54 +1268,69 @@ Select your device and Mountpoint manually.</source>
         <translation type="obsolete">Фатальная ошибка</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Текущий размер кэша %L1 КБ.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>Настройки верны</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>Настройки НЕВЕРНЫ</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="125"/>
         <source>The following errors occurred:</source>
         <translation>Обнаружены следующие ошибки:</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="170"/>
         <source>No mountpoint given</source>
         <translation>Не указана точка монтирования</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="174"/>
         <source>Mountpoint does not exist</source>
         <translation>Точка монтирования не существует</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="178"/>
         <source>Mountpoint is not a directory.</source>
         <translation>Указанная точка монтирования не является папкой.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="182"/>
         <source>Mountpoint is not writeable</source>
         <translation>Точка монтирования незаписываема</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation>Плеер не выбран</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>Указанный путь кэша незаписываем. Оставьте это поле пустым для использования системного пути по умолчанию.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>Вам необходимо исправить вышеуказанные ошибкм перед тем, как продолжить.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation>Ошибка в настройках</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
@@ -1084,68 +1343,83 @@ Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="obsolete">Ошибка: плеер несовместим</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation>Настройки TTS неверны</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation>Настройки TTS неверны.
  Пожалуйста, настройте движок TTS.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation>Не удалось запустить движок TTS.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation>Не удалось запустить движок TTS.
 </translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation>
 Пожалуйста, настройте движок TTS.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation>Проверка голоса</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation>Невозможно озвучить введённый текст.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation>Отображение отображение неподдерживаемых устройств</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation>Вы только что указали, что хотите видеть в списке устройства, помеченные как официально неподдерживаемые. Таковые не рекомендуются к использованию конечным пользователям. Используйте эту функцию только если знаете, что делаете.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation>Указать путь к кэшу</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation>%1 является MacPod&apos;ом!
 Для работы, Rockbox нужен iPod форматированный в FAT (так называемый &quot;WinPod&quot;).</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation>Определение прокси</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation>Системные настройки прокси неверны!
 Мастер Rockbox не может работать с этими настройками. Проверьте правильность системных настроек прокси. Учтите, что мастер Rockbox не поддерживает сценарии &quot;proxy auto config&quot; (PAC). Если таковые используются на Вашей системе, вам необходимо использовать ручные настройки.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>Найден %1 в режиме MTP!
@@ -1156,53 +1430,69 @@ You need to change your player to MSC mode for installation. </source>
         <translation type="obsolete">Пока вы это не измените, установка не пройдёт успешно!</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation>Не удалось произнести проверочное предложение.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation>Ошибка TTS</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>Не удалось инициализироавть выбранный движок. Вы не можете им пользоваться.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation>Было обнаружено несколько устройств. Отключите все, кроме одного и попробуйте снова.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation>Обнаруженные устройства:</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation>(неизвестный)</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation>Примечание: обнаружение подключенных устройств может оказаться двусмысленно. Может быть подключено меньше устройств, чем в списке. В таком случае, Ваш плеер может быть невозможно узнать однозначно.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation>Обнаружение устройств</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation>Обнаружена несовместимая файловая система на плеере.
 Убедитесь в том, что выбрана верная точка монтирования и плеер настроен на использование совместимой с Rockbox файловой системы.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation>Неизвестная ошибка при обнаружении плеера.</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation>%1 (свободны %2 ГиБ из %3 ГиБ)</translation>
     </message>
     <message>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation>%1 на %2</translation>
     </message>
@@ -1210,98 +1500,122 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>ConfigForm</name>
     <message>
+        <location filename="../configurefrm.ui" line="14"/>
         <source>Configuration</source>
         <translation>Настройки</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="20"/>
         <source>Configure Rockbox Utility</source>
         <translation>Настроить мастера Rockbox</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="35"/>
         <source>&amp;Device</source>
         <translation>&amp;Устройство</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="41"/>
         <source>Select your device in the &amp;filesystem</source>
         <translation>Укажите Ваше устройство в &amp;файловой системе</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="326"/>
         <source>&amp;Browse</source>
         <translation>&amp;Обзор</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="72"/>
         <source>&amp;Select your audio player</source>
         <translation>&amp;Выберите ваш аудио плеер</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="114"/>
         <source>&amp;Autodetect</source>
         <translation>&amp;Автоопределение</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="136"/>
         <source>&amp;Proxy</source>
         <translation>П&amp;рокси</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="142"/>
         <source>&amp;No Proxy</source>
         <translation>&amp;Без прокси</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="152"/>
         <source>Use S&amp;ystem values</source>
         <translation>Использовать с&amp;истемные настройки</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="159"/>
         <source>&amp;Manual Proxy settings</source>
         <translation>&amp;Ручные настройки прокси</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="166"/>
         <source>Proxy Values</source>
         <translation>Параметры прокси</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="172"/>
         <source>&amp;Host:</source>
         <translation>&amp;Хост:</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="182"/>
         <source>&amp;Port:</source>
         <translation>&amp;Порт:</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="199"/>
         <source>&amp;Username</source>
         <translation>&amp;Имя пользователя</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="209"/>
         <source>Pass&amp;word</source>
         <translation>Пар&amp;оль</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="267"/>
         <source>&amp;Language</source>
         <translation>&amp;Язык</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="281"/>
         <source>Cac&amp;he</source>
         <translation>К&amp;эш</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="284"/>
         <source>Download cache settings</source>
         <translation>Настройки кэша загрузок</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="290"/>
         <source>Rockbox Utility uses a local download cache to save network traffic. You can change the path to the cache and use it as local repository by enabling Offline mode.</source>
         <translation>Мастер Rockbox использует локальный кэш скачивания для экономии сетевой передачи. Вы можете изменить путь к кэшу и использовать его как локальное хранилище с помощью автономного режима.</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="300"/>
         <source>Current cache size is %1</source>
         <translation>Текущий размер кэша: %1</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="309"/>
         <source>P&amp;ath</source>
         <translation>&amp;Путь</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="319"/>
         <source>Entering an invalid folder will reset the path to the systems temporary path.</source>
         <translation>Введение неверного пути сбросит путь в значение системной временной папки.</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="341"/>
         <source>Disable local &amp;download cache</source>
         <translation>Отключить локальный кэш &amp;загрузок</translation>
     </message>
@@ -1314,70 +1628,88 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="obsolete">Ав&amp;тономный режим</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="376"/>
         <source>Clean cache &amp;now</source>
         <translation>Вычистить кэш &amp;сейчас</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="392"/>
         <source>&amp;TTS &amp;&amp; Encoder</source>
         <translation>&amp;TTS &amp;&amp; Кодировщик</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="398"/>
         <source>TTS Engine</source>
         <translation>Движок TTS</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="404"/>
         <source>&amp;Select TTS Engine</source>
         <translation>&amp;Выберите движок TTS</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="473"/>
         <source>Encoder Engine</source>
         <translation>движок кодирования</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="547"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="558"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="417"/>
         <source>Configure TTS Engine</source>
         <translation>Настроить движок TTS</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="424"/>
+        <location filename="../configurefrm.ui" line="479"/>
         <source>Configuration invalid!</source>
         <translation>Настройка неверна!</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="441"/>
         <source>Configure &amp;TTS</source>
         <translation>Настроить &amp;TTS</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="496"/>
         <source>Configure &amp;Enc</source>
         <translation>Настроить &amp;кодировщик</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="507"/>
         <source>encoder name</source>
         <translation>имя кодировщика</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="452"/>
         <source>Test TTS</source>
         <translation>Проверить TTS</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="95"/>
         <source>Show disabled targets</source>
         <translation>Показывать отключенные устройства</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="58"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Обновить</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="463"/>
         <source>&amp;Use string corrections for TTS</source>
         <translation>&amp;Использовать корекции строк для TTS</translation>
     </message>
     <message>
+        <location filename="../configurefrm.ui" line="219"/>
         <source>Show</source>
         <translation>Показать</translation>
     </message>
@@ -1385,6 +1717,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>Configure</name>
     <message>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Русский</translation>
@@ -1393,42 +1726,52 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>CreateVoiceFrm</name>
     <message>
+        <location filename="../createvoicefrm.ui" line="17"/>
         <source>Create Voice File</source>
         <translation>Создать голосовой файл</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="42"/>
         <source>Select the Language you want to generate a voicefile for:</source>
         <translation>Выберите язык, для которого Вы хотите создать голосовой файл:</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="49"/>
         <source>Generation settings</source>
         <translation>Настройки генерирования</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="72"/>
         <source>Change</source>
         <translation>Изменить</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="143"/>
         <source>&amp;Install</source>
         <translation>&amp;Установить</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="154"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="92"/>
         <source>Wavtrim Threshold</source>
         <translation>Порог Wavtrim</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="167"/>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="55"/>
         <source>TTS:</source>
         <translation>TTS:</translation>
     </message>
     <message>
+        <location filename="../createvoicefrm.ui" line="105"/>
         <source>Silence threshold</source>
         <translation>Порог тишины</translation>
     </message>
@@ -1436,14 +1779,18 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>CreateVoiceWindow</name>
     <message>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Движок: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation>Ошибка TTS</translation>
     </message>
     <message>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>Не удалось инициализироавть выбранный движок. Вы не можете им пользоваться.</translation>
     </message>
@@ -1451,26 +1798,32 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncTtsCfgGui</name>
     <message>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation>Ожидание движка...</translation>
     </message>
     <message>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation>Обзор</translation>
     </message>
     <message>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation>Обновить</translation>
     </message>
     <message>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation>Выбрать исполняемый файл</translation>
     </message>
@@ -1478,10 +1831,12 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncoderExe</name>
     <message>
+        <location filename="../base/encoderexe.cpp" line="37"/>
         <source>Path to Encoder:</source>
         <translation>Путь к кодировщику:</translation>
     </message>
     <message>
+        <location filename="../base/encoderexe.cpp" line="39"/>
         <source>Encoder options:</source>
         <translation>Настройки кодировщика:</translation>
     </message>
@@ -1489,18 +1844,23 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncoderLame</name>
     <message>
+        <location filename="../base/encoderlame.cpp" line="75"/>
+        <location filename="../base/encoderlame.cpp" line="85"/>
         <source>LAME</source>
         <translation>LAME</translation>
     </message>
     <message>
+        <location filename="../base/encoderlame.cpp" line="77"/>
         <source>Volume</source>
         <translation>Громкость</translation>
     </message>
     <message>
+        <location filename="../base/encoderlame.cpp" line="81"/>
         <source>Quality</source>
         <translation>Качество</translation>
     </message>
     <message>
+        <location filename="../base/encoderlame.cpp" line="85"/>
         <source>Could not find libmp3lame!</source>
         <translation>Не удалось найти libmp3lame!</translation>
     </message>
@@ -1508,18 +1868,22 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>EncoderRbSpeex</name>
     <message>
+        <location filename="../base/encoderrbspeex.cpp" line="34"/>
         <source>Volume:</source>
         <translation>Громкость:</translation>
     </message>
     <message>
+        <location filename="../base/encoderrbspeex.cpp" line="36"/>
         <source>Quality:</source>
         <translation>Качество:</translation>
     </message>
     <message>
+        <location filename="../base/encoderrbspeex.cpp" line="38"/>
         <source>Complexity:</source>
         <translation>Сложность:</translation>
     </message>
     <message>
+        <location filename="../base/encoderrbspeex.cpp" line="40"/>
         <source>Use Narrowband:</source>
         <translation>Узкополосный:</translation>
     </message>
@@ -1527,14 +1891,19 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>InfoWidget</name>
     <message>
+        <location filename="../gui/infowidget.cpp" line="30"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
+        <location filename="../gui/infowidget.cpp" line="30"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation>Версия</translation>
     </message>
     <message>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1542,14 +1911,17 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>InfoWidgetFrm</name>
     <message>
+        <location filename="../gui/infowidgetfrm.ui" line="20"/>
         <source>Currently installed packages.&lt;br/&gt;&lt;b&gt;Note:&lt;/b&gt; if you manually installed packages this might not be correct!</source>
         <translation>Установленные пакеты.&lt;br/&gt;&lt;b&gt;Примечание:&lt;/b&gt;Если вы установили некоторые пакеты вручную, могут возникнуть несоответствия!</translation>
     </message>
     <message>
+        <location filename="../gui/infowidgetfrm.ui" line="14"/>
         <source>Info</source>
         <translation>Сведения</translation>
     </message>
     <message>
+        <location filename="../gui/infowidgetfrm.ui" line="34"/>
         <source>Package</source>
         <translation>Пакет</translation>
     </message>
@@ -1557,54 +1929,67 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>InstallTalkFrm</name>
     <message>
+        <location filename="../installtalkfrm.ui" line="17"/>
         <source>Install Talk Files</source>
         <translation>Установить голосовые файлы</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="78"/>
         <source>TTS profile:</source>
         <translation>Профиль TTS :</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="36"/>
         <source>Generation options</source>
         <translation>Свойства сгенерированого</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="42"/>
         <source>Strip Extensions</source>
         <translation>Отрезать расширения</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="158"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="147"/>
         <source>&amp;Install</source>
         <translation>&amp;Установить</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="115"/>
         <source>Change</source>
         <translation>Изменить</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="52"/>
         <source>Generate for files</source>
         <translation>Генерировать для файлов</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="85"/>
         <source>Generate for folders</source>
         <translation>Генерировать для папок</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="95"/>
         <source>Recurse into folders</source>
         <translation>Рекурсировать в папки</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="122"/>
         <source>Ignore files</source>
         <translation>Игнорировать файлы</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="132"/>
         <source>Skip existing</source>
         <translation>Пропускать существующие</translation>
     </message>
     <message>
+        <location filename="../installtalkfrm.ui" line="174"/>
         <source>Select folders for Talkfile generation (Ctrl for multiselect)</source>
         <translation>Выбрать папки для создания файлов произношения (Ctrl для выбора нескольких)</translation>
     </message>
@@ -1612,18 +1997,22 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>InstallTalkWindow</name>
     <message>
+        <location filename="../installtalkwindow.cpp" line="95"/>
         <source>Empty selection</source>
         <translation>Пусто</translation>
     </message>
     <message>
+        <location filename="../installtalkwindow.cpp" line="96"/>
         <source>No files or folders selected. Please select files or folders first.</source>
         <translation>Не выбрано ни одного файла или папки. Сначала выберите файлы и (или) папки.</translation>
     </message>
     <message>
+        <location filename="../installtalkwindow.cpp" line="140"/>
         <source>TTS error</source>
         <translation>Ошибка TTS</translation>
     </message>
     <message>
+        <location filename="../installtalkwindow.cpp" line="141"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>Не удалось инициализироавть выбранный движок. Вы не можете им пользоваться.</translation>
     </message>
@@ -1693,10 +2082,12 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>MsPackUtil</name>
     <message>
+        <location filename="../base/mspackutil.cpp" line="101"/>
         <source>Creating output path failed</source>
         <translation>Ошибка создания выходной папки</translation>
     </message>
     <message>
+        <location filename="../base/mspackutil.cpp" line="109"/>
         <source>Error during CAB operation</source>
         <translation>Ошибка при выполнении операции с CAB-пакетом</translation>
     </message>
@@ -1704,22 +2095,27 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>PlayerBuildInfo</name>
     <message>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation type="unfinished">Непригодный</translation>
     </message>
     <message>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation type="unfinished">Нестабильный</translation>
     </message>
     <message>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation type="unfinished">Стабильный</translation>
     </message>
     <message>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation type="unfinished">Неизвестный</translation>
     </message>
@@ -1727,6 +2123,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>PreviewFrm</name>
     <message>
+        <location filename="../previewfrm.ui" line="16"/>
         <source>Preview</source>
         <translation>Предпросмотр</translation>
     </message>
@@ -1734,18 +2131,23 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>ProgressLoggerFrm</name>
     <message>
+        <location filename="../progressloggerfrm.ui" line="18"/>
+        <location filename="../progressloggerfrm.ui" line="24"/>
         <source>Progress</source>
         <translation>Продвижение</translation>
     </message>
     <message>
+        <location filename="../progressloggerfrm.ui" line="87"/>
         <source>&amp;Abort</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location filename="../progressloggerfrm.ui" line="37"/>
         <source>progresswindow</source>
         <translation>Окно продвижения</translation>
     </message>
     <message>
+        <location filename="../progressloggerfrm.ui" line="63"/>
         <source>Save Log</source>
         <translation>Сохранить журнал</translation>
     </message>
@@ -1753,14 +2155,17 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>ProgressLoggerGui</name>
     <message>
+        <location filename="../progressloggergui.cpp" line="117"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
+        <location filename="../progressloggergui.cpp" line="99"/>
         <source>&amp;Abort</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location filename="../progressloggergui.cpp" line="141"/>
         <source>Save system trace log</source>
         <translation>Сохранить журнал трассировки системы</translation>
     </message>
@@ -1768,84 +2173,77 @@ Make sure you selected the correct mountpoint and the player is set up to use a
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../configure.cpp" line="621"/>
+        <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
         <translation>LTR</translation>
     </message>
     <message>
+        <location filename="../base/system.cpp" line="333"/>
         <source>(unknown vendor name) </source>
         <translation>(неизвестный поставщик)</translation>
     </message>
     <message>
+        <location filename="../base/system.cpp" line="351"/>
         <source>(unknown product name)</source>
         <translation>(неизвестный продукт)</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation>Установка загрузчика почти завершена. Вам &lt;b&gt;протребуется&lt;/b&gt; выполнить следующие операции вручную:</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Отключить плеер от компьютера с использованием безопасного извлечения.&lt;/li&gt;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Перезагрузите плеер на фирменную программу.&lt;/li&gt;&lt;li&gt;Обновите программу с помощью функции обновления в фирменной программе. Для подробностей, см. руководство по эксплуатации Вашего плеера.&lt;br/&gt;&lt;b&gt;Важно:&lt;/b&gt; обновление програмного обеспечения является критичной процедурой и не должно быть прервано. &lt;b&gt;Убедитесь в том, что плеер полностью заряжен перед тем, как приступить к обновлению.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;После обновления, перезагрузите плеер.&lt;/li&gt;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation>&lt;li&gt;Если в плеере стоит SD-карта, извлеките её&lt;/li&gt;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Отсоедините плеер, после чего произойдёт перезагрузка и обновится фирменная программа. Для подробностей, см. руковолство по эксплуатации Вашего плеера.&lt;br/&gt;&lt;b&gt;Важно:&lt;/b&gt; обновление програмного обеспечения является критичной процедурой и не должно быть прервано. &lt;b&gt;Убедитесь в том, что плеер полностью заряжен перед тем, как приступить к обновлению.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;После обновления, перезагрузите плеер.&lt;/li&gt;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation>&lt;li&gt;Выключить плеер&lt;/li&gt;&lt;li&gt;Подключить зарядное устройство&lt;/li&gt;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation>&lt;li&gt;Отключить плеер от USB и сетевого питания&lt;/li&gt;&lt;li&gt;Выключить плеер&lt;/li&gt;&lt;li&gt;Переключить плеер в режим питания от батареи&lt;/li&gt;&lt;li&gt;Обратно включить плеер для загрузки Rockbox&lt;/li&gt;</translation>
     </message>
     <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;Примечание:&lt;/b&gt; Вы можете безопасно устанавливать дополнения, но выше указанные операции &lt;b&gt;обязательны&lt;/b&gt; для завершения установки!&lt;/p&gt;</translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
+        <location filename="../quazip/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation>ошибка ZIP/UNZIP API %1</translation>
     </message>
@@ -1857,6 +2255,7 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="vanished">Подтвердите установку</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>Точка монтирования неверная!</translation>
     </message>
@@ -1865,46 +2264,58 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="vanished">Вы действительно хотите установить голосовой файл?</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>Подтвердите удаление</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Вы действительно хотите удалить загрузчик?</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>Подтвердите установку</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Вы действительно хотите установить мастера Rockbox на Ваш аудио плеер? Вы сможете потом запустить это с диска или памяти плеера.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>Установка мастера Rockbox</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Ошибка при установке мастера Rockbox</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>Установка настроек пользователя</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>Ошибка при установке настроек пользователя</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Мастер Rockbox успешно установлен.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>Ошибка в настройках</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Ваши настройки недействительны. Проверьте, что ваши настройки правильные в окне настроек.</translation>
     </message>
@@ -1917,30 +2328,37 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="vanished">Программа ещё загружает информацию о новых версиях. Попробуйте снова через несколько мгновений.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>Новая установка</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Ваши настройки негодны. Это скорее всего из-за изменённого пути к устройству. Окно настроек сейчас откроется, чтобы позволить Вам решить проблему.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>Ошибка сети</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation>Скачивается информация о сборке, пожалуйста подождите...</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation>Не удалось получить информацию о версии!</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Это новая установка или новая версия мастера Rockbox. Диалог настройки сейчас откроется и даст возможность настроить программу или пересмотреть ваши настройки.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation>Загрузка информации о сборке завершена.</translation>
     </message>
@@ -1953,14 +2371,17 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation type="vanished">Доступна новая версия мастера Rockbox. Скачать можно отсюда: &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="104"/>
         <source>Wine detected!</source>
         <translation>Обнаружен Wine!</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="105"/>
         <source>It seems you are trying to run this program under Wine. Please don&apos;t do this, running under Wine will fail. Use the native Linux binary instead.</source>
         <translation>Похоже, что вы пытаетесь пользоваться этой программой с помощью Wine. Не делайте этого, это приведёт к сбою. Лучше пользуйтесь нативной программой для Linux.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation>Не удалось получить информацию о версии.
@@ -1975,6 +2396,7 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">Не удалось определить версию установленного Rockbox. Устанавливайте Rockbox перед установкой голосовых файлов.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation>Нет известного способа удаления с этого устройства.</translation>
     </message>
@@ -1983,14 +2405,17 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">Мастер Rockbox не может удалить загрузчик с этого устройства. Попробуйте нормальное обновление прошивки, чтобы удалить загрузчик.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation>Проверяется наличие обновления ...</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation>Доступна новая версия мастера Rockbox.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation>Мастер Rockbox не требует обновления.</translation>
     </message>
@@ -2003,30 +2428,37 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="vanished">Установленная версия Rockbox является официально нестабильной. Готовые голоса доступны только для стабильных версий Rockbox. Создайте вручную голосовой файл с помощью кнопки &quot;Создать голосовой файл&quot;.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation>Не найдено загрузчика Rockbox.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation>Устройство извлечено</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation>Устройство успешно извлечено. Теперь можно отсоединить плеер от компьютера.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation>Не удалось извлечь</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation>Извлечение не удалось. Убедитесь в том, что на устройстве нет файлов, занятых другими программами. Если извлечь всё равно не получается, пользуйтесь функцией извлечения Вашего компьютера.</translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2038,22 +2470,27 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2061,30 +2498,39 @@ Temporarily trust certificate?</source>
 <context>
     <name>RbUtilQtFrm</name>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="14"/>
         <source>Rockbox Utility</source>
         <translation>Мастер Rockbox</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="59"/>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="120"/>
         <source>&amp;Change</source>
         <translation>&amp;Изменить</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="166"/>
         <source>Welcome</source>
         <translation>Добро пожаловать</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="163"/>
+        <location filename="../rbutilqtfrm.ui" line="620"/>
         <source>&amp;Installation</source>
         <translation>&amp;Установка</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="171"/>
+        <location filename="../rbutilqtfrm.ui" line="413"/>
         <source>&amp;Accessibility</source>
         <translation>&amp;Специальные возможности</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="174"/>
         <source>Install accessibility add-ons</source>
         <translation>Установить дополнения для специальных возможностей</translation>
     </message>
@@ -2093,18 +2539,23 @@ Temporarily trust certificate?</source>
         <translation type="vanished">Установить голосовые файлы</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="180"/>
         <source>Install Talk files</source>
         <translation>Установить файлы произношения</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="420"/>
         <source>&amp;Uninstallation</source>
         <translation>&amp;Удаление</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="262"/>
+        <location filename="../rbutilqtfrm.ui" line="295"/>
         <source>Uninstall Rockbox</source>
         <translation>Удалить Rockbox</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="268"/>
         <source>Uninstall Bootloader</source>
         <translation>Удалить загрузчик</translation>
     </message>
@@ -2117,74 +2568,93 @@ Temporarily trust certificate?</source>
         <translation type="vanished">Смотреть и/или загрузить руководство по эксплуатации</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="369"/>
         <source>Inf&amp;o</source>
         <translation>&amp;Информация</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="387"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="459"/>
         <source>&amp;About</source>
         <translation>&amp;О программе</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="436"/>
         <source>Empty local download cache</source>
         <translation>Очистить локальный кэш скачивания</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="441"/>
         <source>Install Rockbox Utility on player</source>
         <translation>Установить мастера Rockbox на плеер</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="446"/>
         <source>&amp;Configure</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="451"/>
         <source>E&amp;xit</source>
         <translation>&amp;Выйти</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="454"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="464"/>
         <source>About &amp;Qt</source>
         <translation>О &amp;Qt</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="396"/>
+        <location filename="../rbutilqtfrm.ui" line="469"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощь</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="409"/>
         <source>Action&amp;s</source>
         <translation>&amp;Действия</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="474"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="578"/>
         <source>Read PDF manual</source>
         <translation>Читать руководство по эксплуатации в PDF</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="583"/>
         <source>Read HTML manual</source>
         <translation>Читать руководство по эксплуатации в HTML</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="588"/>
         <source>Download PDF manual</source>
         <translation>Скачать руководство по эксплуатации в PDF</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="593"/>
         <source>Download HTML manual (zip)</source>
         <translation>Скачать руководство по эксплуатации в HTML (zip)</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="230"/>
         <source>Create Voice files</source>
         <translation>Создать голосовые файлы</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="605"/>
         <source>Create Voice File</source>
         <translation>Создать голосовой файл</translation>
     </message>
@@ -2193,66 +2663,82 @@ Temporarily trust certificate?</source>
         <translation type="vanished">&lt;b&gt;Установить голосовой файл&lt;/b&gt;&lt;br/&gt;Он нужен, чтобы Rockbox произносил пользовательский интерфейс. Произношение включено по умолчанию, поэтому если Вы установили голосовой файл, Rockbox станет разговаривать.</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="197"/>
         <source>&lt;b&gt;Create Talk Files&lt;/b&gt;&lt;br/&gt;Talkfiles are needed to let Rockbox speak File and Foldernames</source>
         <translation>&lt;b&gt;Создать файлы произношения.&lt;/b&gt;&lt;br/&gt;Они нужны, чтобы Rockbox мог произносить имена файлов и папок</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="285"/>
         <source>&lt;b&gt;Remove the bootloader&lt;/b&gt;&lt;br/&gt;After removing the bootloader you won&apos;t be able to start Rockbox.</source>
         <translation>&lt;b&gt;Удалить загрузчик&lt;/b&gt;&lt;br/&gt;После удаления загрузчика, вы не сможете запустить Rockbox.</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="312"/>
         <source>&lt;b&gt;Uninstall Rockbox from your audio player.&lt;/b&gt;&lt;br/&gt;This will leave the bootloader in place (you need to remove it manually).</source>
         <translation>&lt;b&gt;Удалить Rockbox с Вашего плеера.&lt;/b&gt;&lt;br/&gt;Это оставит загрузчик установленным (его нужно будет удалить вручную).</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="501"/>
         <source>Install &amp;Bootloader</source>
         <translation>Установить &amp;загрузчик</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="510"/>
         <source>Install &amp;Rockbox</source>
         <translation>Установить &amp;Rockbox</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="519"/>
         <source>Install &amp;Fonts Package</source>
         <translation>Установить пакет &amp;шрифтов</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="528"/>
         <source>Install &amp;Themes</source>
         <translation>Установить &amp;темы</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="537"/>
         <source>Install &amp;Game Files</source>
         <translation>Установить игровые &amp;файлы</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="546"/>
         <source>&amp;Install Voice File</source>
         <translation>&amp;Установить голосовой файл</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="555"/>
         <source>Create &amp;Talk Files</source>
         <translation>Установить файлы &amp;произношения</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="564"/>
         <source>Remove &amp;bootloader</source>
         <translation>У&amp;далить загрузчик</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="573"/>
         <source>Uninstall &amp;Rockbox</source>
         <translation>Удалить &amp;Rockbox</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="602"/>
         <source>Create &amp;Voice File</source>
         <translation>&amp;Создать голосовой файл</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="610"/>
         <source>&amp;System Info</source>
         <translation>Информация о &amp;системе</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="483"/>
         <source>&amp;Complete Installation</source>
         <translation>&amp;Полная установка</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="492"/>
         <source>&amp;Minimal Installation</source>
         <translation>&amp;Минимальная установка</translation>
     </message>
@@ -2261,55 +2747,68 @@ Temporarily trust certificate?</source>
         <translation type="vanished">&amp;Устранение неполадок</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="615"/>
         <source>System &amp;Trace</source>
         <translation>&amp;Трассировка системы</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="247"/>
         <source>&lt;b&gt;Create Voice file&lt;/b&gt;&lt;br/&gt;Voice files are needed to make Rockbox speak the  user interface. Speaking is enabled by default, so
  if you installed the voice file Rockbox will speak.</source>
         <translation>&lt;b&gt;Создать голосовой файл&lt;/b&gt;&lt;br/&gt;Он нужен, чтобы Rockbox произносил пользовательский интерфейс. Произношение включено по умолчанию, поэтому если Вы установили голосовой файл, Rockbox станет разговаривать.</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="149"/>
         <source>mountpoint unknown or invalid</source>
         <translation>точка монтирования неизвестна или неправильна</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="142"/>
         <source>Mountpoint:</source>
         <translation>Точка монтирования:</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="100"/>
         <source>device unknown or invalid</source>
         <translation>устройство неизвестно или неправильно</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="93"/>
         <source>Device:</source>
         <translation>Устройство:</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="259"/>
         <source>Backup &amp;&amp; &amp;Uninstallation</source>
         <translation>Резервная копия и &amp;Удаление</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="325"/>
         <source>Backup</source>
         <translation>Создать резервную копию</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="342"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Backup current installation.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Create a backup by archiving the contents of the Rockbox installation folder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Создать резервную копию текущей установки.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Создать копию, архивируя содержимое системной папки Rockbox.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="131"/>
         <source>&amp;Eject</source>
         <translation>&amp;Извлечь</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="625"/>
         <source>Show &amp;Changelog</source>
         <translation>Показать &amp;историю изменений</translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="43"/>
         <source>Welcome to Rockbox Utility, the installation and housekeeping tool for Rockbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../rbutilqtfrm.ui" line="46"/>
         <source>Rockbox Logo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2317,30 +2816,37 @@ Temporarily trust certificate?</source>
 <context>
     <name>SelectiveInstallWidget</name>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="26"/>
         <source>Rockbox version to install</source>
         <translation>Версия Rockbox для установки</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="35"/>
         <source>Version information not available yet.</source>
         <translation>Сведения о версии пока отсутствуют.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="54"/>
         <source>Rockbox components to install</source>
         <translation>Части Rockbox для установки</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="60"/>
         <source>&amp;Bootloader</source>
         <translation>&amp;Загрузчик</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="253"/>
         <source>The main Rockbox firmware.</source>
         <translation>Основная программа Rockbox.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="115"/>
         <source>Fonts</source>
         <translation>Шрифты</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="74"/>
         <source>&amp;Rockbox</source>
         <translation>&amp;Rockbox</translation>
     </message>
@@ -2349,10 +2855,12 @@ Temporarily trust certificate?</source>
         <translation type="vanished">Некоторые игры требуют дополнительных файлов.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="178"/>
         <source>Additional fonts for the User Interface.</source>
         <translation>Дополнительные шрифты для пользовательского интерфейса.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="135"/>
         <source>The bootloader is required for starting Rockbox. Only necessary for first time install.</source>
         <translation>Загрузчик требуется для запуска Rockbox. Нужен только для первой установки.</translation>
     </message>
@@ -2361,22 +2869,27 @@ Temporarily trust certificate?</source>
         <translation type="vanished">Файлы игр</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="161"/>
         <source>Customize</source>
         <translation>Выбрать</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="104"/>
         <source>Themes</source>
         <translation>Темы</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="94"/>
         <source>Themes allow adjusting the user interface of Rockbox. Use &quot;Customize&quot; to select themes.</source>
         <translation>Темы позволяют изменить пользовательский интерфейс Rockbox. Вы можете их выбрать в списке.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="292"/>
         <source>&amp;Install</source>
         <translation>&amp;Установить</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="78"/>
         <source>This is the latest stable release available.</source>
         <translation>Это последняя стабильная версия.</translation>
     </message>
@@ -2385,108 +2898,135 @@ Temporarily trust certificate?</source>
         <translation type="vanished">Разрабатываемая версия обновляется с каждым изменением исходного кода. Дата последнего обновления: %1</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="88"/>
         <source>This will eventually become the next Rockbox version. Install it to help testing.</source>
         <translation>Это станет следующей стабильной версией Rockbox. Устанавливайте для тестирования.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation>Стабильная версия (%1)</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation>Разрабатываемая версия (ревизия %1)</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation>Пробная версия (ревизия %1)</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation>Выбранный плеер не требует загрузчика.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation>Загрузчик требуется для запуска Rockbox. Установка загрузчика требуется только при первой установке.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation>Точка монтирования неверна</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation>Нет известного способа установки.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="319"/>
         <source>Bootloader detected</source>
         <translation>Найден загрузчик</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="320"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation>Загрузчик уже установлен. Переустановить?</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="324"/>
         <source>Bootloader installation skipped</source>
         <translation>Установка загрузчика пропущена</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="338"/>
         <source>Create Bootloader backup</source>
         <translation>Создать резервную копию загрузчика</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="339"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation>Вы можете создать резервную копию фирменного файла загрузчика. Нажмите на &quot;Да&quot;, чтобы выбрать выходную папку, в которой будет создана ещё одна папка &quot;%1&quot;, содержащая файл.
 Нажмите на &quot;Нет&quot;, чтобы пропустить этот шаг.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="346"/>
         <source>Browse backup folder</source>
         <translation>Обзор папки резервных копий</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="358"/>
         <source>Prerequisites</source>
         <translation>Предварительные требования</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="363"/>
         <source>Bootloader installation aborted</source>
         <translation>Установка загрузчика отменена</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="373"/>
         <source>Bootloader files (%1)</source>
         <translation>Загрузочные файлы (%1)</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="375"/>
         <source>All files (*)</source>
         <translation>Все файлы (*)</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="377"/>
         <source>Select firmware file</source>
         <translation>Выберите файл прошивки</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="379"/>
         <source>Error opening firmware file</source>
         <translation>Ошибка при открытии файла прошивки</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="385"/>
         <source>Error reading firmware file</source>
         <translation>Ошибка при чтении файла прошивки</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="395"/>
         <source>Backup error</source>
         <translation>Ошибка резервной копии</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="396"/>
         <source>Could not create backup file. Continue?</source>
         <translation>Не удалось создать резеврную копию файла. Продолжить?</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation>Требуются действия вручную</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation>Продолжить и приступить к установке?</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translatorcomment>:-)</translatorcomment>
         <translation>Точно продожить?</translation>
@@ -2500,50 +3040,62 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="vanished">Ваша установка не требует игровых файлов, шаг пропущен.</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="20"/>
         <source>Selective Installation</source>
         <translation>Выборочная установка</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="151"/>
         <source>Some plugins require additional data files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="188"/>
         <source>Install prerendered voice file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="195"/>
         <source>Plugin Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="222"/>
         <source>&amp;Manual</source>
         <translation type="unfinished">&amp;Руководство по эксплуатации</translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="233"/>
         <source>&amp;Voice File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="263"/>
         <source>Save a copy of the manual on the player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="83"/>
         <source>The development version is updated on every code change.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="93"/>
         <source>Daily updated development version.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="100"/>
         <source>Not available for the selected version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2570,6 +3122,8 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>SysTrace</name>
     <message>
+        <location filename="../systrace.cpp" line="100"/>
+        <location filename="../systrace.cpp" line="109"/>
         <source>Save system trace log</source>
         <translation>Сохранить журнал трассировки системы</translation>
     </message>
@@ -2577,26 +3131,32 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>SysTraceFrm</name>
     <message>
+        <location filename="../systracefrm.ui" line="14"/>
         <source>System Trace</source>
         <translation>Трассировка системы</translation>
     </message>
     <message>
+        <location filename="../systracefrm.ui" line="20"/>
         <source>System State trace</source>
         <translation>Трассировка состояния системы</translation>
     </message>
     <message>
+        <location filename="../systracefrm.ui" line="46"/>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
     <message>
+        <location filename="../systracefrm.ui" line="57"/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
+        <location filename="../systracefrm.ui" line="68"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Обновить</translation>
     </message>
     <message>
+        <location filename="../systracefrm.ui" line="79"/>
         <source>Save &amp;previous</source>
         <translation>Сохранить &amp;предыдущий</translation>
     </message>
@@ -2604,42 +3164,52 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>Sysinfo</name>
     <message>
+        <location filename="../sysinfo.cpp" line="46"/>
         <source>&lt;b&gt;OS&lt;/b&gt;&lt;br/&gt;</source>
         <translation>&lt;b&gt;ОС&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="47"/>
         <source>&lt;b&gt;Username&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Имя пользователя&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="49"/>
         <source>&lt;b&gt;Permissions&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Полномочия&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="51"/>
         <source>&lt;b&gt;Attached USB devices&lt;/b&gt;&lt;br/&gt;</source>
         <translation>&lt;b&gt;Подключенные USB-устройства&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="55"/>
         <source>VID: %1 PID: %2, %3</source>
         <translation>VID: %1 PID: %2, %3</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="64"/>
         <source>Filesystem</source>
         <translation>Файловая система</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="67"/>
         <source>Mountpoint</source>
         <translation>Точка монтирования</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="67"/>
         <source>Label</source>
         <translation>Метка</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="68"/>
         <source>Free</source>
         <translation>Свободно</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="68"/>
         <source>Total</source>
         <translation>Всего</translation>
     </message>
@@ -2648,10 +3218,12 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="vanished">Размер кластера</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="71"/>
         <source>&lt;tr&gt;&lt;td&gt;%1&lt;/td&gt;&lt;td&gt;%4&lt;/td&gt;&lt;td&gt;%2 GiB&lt;/td&gt;&lt;td&gt;%3 GiB&lt;/td&gt;&lt;td&gt;%5&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;%1&lt;/td&gt;&lt;td&gt;%4&lt;/td&gt;&lt;td&gt;%2 ГиБ&lt;/td&gt;&lt;td&gt;%3 ГБ&lt;/td&gt;&lt;td&gt;%5&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="69"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2659,14 +3231,17 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>SysinfoFrm</name>
     <message>
+        <location filename="../sysinfofrm.ui" line="13"/>
         <source>System Info</source>
         <translation>Информация о системе</translation>
     </message>
     <message>
+        <location filename="../sysinfofrm.ui" line="22"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Обновить</translation>
     </message>
     <message>
+        <location filename="../sysinfofrm.ui" line="46"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
@@ -2674,22 +3249,27 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>System</name>
     <message>
+        <location filename="../base/system.cpp" line="117"/>
         <source>Guest</source>
         <translation>Гость</translation>
     </message>
     <message>
+        <location filename="../base/system.cpp" line="120"/>
         <source>Admin</source>
         <translation>Администратор</translation>
     </message>
     <message>
+        <location filename="../base/system.cpp" line="123"/>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
+        <location filename="../base/system.cpp" line="126"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
+        <location filename="../base/system.cpp" line="273"/>
         <source>(no description available)</source>
         <translation>(описание недоступно)</translation>
     </message>
@@ -2697,14 +3277,17 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TTSBase</name>
     <message>
+        <location filename="../base/ttsbase.cpp" line="47"/>
         <source>Espeak TTS Engine</source>
         <translation>Espeak TTS движок</translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="51"/>
         <source>Flite TTS Engine</source>
         <translation>Flite TTS движок</translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="52"/>
         <source>Swift TTS Engine</source>
         <translation>Swift TTS движок</translation>
     </message>
@@ -2713,30 +3296,37 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="obsolete">SAPI TTS движок</translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="61"/>
         <source>Festival TTS Engine</source>
         <translation>Festival TTS движок</translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="64"/>
         <source>OS X System Engine</source>
         <translation>Системный движок OS X</translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="55"/>
         <source>SAPI4 TTS Engine</source>
         <translation>Движок TTS SAPI4</translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="57"/>
         <source>SAPI5 TTS Engine</source>
         <translation>Движок TTS SAPI5</translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="58"/>
         <source>MS Speech Platform</source>
         <translation>Платформа MS Speech</translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="48"/>
         <source>Espeak-ng TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../base/ttsbase.cpp" line="49"/>
         <source>Mimic TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2744,22 +3334,27 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TTSCarbon</name>
     <message>
+        <location filename="../base/ttscarbon.cpp" line="139"/>
         <source>Voice:</source>
         <translation>Голос:</translation>
     </message>
     <message>
+        <location filename="../base/ttscarbon.cpp" line="145"/>
         <source>Speed (words/min):</source>
         <translation>Скорость (слов/мин):</translation>
     </message>
     <message>
+        <location filename="../base/ttscarbon.cpp" line="222"/>
         <source>Could not voice string</source>
         <translation>Не удалось произнести</translation>
     </message>
     <message>
+        <location filename="../base/ttscarbon.cpp" line="232"/>
         <source>Could not convert intermediate file</source>
         <translation>Не удалось преобразовать промежуточный файл</translation>
     </message>
     <message>
+        <location filename="../base/ttscarbon.cpp" line="152"/>
         <source>Pitch (0 for default):</source>
         <translation>Тон (0 по умолчанию) :</translation>
     </message>
@@ -2767,14 +3362,17 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TTSExes</name>
     <message>
+        <location filename="../base/ttsexes.cpp" line="78"/>
         <source>TTS executable not found</source>
         <translation>Выполняемый файл TTS не найден</translation>
     </message>
     <message>
+        <location filename="../base/ttsexes.cpp" line="44"/>
         <source>Path to TTS engine:</source>
         <translation>Путь к мотору TTS:</translation>
     </message>
     <message>
+        <location filename="../base/ttsexes.cpp" line="46"/>
         <source>TTS engine options:</source>
         <translation>Настройки мотора TTS:</translation>
     </message>
@@ -2782,26 +3380,32 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TTSFestival</name>
     <message>
+        <location filename="../base/ttsfestival.cpp" line="207"/>
         <source>engine could not voice string</source>
         <translation>мотор не смог озвучить выражение</translation>
     </message>
     <message>
+        <location filename="../base/ttsfestival.cpp" line="290"/>
         <source>No description available</source>
         <translation>Описание отсутствует</translation>
     </message>
     <message>
+        <location filename="../base/ttsfestival.cpp" line="53"/>
         <source>Path to Festival client:</source>
         <translation>Путь к клиенту Festival:</translation>
     </message>
     <message>
+        <location filename="../base/ttsfestival.cpp" line="58"/>
         <source>Voice:</source>
         <translation>Голос:</translation>
     </message>
     <message>
+        <location filename="../base/ttsfestival.cpp" line="69"/>
         <source>Voice description:</source>
         <translation>Описание голоса:</translation>
     </message>
     <message>
+        <location filename="../base/ttsfestival.cpp" line="173"/>
         <source>Festival could not be started</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2809,26 +3413,32 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TTSSapi</name>
     <message>
+        <location filename="../base/ttssapi.cpp" line="46"/>
         <source>Language:</source>
         <translation>Язык:</translation>
     </message>
     <message>
+        <location filename="../base/ttssapi.cpp" line="53"/>
         <source>Voice:</source>
         <translation>Голос:</translation>
     </message>
     <message>
+        <location filename="../base/ttssapi.cpp" line="65"/>
         <source>Speed:</source>
         <translation>Скорость:</translation>
     </message>
     <message>
+        <location filename="../base/ttssapi.cpp" line="68"/>
         <source>Options:</source>
         <translation>Настройки:</translation>
     </message>
     <message>
+        <location filename="../base/ttssapi.cpp" line="112"/>
         <source>Could not copy the SAPI script</source>
         <translation>Не удалось скопировать SAPI-сценарий</translation>
     </message>
     <message>
+        <location filename="../base/ttssapi.cpp" line="130"/>
         <source>Could not start SAPI process</source>
         <translation>Не удалось запустить SAPI-задачу</translation>
     </message>
@@ -2836,38 +3446,47 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TalkFileCreator</name>
     <message>
+        <location filename="../base/talkfile.cpp" line="45"/>
         <source>Talk file creation aborted</source>
         <translation>Создание файла произношения отменено</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="78"/>
         <source>Finished creating Talk files</source>
         <translation>Создание файлов произношения завершено</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="42"/>
         <source>Reading Filelist...</source>
         <translation>Чтение списка файлов...</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Сбой копирования %1 в %2</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="66"/>
         <source>Copying Talkfiles...</source>
         <translation>Копирую файлы произношения...</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation>Копия файлов отменена</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation>Навожу порядок...</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation>Всё</translation>
     </message>
     <message>
+        <location filename="../base/talkfile.cpp" line="36"/>
         <source>Starting Talk file generation for folder %1</source>
         <translation>Начинается создание голосового файла для папки %1</translation>
     </message>
@@ -2875,42 +3494,54 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TalkGenerator</name>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="38"/>
         <source>Starting TTS Engine</source>
         <translation>Запуск мотора TTS</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="43"/>
+        <location filename="../base/talkgenerator.cpp" line="50"/>
         <source>Init of TTS engine failed</source>
         <translation>Сбой инициализации мотора TTS</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="57"/>
         <source>Starting Encoder Engine</source>
         <translation>Запуск мотора кодировщика</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="62"/>
         <source>Init of Encoder engine failed</source>
         <translation>Сбой инициализации мотора кодировщика</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="72"/>
         <source>Voicing entries...</source>
         <translation>Озвучивание вводов...</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="87"/>
         <source>Encoding files...</source>
         <translation>Кодировка файлов...</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="126"/>
         <source>Voicing aborted</source>
         <translation>Озвучивание отменено</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="163"/>
+        <location filename="../base/talkgenerator.cpp" line="168"/>
         <source>Voicing of %1 failed: %2</source>
         <translation>Сбой озвучивания %1 : %2</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="212"/>
         <source>Encoding aborted</source>
         <translation>Кодировка отменена</translation>
     </message>
     <message>
+        <location filename="../base/talkgenerator.cpp" line="240"/>
         <source>Encoding of %1 failed</source>
         <translation>Сбой кодировки %1</translation>
     </message>
@@ -2918,30 +3549,37 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>ThemeInstallFrm</name>
     <message>
+        <location filename="../themesinstallfrm.ui" line="13"/>
         <source>Theme Installation</source>
         <translation>Установка тем</translation>
     </message>
     <message>
+        <location filename="../themesinstallfrm.ui" line="48"/>
         <source>Selected Theme</source>
         <translation>Выбранная тема</translation>
     </message>
     <message>
+        <location filename="../themesinstallfrm.ui" line="73"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
+        <location filename="../themesinstallfrm.ui" line="83"/>
         <source>Download size:</source>
         <translation>Объём скачивания :</translation>
     </message>
     <message>
+        <location filename="../themesinstallfrm.ui" line="126"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location filename="../themesinstallfrm.ui" line="115"/>
         <source>&amp;Install</source>
         <translation>&amp;Установить</translation>
     </message>
     <message>
+        <location filename="../themesinstallfrm.ui" line="93"/>
         <source>Hold Ctrl to select multiple item, Shift for a range</source>
         <translation>Нажать и держать Ctrl для выделения нескольких элеметнов, Shift для выделения ряда элементов</translation>
     </message>
@@ -2949,74 +3587,92 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>ThemesInstallWindow</name>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="41"/>
         <source>no theme selected</source>
         <translation>Тема не выделена</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Ошибка сети: %1.
 Проверьте настройки сети и прокси.</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>Произошла следующая ошибка :
 %1</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>выполнено.</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>получаю подробности о %1</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>Получаю предпросмотр ...</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Автор :&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>неизвестный</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Версия :&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Описание:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>нет описания</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>предпросмотр недоступен</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>получаю информацию о темах ...</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>Неправильная точка монтирования!</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="42"/>
         <source>no selection</source>
         <translation>нет выделения</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message numerus="yes">
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation>
             <numerusform>Размер загрузки %L1 КиБ (%n штука)</numerusform>
@@ -3025,16 +3681,19 @@ Please check your network and proxy settings.</source>
         </translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>Сбой при получении предпросмотра темы.
 Код ответа HTTP : %1</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation>Выбрать</translation>
     </message>
     <message>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation>Не выбрано ни одной темы, этап пропускается</translation>
     </message>
@@ -3042,38 +3701,47 @@ HTTP response code: %1</source>
 <context>
     <name>UninstallFrm</name>
     <message>
+        <location filename="../uninstallfrm.ui" line="16"/>
         <source>Uninstall Rockbox</source>
         <translation>Удалить Rockbox</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="35"/>
         <source>Please select the Uninstallation Method</source>
         <translation>Выберите способ удаления</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="45"/>
         <source>Uninstallation Method</source>
         <translation>Способ удаления</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="51"/>
         <source>Complete Uninstallation</source>
         <translation>Полное удаление</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="58"/>
         <source>Smart Uninstallation</source>
         <translation>Выборочное удаление</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="68"/>
         <source>Please select what you want to uninstall</source>
         <translation>Выберите, что вы желаете удалить</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="78"/>
         <source>Installed Parts</source>
         <translation>Установленные части</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="139"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location filename="../uninstallfrm.ui" line="128"/>
         <source>&amp;Uninstall</source>
         <translation>&amp;Удалить</translation>
     </message>
@@ -3081,22 +3749,28 @@ HTTP response code: %1</source>
 <context>
     <name>Uninstaller</name>
     <message>
+        <location filename="../base/uninstall.cpp" line="32"/>
+        <location filename="../base/uninstall.cpp" line="43"/>
         <source>Starting Uninstallation</source>
         <translation>Начало удаления</translation>
     </message>
     <message>
+        <location filename="../base/uninstall.cpp" line="36"/>
         <source>Finished Uninstallation</source>
         <translation>Удаление завершено</translation>
     </message>
     <message>
+        <location filename="../base/uninstall.cpp" line="115"/>
         <source>Uninstallation finished</source>
         <translation>Удаление завершено</translation>
     </message>
     <message>
+        <location filename="../base/uninstall.cpp" line="49"/>
         <source>Uninstalling %1...</source>
         <translation>Удаляется %1...</translation>
     </message>
     <message>
+        <location filename="../base/uninstall.cpp" line="81"/>
         <source>Could not delete %1</source>
         <translation>Не удалось удалить %1</translation>
     </message>
@@ -3104,16 +3778,19 @@ HTTP response code: %1</source>
 <context>
     <name>Utils</name>
     <message>
+        <location filename="../base/utils.cpp" line="375"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Недостаточные полномочия для установки загрузчика.
 Нужны полномочия администратора.&lt;/li&gt;</translation>
     </message>
     <message>
+        <location filename="../base/utils.cpp" line="396"/>
         <source>Problem detected:</source>
         <translation>Обнаружена проблема:</translation>
     </message>
     <message>
+        <location filename="../base/utils.cpp" line="387"/>
         <source>&lt;li&gt;Target mismatch detected.&lt;br/&gt;Installed target: %1&lt;br/&gt;Selected target: %2.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Обнаруженно несовпадение устройств.&lt;br/&gt;Установленное устройство: %1&lt;br/&gt;Выбранное устройство : %2.&lt;/li&gt;</translation>
     </message>
@@ -3121,78 +3798,112 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>VoiceFileCreator</name>
     <message>
+        <location filename="../base/voicefile.cpp" line="43"/>
         <source>Starting Voicefile generation</source>
         <translation>Начинаю вырабатывание голосового файла</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Ошибка скачивания : получена ошибка HTTP %1.</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>Использован файл из кэша.</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>Ошибка скачивания : %1</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>Скачивание завершено.</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>Сбой при открытии скаченного файла</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>Скачаный файл пуст!</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>Сбой при открытии скаченного файла</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>Сбой при открытии выводного файла</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>успешно создано.</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="56"/>
         <source>could not find rockbox-info.txt</source>
         <translation>Не удалось найти rockbox-info.txt</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation>Получаю информацию о голосе...</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation>Читаются значения...</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation>Создаются голосовые файлы...</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation>Навожу порядок...</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation>Всё</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
         <source>Extracted voice strings from installation</source>
         <translation>Извлечены голосовые произношения</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation>Извлечённые произношения несовместимы</translation>
     </message>
     <message>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation>Не удалось найти произношения в установке, скачиваются</translation>
     </message>
@@ -3200,10 +3911,12 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>ZipInstaller</name>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>выполнено.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>Скачивается файл %1.%2</translation>
     </message>
@@ -3216,48 +3929,59 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="vanished">Используется файл из кэша.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>Сбой скачивания: %1</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>Скачивание завершено.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>Извлечение файла.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>Установка файла.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>Сбой установки файла.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>Создаю журнал установки</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>Не достаточно дискового пространства! Отмена.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation>Ошибка распаковки!</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation>Установка файла успешно завершена.</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation type="unfinished">Сбой скачивания. Ошибка HTTP %1. {1
 %2?}</translation>
     </message>
     <message>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished">Скачивание завершено (из кэша).</translation>
     </message>
@@ -3265,14 +3989,17 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>ZipUtil</name>
     <message>
+        <location filename="../base/ziputil.cpp" line="125"/>
         <source>Creating output path failed</source>
         <translation>Ошибка создания выходной папки</translation>
     </message>
     <message>
+        <location filename="../base/ziputil.cpp" line="132"/>
         <source>Creating output file failed</source>
         <translation>Ошибка создания выходного файла</translation>
     </message>
     <message>
+        <location filename="../base/ziputil.cpp" line="141"/>
         <source>Error during Zip operation</source>
         <translation>Ошибка при выполнении операции с ZIP-пакетом</translation>
     </message>
@@ -3280,26 +4007,32 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>aboutBox</name>
     <message>
+        <location filename="../aboutbox.ui" line="14"/>
         <source>About Rockbox Utility</source>
         <translation>О мастере Rockbox</translation>
     </message>
     <message>
+        <location filename="../aboutbox.ui" line="32"/>
         <source>The Rockbox Utility</source>
         <translation>Мастер Rockbox</translation>
     </message>
     <message>
+        <location filename="../aboutbox.ui" line="74"/>
         <source>&amp;Credits</source>
         <translation>&amp;Благодарности</translation>
     </message>
     <message>
+        <location filename="../aboutbox.ui" line="106"/>
         <source>&amp;License</source>
         <translation>&amp;Лицензия</translation>
     </message>
     <message>
+        <location filename="../aboutbox.ui" line="158"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
+        <location filename="../aboutbox.ui" line="54"/>
         <source>Installer and housekeeping utility for the Rockbox open source digital audio player firmware.&lt;br/&gt;© The Rockbox Team.&lt;br/&gt;Released under the GNU General Public License v2.&lt;br/&gt;Uses icons by the &lt;a href=&quot;http://tango.freedesktop.org/&quot;&gt;Tango Project&lt;/a&gt;.&lt;br/&gt;&lt;center&gt;&lt;a href=&quot;https://www.rockbox.org&quot;&gt;https://www.rockbox.org&lt;/a&gt;&lt;/center&gt;</source>
         <translation>Мастер установки и управления Rockbox, микропрограммы с открытым исходным кодом для цифровых аудиоплееров.&lt;br/&gt;© Команда Rockbox.&lt;br/&gt;Раздаётся по лицензии GNU General Public License v2.&lt;br/&gt;Используются иконки из &lt;a href=&quot;http://tango.freedesktop.org/&quot;&gt;проекта Tango&lt;/a&gt;.&lt;br/&gt;&lt;center&gt;&lt;a href=&quot;https://www.rockbox.org&quot;&gt;https://www.rockbox.org&lt;/a&gt;&lt;/center&gt;</translation>
     </message>
@@ -3308,6 +4041,7 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="vanished">&amp;Лицензия Speex</translation>
     </message>
     <message>
+        <location filename="../aboutbox.ui" line="132"/>
         <source>L&amp;ibraries</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_tr.ts b/utils/rbutilqt/lang/rbutil_tr.ts
index 9f9b168950..677e82b6e9 100644
--- a/utils/rbutilqt/lang/rbutil_tr.ts
+++ b/utils/rbutilqt/lang/rbutil_tr.ts
@@ -45,7 +45,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+27"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -583,11 +583,11 @@
     <name>BootloaderInstallImx</name>
     <message>
         <location filename="../base/bootloaderinstallimx.cpp" line="+72"/>
-        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <source>Could not read original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -791,7 +791,7 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="+34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="+33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1516,7 +1516,7 @@ Ayrıntılı bilgi için: https://www.rockbox.org/twiki/bin/view/Main/SansaE200I
         <translation type="obsolete">Seçilen dilin etkin olması için uygulamayı yeniden başlatmalısınız.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="+310"/>
+        <location filename="../configure.cpp" line="+315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Mevcut önbellek boyutu %L1 KB.</translation>
     </message>
@@ -1564,7 +1564,7 @@ Select your device and Mountpoint manually.</source>
 Aygıtınızı ve bağlama noktasını kendiniz seçiniz.</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-636"/>
         <source>The following errors occurred:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1589,12 +1589,12 @@ Aygıtınızı ve bağlama noktasını kendiniz seçiniz.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+13"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2113,7 +2113,7 @@ Please configure TTS engine.</source>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="+106"/>
+        <location filename="../createvoicewindow.cpp" line="+115"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2132,7 +2132,7 @@ Please configure TTS engine.</source>
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="+44"/>
+        <location filename="../encttscfggui.cpp" line="+43"/>
         <source>Waiting for engine...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2226,13 +2226,13 @@ Please configure TTS engine.</source>
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="+30"/>
-        <location line="+69"/>
+        <location line="+78"/>
         <source>File</source>
         <translation type="unfinished">Dosya</translation>
     </message>
     <message>
-        <location line="-69"/>
-        <location line="+69"/>
+        <location line="-78"/>
+        <location line="+78"/>
         <source>Version</source>
         <translation type="unfinished">Sürüm</translation>
     </message>
@@ -2594,7 +2594,7 @@ Please configure TTS engine.</source>
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="+337"/>
+        <location filename="../base/playerbuildinfo.cpp" line="+358"/>
         <source>Stable (Retired)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2672,7 +2672,17 @@ Please configure TTS engine.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="+107"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="+106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2682,7 +2692,7 @@ Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2729,54 +2739,10 @@ Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="+60"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="+60"/>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="+6"/>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="+8"/>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="+6"/>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="+188"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="+188"/>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="+5"/>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
         <location filename="../quazip/quazipfile.cpp" line="+251"/>
-        <location filename="../quazip-1.2/quazip/quazipfile.cpp" line="+251"/>
-        <location filename="../quazip_/quazipfile.cpp" line="+251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2792,7 +2758,7 @@ Please configure TTS engine.</source>
         <translation type="obsolete">Sürüm</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="+391"/>
+        <location filename="../rbutilqt.cpp" line="+393"/>
         <location line="+231"/>
         <source>Configuration error</source>
         <translation>Yapılandırma hatası</translation>
@@ -2911,7 +2877,7 @@ Mevcut önyükleyiciyi değiştirmek istiyor musunuz?</translation>
         <translation type="obsolete">Kılavuzu indirmek istiyor musunuz? Aygıtınızın bulunduğu konuma kaydedilecektir.</translation>
     </message>
     <message>
-        <location line="-390"/>
+        <location line="-392"/>
         <source>Wine detected!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2921,7 +2887,7 @@ Mevcut önyükleyiciyi değiştirmek istiyor musunuz?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>Downloading build information, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2969,7 +2935,7 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+80"/>
         <source>New installation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3783,7 +3749,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Stable Release (Version %1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3798,7 +3764,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-46"/>
+        <location line="-47"/>
         <source>The development version is updated on every code change.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3813,7 +3779,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Daily Build (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3848,7 +3814,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>Bootloader detected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3924,12 +3890,13 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+23"/>
+        <location line="+12"/>
         <source>Manual steps required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+236"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4278,7 +4245,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+179"/>
         <source>File copy aborted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4408,7 +4375,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+85"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Ağ hatası: %1.
@@ -4505,7 +4472,7 @@ HTTP response code: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Mount point is wrong!</source>
         <translation>Bağlama noktası hatalı!</translation>
     </message>
@@ -4702,7 +4669,22 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+39"/>
+        <source>Extracted voice corrections file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Extracted voice strings from installation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4712,7 +4694,7 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+51"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4752,7 +4734,7 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+56"/>
         <source>The downloaded file was empty!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4772,7 +4754,7 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>successfully created.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4833,7 +4815,7 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="+59"/>
+        <location filename="../base/zipinstaller.cpp" line="+60"/>
         <source>done.</source>
         <translation>tamamlandı.</translation>
     </message>
diff --git a/utils/rbutilqt/lang/rbutil_zh_CN.ts b/utils/rbutilqt/lang/rbutil_zh_CN.ts
index 42f1a3ab25..38746fa6c8 100644
--- a/utils/rbutilqt/lang/rbutil_zh_CN.ts
+++ b/utils/rbutilqt/lang/rbutil_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>BackupDialog</name>
     <message>
@@ -12,6 +12,7 @@
     <message>
         <location filename="../gui/backupdialogfrm.ui" line="33"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This dialog will create a backup by archiving the contents of the Rockbox installation on the player into a zip file. This will include installed themes and settings stored below the .rockbox folder on the player.&lt;/p&gt;&lt;p&gt;The backup filename will be created based on the installed version. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translatorcomment>我真的服了，上一个翻译者到底是谁，随便在中文汉字前面加一个&amp;就当快捷键用，在这种情况下用户必须用输入法选择一个汉字才能触发快捷键，一点也不考虑实际使用场景。我全部改成了和原版一样的英文字母快捷键，远比之前那种方便，而且界面看起来也不会别扭了。——Meduhedan 2026.6.21</translatorcomment>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;此对话框将通过将播放器上安装的 Rockbox 内容存档到 zip 文件中来创建备份。这将包括已安装的主题和存储在播放器的 .rockbox 文件夹下的设置。&lt;/p&gt;&lt;p&gt;备份文件名将根据已安装的版本创建。 &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
@@ -27,55 +28,55 @@
     <message>
         <location filename="../gui/backupdialogfrm.ui" line="76"/>
         <source>&amp;Change</source>
-        <translation>&amp;更改</translation>
+        <translation>更改(&amp;C)</translation>
     </message>
     <message>
         <location filename="../gui/backupdialogfrm.ui" line="116"/>
         <source>&amp;Backup</source>
-        <translation>&amp;备份</translation>
+        <translation>备份(&amp;B)</translation>
     </message>
     <message>
         <location filename="../gui/backupdialogfrm.ui" line="127"/>
         <source>&amp;Cancel</source>
-        <translation>&amp;取消</translation>
+        <translation>取消(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="70"/>
+        <location filename="../gui/backupdialog.cpp" line="69"/>
         <source>Installation size: calculating ...</source>
-        <translation>安装大小：计算中</translation>
+        <translation>安装大小：计算中……</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="89"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation>选择备份文件名</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="109"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation>安装大小 %L1 %2</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation>文件存在</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="117"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation>选定的备份文件已经存在。要覆盖吗？</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="125"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation>开始备份…</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="144"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation>备份成功。</translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="147"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation>备份失败！</translation>
     </message>
@@ -85,7 +86,7 @@
     <message>
         <location filename="../base/bootloaderinstallams.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (bin file). This firmware file will be patched and then installed to your player along with the rockbox bootloader. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/SansaAMS&apos;&gt;SansaAMS&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;&lt;b&gt;Note:&lt;/b&gt; This file is not present on your player and will disappear automatically after installing it.&lt;br/&gt;&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation>Bootloader 安装需要您提供原始 Sandisk 固件的副本（bin 文件）。此固件文件将被修补，然后与rockbox bootloader一起安装到您的播放器中。由于法律原因，您需要自行下载此文件。请浏览&lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; 或参阅 &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; 和 &lt;a href=&apos;https://www.rockbox.org/wiki/SansaAMS&apos;&gt;SansaAMS&lt;/a&gt; wiki 页面以获取此文件。&lt;br/&gt;&lt;b&gt;Note:&lt;/b&gt;此文件在您的播放器上不存在，安装后将自动消失。&lt;br/&gt;&lt;br/&gt;按确定继续并浏览您的计算机以查找固件文件。</translation>
+        <translation>Bootloader 安装需要您提供原始 Sandisk 固件的副本（bin 文件）。此固件文件将被修补，然后与rockbox bootloader一起安装到您的播放器中。由于法律原因，您需要自行下载此文件。请浏览&lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; 或参阅 &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; 和 &lt;a href=&apos;https://www.rockbox.org/wiki/SansaAMS&apos;&gt;SansaAMS&lt;/a&gt; wiki 页面以获取此文件。&lt;br/&gt;&lt;b&gt;Note:&lt;/b&gt;此文件在您的播放器上不保存，安装后将自动消失。&lt;br/&gt;&lt;br/&gt;按确定继续并浏览您的计算机以查找固件文件。</translation>
     </message>
     <message>
         <location filename="../base/bootloaderinstallams.cpp" line="58"/>
@@ -130,94 +131,142 @@
     </message>
 </context>
 <context>
-    <name>BootloaderInstallBase</name>
+    <name>BootloaderInstallBSPatch</name>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="78"/>
-        <source>Download error: received HTTP error %1.</source>
-        <translation>下载错误: 接到 HTTP 错误 %1. </translation>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="65"/>
+        <source>Bootloader installation requires you to provide the correct verrsion of the original firmware file. This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/wiki/&apos;&gt;rockbox wiki&lt;/a&gt; pages on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation>引导程序安装需要你提供正确版本的原始固件文件。这个文件会被 Rockbox 引导程序打补丁并安装到你的播放器上。由于法律原因，你需要自己下载这个文件。请参考 &lt;a href=&apos;https://www.rockbox.org/wiki/&apos;&gt;Rockbox 维基&lt;/a&gt; 页面了解如何获取这个文件。&lt;br/&gt;按确定继续，然后在你的电脑上浏览固件文件。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="84"/>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="84"/>
+        <source>Could not read original firmware file</source>
+        <translation>无法读取原始固件文件</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="90"/>
+        <source>Downloading bootloader file</source>
+        <translation>正在下载引导程序文件</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="99"/>
+        <source>Patching file...</source>
+        <translation>正在修补文件…</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="124"/>
+        <source>Patching the original firmware failed</source>
+        <translation>修补原始固件失败</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="130"/>
+        <source>Succesfully patched firmware file</source>
+        <translation>修补原始固件成功</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="145"/>
+        <source>Bootloader successful installed</source>
+        <translation>Bootloader安装成功</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="151"/>
+        <source>Patched bootloader could not be installed</source>
+        <translation>修补的bootloader无法被安装</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbspatch.cpp" line="161"/>
+        <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
+        <translation>要卸载，请使用未修改的原始固件执行正常升级。</translation>
+    </message>
+</context>
+<context>
+    <name>BootloaderInstallBase</name>
+    <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="69"/>
+        <source>Download error: received HTTP error %1.</source>
+        <translation>下载错误: 接到 HTTP 错误 %1。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="75"/>
         <source>Download error: %1</source>
         <translation>下载错误: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="90"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="81"/>
         <source>Download finished (cache used).</source>
         <translation>完成下载（已使用缓存）。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="83"/>
         <source>Download finished.</source>
-        <translation>完成下载.</translation>
+        <translation>完成下载。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="112"/>
         <source>Creating backup of original firmware file.</source>
-        <translation>创建原始固件文件备份。</translation>
+        <translation>正在创建原始固件文件备份。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="115"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="114"/>
         <source>Creating backup folder failed</source>
         <translation>创建备份文件夹失败</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="121"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="120"/>
         <source>Creating backup copy failed.</source>
         <translation>创建备份副本失败。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="124"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="123"/>
         <source>Backup created.</source>
         <translation>备份已创建。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="137"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="140"/>
         <source>Creating installation log</source>
         <translation>正在建立安装日志</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="226"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="245"/>
         <source>Zip file format detected</source>
         <translation>检测到ZIP文件格式</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="257"/>
         <source>CAB file format detected</source>
         <translation>检测到CAB文件格式</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="259"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="278"/>
         <source>Extracting firmware %1 from archive</source>
         <translation>从存档中提取固件 %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="266"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="285"/>
         <source>Error extracting firmware from archive</source>
         <translation>从存档中提取固件时失败</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="275"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="294"/>
         <source>Could not find firmware in archive</source>
         <translation>无法在存档中找到固件</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="159"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="162"/>
         <source>Waiting for system to remount player</source>
         <translation>等待系统卸载播放器</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="189"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="192"/>
         <source>Player remounted</source>
         <translation>播放器已卸载</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="194"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="197"/>
         <source>Timeout on remount</source>
         <translation>卸载超时</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="149"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="152"/>
         <source>Installation log created</source>
         <translation>安装日志已创建</translation>
     </message>
@@ -481,47 +530,47 @@
         <translation>无法卸载，仅删除安装信息</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="258"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="259"/>
         <source>Can&apos;t open input file</source>
         <translation>无法打开输入文件</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="259"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="260"/>
         <source>Can&apos;t open output file</source>
         <translation>无法打开输出文件</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="260"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="261"/>
         <source>invalid file: header length wrong</source>
         <translation>无效文件：标头长度错误</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="261"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="262"/>
         <source>invalid file: unrecognized header</source>
         <translation>无效文件：标头无法识别</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="262"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="263"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation>无效文件：“length”区域错误</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="263"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="264"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation>无效文件：“length2”区域错误</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="264"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="265"/>
         <source>invalid file: internal checksum error</source>
         <translation>无效文件：内部校验和出错</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="265"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="266"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation>无效文件：“length3”区域错误</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="266"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="267"/>
         <source>unknown</source>
         <translation>不明</translation>
     </message>
@@ -534,22 +583,26 @@
 <context>
     <name>BootloaderInstallImx</name>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
         <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation>Bootloader 安装需要您提供原始 Sandisk 固件的副本（firmware.sb 文件）。此文件将使用 Rockbox 引导加载程序进行修补并安装到您的播放器中。由于法律原因，您需要自行下载此文件。请浏览 &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; 或参阅 &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki 页面以获取此文件。&lt;br/&gt;按确定继续并浏览您的计算机以获取固件文件。</translation>
+        <translation type="vanished">Bootloader 安装需要您提供原始 Sandisk 固件的副本（firmware.sb 文件）。此文件将使用 Rockbox 引导加载程序进行修补并安装到您的播放器中。由于法律原因，您需要自行下载此文件。请浏览 &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; 或参阅 &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki 页面以获取此文件。&lt;br/&gt;按确定继续并浏览您的计算机以获取固件文件。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation>启动加载程序的安装需要你提供原版 Sandisk 固件（firmware.sb 文件）的副本。这个文件将会被 Rockbox 启动加载程序修改后安装到你的播放器上。由于法律原因，你需要自己下载这个文件。请浏览 &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa 论坛&lt;/a&gt;，或参考 &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;手册&lt;/a&gt; 和 &lt;a href=&apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; 维基页面了解如何获取该文件。&lt;br/&gt;请按确定继续，并在你的电脑上查找固件文件。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation>无法读取原始固件文件</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation>正在下载bootloader文件</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation>修补文件…</translation>
     </message>
@@ -582,111 +635,116 @@
 <context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="49"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
-        <translation>错误：无法分配缓冲区内存！</translation>
+        <translation type="vanished">错误：无法分配缓冲区内存！</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="72"/>
         <source>Downloading bootloader file</source>
         <translation>正在下载bootloader文件</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
-        <location filename="../base/bootloaderinstallipod.cpp" line="151"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="143"/>
         <source>Failed to read firmware directory</source>
         <translation>读取固件文件夹失败</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="69"/>
-        <location filename="../base/bootloaderinstallipod.cpp" line="156"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="61"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="148"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation>固件版本不明 (%1)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="75"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
-        <translation>警告：这是苹果格式的iPod，Rockbox仅能运行于Windows格式的iPod。参阅https://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
+        <translation type="vanished">警告：这是苹果格式的iPod，Rockbox仅能运行于Windows格式的iPod。参阅https://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="94"/>
-        <location filename="../base/bootloaderinstallipod.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="155"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation>无法打开iPod读写模式</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="96"/>
         <source>Successfull added bootloader</source>
         <translation>追加bootloader成功</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="115"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="107"/>
         <source>Failed to add bootloader</source>
         <translation>追加bootloader失败</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="119"/>
         <source>Bootloader Installation complete.</source>
         <translation>Bootloader安装完成。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="132"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="124"/>
         <source>Writing log aborted</source>
         <translation>写入日志已中止</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="169"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>No bootloader detected.</source>
         <translation>找不到启动程序.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="175"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="167"/>
         <source>Successfully removed bootloader</source>
         <translation>移除bootloader成功</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="182"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="175"/>
         <source>Removing bootloader failed.</source>
         <translation>移除bootloader失败。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="228"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="241"/>
         <source>Error: could not retrieve device name</source>
         <translation>错误：无法检索设备名称</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="244"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
         <source>Error: no mountpoint specified!</source>
         <translation>错误：未指定挂载点！</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="249"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="262"/>
         <source>Could not open Ipod: permission denied</source>
         <translation>无法打开iPod：拒绝访问</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="253"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="266"/>
         <source>Could not open Ipod</source>
         <translation>无法打开iPod</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="264"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="277"/>
         <source>No firmware partition on disk</source>
         <translation>硬盘上没有固件分区</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="90"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="82"/>
         <source>Installing Rockbox bootloader</source>
         <translation>正在安装Rockbox bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="67"/>
+        <source>Warning: This is a MacPod, Rockbox only runs on WinPods. 
+See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
+        <translation>警告：这是Macintosh格式的iPod，而Rockbox仅能运行在Windows格式的iPod上。
+参见 https://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="134"/>
         <source>Uninstalling bootloader</source>
         <translation>正在卸载bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="258"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="271"/>
         <source>Error reading partition table - possibly not an Ipod</source>
         <translation>读取分区表时出错 - 可能不是 iPod</translation>
     </message>
@@ -730,17 +788,17 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation>未找到 Rockbox 引导加载程序</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="99"/>
         <source>Checking for original firmware file</source>
         <translation>检查原始固件文件</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="103"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="104"/>
         <source>Error finding original firmware file</source>
         <translation>寻找原始固件文件时出错</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="115"/>
         <source>Rockbox bootloader successful removed</source>
         <translation>Rockbox bootloader移除成功</translation>
     </message>
@@ -748,113 +806,272 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>Bootloader 安装需要您提供原始固件的固件文件（bin 文件）。由于法律原因，您需要自行下载此文件。有关如何获取此文件，请参阅 &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; 和 &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki页面。&lt;br/&gt;按确定继续并浏览您的计算机以查找固件文件。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation>正在下载bootloader文件</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation>无法打开原始固件文件。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation>无法读取原始挂件文件。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation>加载的固件文件似乎并不是MPIO原始固件文件。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation>无法打开输出文件。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation>无法写出输出文件。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation>未知错误码: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation>无法打开已下载的bootloader。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation>在 OF 文件中放置bootloader的位置不为空。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation>无法读取已下载的bootloader。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation>Bootloader校验出错。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation>修改原始固件出错: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation>成功：已创建魔改固件文件</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation>要卸载，请用未修改的原始固件进行正常升级</translation>
     </message>
 </context>
+<context>
+    <name>BootloaderInstallS5l</name>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="61"/>
+        <source>Could not find mounted iPod.</source>
+        <translation>无法找到已挂载的iPod。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="68"/>
+        <source>Downloading bootloader file...</source>
+        <translation>正在下载引导程序文件……</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="113"/>
+        <source>Could not make DFU image.</source>
+        <translation>无法制作DFU镜像。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="119"/>
+        <source>Ejecting iPod...</source>
+        <translation>正在弹出iPod……</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="141"/>
+        <source>Action required:
+
+Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject functionality.</source>
+        <translation>需要操作：
+
+请确保没有程序正在存取设备上的文件。如果弹出仍然失败请使用你电脑上的弹出功能。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="151"/>
+        <source>Device successfully ejected.</source>
+        <translation>设备已成功弹出。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="171"/>
+        <source>Action required:
+
+Quit iTunes application.</source>
+        <translation>需要操作：
+
+请退出iTunes程序。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="179"/>
+        <source>iTunes closed.</source>
+        <translation>iTunes已关闭。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="192"/>
+        <source>Could not suspend iTunesHelper. Stop it using the Task Manager, and try again.</source>
+        <translation>无法挂起iTunesHelper。请按Ctrl+Shift+ESC打开任务管理器并结束该进程，然后再试一次。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="201"/>
+        <source>Waiting for HDD spin-down...</source>
+        <translation>正在等待硬盘停止旋转……</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="217"/>
+        <source>Waiting for DFU mode...</source>
+        <translation>等待DFU模式……</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="218"/>
+        <source>Action required:
+
+Press and hold SELECT+MENU buttons, after about 12 seconds a new action will require you to release the buttons, DO IT QUICKLY, otherwise the process could fail.</source>
+        <translation>需要操作：
+
+请按住SELECT+MENU大约12秒钟，然后程序将需要你释放这些按钮。请【立即操作】，否则进程将会失败。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="241"/>
+        <source>DFU mode detected.</source>
+        <translation>已检测到DFU模式。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="243"/>
+        <source>Action required:
+
+Release SELECT+MENU buttons and wait...</source>
+        <translation>需要操作：
+
+请松开SELECT+MENU键，坐和放宽……</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="268"/>
+        <source>Device is not in DFU mode. It seems that the previous required action failed, please try again.</source>
+        <translation>设备未处于DFU模式。也许之前需要你执行的操作失败了，请再试一次。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="275"/>
+        <source>Transfering DFU image...</source>
+        <translation>正在传输DFU镜像……</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="285"/>
+        <source>No valid DFU USB driver found.
+
+Install iTunes (or the Apple Device Driver) and try again.</source>
+        <translation>未找到有效的DFU USB驱动程序。
+
+请安装iTunes或Apple Device驱动程序，然后再试一次。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="294"/>
+        <source>Could not transfer DFU image.</source>
+        <translation>无法传输DFU镜像。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="299"/>
+        <source>DFU transfer completed.</source>
+        <translation>DFU传输已完成。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="302"/>
+        <source>Restarting iPod, waiting for remount...</source>
+        <translation>正在重新启动iPod并等待重新挂载……</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="321"/>
+        <source>Action required:
+
+Could not remount the device, try to do it manually. If the iPod didn&apos;t restart, force a reset by pressing SELECT+MENU buttons for about 5 seconds. If the problem could not be solved then click &apos;Abort&apos; to cancel.</source>
+        <translation>需要操作
+
+无法重新挂载设备，请尝试手动操作。如果iPod没有重新启动，请按住SELECT+MENU键约5秒钟强制重启。如果问题没有解决，请点击”中断“来取消。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="333"/>
+        <source>Device remounted.</source>
+        <translation>设备已重新挂载。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="336"/>
+        <source>Bootloader successfully installed.</source>
+        <translation>引导程序已成功安装。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="338"/>
+        <source>Bootloader successfully uninstalled.</source>
+        <translation>引导程序已成功卸载。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="350"/>
+        <source>Could not resume iTunesHelper.</source>
+        <translation>无法恢复iTunesHelper。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="368"/>
+        <source>Install aborted by user.</source>
+        <translation>用户中断了安装。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstalls5l.cpp" line="370"/>
+        <source>Uninstall aborted by user.</source>
+        <translation>用户中断了卸载。</translation>
+    </message>
+</context>
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="50"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation>错误：无法分配缓冲区内存！</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="55"/>
         <source>Searching for Sansa</source>
-        <translation>寻找Sansa</translation>
+        <translation type="vanished">寻找Sansa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="59"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
-        <translation>磁盘拒绝访问！
-安装bootloader时，这是必需的！</translation>
+        <translation type="vanished">磁盘拒绝访问！
+安装启动引导程序时这是必需的</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
         <source>No Sansa detected!</source>
-        <translation>未检测到Sansa！</translation>
+        <translation type="vanished">未检测到Sansa设备！</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="79"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Downloading bootloader file</source>
         <translation>正在下载bootloader文件</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="71"/>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="164"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -862,86 +1079,87 @@ See https://www.rockbox.org/wiki/SansaE200Install
 </source>
         <translation>检测到旧的 ROCKBOX 安装，安装中止。
 在首次运行Sansapatcher之前，您必须重新安装原始的 Sansa 固件
-请参阅 https://www.rockbox.org/wiki/SansaE200Install</translation>
+请参阅 https://www.rockbox.org/wiki/SansaE200Install
+</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="102"/>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="189"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="87"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="174"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation>无法以读写模式打开Sansa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="114"/>
         <source>Successfully installed bootloader</source>
         <translation>成功安装Bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="140"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="125"/>
         <source>Failed to install bootloader</source>
         <translation>无法安装bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="138"/>
         <source>Bootloader Installation complete.</source>
         <translation>Bootloader安装完成。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="143"/>
         <source>Writing log aborted</source>
         <translation>写日志中断</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="244"/>
         <source>Error: could not retrieve device name</source>
         <translation>错误：无法检索设备名称</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="254"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="260"/>
         <source>Can&apos;t find Sansa</source>
         <translation>无法找到Sansa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="259"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="265"/>
         <source>Could not open Sansa</source>
         <translation>无法打开Sansa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="264"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="270"/>
         <source>Could not read partition table</source>
         <translation>无法读取分区表</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="271"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="277"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation>磁盘并非Sansa (Error %1)，安装中断。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="195"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="180"/>
         <source>Successfully removed bootloader</source>
         <translation>成功移除bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="202"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="188"/>
         <source>Removing bootloader failed.</source>
         <translation>移除bootloader失败。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="83"/>
         <source>Installing Rockbox bootloader</source>
         <translation>正在安装Rockbox bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="111"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
         <source>Checking downloaded bootloader</source>
         <translation>正在校验下载的bootloader文件</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation>Bootloader不匹配！安装中止。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="170"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="155"/>
         <source>Uninstalling bootloader</source>
         <translation>正在卸载bootloader</translation>
     </message>
@@ -1021,48 +1239,48 @@ See https://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="340"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation>展示禁用目标</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="341"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation>您刚刚启用了显示标记为禁用的目标的功能。不建议最终用户禁用目标。请仅在您知道自己在做什么时才使用此选项。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="529"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation>代理检测</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="530"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation>系统代理设置无效！
 Rockbox Utility 无法使用此代理设置。请确保系统代理设置正确。请注意，Rockbox Utility 不支持“代理自动配置 （PAC）”脚本。如果您的系统使用此功能，则需要使用手动代理设置。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="643"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation>设置缓存路径</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="788"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation>%1 发现Mac格式的iPod！！
-Rockbox需要FAT格式的iPod才能运行。</translation>
+Rockbox需要FAT格式的iPod才能运行。 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="780"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>%1 发现处于MTP模式！
-你需要将你的播放器置于MSC模式才能安装。</translation>
+你需要将你的播放器置于MSC模式才能安装。 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="774"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
@@ -1083,57 +1301,57 @@ Select your Mountpoint manually.</source>
 请手动选择你的挂载点。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="764"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>无法检测到设备
 请手动选择你的设备和挂载点。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="448"/>
-        <location filename="../configure.cpp" line="914"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation>TTS错误</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="449"/>
-        <location filename="../configure.cpp" line="915"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
-        <translation>选定的TTS无法初始化。你无法使用此TTS</translation>
+        <translation>选定的TTS无法初始化。你不能使用此TTS。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="665"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation>%1 (%2 GB 共 %3 GB 空闲)</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="739"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation>检测到多个设备。请断开其它播放器的连接并再试一次。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="742"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation>检测到设备：</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation>（未知）</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="749"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation>%1 位于 %2</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="755"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation>注意：检测连接的设备可能不明确。您连接的设备可能少于列出的设备数量。在这种情况下，可能无法明确地检测到您的播放器。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="759"/>
-        <location filename="../configure.cpp" line="763"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
         <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation>设备检测</translation>
@@ -1171,98 +1389,104 @@ Make sure you selected the correct mountpoint and the player is set up to use a
         <translation>缓冲路径错误. 正在取消.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="921"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation>TTS配置无效</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="922"/>
+        <location filename="../configure.cpp" line="917"/>
+        <source>TTS configuration invalid. 
+ Please configure TTS engine.</source>
+        <translation>TTS配置无效。
+ 请配置TTS引擎。</translation>
+    </message>
+    <message>
         <source>TTS configuration invalid.
  Please configure TTS engine.</source>
-        <translation>TTS 配置无效。
+        <translation type="vanished">TTS 配置无效。
  请配置 TTS 引擎。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="927"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation>无法启动TTS引擎。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="928"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation>无法启动TTS引擎。
 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="929"/>
-        <location filename="../configure.cpp" line="948"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation>
 请配置TTS引擎。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="943"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation>Rockbox实用程序语音测试</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="946"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation>无法读出测试字段。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="947"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation>无法读出测试字段。
 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="322"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>当前缓存大小 %L1 kB。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="485"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation>配置正常</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="461"/>
-        <location filename="../configure.cpp" line="490"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation>配置无效</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="130"/>
+        <location filename="../configure.cpp" line="125"/>
         <source>The following errors occurred:</source>
         <translation>下述错误发生：</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="175"/>
+        <location filename="../configure.cpp" line="170"/>
         <source>No mountpoint given</source>
         <translation>未指定挂载点</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="179"/>
+        <location filename="../configure.cpp" line="174"/>
         <source>Mountpoint does not exist</source>
         <translation>挂载点不存在</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="183"/>
+        <location filename="../configure.cpp" line="178"/>
         <source>Mountpoint is not a directory.</source>
         <translation>挂载点不是一个目录。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="187"/>
+        <location filename="../configure.cpp" line="182"/>
         <source>Mountpoint is not writeable</source>
         <translation>挂载点无法写入</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="202"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation>未指定播放器</translation>
     </message>
@@ -1302,10 +1526,10 @@ Please configure TTS engine.</source>
     <message>
         <location filename="../configurefrm.ui" line="41"/>
         <source>Select your device in the &amp;filesystem</source>
-        <translation>请在文件系统中选择你的播放器</translation>
+        <translation>请在文件系统中选择你的播放器（&amp;F）</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="319"/>
+        <location filename="../configurefrm.ui" line="326"/>
         <source>&amp;Browse</source>
         <translation>浏览(&amp;B)</translation>
     </message>
@@ -1375,42 +1599,42 @@ Please configure TTS engine.</source>
         <translation>展示</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="260"/>
+        <location filename="../configurefrm.ui" line="267"/>
         <source>&amp;Language</source>
         <translation>语言(&amp;L)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="274"/>
+        <location filename="../configurefrm.ui" line="281"/>
         <source>Cac&amp;he</source>
         <translation>缓存(&amp;h)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="277"/>
+        <location filename="../configurefrm.ui" line="284"/>
         <source>Download cache settings</source>
         <translation>下载缓冲设置</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="283"/>
+        <location filename="../configurefrm.ui" line="290"/>
         <source>Rockbox Utility uses a local download cache to save network traffic. You can change the path to the cache and use it as local repository by enabling Offline mode.</source>
         <translation>Rockbox 安装程序使用本机缓冲来保存网络资料. 你可以改变这个缓冲的路径. 启动离线模式后, 你还可以用路径来保存文件.</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="293"/>
+        <location filename="../configurefrm.ui" line="300"/>
         <source>Current cache size is %1</source>
         <translation>现在缓冲大小是 %1</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="302"/>
+        <location filename="../configurefrm.ui" line="309"/>
         <source>P&amp;ath</source>
         <translation>路径(&amp;a)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="312"/>
+        <location filename="../configurefrm.ui" line="319"/>
         <source>Entering an invalid folder will reset the path to the systems temporary path.</source>
         <translation>输入无效地址会重设到系统临时文件夹.</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="334"/>
+        <location filename="../configurefrm.ui" line="341"/>
         <source>Disable local &amp;download cache</source>
         <translation>&amp;不使用本机缓存</translation>
     </message>
@@ -1423,47 +1647,47 @@ Please configure TTS engine.</source>
         <translation type="obsolete">离线模式(&amp;f)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="369"/>
+        <location filename="../configurefrm.ui" line="376"/>
         <source>Clean cache &amp;now</source>
         <translation>现在清除缓冲文件夹(&amp;n)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="385"/>
+        <location filename="../configurefrm.ui" line="392"/>
         <source>&amp;TTS &amp;&amp; Encoder</source>
         <translation>&amp;TTS &amp;&amp; 信号转换器</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="391"/>
+        <location filename="../configurefrm.ui" line="398"/>
         <source>TTS Engine</source>
         <translation>TTS 引擎</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="445"/>
+        <location filename="../configurefrm.ui" line="452"/>
         <source>Test TTS</source>
         <translation>测试TTS</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="452"/>
+        <location filename="../configurefrm.ui" line="463"/>
         <source>&amp;Use string corrections for TTS</source>
         <translation>为TTS使用字段修正(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="462"/>
+        <location filename="../configurefrm.ui" line="473"/>
         <source>Encoder Engine</source>
         <translation>编码器</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="536"/>
+        <location filename="../configurefrm.ui" line="547"/>
         <source>&amp;Ok</source>
         <translation>确定(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="547"/>
+        <location filename="../configurefrm.ui" line="558"/>
         <source>&amp;Cancel</source>
         <translation>取消(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="397"/>
+        <location filename="../configurefrm.ui" line="404"/>
         <source>&amp;Select TTS Engine</source>
         <translation>选择TTS引擎(&amp;S)</translation>
     </message>
@@ -1473,28 +1697,28 @@ Please configure TTS engine.</source>
         <translation>展示禁用目标</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="410"/>
+        <location filename="../configurefrm.ui" line="417"/>
         <source>Configure TTS Engine</source>
         <translation>配置TTS引擎</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="417"/>
-        <location filename="../configurefrm.ui" line="468"/>
+        <location filename="../configurefrm.ui" line="424"/>
+        <location filename="../configurefrm.ui" line="479"/>
         <source>Configuration invalid!</source>
         <translation>配置无效！</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="434"/>
+        <location filename="../configurefrm.ui" line="441"/>
         <source>Configure &amp;TTS</source>
         <translation>配置&amp;TTS</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="485"/>
+        <location filename="../configurefrm.ui" line="496"/>
         <source>Configure &amp;Enc</source>
-        <translation>配置编码器</translation>
+        <translation>配置编码器（&amp;E）</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="496"/>
+        <location filename="../configurefrm.ui" line="507"/>
         <source>encoder name</source>
         <translation>编码器名称</translation>
     </message>
@@ -1502,7 +1726,7 @@ Please configure TTS engine.</source>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="589"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>简体中文 (Chinese Simplified)</translation>
@@ -1526,12 +1750,12 @@ Please configure TTS engine.</source>
         <translation>TTS：</translation>
     </message>
     <message>
-        <location filename="../createvoicefrm.ui" line="101"/>
+        <location filename="../createvoicefrm.ui" line="105"/>
         <source>Silence threshold</source>
         <translation>静默阈值</translation>
     </message>
     <message>
-        <location filename="../createvoicefrm.ui" line="163"/>
+        <location filename="../createvoicefrm.ui" line="167"/>
         <source>Language</source>
         <translation>语言</translation>
     </message>
@@ -1541,22 +1765,22 @@ Please configure TTS engine.</source>
         <translation>语音合成设置</translation>
     </message>
     <message>
-        <location filename="../createvoicefrm.ui" line="68"/>
+        <location filename="../createvoicefrm.ui" line="72"/>
         <source>Change</source>
         <translation>变更</translation>
     </message>
     <message>
-        <location filename="../createvoicefrm.ui" line="139"/>
+        <location filename="../createvoicefrm.ui" line="143"/>
         <source>&amp;Install</source>
         <translation>安装(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../createvoicefrm.ui" line="150"/>
+        <location filename="../createvoicefrm.ui" line="154"/>
         <source>&amp;Cancel</source>
         <translation>取消(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../createvoicefrm.ui" line="88"/>
+        <location filename="../createvoicefrm.ui" line="92"/>
         <source>Wavtrim Threshold</source>
         <translation>波形修剪阈值</translation>
     </message>
@@ -1564,18 +1788,18 @@ Please configure TTS engine.</source>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="100"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation>TTS错误</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="101"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>选定的TTS无法初始化。您无法使用此TTS。</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="105"/>
-        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>引擎 : &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1583,32 +1807,32 @@ Please configure TTS engine.</source>
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="45"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation>等待引擎…</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="95"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="98"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="197"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation>浏览</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="205"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation>刷新</translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="377"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation>选择可执行文件</translation>
     </message>
@@ -1616,12 +1840,12 @@ Please configure TTS engine.</source>
 <context>
     <name>EncoderExe</name>
     <message>
-        <location filename="../base/encoderexe.cpp" line="41"/>
+        <location filename="../base/encoderexe.cpp" line="37"/>
         <source>Path to Encoder:</source>
         <translation>编码器路径：</translation>
     </message>
     <message>
-        <location filename="../base/encoderexe.cpp" line="43"/>
+        <location filename="../base/encoderexe.cpp" line="39"/>
         <source>Encoder options:</source>
         <translation>编码器选项：</translation>
     </message>
@@ -1629,23 +1853,23 @@ Please configure TTS engine.</source>
 <context>
     <name>EncoderLame</name>
     <message>
-        <location filename="../base/encoderlame.cpp" line="73"/>
-        <location filename="../base/encoderlame.cpp" line="83"/>
+        <location filename="../base/encoderlame.cpp" line="75"/>
+        <location filename="../base/encoderlame.cpp" line="85"/>
         <source>LAME</source>
         <translation>编码器LAME</translation>
     </message>
     <message>
-        <location filename="../base/encoderlame.cpp" line="75"/>
+        <location filename="../base/encoderlame.cpp" line="77"/>
         <source>Volume</source>
         <translation>音量</translation>
     </message>
     <message>
-        <location filename="../base/encoderlame.cpp" line="79"/>
+        <location filename="../base/encoderlame.cpp" line="81"/>
         <source>Quality</source>
         <translation>质量</translation>
     </message>
     <message>
-        <location filename="../base/encoderlame.cpp" line="83"/>
+        <location filename="../base/encoderlame.cpp" line="85"/>
         <source>Could not find libmp3lame!</source>
         <translation>无法找到libmp3lame！</translation>
     </message>
@@ -1677,16 +1901,21 @@ Please configure TTS engine.</source>
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="107"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation>文件</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="107"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation>版本</translation>
     </message>
+    <message>
+        <location filename="../gui/infowidget.cpp" line="56"/>
+        <source>Loading, please wait ...</source>
+        <translation>正在加载，请稍候……</translation>
+    </message>
 </context>
 <context>
     <name>InfoWidgetFrm</name>
@@ -1729,17 +1958,17 @@ Please configure TTS engine.</source>
         <translation>递归到文件夹中</translation>
     </message>
     <message>
-        <location filename="../installtalkfrm.ui" line="118"/>
+        <location filename="../installtalkfrm.ui" line="122"/>
         <source>Ignore files</source>
         <translation>忽略文件</translation>
     </message>
     <message>
-        <location filename="../installtalkfrm.ui" line="128"/>
+        <location filename="../installtalkfrm.ui" line="132"/>
         <source>Skip existing</source>
         <translation>跳过已存在项目</translation>
     </message>
     <message>
-        <location filename="../installtalkfrm.ui" line="170"/>
+        <location filename="../installtalkfrm.ui" line="174"/>
         <source>Select folders for Talkfile generation (Ctrl for multiselect)</source>
         <translation>选择Talk文件生成目录（Ctrl多选）</translation>
     </message>
@@ -1759,40 +1988,40 @@ Please configure TTS engine.</source>
         <translation>除去后缀</translation>
     </message>
     <message>
-        <location filename="../installtalkfrm.ui" line="154"/>
+        <location filename="../installtalkfrm.ui" line="158"/>
         <source>&amp;Cancel</source>
-        <translation>&amp;取消</translation>
+        <translation>取消(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../installtalkfrm.ui" line="111"/>
+        <location filename="../installtalkfrm.ui" line="115"/>
         <source>Change</source>
         <translation>变更</translation>
     </message>
     <message>
-        <location filename="../installtalkfrm.ui" line="143"/>
+        <location filename="../installtalkfrm.ui" line="147"/>
         <source>&amp;Install</source>
-        <translation>安装</translation>
+        <translation>安装（&amp;I）</translation>
     </message>
 </context>
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="96"/>
+        <location filename="../installtalkwindow.cpp" line="95"/>
         <source>Empty selection</source>
         <translation>空选择</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="97"/>
+        <location filename="../installtalkwindow.cpp" line="96"/>
         <source>No files or folders selected. Please select files or folders first.</source>
         <translation>未选定文件夹或文件。请先选择文件或文件夹。</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="137"/>
+        <location filename="../installtalkwindow.cpp" line="140"/>
         <source>TTS error</source>
         <translation>TTS错误</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="138"/>
+        <location filename="../installtalkwindow.cpp" line="141"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation>选定的TTS无法初始化。你无法使用这个TTS。</translation>
     </message>
@@ -1800,77 +2029,63 @@ Please configure TTS engine.</source>
 <context>
     <name>ManualWidget</name>
     <message>
-        <location filename="../gui/manualwidget.cpp" line="44"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
-        <translation>&lt;a href=&apos;%1&apos;&gt;PDF 用户手册(英文)&lt;/a&gt;</translation>
+        <translation type="vanished">&lt;a href=&apos;%1&apos;&gt;PDF 用户手册(英文)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidget.cpp" line="46"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
-        <translation>&lt;a href=&apos;%1&apos;&gt;HTML 用户手册(英文,在浏览器打开)&lt;/a&gt;</translation>
+        <translation type="vanished">&lt;a href=&apos;%1&apos;&gt;HTML 用户手册(英文,在浏览器打开)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidget.cpp" line="50"/>
         <source>Select a device for a link to the correct manual</source>
-        <translation>请选择你的播放器</translation>
+        <translation type="vanished">请选择你的播放器</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidget.cpp" line="51"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
-        <translation>&lt;a href=&apos;%1&apos;&gt;用户手册总观&lt;/a&gt;</translation>
+        <translation type="vanished">&lt;a href=&apos;%1&apos;&gt;用户手册总观&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidget.cpp" line="62"/>
         <source>Confirm download</source>
-        <translation>确认下载</translation>
+        <translation type="vanished">确认下载</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidget.cpp" line="63"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
-        <translation>你确认要下载用户手册吗? 用户手册将会被放在你播放器的主目录里.</translation>
+        <translation type="vanished">你确认要下载用户手册吗? 用户手册将会被放在你播放器的主目录里.</translation>
     </message>
 </context>
 <context>
     <name>ManualWidgetFrm</name>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="14"/>
         <source>Manual</source>
-        <translation>用户手册</translation>
+        <translation type="vanished">用户手册</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="20"/>
         <source>Read the manual</source>
-        <translation>查看用户手册</translation>
+        <translation type="vanished">查看用户手册</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="26"/>
         <source>PDF manual</source>
-        <translation>PDF 用户手册</translation>
+        <translation type="vanished">PDF 用户手册</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="39"/>
         <source>HTML manual</source>
-        <translation>HTML 用户手册</translation>
+        <translation type="vanished">HTML 用户手册</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="55"/>
         <source>Download the manual</source>
-        <translation>下载用户手册</translation>
+        <translation type="vanished">下载用户手册</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="63"/>
         <source>&amp;PDF version</source>
-        <translation>PDF 版本</translation>
+        <translation type="vanished">&amp;PDF 版本</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="70"/>
         <source>&amp;HTML version (zip file)</source>
-        <translation>HTML 版本 (zip)</translation>
+        <translation type="vanished">&amp;HTML 版本 (ZIP文件不)</translation>
     </message>
     <message>
-        <location filename="../gui/manualwidgetfrm.ui" line="92"/>
         <source>Down&amp;load</source>
-        <translation>下载</translation>
+        <translation type="vanished">下载(&amp;L)</translation>
     </message>
 </context>
 <context>
@@ -1886,6 +2101,34 @@ Please configure TTS engine.</source>
         <translation>CAB操作时出错</translation>
     </message>
 </context>
+<context>
+    <name>PlayerBuildInfo</name>
+    <message>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
+        <source>Stable (Retired)</source>
+        <translation>稳定版（已停止维护）</translation>
+    </message>
+    <message>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
+        <source>Unusable</source>
+        <translation>不可用</translation>
+    </message>
+    <message>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
+        <source>Unstable</source>
+        <translation>不稳定</translation>
+    </message>
+    <message>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
+        <source>Stable</source>
+        <translation>稳定</translation>
+    </message>
+    <message>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
+        <source>Unknown</source>
+        <translation>未知</translation>
+    </message>
+</context>
 <context>
     <name>PreviewFrm</name>
     <message>
@@ -1897,23 +2140,23 @@ Please configure TTS engine.</source>
 <context>
     <name>ProgressLoggerFrm</name>
     <message>
-        <location filename="../progressloggerfrm.ui" line="13"/>
-        <location filename="../progressloggerfrm.ui" line="19"/>
+        <location filename="../progressloggerfrm.ui" line="18"/>
+        <location filename="../progressloggerfrm.ui" line="24"/>
         <source>Progress</source>
         <translation>进程</translation>
     </message>
     <message>
-        <location filename="../progressloggerfrm.ui" line="58"/>
+        <location filename="../progressloggerfrm.ui" line="63"/>
         <source>Save Log</source>
         <translation>保存日志</translation>
     </message>
     <message>
-        <location filename="../progressloggerfrm.ui" line="82"/>
+        <location filename="../progressloggerfrm.ui" line="87"/>
         <source>&amp;Abort</source>
         <translation>&amp;取消</translation>
     </message>
     <message>
-        <location filename="../progressloggerfrm.ui" line="32"/>
+        <location filename="../progressloggerfrm.ui" line="37"/>
         <source>progresswindow</source>
         <translation>处理窗口</translation>
     </message>
@@ -1921,17 +2164,17 @@ Please configure TTS engine.</source>
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="122"/>
+        <location filename="../progressloggergui.cpp" line="117"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="146"/>
+        <location filename="../progressloggergui.cpp" line="141"/>
         <source>Save system trace log</source>
         <translation>保存系统跟踪日志</translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="104"/>
+        <location filename="../progressloggergui.cpp" line="99"/>
         <source>&amp;Abort</source>
         <translation>&amp;取消</translation>
     </message>
@@ -1939,61 +2182,69 @@ Please configure TTS engine.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="625"/>
-        <location filename="../main.cpp" line="83"/>
+        <location filename="../configure.cpp" line="621"/>
+        <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
-        <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.
-----------
-This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
+        <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
         <translation>LTR</translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="385"/>
+        <location filename="../base/system.cpp" line="333"/>
         <source>(unknown vendor name) </source>
-        <translation>（供应商名称未知）</translation>
+        <translation>（未知供应商名称） </translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="403"/>
+        <location filename="../base/system.cpp" line="351"/>
         <source>(unknown product name)</source>
         <translation>（产品名未知）</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation>在引导程序安装开始之前，请检查下述事项：</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation>&lt;li&gt;请确保你的 SD 卡格式为 FAT。exFAT &lt;i&gt;不受&lt;/i&gt;支持。如果需要，你可以使用播放器的原始固件重新格式化。请前往(系统设置 --&gt; 重置 --&gt; 格式化TF卡)。&lt;/li&gt;&lt;li&gt;请使用信誉良好的品牌的优质 SD 卡。随播放器附带的 SD 卡通常质量较差，可能会引发问题。&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation>Bootloader的安装即将完成。安装 &lt;b&gt;需要&lt;/b&gt; 你手动执行下列步骤：</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;安全地移除你的播放器。&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="91"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;将你的播放器重启到原始固件。&lt;/li&gt;&lt;li&gt;请用原始固件的升级功能进行一次升级。参阅厂商的说明书以获得更多信息。&lt;br/&gt;&lt;b&gt;重要：&lt;/b&gt; 升级过程绝对不可以被中断，&lt;b&gt;进行固件升级之前必须确认播放器已充电。&lt;/b&gt;&lt;/li&gt;&lt;li&gt;固件升级后，重启你的播放器。&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="102"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation>&lt;li&gt;移除所有先前插入的microSD卡&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="103"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;断开你的播放器。播放器将重启并进行一次原始固件的升级。参阅厂商的说明书以获得更多信息。&lt;br/&gt;&lt;b&gt;重要：&lt;/b&gt; 升级过程绝对不可以被中断，&lt;b&gt;进行固件升级之前必须确认播放器已充电。&lt;/b&gt;&lt;/li&gt;&lt;li&gt;固件升级后，重启你的播放器。&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="114"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation>&lt;li&gt;关闭播放器&lt;/li&gt;&lt;li&gt;插入充电器&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation>&lt;li&gt;移除USB和电源适配器。&lt;/li&gt;&lt;li&gt;按住 &lt;i&gt;电源键&lt;/i&gt; 以关闭播放器&lt;/li&gt;&lt;li&gt;在播放器上切换电池开关&lt;/li&gt;&lt;li&gt;按住&lt;i&gt;电源键&lt;/i&gt; 来启动Rockbox。&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;注意：&lt;/b&gt;你可以先安全地安装其他部分，但是要完成安装，以上的部分是必需的！&lt;/p&gt;</translation>
     </message>
@@ -2001,7 +2252,7 @@ This string is used to indicate the writing direction. Translate it to &quot;RTL
 <context>
     <name>QuaZipFile</name>
     <message>
-        <location filename="../quazip/quazipfile.cpp" line="141"/>
+        <location filename="../quazip/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation>ZIP/UNZIP API 出错 %1</translation>
     </message>
@@ -2009,215 +2260,253 @@ This string is used to indicate the writing direction. Translate it to &quot;RTL
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="224"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation>正在下载构建信息，请稍后…</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="235"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation>无法取得版本信息！</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="249"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation>下载构建信息完成。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="450"/>
         <source>Confirm Installation</source>
-        <translation>确认安装</translation>
+        <translation type="vanished">确认安装</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="582"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>挂载点错误!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="430"/>
         <source>No Rockbox installation found</source>
-        <translation>未找到Rockbox安装</translation>
+        <translation type="vanished">未找到Rockbox安装</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="431"/>
         <source>Could not determine the installed Rockbox version. Please install a Rockbox build before installing voice files.</source>
-        <translation>无法确认已安装的Rockbox版本。请在构建语音文件之前安装一个Rockbox构建。</translation>
+        <translation type="vanished">无法确认已安装的Rockbox版本。请在构建语音文件之前安装一个Rockbox构建。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="451"/>
         <source>Do you really want to install the voice file?</source>
-        <translation>你确认要安装语音文件吗?</translation>
+        <translation type="vanished">你确认要安装语音文件吗?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="439"/>
         <source>No voice file available</source>
-        <translation>无语音文件可用</translation>
+        <translation type="vanished">无语音文件可用</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="440"/>
         <source>The installed version of Rockbox is a development version. Pre-built voices are only available for release versions of Rockbox. Please generate a voice yourself using the &quot;Create voice file&quot; functionality.</source>
-        <translation>已安装的Rockbox是开发版。预构建的语音文件仅对稳定版可用。请使用&quot;创建语音文件&quot;功能自行生成语音文件。</translation>
+        <translation type="vanished">已安装的Rockbox是开发版。预构建的语音文件仅对稳定版可用。请使用&quot;创建语音文件&quot;功能自行生成语音文件。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="512"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>确认安装</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="513"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>你确认要卸载启动程序吗?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="528"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation>对于此目标无已知卸载方法。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="542"/>
         <source>Rockbox Utility can not uninstall the bootloader on this target. Try a normal firmware update to remove the booloader.</source>
-        <translation>Rockbox实用程序无法在此目标上卸载bootloader。请尝试进行普通固件升级来移除bootloader。</translation>
+        <translation type="vanished">Rockbox实用程序无法在此目标上卸载bootloader。请尝试进行普通固件升级来移除bootloader。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="550"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation>未找到Rockbox bootloader。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="568"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>确认安装</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="569"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>你确认要安装Rockbox安装程序到你的播放器上吗? 安装后你可以从你播放器硬盘上运行此程序.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="578"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>安装 Rockbox安装程序</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="596"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
-        <translation>安装 Rockbox安装程序错误!</translation>
+        <translation>安装 Rockbox安装程序错误</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="600"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>安装用户设置</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="604"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>安装用户设置错误</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="608"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>成功安装 Rockbox安装程序.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="664"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation>检查更新…</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="729"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
+        <source>Rockbox Utility Update available</source>
+        <translation>Rockbox Utility有更新可用</translation>
+    </message>
+    <message>
+        <location filename="../rbutilqt.cpp" line="711"/>
+        <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
+        <translation>&lt;b&gt;Rockbox Utility有新版本可用。&lt;/b&gt;&lt;br&gt;&lt;br&gt;您正在使用版本%1。 获取版本%2 在 &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>RockboxUtility Update available</source>
-        <translation>RockboxUtility更新可用</translation>
+        <translation type="vanished">RockboxUtility更新可用</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="730"/>
         <source>&lt;b&gt;New RockboxUtility Version available.&lt;/b&gt; &lt;br&gt;&lt;br&gt;Download it from here: &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</source>
-        <translation>&lt;b&gt;RockboxUtility新版本可用。&lt;/b&gt; &lt;br&gt;&lt;br&gt;请从此处下载：&lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</translation>
+        <translation type="vanished">&lt;b&gt;RockboxUtility新版本可用。&lt;/b&gt; &lt;br&gt;&lt;br&gt;请从此处下载：&lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="733"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation>Rockbox Utility的新版本可用。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="736"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation>Rockbox Utility已更新。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="759"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation>设备已弹出</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="760"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation>设备已成功弹出。你现在可以从PC上断开播放器了。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="764"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation>弹出失败</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="765"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation>弹出设备失败。请确认没有程序正在设备上存取文件。如果弹出仍然失败，请用你电脑上的弹出功能。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="337"/>
-        <location filename="../rbutilqt.cpp" line="642"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation>配置错误</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="643"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
+        <source>Libraries used</source>
+        <translation>使用的库</translation>
+    </message>
+    <message>
+        <location filename="../rbutilqt.cpp" line="520"/>
+        <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
+        <translation>Rockbox Utility 无法卸载你播放器上的引导程序。请使用你的播放器厂商的固件更新流程来执行固件更新。</translation>
+    </message>
+    <message>
+        <location filename="../rbutilqt.cpp" line="523"/>
+        <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
+        <translation>重要提示：在使用厂商的固件更新流程之前，确保先将播放器启动到原始固件。</translation>
+    </message>
+    <message>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>你的配置无效。请去配置对话框并确保选定的值是正确的。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="330"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>这是Rockbox Utility的新安装或者一个新版本。配置对话框现在将打开以允许你设置此程序，或回顾你的设置。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="110"/>
+        <location filename="../rbutilqt.cpp" line="104"/>
         <source>Wine detected!</source>
         <translation>检测到Wine！</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="111"/>
+        <location filename="../rbutilqt.cpp" line="105"/>
         <source>It seems you are trying to run this program under Wine. Please don&apos;t do this, running under Wine will fail. Use the native Linux binary instead.</source>
         <translation>看起来你正在用Wine运行此程序。请勿这样做，否则将会导致错误。请使用Linux构建版本。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="237"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
+        <source>Certificate error</source>
+        <translation>证书错误</translation>
+    </message>
+    <message>
+        <location filename="../rbutilqt.cpp" line="230"/>
+        <source>%1
+
+Issuer: %2
+Subject: %3
+Valid since: %4
+Valid until: %5
+
+Temporarily trust certificate?</source>
+        <translation>%1
+
+发行者: %2
+主题: %3
+有效期自: %4
+有效期至: %5
+
+暂时信任此证书？</translation>
+    </message>
+    <message>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation>无法取得版本信息。
 网络错误： %1。请检查你的网络和代理设置。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="416"/>
         <source>Warning</source>
-        <translation>警告</translation>
+        <translation type="vanished">警告</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="417"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
-        <translation>应用程序仍在下载新构建的信息。请稍后再试。</translation>
+        <translation type="vanished">应用程序仍在下载新构建的信息。请稍后再试。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="329"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation>新安装</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="338"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>你的配置无效。这很可能是设备路径的改变导致的。配置对话框现在将打开以允许你修正此错误。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="236"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation>网络错误</translation>
     </message>
@@ -2230,310 +2519,315 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation>Rockbox 安装程序</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="31"/>
+        <location filename="../rbutilqtfrm.ui" line="59"/>
         <source>Device</source>
         <translation>播放器</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="92"/>
+        <location filename="../rbutilqtfrm.ui" line="120"/>
         <source>&amp;Change</source>
-        <translation>&amp;更改</translation>
+        <translation>更改(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="163"/>
+        <location filename="../rbutilqtfrm.ui" line="166"/>
         <source>Welcome</source>
         <translation>欢迎</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="160"/>
-        <location filename="../rbutilqtfrm.ui" line="658"/>
+        <location filename="../rbutilqtfrm.ui" line="163"/>
+        <location filename="../rbutilqtfrm.ui" line="620"/>
         <source>&amp;Installation</source>
-        <translation>&amp;安装</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="168"/>
-        <location filename="../rbutilqtfrm.ui" line="450"/>
-        <source>&amp;Accessibility</source>
-        <translation>&amp;辅助</translation>
+        <translation>安装(&amp;I)</translation>
     </message>
     <message>
         <location filename="../rbutilqtfrm.ui" line="171"/>
+        <location filename="../rbutilqtfrm.ui" line="413"/>
+        <source>&amp;Accessibility</source>
+        <translation>无障碍(&amp;A)</translation>
+    </message>
+    <message>
+        <location filename="../rbutilqtfrm.ui" line="174"/>
         <source>Install accessibility add-ons</source>
         <translation>安装辅助功能</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="177"/>
         <source>Install Voice files</source>
-        <translation>安装语音文件</translation>
+        <translation type="vanished">安装语音文件</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="204"/>
+        <location filename="../rbutilqtfrm.ui" line="180"/>
         <source>Install Talk files</source>
         <translation>安装说话文件</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="458"/>
+        <location filename="../rbutilqtfrm.ui" line="420"/>
         <source>&amp;Uninstallation</source>
-        <translation>&amp;卸载</translation>
+        <translation>卸载(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="286"/>
-        <location filename="../rbutilqtfrm.ui" line="319"/>
+        <location filename="../rbutilqtfrm.ui" line="262"/>
+        <location filename="../rbutilqtfrm.ui" line="295"/>
         <source>Uninstall Rockbox</source>
         <translation>卸载 Rockbox</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="121"/>
+        <location filename="../rbutilqtfrm.ui" line="149"/>
         <source>mountpoint unknown or invalid</source>
         <translation>挂载点未知或无效</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="114"/>
+        <location filename="../rbutilqtfrm.ui" line="142"/>
         <source>Mountpoint:</source>
         <translation>挂载点：</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="72"/>
+        <location filename="../rbutilqtfrm.ui" line="100"/>
         <source>device unknown or invalid</source>
         <translation>设备未知或无效</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="65"/>
+        <location filename="../rbutilqtfrm.ui" line="93"/>
         <source>Device:</source>
         <translation>设备：</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="292"/>
+        <location filename="../rbutilqtfrm.ui" line="268"/>
         <source>Uninstall Bootloader</source>
         <translation>卸载启动程序</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="393"/>
         <source>&amp;Manual</source>
-        <translation>&amp;用户手册</translation>
+        <translation type="vanished">用户指南(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="396"/>
         <source>View and download the manual</source>
-        <translation>查看和下载用户手册</translation>
+        <translation type="vanished">查看和下载用户手册</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="401"/>
+        <location filename="../rbutilqtfrm.ui" line="369"/>
         <source>Inf&amp;o</source>
-        <translation>&amp;信息</translation>
+        <translation>信息(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="419"/>
+        <location filename="../rbutilqtfrm.ui" line="387"/>
         <source>&amp;File</source>
-        <translation>&amp;文件</translation>
+        <translation>文件(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="432"/>
         <source>&amp;Troubleshoot</source>
-        <translation>疑难解答</translation>
+        <translation type="vanished">疑难解答(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="497"/>
+        <location filename="../rbutilqtfrm.ui" line="459"/>
         <source>&amp;About</source>
-        <translation>&amp;关于</translation>
+        <translation>关于(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="653"/>
+        <location filename="../rbutilqtfrm.ui" line="615"/>
         <source>System &amp;Trace</source>
-        <translation>跟踪</translation>
+        <translation>系统跟踪(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="474"/>
+        <location filename="../rbutilqtfrm.ui" line="436"/>
         <source>Empty local download cache</source>
         <translation>清除本机下载缓存</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="479"/>
+        <location filename="../rbutilqtfrm.ui" line="441"/>
         <source>Install Rockbox Utility on player</source>
         <translation>在播放器上安装Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="484"/>
+        <location filename="../rbutilqtfrm.ui" line="446"/>
         <source>&amp;Configure</source>
-        <translation>&amp;配置</translation>
+        <translation>配置(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="489"/>
+        <location filename="../rbutilqtfrm.ui" line="451"/>
         <source>E&amp;xit</source>
-        <translation>&amp;退出</translation>
+        <translation>退出(&amp;X)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="492"/>
+        <location filename="../rbutilqtfrm.ui" line="454"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="502"/>
+        <location filename="../rbutilqtfrm.ui" line="464"/>
         <source>About &amp;Qt</source>
         <translation>关于&amp;Qt</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="428"/>
-        <location filename="../rbutilqtfrm.ui" line="507"/>
+        <location filename="../rbutilqtfrm.ui" line="396"/>
+        <location filename="../rbutilqtfrm.ui" line="469"/>
         <source>&amp;Help</source>
-        <translation>&amp;帮助</translation>
+        <translation>帮助(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="446"/>
+        <location filename="../rbutilqtfrm.ui" line="43"/>
+        <source>Welcome to Rockbox Utility, the installation and housekeeping tool for Rockbox.</source>
+        <translation>欢迎使用 Rockbox Utility，这是 Rockbox 的安装和管理工具。</translation>
+    </message>
+    <message>
+        <location filename="../rbutilqtfrm.ui" line="46"/>
+        <source>Rockbox Logo</source>
+        <translation>Rockbox 图标</translation>
+    </message>
+    <message>
+        <location filename="../rbutilqtfrm.ui" line="409"/>
         <source>Action&amp;s</source>
-        <translation>动作</translation>
+        <translation>操作(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="512"/>
+        <location filename="../rbutilqtfrm.ui" line="474"/>
         <source>Info</source>
         <translation>信息</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="616"/>
+        <location filename="../rbutilqtfrm.ui" line="578"/>
         <source>Read PDF manual</source>
         <translation>阅读PDF手册</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="621"/>
+        <location filename="../rbutilqtfrm.ui" line="583"/>
         <source>Read HTML manual</source>
         <translation>阅读HTML手册</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="626"/>
+        <location filename="../rbutilqtfrm.ui" line="588"/>
         <source>Download PDF manual</source>
         <translation>下载PDF手册</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="631"/>
+        <location filename="../rbutilqtfrm.ui" line="593"/>
         <source>Download HTML manual (zip)</source>
         <translation>下载HTML手册（ZIP）</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="254"/>
+        <location filename="../rbutilqtfrm.ui" line="230"/>
         <source>Create Voice files</source>
         <translation>创建语音文件</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="643"/>
+        <location filename="../rbutilqtfrm.ui" line="605"/>
         <source>Create Voice File</source>
         <translation>创建语音文件</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="194"/>
         <source>&lt;b&gt;Install Voice file&lt;/b&gt;&lt;br/&gt;Voice files are needed to make Rockbox speak the user interface. Speaking is enabled by default, so if you installed the voice file Rockbox will speak.</source>
-        <translation>&lt;b&gt;安装语音文件&lt;/b&gt;&lt;br/&gt;Rockbox需要语音文件来读出用户界面。语音默认开启，所以一旦你安装了语音文件Rockbox就会说话。</translation>
+        <translation type="vanished">&lt;b&gt;安装语音文件&lt;/b&gt;&lt;br/&gt;Rockbox需要语音文件来读出用户界面。语音默认开启，所以一旦你安装了语音文件Rockbox就会说话。</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="103"/>
+        <location filename="../rbutilqtfrm.ui" line="131"/>
         <source>&amp;Eject</source>
         <translation>弹出(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="221"/>
+        <location filename="../rbutilqtfrm.ui" line="197"/>
         <source>&lt;b&gt;Create Talk Files&lt;/b&gt;&lt;br/&gt;Talkfiles are needed to let Rockbox speak File and Foldernames</source>
         <translation>&lt;b&gt;创建说话文件&lt;/b&gt;&lt;br/&gt;Rockbox需要说话文件来读出文件和文件夹名称</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="271"/>
+        <location filename="../rbutilqtfrm.ui" line="247"/>
         <source>&lt;b&gt;Create Voice file&lt;/b&gt;&lt;br/&gt;Voice files are needed to make Rockbox speak the  user interface. Speaking is enabled by default, so
  if you installed the voice file Rockbox will speak.</source>
         <translation>&lt;b&gt;创建语音文件&lt;/b&gt;&lt;br/&gt;Rockbox需要语音文件才能读出用户界面。语音功能默认开启，所以
 一旦你安装了语音文件Rockbox就会说话。</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="283"/>
+        <location filename="../rbutilqtfrm.ui" line="259"/>
         <source>Backup &amp;&amp; &amp;Uninstallation</source>
-        <translation>备份 &amp;&amp; &amp;卸载</translation>
+        <translation>备份 &amp;&amp; 卸载(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="309"/>
+        <location filename="../rbutilqtfrm.ui" line="285"/>
         <source>&lt;b&gt;Remove the bootloader&lt;/b&gt;&lt;br/&gt;After removing the bootloader you won&apos;t be able to start Rockbox.</source>
         <translation>&lt;b&gt;移除bootloader&lt;/b&gt;&lt;br/&gt;移除bootloader之后你将再也无法启动Rockbox。</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="336"/>
+        <location filename="../rbutilqtfrm.ui" line="312"/>
         <source>&lt;b&gt;Uninstall Rockbox from your audio player.&lt;/b&gt;&lt;br/&gt;This will leave the bootloader in place (you need to remove it manually).</source>
         <translation>&lt;b&gt;从你的音频播放器上卸载Rockbox。&lt;/b&gt;&lt;br/&gt;这将会保留bootloader (需要手动卸载)。</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="349"/>
+        <location filename="../rbutilqtfrm.ui" line="325"/>
         <source>Backup</source>
         <translation>备份</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="366"/>
+        <location filename="../rbutilqtfrm.ui" line="342"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Backup current installation.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Create a backup by archiving the contents of the Rockbox installation folder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;备份当前安装。&lt;/span&gt;&lt;/p&gt;&lt;p&gt;通过压缩Rockbox安装目录中的内容来备份。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="539"/>
+        <location filename="../rbutilqtfrm.ui" line="501"/>
         <source>Install &amp;Bootloader</source>
-        <translation>安装&amp;Bootloader</translation>
+        <translation>安装Bootloader(&amp;B)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="548"/>
+        <location filename="../rbutilqtfrm.ui" line="510"/>
         <source>Install &amp;Rockbox</source>
-        <translation>安装&amp;Rockbox</translation>
+        <translation>安装Rockbox(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="557"/>
+        <location filename="../rbutilqtfrm.ui" line="519"/>
         <source>Install &amp;Fonts Package</source>
-        <translation>安装&amp;字体包</translation>
+        <translation>安装字体包(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="566"/>
+        <location filename="../rbutilqtfrm.ui" line="528"/>
         <source>Install &amp;Themes</source>
-        <translation>安装&amp;主题</translation>
+        <translation>安装主题(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="575"/>
+        <location filename="../rbutilqtfrm.ui" line="537"/>
         <source>Install &amp;Game Files</source>
-        <translation>安装&amp;游戏文件</translation>
+        <translation>安装游戏文件(&amp;G)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="584"/>
+        <location filename="../rbutilqtfrm.ui" line="546"/>
         <source>&amp;Install Voice File</source>
-        <translation>&amp;安装语音文件</translation>
+        <translation>安装语音文件(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="593"/>
+        <location filename="../rbutilqtfrm.ui" line="555"/>
         <source>Create &amp;Talk Files</source>
-        <translation>创建&amp;说话文件</translation>
+        <translation>创建说话文件(&amp;T)</translation>
+    </message>
+    <message>
+        <location filename="../rbutilqtfrm.ui" line="564"/>
+        <source>Remove &amp;bootloader</source>
+        <translation>移除Bootloader(&amp;B)</translation>
+    </message>
+    <message>
+        <location filename="../rbutilqtfrm.ui" line="573"/>
+        <source>Uninstall &amp;Rockbox</source>
+        <translation>卸载Rockbox(&amp;R)</translation>
     </message>
     <message>
         <location filename="../rbutilqtfrm.ui" line="602"/>
-        <source>Remove &amp;bootloader</source>
-        <translation>移除&amp;bootloader</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="611"/>
-        <source>Uninstall &amp;Rockbox</source>
-        <translation>卸载&amp;Rockbox</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="640"/>
         <source>Create &amp;Voice File</source>
-        <translation>创建&amp;语音文件</translation>
+        <translation>创建语音文件(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="648"/>
+        <location filename="../rbutilqtfrm.ui" line="610"/>
         <source>&amp;System Info</source>
-        <translation>&amp;系统信息</translation>
+        <translation>系统信息(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="663"/>
+        <location filename="../rbutilqtfrm.ui" line="625"/>
         <source>Show &amp;Changelog</source>
-        <translation>显示&amp;变更日志</translation>
+        <translation>显示变更日志(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="521"/>
+        <location filename="../rbutilqtfrm.ui" line="483"/>
         <source>&amp;Complete Installation</source>
-        <translation>&amp;完成安装</translation>
+        <translation>完成安装(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="530"/>
+        <location filename="../rbutilqtfrm.ui" line="492"/>
         <source>&amp;Minimal Installation</source>
-        <translation>&amp;最小安装</translation>
+        <translation>最小安装(&amp;M)</translation>
     </message>
 </context>
 <context>
@@ -2561,239 +2855,287 @@ Network error: %1. Please check your network and proxy settings.</source>
     <message>
         <location filename="../gui/selectiveinstallwidgetfrm.ui" line="60"/>
         <source>&amp;Bootloader</source>
-        <translation>&amp;Bootloader</translation>
+        <translation>引导程序(&amp;B)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="80"/>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="151"/>
+        <source>Some plugins require additional data files.</source>
+        <translation>有些插件需要额外的数据文件。</translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="188"/>
+        <source>Install prerendered voice file.</source>
+        <translation>安装预渲染语音文件。</translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="195"/>
+        <source>Plugin Data</source>
+        <translation>插件数据</translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="222"/>
+        <source>&amp;Manual</source>
+        <translation>用户指南(&amp;M)</translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="233"/>
+        <source>&amp;Voice File</source>
+        <translation>语音文件(&amp;V)</translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="253"/>
         <source>The main Rockbox firmware.</source>
         <translation>主要的Rockbox固件。</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="90"/>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="115"/>
         <source>Fonts</source>
         <translation>字体</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="104"/>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="74"/>
         <source>&amp;Rockbox</source>
-        <translation>&amp;Rockbox</translation>
+        <translation>Rockbox(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="124"/>
         <source>Some game plugins require additional files.</source>
-        <translation>一些游戏插件需要额外文件。</translation>
+        <translation type="vanished">一些游戏插件需要额外文件。</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="140"/>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="178"/>
         <source>Additional fonts for the User Interface.</source>
         <translation>用户界面的额外字体。</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="156"/>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="135"/>
         <source>The bootloader is required for starting Rockbox. Only necessary for first time install.</source>
         <translation>Bootloader是启动Rockbox所必需的。仅第一次安装需要。</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="166"/>
         <source>Game Files</source>
-        <translation>游戏文件</translation>
+        <translation type="vanished">游戏文件</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="177"/>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="161"/>
         <source>Customize</source>
         <translation>定制</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="188"/>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="104"/>
         <source>Themes</source>
         <translation>主题</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="205"/>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="94"/>
         <source>Themes allow adjusting the user interface of Rockbox. Use &quot;Customize&quot; to select themes.</source>
         <translation>主题允许更改Rockbox的用户界面。使用定制选项来选择主题。</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="250"/>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="263"/>
+        <source>Save a copy of the manual on the player.</source>
+        <translation>在播放器上保存一份手册的副本。</translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidgetfrm.ui" line="292"/>
         <source>&amp;Install</source>
         <translation>&amp;安装</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="67"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="78"/>
         <source>This is the latest stable release available.</source>
         <translation>这是可用的最新稳定发行版。</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="70"/>
         <source>The development version is updated on every code change. Last update was on %1</source>
-        <translation>开发版在每次代码变更时构建。最后一次更新于%1</translation>
+        <translation type="vanished">开发版在每次代码变更时构建。最后一次更新于%1</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="74"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="88"/>
         <source>This will eventually become the next Rockbox version. Install it to help testing.</source>
         <translation>这最终将成为下一个 Rockbox 版本。安装它以帮助测试。</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="100"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation>稳定发行版(版本 %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="104"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation>开发板(修订 %1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="108"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation>候选版本(修订版%1)</translation>
     </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="83"/>
+        <source>The development version is updated on every code change.</source>
+        <translation>开发版本在每次代码变更时更新。</translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="93"/>
+        <source>Daily updated development version.</source>
+        <translation>每日更新的开发版本。</translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="100"/>
+        <source>Not available for the selected version</source>
+        <translation>对于选定的版本不可用</translation>
+    </message>
     <message>
         <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <source>Daily Build (%1)</source>
+        <translation>每日构建 (%1)</translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation>选定的播放器不需要bootloader。</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="136"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation>Bootloader是启动Rockbox所必需的。仅在第一次安装时才需要安装bootloader。</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="183"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation>挂载点错误</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="239"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation>无已知安装方法。</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="266"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="319"/>
         <source>Bootloader detected</source>
         <translation>检测到bootloader</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="267"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="320"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation>Bootloader已安装。你想要重新安装他吗？</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="271"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="324"/>
         <source>Bootloader installation skipped</source>
         <translation>已跳过Bootloader安装</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="284"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="338"/>
         <source>Create Bootloader backup</source>
         <translation>创建Bootloader备份</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="285"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="339"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation>你可以创建一个原始bootloader的备份。按 &quot;是&quot; 来选定一个保存此文件的目录。文件将会被放入新文件夹&quot;%1&quot;中。
 按 &quot;否&quot; 来跳过这一步。</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="292"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="346"/>
         <source>Browse backup folder</source>
         <translation>浏览备份文件夹</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="304"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="358"/>
         <source>Prerequisites</source>
         <translation>前提条件</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="309"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="363"/>
         <source>Bootloader installation aborted</source>
         <translation>Bootloader安装中断</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="319"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="373"/>
         <source>Bootloader files (%1)</source>
         <translation>Bootloader 文件 (%1)</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="321"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="375"/>
         <source>All files (*)</source>
         <translation>所有文件（*）</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="323"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="377"/>
         <source>Select firmware file</source>
         <translation>选择固件文件</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="325"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="379"/>
         <source>Error opening firmware file</source>
         <translation>打开固件文件时出错</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="331"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="385"/>
         <source>Error reading firmware file</source>
         <translation>读取固件文件时出错</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="341"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="395"/>
         <source>Backup error</source>
         <translation>备份出错</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="342"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="396"/>
         <source>Could not create backup file. Continue?</source>
         <translation>无法创建备份文件。要继续吗？</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="366"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation>需要手动步骤</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="171"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
+        <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
+        <translation>你的安装不需要任何插件数据文件，已跳过。</translation>
+    </message>
+    <message>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation>继续安装？</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="172"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation>真的继续？</translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="490"/>
         <source>Your installation doesn&apos;t require game files, skipping.</source>
-        <translation>你的安装不需要游戏文件，已跳过。</translation>
+        <translation type="vanished">你的安装不需要游戏文件，已跳过。</translation>
     </message>
 </context>
 <context>
     <name>ServerInfo</name>
     <message>
-        <location filename="../base/serverinfo.cpp" line="117"/>
         <source>Unknown</source>
-        <translation>未知</translation>
+        <translation type="vanished">未知</translation>
     </message>
     <message>
-        <location filename="../base/serverinfo.cpp" line="121"/>
         <source>Unusable</source>
-        <translation>不可用</translation>
+        <translation type="vanished">不可用</translation>
     </message>
     <message>
-        <location filename="../base/serverinfo.cpp" line="124"/>
         <source>Unstable</source>
-        <translation>不稳定</translation>
+        <translation type="vanished">不稳定</translation>
     </message>
     <message>
-        <location filename="../base/serverinfo.cpp" line="127"/>
         <source>Stable</source>
-        <translation>稳定</translation>
+        <translation type="vanished">稳定</translation>
     </message>
 </context>
 <context>
     <name>SysTrace</name>
     <message>
-        <location filename="../systrace.cpp" line="98"/>
-        <location filename="../systrace.cpp" line="107"/>
+        <location filename="../systrace.cpp" line="100"/>
+        <location filename="../systrace.cpp" line="109"/>
         <source>Save system trace log</source>
         <translation>保存系统追踪日志</translation>
     </message>
@@ -2834,62 +3176,66 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>Sysinfo</name>
     <message>
-        <location filename="../sysinfo.cpp" line="45"/>
+        <location filename="../sysinfo.cpp" line="46"/>
         <source>&lt;b&gt;OS&lt;/b&gt;&lt;br/&gt;</source>
         <translation>&lt;b&gt;操作系统&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="46"/>
+        <location filename="../sysinfo.cpp" line="47"/>
         <source>&lt;b&gt;Username&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;用户名&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="48"/>
+        <location filename="../sysinfo.cpp" line="49"/>
         <source>&lt;b&gt;Permissions&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;许可&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="50"/>
+        <location filename="../sysinfo.cpp" line="51"/>
         <source>&lt;b&gt;Attached USB devices&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;b&gt;连接的USB设备&lt;/b&gt;&lt;br/&gt;</translation>
+        <translation>&lt;b&gt;已连接的USB设备&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="54"/>
+        <location filename="../sysinfo.cpp" line="55"/>
         <source>VID: %1 PID: %2, %3</source>
         <translation>VID: %1 PID: %2, %3</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="63"/>
+        <location filename="../sysinfo.cpp" line="64"/>
         <source>Filesystem</source>
         <translation>文件系统</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="66"/>
+        <location filename="../sysinfo.cpp" line="67"/>
         <source>Mountpoint</source>
         <translation>挂载点</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="66"/>
+        <location filename="../sysinfo.cpp" line="67"/>
         <source>Label</source>
         <translation>标签</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="67"/>
+        <location filename="../sysinfo.cpp" line="68"/>
         <source>Free</source>
         <translation>剩余空间</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="67"/>
+        <location filename="../sysinfo.cpp" line="68"/>
         <source>Total</source>
         <translation>总空间</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="68"/>
-        <source>Cluster Size</source>
-        <translation>集群大小</translation>
+        <location filename="../sysinfo.cpp" line="69"/>
+        <source>Type</source>
+        <translation>类型</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="70"/>
+        <source>Cluster Size</source>
+        <translation type="vanished">集群大小</translation>
+    </message>
+    <message>
+        <location filename="../sysinfo.cpp" line="71"/>
         <source>&lt;tr&gt;&lt;td&gt;%1&lt;/td&gt;&lt;td&gt;%4&lt;/td&gt;&lt;td&gt;%2 GiB&lt;/td&gt;&lt;td&gt;%3 GiB&lt;/td&gt;&lt;td&gt;%5&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;%1&lt;/td&gt;&lt;td&gt;%4&lt;/td&gt;&lt;td&gt;%2 GiB&lt;/td&gt;&lt;td&gt;%3 GiB&lt;/td&gt;&lt;td&gt;%5&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
@@ -2907,7 +3253,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>&amp;刷新</translation>
     </message>
     <message>
-        <location filename="../sysinfofrm.ui" line="45"/>
+        <location filename="../sysinfofrm.ui" line="46"/>
         <source>&amp;OK</source>
         <translation>&amp;确定</translation>
     </message>
@@ -2915,28 +3261,27 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>System</name>
     <message>
-        <location filename="../base/system.cpp" line="121"/>
+        <location filename="../base/system.cpp" line="117"/>
         <source>Guest</source>
         <translation>游客</translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="124"/>
+        <location filename="../base/system.cpp" line="120"/>
         <source>Admin</source>
         <translation>管理员</translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="127"/>
+        <location filename="../base/system.cpp" line="123"/>
         <source>User</source>
         <translation>用户</translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="130"/>
+        <location filename="../base/system.cpp" line="126"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="278"/>
-        <location filename="../base/system.cpp" line="323"/>
+        <location filename="../base/system.cpp" line="273"/>
         <source>(no description available)</source>
         <translation>（无可用描述）</translation>
     </message>
@@ -2944,42 +3289,52 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TTSBase</name>
     <message>
-        <location filename="../base/ttsbase.cpp" line="45"/>
+        <location filename="../base/ttsbase.cpp" line="47"/>
         <source>Espeak TTS Engine</source>
         <translation>Espaek TTS引擎</translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="47"/>
+        <location filename="../base/ttsbase.cpp" line="48"/>
+        <source>Espeak-ng TTS Engine</source>
+        <translation>Espeak-ng TTS 引擎</translation>
+    </message>
+    <message>
+        <location filename="../base/ttsbase.cpp" line="49"/>
+        <source>Mimic TTS Engine</source>
+        <translation>Mimic TTS 引擎</translation>
+    </message>
+    <message>
+        <location filename="../base/ttsbase.cpp" line="51"/>
         <source>Flite TTS Engine</source>
         <translation>Flite TTS引擎</translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="48"/>
+        <location filename="../base/ttsbase.cpp" line="52"/>
         <source>Swift TTS Engine</source>
         <translation>Swift TTS引擎</translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="51"/>
+        <location filename="../base/ttsbase.cpp" line="55"/>
         <source>SAPI4 TTS Engine</source>
         <translation>SAPI4 TTS引擎</translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="53"/>
+        <location filename="../base/ttsbase.cpp" line="57"/>
         <source>SAPI5 TTS Engine</source>
         <translation>SAPI5 TTS引擎</translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="54"/>
+        <location filename="../base/ttsbase.cpp" line="58"/>
         <source>MS Speech Platform</source>
         <translation>MS Speech平台</translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="57"/>
+        <location filename="../base/ttsbase.cpp" line="61"/>
         <source>Festival TTS Engine</source>
         <translation>Festival TTS引擎</translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="60"/>
+        <location filename="../base/ttsbase.cpp" line="64"/>
         <source>OS X System Engine</source>
         <translation>OSX系统引擎</translation>
     </message>
@@ -3053,40 +3408,45 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>语音：</translation>
     </message>
     <message>
-        <location filename="../base/ttsfestival.cpp" line="67"/>
+        <location filename="../base/ttsfestival.cpp" line="69"/>
         <source>Voice description:</source>
         <translation>语音描述：</translation>
     </message>
+    <message>
+        <location filename="../base/ttsfestival.cpp" line="173"/>
+        <source>Festival could not be started</source>
+        <translation>Festival无法启动</translation>
+    </message>
 </context>
 <context>
     <name>TTSSapi</name>
     <message>
-        <location filename="../base/ttssapi.cpp" line="49"/>
+        <location filename="../base/ttssapi.cpp" line="46"/>
         <source>Language:</source>
         <translation>语言：</translation>
     </message>
     <message>
-        <location filename="../base/ttssapi.cpp" line="56"/>
+        <location filename="../base/ttssapi.cpp" line="53"/>
         <source>Voice:</source>
         <translation>语音：</translation>
     </message>
     <message>
-        <location filename="../base/ttssapi.cpp" line="68"/>
+        <location filename="../base/ttssapi.cpp" line="65"/>
         <source>Speed:</source>
         <translation>语速：</translation>
     </message>
     <message>
-        <location filename="../base/ttssapi.cpp" line="71"/>
+        <location filename="../base/ttssapi.cpp" line="68"/>
         <source>Options:</source>
         <translation>选项：</translation>
     </message>
     <message>
-        <location filename="../base/ttssapi.cpp" line="115"/>
+        <location filename="../base/ttssapi.cpp" line="112"/>
         <source>Could not copy the SAPI script</source>
         <translation>无法复制SAPI脚本</translation>
     </message>
     <message>
-        <location filename="../base/ttssapi.cpp" line="133"/>
+        <location filename="../base/ttssapi.cpp" line="130"/>
         <source>Could not start SAPI process</source>
         <translation>无法启动SAPI进程</translation>
     </message>
@@ -3094,22 +3454,22 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../base/talkfile.cpp" line="68"/>
+        <location filename="../base/talkfile.cpp" line="66"/>
         <source>Copying Talkfiles...</source>
         <translation>复制说话文件…</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="240"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation>文件复制中断</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="280"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation>清理…</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="291"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation>完成</translation>
     </message>
@@ -3124,7 +3484,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>开始为文件夹%1生成说话文件</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="80"/>
+        <location filename="../base/talkfile.cpp" line="78"/>
         <source>Finished creating Talk files</source>
         <translation>创建说话文件完成</translation>
     </message>
@@ -3134,7 +3494,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>正在读取文件列表…</translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="259"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>%1 到 %2 复制失败</translation>
     </message>
@@ -3142,18 +3502,18 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>TalkGenerator</name>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="39"/>
+        <location filename="../base/talkgenerator.cpp" line="38"/>
         <source>Starting TTS Engine</source>
         <translation>开始TTS引擎</translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="44"/>
-        <location filename="../base/talkgenerator.cpp" line="51"/>
+        <location filename="../base/talkgenerator.cpp" line="43"/>
+        <location filename="../base/talkgenerator.cpp" line="50"/>
         <source>Init of TTS engine failed</source>
         <translation>TTS引擎初始化失败</translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="58"/>
+        <location filename="../base/talkgenerator.cpp" line="57"/>
         <source>Starting Encoder Engine</source>
         <translation>开始编码引擎</translation>
     </message>
@@ -3178,18 +3538,18 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>发音中止</translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="162"/>
-        <location filename="../base/talkgenerator.cpp" line="167"/>
+        <location filename="../base/talkgenerator.cpp" line="163"/>
+        <location filename="../base/talkgenerator.cpp" line="168"/>
         <source>Voicing of %1 failed: %2</source>
         <translation>%1发音出错：%2</translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="211"/>
+        <location filename="../base/talkgenerator.cpp" line="212"/>
         <source>Encoding aborted</source>
         <translation>编码中止</translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="239"/>
+        <location filename="../base/talkgenerator.cpp" line="240"/>
         <source>Encoding of %1 failed</source>
         <translation>%1编码失败</translation>
     </message>
@@ -3217,7 +3577,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>下载大小:</translation>
     </message>
     <message>
-        <location filename="../themesinstallfrm.ui" line="125"/>
+        <location filename="../themesinstallfrm.ui" line="126"/>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
@@ -3235,109 +3595,109 @@ Press &quot;No&quot; to skip this step.</source>
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="40"/>
+        <location filename="../themesinstallwindow.cpp" line="41"/>
         <source>no theme selected</source>
         <translation>未选择主题</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="125"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>网络错误： %1.
 请检查你的网络和代理设置.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="144"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>完成.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="211"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>正在抓取 %1 的详细信息</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>正在拿取预览...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="227"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;作者:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="228"/>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="229"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;版本:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;描述:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>无描述</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="260"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>无主题预览</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="289"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation>选择</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="296"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>正在拿取主题信息...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="326"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation>未选择主题，已跳过</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="356"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>挂载点错误!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="138"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation>发生下述错误：
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="41"/>
+        <location filename="../themesinstallwindow.cpp" line="42"/>
         <source>no selection</source>
         <translation>无选择</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="181"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation>信息</translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation>
             <numerusform>下载大小%L1 KB（%n 个项目）</numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="248"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>拿取主题预览失败。
@@ -3382,7 +3742,7 @@ HTTP返回代码：%1</translation>
         <translation>已安装的部分</translation>
     </message>
     <message>
-        <location filename="../uninstallfrm.ui" line="138"/>
+        <location filename="../uninstallfrm.ui" line="139"/>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
@@ -3411,12 +3771,12 @@ HTTP返回代码：%1</translation>
         <translation>正在卸载%1…</translation>
     </message>
     <message>
-        <location filename="../base/uninstall.cpp" line="80"/>
+        <location filename="../base/uninstall.cpp" line="81"/>
         <source>Could not delete %1</source>
         <translation>无法删除%1</translation>
     </message>
     <message>
-        <location filename="../base/uninstall.cpp" line="109"/>
+        <location filename="../base/uninstall.cpp" line="115"/>
         <source>Uninstallation finished</source>
         <translation>卸载完成</translation>
     </message>
@@ -3424,19 +3784,19 @@ HTTP返回代码：%1</translation>
 <context>
     <name>Utils</name>
     <message>
-        <location filename="../base/utils.cpp" line="312"/>
+        <location filename="../base/utils.cpp" line="375"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>&lt;li&gt;bootloader安装权限不够
 需要管理员权限。&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/utils.cpp" line="324"/>
+        <location filename="../base/utils.cpp" line="387"/>
         <source>&lt;li&gt;Target mismatch detected.&lt;br/&gt;Installed target: %1&lt;br/&gt;Selected target: %2.&lt;/li&gt;</source>
         <translation>&lt;li&gt;检测到目标不匹配。&lt;br/&gt;已安装目标： %1&lt;br/&gt;选定目标： %2。&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/utils.cpp" line="331"/>
+        <location filename="../base/utils.cpp" line="396"/>
         <source>Problem detected:</source>
         <translation>检测到问题：</translation>
     </message>
@@ -3449,87 +3809,102 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>开始语音文件生成</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
+        <translation>已从安装中提取了语音更正文件</translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation>使用内部语音校正文件</translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation>已从安装中提取语言枚举文件</translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
         <source>Extracted voice strings from installation</source>
         <translation>已从安装中提取语音字段</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="100"/>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation>提取的语音字符串不兼容</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation>无法从安装检索字符串，正在下载</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="171"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation>下载语音信息…</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="184"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
-        <translation>下载错误: 接到 HTTP 错误 %1. </translation>
+        <translation>下载错误: 接到 HTTP 错误 %1。</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="191"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation>已使用缓存文件。</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="194"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation>下载错误: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="199"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation>下载完成。</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="212"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation>无法打开下载的文件</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="218"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation>正在读出字段…</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="297"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation>正在创建语音文件…</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="342"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation>正在清理…</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="353"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation>已完成</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="271"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation>下载文件是空的！</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation>打开下载的文件时出错</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="313"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation>打开输出文件时出错</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="333"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation>成功创建。</translation>
     </message>
@@ -3552,57 +3927,67 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>已成功完成包安装。</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="80"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>正在下载文件 %1.%2</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
-        <translation>下载错误: 接到 HTTP 错误 %1. </translation>
+        <translation type="vanished">下载错误: 接到 HTTP 错误 %1。</translation>
+    </message>
+    <message>
+        <source>Cached file used.</source>
+        <translation type="vanished">已使用缓存文件。</translation>
+    </message>
+    <message>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
+        <source>Download error: received HTTP error %1
+%2</source>
+        <translation>下载错误：接到 HTTP 错误 %1
+%2</translation>
     </message>
     <message>
         <location filename="../base/zipinstaller.cpp" line="121"/>
-        <source>Cached file used.</source>
-        <translation>已使用缓存文件。</translation>
-    </message>
-    <message>
-        <location filename="../base/zipinstaller.cpp" line="123"/>
         <source>Download error: %1</source>
         <translation>下载错误: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="127"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
+        <source>Download finished (cache used).</source>
+        <translation>下载完成（已使用缓存）。</translation>
+    </message>
+    <message>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>完成下载.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="133"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>正在解压文件.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="153"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation>解压失败！</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="162"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>正在安装文件.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="173"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>安装文件失败.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="186"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>正在建立安装日志</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="146"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>没有足够的硬盘空间了！已中断。</translation>
     </message>
@@ -3630,14 +4015,15 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
     <message>
         <location filename="../aboutbox.ui" line="14"/>
         <source>About Rockbox Utility</source>
-        <translation>关于Rockbox安装程序</translation>
+        <translatorcomment>Rockbox Utility按照专有名词处理，按原样保留</translatorcomment>
+        <translation>关于Rockbox Utility</translation>
     </message>
     <message>
         <location filename="../aboutbox.ui" line="32"/>
         <source>The Rockbox Utility</source>
-        <translation>Rockbox安装程序</translation>
+        <translation>Rockbox Utility</translation>
     </message>
-    <message utf8="true">
+    <message>
         <location filename="../aboutbox.ui" line="54"/>
         <source>Installer and housekeeping utility for the Rockbox open source digital audio player firmware.&lt;br/&gt;© The Rockbox Team.&lt;br/&gt;Released under the GNU General Public License v2.&lt;br/&gt;Uses icons by the &lt;a href=&quot;http://tango.freedesktop.org/&quot;&gt;Tango Project&lt;/a&gt;.&lt;br/&gt;&lt;center&gt;&lt;a href=&quot;https://www.rockbox.org&quot;&gt;https://www.rockbox.org&lt;/a&gt;&lt;/center&gt;</source>
         <translation>Rockbox 开源数字音频播放器固件的安装程序和管理实用程序。&lt;br/&gt;© The Rockbox Team.&lt;br/&gt;在 GNU 通用公共许可证 v2 下发布。&lt;br/&gt;使用的图标来自 &lt;a href=&quot;http://tango.freedesktop.org/&quot;&gt;Tango Project&lt;/a&gt;.&lt;br/&gt;&lt;center&gt;&lt;a href=&quot;https://www.rockbox.org&quot;&gt;https://www.rockbox.org&lt;/a&gt;&lt;/center&gt;</translation>
@@ -3645,17 +4031,21 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
     <message>
         <location filename="../aboutbox.ui" line="74"/>
         <source>&amp;Credits</source>
-        <translation>&amp;特别鸣谢</translation>
+        <translation>特别鸣谢(&amp;C)</translation>
     </message>
     <message>
         <location filename="../aboutbox.ui" line="106"/>
         <source>&amp;License</source>
-        <translation>&amp;授权</translation>
+        <translation>授权(&amp;L)</translation>
     </message>
     <message>
         <location filename="../aboutbox.ui" line="132"/>
+        <source>L&amp;ibraries</source>
+        <translation>库(&amp;I)</translation>
+    </message>
+    <message>
         <source>&amp;Speex License</source>
-        <translation>&amp;Speex 许可证</translation>
+        <translation type="vanished">&amp;Speex 许可证</translation>
     </message>
     <message>
         <location filename="../aboutbox.ui" line="158"/>
diff --git a/utils/rbutilqt/lang/rbutil_zh_TW.ts b/utils/rbutilqt/lang/rbutil_zh_TW.ts
index de591b2b9c..b1b7265a6f 100644
--- a/utils/rbutilqt/lang/rbutil_zh_TW.ts
+++ b/utils/rbutilqt/lang/rbutil_zh_TW.ts
@@ -45,37 +45,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="88"/>
+        <location filename="../gui/backupdialog.cpp" line="96"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="108"/>
+        <location filename="../gui/backupdialog.cpp" line="116"/>
         <source>Installation size: %L1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="115"/>
+        <location filename="../gui/backupdialog.cpp" line="123"/>
         <source>File exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="116"/>
+        <location filename="../gui/backupdialog.cpp" line="124"/>
         <source>The selected backup file already exists. Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="124"/>
+        <location filename="../gui/backupdialog.cpp" line="132"/>
         <source>Starting backup ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="143"/>
+        <location filename="../gui/backupdialog.cpp" line="151"/>
         <source>Backup successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/backupdialog.cpp" line="146"/>
+        <location filename="../gui/backupdialog.cpp" line="154"/>
         <source>Backup failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -583,46 +583,46 @@
     <name>BootloaderInstallImx</name>
     <message>
         <location filename="../base/bootloaderinstallimx.cpp" line="72"/>
-        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and &lt;a href= &apos;https://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="95"/>
         <source>Could not read original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="101"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="111"/>
         <source>Patching file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="137"/>
         <source>Patching the original firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="143"/>
         <source>Succesfully patched firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="158"/>
         <source>Bootloader successful installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="164"/>
         <source>Patched bootloader could not be installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallimx.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallimx.cpp" line="175"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -791,77 +791,77 @@ See https://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallMpio</name>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;https://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;https://www.rockbox.org/wiki/MPIOHD200Port&apos;&gt;MPIOHD200Port&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="83"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="86"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
         <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
         <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="104"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
         <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
         <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
         <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
         <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
         <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
         <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="112"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="127"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1195,208 +1195,208 @@ See https://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="328"/>
+        <location filename="../configure.cpp" line="333"/>
         <source>Showing disabled targets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="329"/>
+        <location filename="../configure.cpp" line="334"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="523"/>
+        <location filename="../configure.cpp" line="528"/>
         <source>Proxy Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="524"/>
+        <location filename="../configure.cpp" line="529"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="634"/>
+        <location filename="../configure.cpp" line="639"/>
         <source>Set Cache Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="782"/>
+        <location filename="../configure.cpp" line="787"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="773"/>
+        <location filename="../configure.cpp" line="778"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="766"/>
+        <location filename="../configure.cpp" line="771"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="853"/>
+        <location filename="../configure.cpp" line="858"/>
         <source>Autodetection</source>
         <translation>自動識別</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="854"/>
+        <location filename="../configure.cpp" line="859"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>找不到 mountpoint
 請手動選擇你的 mountpoing.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="761"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>不能識別你的播放器
 請手動選擇.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="438"/>
-        <location filename="../configure.cpp" line="904"/>
+        <location filename="../configure.cpp" line="443"/>
+        <location filename="../configure.cpp" line="909"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="439"/>
-        <location filename="../configure.cpp" line="905"/>
+        <location filename="../configure.cpp" line="444"/>
+        <location filename="../configure.cpp" line="910"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="656"/>
+        <location filename="../configure.cpp" line="661"/>
         <source>%1 (%2 GiB of %3 GiB free)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="730"/>
+        <location filename="../configure.cpp" line="735"/>
         <source>Multiple devices have been detected. Please disconnect all players but one and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="733"/>
+        <location filename="../configure.cpp" line="738"/>
         <source>Detected devices:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="738"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>(unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="740"/>
+        <location filename="../configure.cpp" line="745"/>
         <source>%1 at %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="747"/>
+        <location filename="../configure.cpp" line="752"/>
         <source>Note: detecting connected devices might be ambiguous. You might have less devices connected than listed. In this case it might not be possible to detect your player unambiguously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="751"/>
-        <location filename="../configure.cpp" line="755"/>
-        <location filename="../configure.cpp" line="800"/>
+        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="760"/>
+        <location filename="../configure.cpp" line="805"/>
         <source>Device Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="789"/>
+        <location filename="../configure.cpp" line="794"/>
         <source>The player contains an incompatible filesystem.
 Make sure you selected the correct mountpoint and the player is set up to use a filesystem compatible with Rockbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="797"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>An unknown error occured during player detection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="864"/>
+        <location filename="../configure.cpp" line="869"/>
         <source>Really delete cache?</source>
         <translation>你肯定要刪除緩沖嗎?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="865"/>
+        <location filename="../configure.cpp" line="870"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>你真的肯定要刪除緩沖嗎? 請确認你的設定是正确的因為這會刪除 &lt;b&gt;全部&lt;/b&gt; 的文件在此文件夾 !</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="873"/>
+        <location filename="../configure.cpp" line="878"/>
         <source>Path wrong!</source>
         <translation>路徑錯誤!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="874"/>
+        <location filename="../configure.cpp" line="879"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>緩沖路徑錯誤. 正在取消.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="911"/>
+        <location filename="../configure.cpp" line="916"/>
         <source>TTS configuration invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="912"/>
+        <location filename="../configure.cpp" line="917"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="917"/>
+        <location filename="../configure.cpp" line="922"/>
         <source>Could not start TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="918"/>
+        <location filename="../configure.cpp" line="923"/>
         <source>Could not start TTS engine.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="919"/>
-        <location filename="../configure.cpp" line="938"/>
+        <location filename="../configure.cpp" line="924"/>
+        <location filename="../configure.cpp" line="943"/>
         <source>
 Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="933"/>
+        <location filename="../configure.cpp" line="938"/>
         <source>Rockbox Utility Voice Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="936"/>
+        <location filename="../configure.cpp" line="941"/>
         <source>Could not voice test string.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="937"/>
+        <location filename="../configure.cpp" line="942"/>
         <source>Could not voice test string.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="310"/>
+        <location filename="../configure.cpp" line="315"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="445"/>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="450"/>
+        <location filename="../configure.cpp" line="484"/>
         <source>Configuration OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="455"/>
-        <location filename="../configure.cpp" line="484"/>
+        <location filename="../configure.cpp" line="460"/>
+        <location filename="../configure.cpp" line="489"/>
         <source>Configuration INVALID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1426,22 +1426,22 @@ Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="196"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="204"/>
+        <location filename="../configure.cpp" line="209"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="223"/>
+        <location filename="../configure.cpp" line="228"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="226"/>
+        <location filename="../configure.cpp" line="231"/>
         <source>Configuration error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1666,7 +1666,7 @@ Please configure TTS engine.</source>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="586"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation type="unfinished">中文 (Chinese Traditional)</translation>
@@ -1728,18 +1728,18 @@ Please configure TTS engine.</source>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="106"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>TTS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="107"/>
+        <location filename="../createvoicewindow.cpp" line="116"/>
         <source>The selected TTS failed to initialize. You can&apos;t use this TTS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="111"/>
-        <location filename="../createvoicewindow.cpp" line="114"/>
+        <location filename="../createvoicewindow.cpp" line="120"/>
+        <location filename="../createvoicewindow.cpp" line="123"/>
         <source>Engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1747,32 +1747,32 @@ Please configure TTS engine.</source>
 <context>
     <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="44"/>
+        <location filename="../encttscfggui.cpp" line="43"/>
         <source>Waiting for engine...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="91"/>
+        <location filename="../encttscfggui.cpp" line="90"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="94"/>
+        <location filename="../encttscfggui.cpp" line="93"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="257"/>
+        <location filename="../encttscfggui.cpp" line="256"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="272"/>
+        <location filename="../encttscfggui.cpp" line="271"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="263"/>
+        <location filename="../encttscfggui.cpp" line="262"/>
         <source>Select executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1841,18 +1841,18 @@ Please configure TTS engine.</source>
     <name>InfoWidget</name>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>File</source>
         <translation type="unfinished">文件</translation>
     </message>
     <message>
         <location filename="../gui/infowidget.cpp" line="30"/>
-        <location filename="../gui/infowidget.cpp" line="99"/>
+        <location filename="../gui/infowidget.cpp" line="108"/>
         <source>Version</source>
         <translation type="unfinished">版本</translation>
     </message>
     <message>
-        <location filename="../gui/infowidget.cpp" line="47"/>
+        <location filename="../gui/infowidget.cpp" line="56"/>
         <source>Loading, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2040,27 +2040,27 @@ Please configure TTS engine.</source>
 <context>
     <name>PlayerBuildInfo</name>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="337"/>
+        <location filename="../base/playerbuildinfo.cpp" line="358"/>
         <source>Stable (Retired)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="340"/>
+        <location filename="../base/playerbuildinfo.cpp" line="361"/>
         <source>Unusable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="343"/>
+        <location filename="../base/playerbuildinfo.cpp" line="364"/>
         <source>Unstable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="346"/>
+        <location filename="../base/playerbuildinfo.cpp" line="367"/>
         <source>Stable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/playerbuildinfo.cpp" line="349"/>
+        <location filename="../base/playerbuildinfo.cpp" line="370"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2118,7 +2118,7 @@ Please configure TTS engine.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../configure.cpp" line="616"/>
+        <location filename="../configure.cpp" line="621"/>
         <location filename="../main.cpp" line="102"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -2135,94 +2135,60 @@ Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="107"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="106"/>
+        <source>Before Bootloader installation begins, Please check the following:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="112"/>
+        <source>&lt;li&gt;Ensure your SD card is formatted as FAT. exFAT is &lt;i&gt;not&lt;/i&gt; supported. You can reformat using the Original Firmware on your player if need be. It is located under (System Settings --&gt; Reset --&gt; Format TF Card).&lt;/li&gt;&lt;li&gt;Please use a quality SD card from a reputable source. The SD cards that come bundled with players are often of substandard quality and may cause issues.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="135"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="113"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="141"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="119"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="148"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="159"/>
         <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="131"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="160"/>
         <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="171"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="176"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhelper.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallhelper.cpp" line="182"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QuaGzipFile</name>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="60"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="60"/>
-        <source>QIODevice::Append is not supported for GZIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="66"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="66"/>
-        <source>Opening gzip for both reading and writing is not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="74"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="74"/>
-        <source>You can open a gzip either for reading or for writing. Which is it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quagzipfile.cpp" line="80"/>
-        <location filename="../quazip-1.2/quazip/quagzipfile.cpp" line="80"/>
-        <source>Could not gzopen() file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QuaZIODevice</name>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="188"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="188"/>
-        <source>QIODevice::Append is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../quazip/quaziodevice.cpp" line="193"/>
-        <location filename="../quazip-1.2/quazip/quaziodevice.cpp" line="193"/>
-        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QuaZipFile</name>
     <message>
         <location filename="../quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip-1.2/quazip/quazipfile.cpp" line="251"/>
-        <location filename="../quazip_/quazipfile.cpp" line="251"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2230,17 +2196,17 @@ Please configure TTS engine.</source>
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="211"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>Downloading build information, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="261"/>
+        <location filename="../rbutilqt.cpp" line="262"/>
         <source>Can&apos;t get version information!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="275"/>
+        <location filename="../rbutilqt.cpp" line="276"/>
         <source>Download build information finished.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2249,7 +2215,7 @@ Please configure TTS engine.</source>
         <translation type="vanished">确認安裝</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="564"/>
         <source>Mount point is wrong!</source>
         <translation>Mountpoint 錯誤!</translation>
     </message>
@@ -2258,133 +2224,133 @@ Please configure TTS engine.</source>
         <translation type="vanished">你确認要安裝語音文件嗎?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="493"/>
+        <location filename="../rbutilqt.cpp" line="495"/>
         <source>Confirm Uninstallation</source>
         <translation>确認安裝</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="494"/>
+        <location filename="../rbutilqt.cpp" line="496"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>你确認要卸載啟動程序嗎?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="506"/>
+        <location filename="../rbutilqt.cpp" line="508"/>
         <source>No uninstall method for this target known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="529"/>
+        <location filename="../rbutilqt.cpp" line="531"/>
         <source>No Rockbox bootloader found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="548"/>
+        <location filename="../rbutilqt.cpp" line="550"/>
         <source>Confirm installation</source>
         <translation>确認安裝</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="549"/>
+        <location filename="../rbutilqt.cpp" line="551"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>你确認要安裝Rockbox安裝程序到你的播放器上嗎? 安裝后你可以從你播放器上運行此程序.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="560"/>
         <source>Installing Rockbox Utility</source>
         <translation>安裝 Rockbox安裝程序</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="576"/>
+        <location filename="../rbutilqt.cpp" line="578"/>
         <source>Error installing Rockbox Utility</source>
         <translation>安裝 Rockbox安裝程序錯誤!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="580"/>
+        <location filename="../rbutilqt.cpp" line="582"/>
         <source>Installing user configuration</source>
         <translation>安裝用戶設置</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="584"/>
+        <location filename="../rbutilqt.cpp" line="586"/>
         <source>Error installing user configuration</source>
         <translation>安裝用戶設置錯誤</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="588"/>
+        <location filename="../rbutilqt.cpp" line="590"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>成功安裝 Rockbox安裝程序.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="644"/>
+        <location filename="../rbutilqt.cpp" line="646"/>
         <source>Checking for update ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="708"/>
+        <location filename="../rbutilqt.cpp" line="710"/>
         <source>Rockbox Utility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="709"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>&lt;b&gt;New Rockbox Utility version available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;You are currently using version %1. Get version %2 at &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="713"/>
+        <location filename="../rbutilqt.cpp" line="715"/>
         <source>New version of Rockbox Utility available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="716"/>
+        <location filename="../rbutilqt.cpp" line="718"/>
         <source>Rockbox Utility is up to date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="739"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Device ejected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="740"/>
+        <location filename="../rbutilqt.cpp" line="742"/>
         <source>Device successfully ejected. You may now disconnect the player from the PC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="744"/>
+        <location filename="../rbutilqt.cpp" line="746"/>
         <source>Ejecting failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="745"/>
+        <location filename="../rbutilqt.cpp" line="747"/>
         <source>Ejecting the device failed. Please make sure no programs are accessing files on the device. If ejecting still fails please use your computers eject funtionality.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="391"/>
-        <location filename="../rbutilqt.cpp" line="622"/>
+        <location filename="../rbutilqt.cpp" line="393"/>
+        <location filename="../rbutilqt.cpp" line="624"/>
         <source>Configuration error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="304"/>
+        <location filename="../rbutilqt.cpp" line="305"/>
         <source>Libraries used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="518"/>
+        <location filename="../rbutilqt.cpp" line="520"/>
         <source>Rockbox Utility can not uninstall the bootloader on your player. Please perform a firmware update using your player vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="521"/>
+        <location filename="../rbutilqt.cpp" line="523"/>
         <source>Important: make sure to boot your player into the original firmware before using the vendors firmware update process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="623"/>
+        <location filename="../rbutilqt.cpp" line="625"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="384"/>
+        <location filename="../rbutilqt.cpp" line="386"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2399,12 +2365,12 @@ Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="228"/>
         <source>Certificate error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="229"/>
+        <location filename="../rbutilqt.cpp" line="230"/>
         <source>%1
 
 Issuer: %2
@@ -2416,23 +2382,23 @@ Temporarily trust certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="263"/>
+        <location filename="../rbutilqt.cpp" line="264"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="383"/>
+        <location filename="../rbutilqt.cpp" line="385"/>
         <source>New installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="392"/>
+        <location filename="../rbutilqt.cpp" line="394"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="262"/>
+        <location filename="../rbutilqt.cpp" line="263"/>
         <source>Network error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2860,17 +2826,17 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="127"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="128"/>
         <source>Stable Release (Version %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="132"/>
         <source>Development Version (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="129"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
         <source>Release Candidate (Revison %1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2890,27 +2856,27 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="130"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="131"/>
         <source>Daily Build (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="158"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="159"/>
         <source>The selected player doesn&apos;t need a bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="163"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="164"/>
         <source>The bootloader is required for starting Rockbox. Installation of the bootloader is only necessary on first time installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="236"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="237"/>
         <source>Mountpoint is wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="294"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="295"/>
         <source>No install method known.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2991,22 +2957,23 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="420"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="419"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="431"/>
         <source>Manual steps required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="641"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="667"/>
         <source>Your installation doesn&apos;t require any plugin data files, skipping.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="224"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
         <source>Continue with installation?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/selectiveinstallwidget.cpp" line="225"/>
+        <location filename="../gui/selectiveinstallwidget.cpp" line="226"/>
         <source>Really continue?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3335,17 +3302,17 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="242"/>
+        <location filename="../base/talkfile.cpp" line="257"/>
         <source>File copy aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="283"/>
+        <location filename="../base/talkfile.cpp" line="298"/>
         <source>Cleaning up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="294"/>
+        <location filename="../base/talkfile.cpp" line="309"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3370,7 +3337,7 @@ Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="261"/>
+        <location filename="../base/talkfile.cpp" line="276"/>
         <source>Copying of %1 to %2 failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3476,80 +3443,80 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>沒有選擇主題</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="122"/>
+        <location filename="../themesinstallwindow.cpp" line="127"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>网絡錯誤： %1. 
 請檢查你的网絡和代理服務的設置.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="141"/>
+        <location filename="../themesinstallwindow.cpp" line="146"/>
         <source>done.</source>
         <translation>完成.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
+        <location filename="../themesinstallwindow.cpp" line="219"/>
         <source>fetching details for %1</source>
         <translation>正在拿取 %1 的細節</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="217"/>
+        <location filename="../themesinstallwindow.cpp" line="222"/>
         <source>fetching preview ...</source>
         <translation>正在拿取預覽...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="230"/>
+        <location filename="../themesinstallwindow.cpp" line="235"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;作者:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="231"/>
-        <location filename="../themesinstallwindow.cpp" line="233"/>
+        <location filename="../themesinstallwindow.cpp" line="236"/>
+        <location filename="../themesinstallwindow.cpp" line="238"/>
         <source>unknown</source>
         <translation>不明</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="232"/>
+        <location filename="../themesinstallwindow.cpp" line="237"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;版本:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="234"/>
+        <location filename="../themesinstallwindow.cpp" line="239"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;描述:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="235"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>no description</source>
         <translation>無描述</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="262"/>
+        <location filename="../themesinstallwindow.cpp" line="267"/>
         <source>no theme preview</source>
         <translation>無主題預覽</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="290"/>
+        <location filename="../themesinstallwindow.cpp" line="295"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="297"/>
+        <location filename="../themesinstallwindow.cpp" line="302"/>
         <source>getting themes information ...</source>
         <translation>正在拿取主題信息...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="325"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>No themes selected, skipping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="354"/>
+        <location filename="../themesinstallwindow.cpp" line="360"/>
         <source>Mount point is wrong!</source>
         <translation>Mountpoint 錯誤!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="135"/>
+        <location filename="../themesinstallwindow.cpp" line="140"/>
         <source>the following error occured:
 %1</source>
         <translation type="unfinished"></translation>
@@ -3560,19 +3527,19 @@ Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="178"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="251"/>
+        <location filename="../themesinstallwindow.cpp" line="256"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -3682,87 +3649,102 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="90"/>
-        <source>Extracted voice strings from installation</source>
+        <location filename="../base/voicefile.cpp" line="95"/>
+        <source>Extracted voice corrections file from installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../base/voicefile.cpp" line="100"/>
+        <source>Using internal voice corrections file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="113"/>
+        <source>Extracted language enumeration file from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="133"/>
+        <source>Extracted voice strings from installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/voicefile.cpp" line="143"/>
         <source>Extracted voice strings incompatible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="145"/>
+        <location filename="../base/voicefile.cpp" line="194"/>
         <source>Could not retrieve strings from installation, downloading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="172"/>
+        <location filename="../base/voicefile.cpp" line="221"/>
         <source>Downloading voice info...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="185"/>
+        <location filename="../base/voicefile.cpp" line="234"/>
         <source>Download error: received HTTP error %1.</source>
         <translation type="unfinished">下載錯誤: 接到 HTTP 錯誤 %1. </translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="192"/>
+        <location filename="../base/voicefile.cpp" line="241"/>
         <source>Cached file used.</source>
         <translation type="unfinished">使用緩沖文件.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="195"/>
+        <location filename="../base/voicefile.cpp" line="244"/>
         <source>Download error: %1</source>
         <translation type="unfinished">下載錯誤: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="200"/>
+        <location filename="../base/voicefile.cpp" line="249"/>
         <source>Download finished.</source>
         <translation type="unfinished">完成下載.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="213"/>
+        <location filename="../base/voicefile.cpp" line="262"/>
         <source>failed to open downloaded file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="219"/>
+        <location filename="../base/voicefile.cpp" line="268"/>
         <source>Reading strings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="302"/>
+        <location filename="../base/voicefile.cpp" line="350"/>
         <source>Creating voicefiles...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="347"/>
+        <location filename="../base/voicefile.cpp" line="399"/>
         <source>Cleaning up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="358"/>
+        <location filename="../base/voicefile.cpp" line="410"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="276"/>
+        <location filename="../base/voicefile.cpp" line="324"/>
         <source>The downloaded file was empty!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="307"/>
+        <location filename="../base/voicefile.cpp" line="355"/>
         <source>Error opening downloaded file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="318"/>
+        <location filename="../base/voicefile.cpp" line="366"/>
         <source>Error opening output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="338"/>
+        <location filename="../base/voicefile.cpp" line="390"/>
         <source>successfully created.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3775,17 +3757,17 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="60"/>
         <source>done.</source>
         <translation>完成.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="68"/>
         <source>Package installation finished successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="78"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>正在下載文件 %1.%2</translation>
     </message>
@@ -3798,54 +3780,54 @@ Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="vanished">使用緩沖文件.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="113"/>
+        <location filename="../base/zipinstaller.cpp" line="114"/>
         <source>Download error: received HTTP error %1
 %2</source>
         <translation type="unfinished">下載錯誤: 接到 HTTP 錯誤 %1.  {1
 %2?}</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>下載錯誤: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="125"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="128"/>
+        <location filename="../base/zipinstaller.cpp" line="129"/>
         <source>Download finished.</source>
         <translation>完成下載.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="135"/>
+        <location filename="../base/zipinstaller.cpp" line="136"/>
         <source>Extracting file.</source>
         <translation>正在解壓文件.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="156"/>
+        <location filename="../base/zipinstaller.cpp" line="157"/>
         <source>Extraction failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="168"/>
+        <location filename="../base/zipinstaller.cpp" line="169"/>
         <source>Installing file.</source>
         <translation>正在安裝文件.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="180"/>
+        <location filename="../base/zipinstaller.cpp" line="181"/>
         <source>Installing file failed.</source>
         <translation>安裝文件失敗.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="193"/>
+        <location filename="../base/zipinstaller.cpp" line="194"/>
         <source>Creating installation log</source>
         <translation>正在建立安裝日志</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="149"/>
+        <location filename="../base/zipinstaller.cpp" line="150"/>
         <source>Not enough disk space! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/utils/rbutilqt/langstats.py b/utils/rbutilqt/langstats.py
index 26a56f866c..7167b65bb8 100755
--- a/utils/rbutilqt/langstats.py
+++ b/utils/rbutilqt/langstats.py
@@ -85,12 +85,12 @@ def langstat(pretty=True, tree=None):
 
     projectfolder = os.path.join(workfolder, LANGBASE)
     # lupdate translations and drop all obsolete translations
-    subprocess.Popen(["lupdate", "-no-obsolete", projectfolder, "-ts"]
+    subprocess.Popen(["lupdate-qt6", "-no-obsolete", projectfolder, "-ts"]
                      + [f"lang/rbutil_{l}.ts" for l in LANGS],
                      stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                      cwd=projectfolder).communicate()
     # lrelease translations to get status
-    output = subprocess.Popen(["lrelease"]
+    output = subprocess.Popen(["lrelease-qt6"]
                               + [f"lang/rbutil_{l}.ts" for l in LANGS],
                               stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                               cwd=projectfolder).communicate()
diff --git a/utils/rbutilqt/main.cpp b/utils/rbutilqt/main.cpp
index cdee3af81d..439ca503ab 100644
--- a/utils/rbutilqt/main.cpp
+++ b/utils/rbutilqt/main.cpp
@@ -26,23 +26,7 @@
 #include "ConsoleAppender.h"
 #include "FileAppender.h"
 
-#ifdef STATIC
-#if QT_VERSION < 0x050400
-/*
- * accessibility is no longer a plugin after 5.4.0:
- * <https://bugreports.qt.io/browse/QTBUG-37957#comment-239189>
- */
-#include <QtPlugin>
-Q_IMPORT_PLUGIN(AccessibleFactory)
-#endif
-#endif
-
-
 int main( int argc, char ** argv ) {
-#if QT_VERSION >= 0x050600 && QT_VERSION < 0x060000
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-#endif
     QApplication app( argc, argv );
 #ifdef Q_OS_WIN
     qApp->setStyle(QStyleFactory::create("Fusion"));
@@ -81,15 +65,17 @@ int main( int argc, char ** argv ) {
     }
     if(!applang.isEmpty()) {
         if(!translator.load("rbutil_" + applang, absolutePath))
-            translator.load("rbutil_" + applang, ":/lang");
+            if (!translator.load("rbutil_" + applang, ":/lang")) {
+                LOG_ERROR() << "Failed to load translation:" << ("rbutil_" + applang);
+                // XXX do something.
+            }
         if(!qttrans.load("qt_" + applang,
-#if QT_VERSION >= 0x060000
             QLibraryInfo::path(QLibraryInfo::TranslationsPath)
-#else
-            QLibraryInfo::location(QLibraryInfo::TranslationsPath)
-#endif
                 ))
-            qttrans.load("qt_" + applang, ":/lang");
+            if (!qttrans.load("qt_" + applang, ":/lang")) {
+                LOG_ERROR() << "Failed to load translation:" << ("qt_" + applang);
+                // XXX do something?
+            }
 
         QLocale::setDefault(QLocale(applang));
     }
diff --git a/utils/rbutilqt/mspack/README.ROCKBOX b/utils/rbutilqt/mspack/README.ROCKBOX
index 220691af2c..d854566104 100644
--- a/utils/rbutilqt/mspack/README.ROCKBOX
+++ b/utils/rbutilqt/mspack/README.ROCKBOX
@@ -1,6 +1,6 @@
 This folder contains the mspack project for MS files compression/decompression.
 These files are distributed under the LGPL.
 
-The source files have been last synced with libmspack-0.10.1alpha
-https://www.cabextract.org.uk/libmspack/ on June 8, 2020
+The source files have been last synced with libmspack-0.11alpha
+https://www.cabextract.org.uk/libmspack/ released on Feb 5, 2023
 
diff --git a/utils/rbutilqt/mspack/cabd.c b/utils/rbutilqt/mspack/cabd.c
index ae66769b24..a3dc303d2c 100644
--- a/utils/rbutilqt/mspack/cabd.c
+++ b/utils/rbutilqt/mspack/cabd.c
@@ -1,5 +1,5 @@
 /* This file is part of libmspack.
- * (C) 2003-2018 Stuart Caie.
+ * (C) 2003-2023 Stuart Caie.
  *
  * libmspack is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License (LGPL) version 2.1
@@ -76,7 +76,8 @@ static int cabd_read_headers(
   struct mspack_system *sys, struct mspack_file *fh,
   struct mscabd_cabinet_p *cab, off_t offset, int salvage, int quiet);
 static char *cabd_read_string(
-  struct mspack_system *sys, struct mspack_file *fh, int *error);
+  struct mspack_system *sys, struct mspack_file *fh, int permit_empty,
+  int *error);
 
 static struct mscabd_cabinet *cabd_search(
   struct mscab_decompressor *base, const char *filename);
@@ -394,17 +395,17 @@ static int cabd_read_headers(struct mspack_system *sys,
 
   /* read name and info of preceeding cabinet in set, if present */
   if (cab->base.flags & cfheadPREV_CABINET) {
-    cab->base.prevname = cabd_read_string(sys, fh, &err);
+    cab->base.prevname = cabd_read_string(sys, fh, 0, &err);
     if (err) return err;
-    cab->base.previnfo = cabd_read_string(sys, fh, &err);
+    cab->base.previnfo = cabd_read_string(sys, fh, 1, &err);
     if (err) return err;
   }
 
   /* read name and info of next cabinet in set, if present */
   if (cab->base.flags & cfheadNEXT_CABINET) {
-    cab->base.nextname = cabd_read_string(sys, fh, &err);
+    cab->base.nextname = cabd_read_string(sys, fh, 0, &err);
     if (err) return err;
-    cab->base.nextinfo = cabd_read_string(sys, fh, &err);
+    cab->base.nextinfo = cabd_read_string(sys, fh, 1, &err);
     if (err) return err;
   }
 
@@ -508,7 +509,7 @@ static int cabd_read_headers(struct mspack_system *sys,
     file->date_y = (x >> 9) + 1980;
 
     /* get filename */
-    file->filename = cabd_read_string(sys, fh, &err);
+    file->filename = cabd_read_string(sys, fh, 0, &err);
 
     /* if folder index or filename are bad, either skip it or fail */
     if (err || !file->folder) {
@@ -535,7 +536,8 @@ static int cabd_read_headers(struct mspack_system *sys,
 }
 
 static char *cabd_read_string(struct mspack_system *sys,
-                              struct mspack_file *fh, int *error)
+                              struct mspack_file *fh, int permit_empty,
+                              int *error)
 {
   off_t base = sys->tell(fh);
   char buf[256], *str;
@@ -549,8 +551,8 @@ static char *cabd_read_string(struct mspack_system *sys,
 
   /* search for a null terminator in the buffer */
   for (i = 0, ok = 0; i < len; i++) if (!buf[i]) { ok = 1; break; }
-  /* reject empty strings */
-  if (i == 0) ok = 0;
+  /* optionally reject empty strings */
+  if (i == 0 && !permit_empty) ok = 0;
 
   if (!ok) {
     *error = MSPACK_ERR_DATAFORMAT;
@@ -651,10 +653,10 @@ static int cabd_find(struct mscab_decompressor_p *self, unsigned char *buf,
   unsigned int cablen_u32 = 0, foffset_u32 = 0;
   int false_cabs = 0;
 
-#if !LARGEFILE_SUPPORT
+#if SIZEOF_OFF_T < 8
   /* detect 32-bit off_t overflow */
   if (flen < 0) {
-    sys->message(fh, largefile_msg);
+    sys->message(fh, "library not compiled to support large files.");
     return MSPACK_ERR_OK;
   }
 #endif
@@ -753,10 +755,10 @@ static int cabd_find(struct mscab_decompressor_p *self, unsigned char *buf,
             /* cause the search to restart after this cab's data. */
             offset = caboff + (off_t) cablen_u32;
 
-#if !LARGEFILE_SUPPORT
+#if SIZEOF_OFF_T < 8
             /* detect 32-bit off_t overflow */
             if (offset < caboff) {
-              sys->message(fh, largefile_msg);
+              sys->message(fh, "library not compiled to support large files.");
               return MSPACK_ERR_OK;
             }
 #endif        
@@ -1012,7 +1014,7 @@ static int cabd_extract(struct mscab_decompressor *base,
   struct mscabd_folder_p *fol;
   struct mspack_system *sys;
   struct mspack_file *fh;
-  off_t filelen;
+  unsigned int filelen;
 
   if (!self) return MSPACK_ERR_ARGS;
   if (!file) return self->error = MSPACK_ERR_ARGS;
@@ -1029,7 +1031,7 @@ static int cabd_extract(struct mscab_decompressor *base,
    * or in salvage mode reduce file length so it fits 2GB limit
    */
   filelen = file->length;
-  if (filelen > CAB_LENGTHMAX || (file->offset + filelen) > CAB_LENGTHMAX) {
+  if (filelen > (CAB_LENGTHMAX - file->offset)) {
     if (self->salvage) {
       filelen = CAB_LENGTHMAX - file->offset;
     }
@@ -1049,8 +1051,8 @@ static int cabd_extract(struct mscab_decompressor *base,
    * In salvage mode, don't assume block sizes, just try decoding
    */
   if (!self->salvage) {
-    off_t maxlen = fol->base.num_blocks * CAB_BLOCKMAX;
-    if ((file->offset + filelen) > maxlen) {
+    unsigned int maxlen = fol->base.num_blocks * CAB_BLOCKMAX;
+    if (file->offset > maxlen || filelen > (maxlen - file->offset)) {
       sys->message(NULL, "ERROR; file \"%s\" cannot be extracted, "
                    "cabinet set is incomplete", file->filename);
       return self->error = MSPACK_ERR_DECRUNCH;
@@ -1398,7 +1400,7 @@ static unsigned int cabd_checksum(unsigned char *data, unsigned int bytes,
   unsigned int len, ul = 0;
 
   for (len = bytes >> 2; len--; data += 4) {
-    cksum ^= ((data[0]) | (data[1]<<8) | (data[2]<<16) | (data[3]<<24));
+    cksum ^= EndGetI32(data);
   }
 
   switch (bytes & 3) {
diff --git a/utils/rbutilqt/mspack/chm.h b/utils/rbutilqt/mspack/chm.h
index 4b19f1505a..2642a82caf 100644
--- a/utils/rbutilqt/mspack/chm.h
+++ b/utils/rbutilqt/mspack/chm.h
@@ -1,5 +1,5 @@
 /* This file is part of libmspack.
- * (C) 2003-2004 Stuart Caie.
+ * (C) 2003-2023 Stuart Caie.
  *
  * libmspack is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License (LGPL) version 2.1
@@ -104,7 +104,8 @@ struct mschm_compressor_p {
 /* CHM decompression definitions */
 struct mschmd_decompress_state {
   struct mschmd_header *chm;         /* CHM file being decompressed          */
-  off_t offset;                      /* uncompressed offset within folder    */
+  off_t length;                      /* uncompressed length of LZX stream    */
+  off_t offset;                      /* uncompressed offset within stream    */
   off_t inoffset;                    /* offset in input file                 */
   struct lzxd_stream *state;         /* LZX decompressor state               */
   struct mspack_system sys;          /* special I/O code for decompressor    */
diff --git a/utils/rbutilqt/mspack/chmd.c b/utils/rbutilqt/mspack/chmd.c
index 6c8481db14..e860e95903 100644
--- a/utils/rbutilqt/mspack/chmd.c
+++ b/utils/rbutilqt/mspack/chmd.c
@@ -1,5 +1,5 @@
 /* This file is part of libmspack.
- * (C) 2003-2018 Stuart Caie.
+ * (C) 2003-2023 Stuart Caie.
  *
  * libmspack is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License (LGPL) version 2.1
@@ -58,6 +58,8 @@ static int chmd_error(
 static int read_off64(
   off_t *var, unsigned char *mem, struct mspack_system *sys,
   struct mspack_file *fh);
+static off_t read_encint(
+  const unsigned char **p, const unsigned char *end, int *err);
 
 /* filenames of the system files used for decompression.
  * Content and ControlData are essential.
@@ -249,24 +251,15 @@ static const unsigned char guids[32] = {
   0x9E, 0x0C, 0x00, 0xA0, 0xC9, 0x22, 0xE6, 0xEC
 };
 
-/* reads an encoded integer into a variable; 7 bits of data per byte,
- * the high bit is used to indicate that there is another byte */
-#define READ_ENCINT(var) do {                   \
-    (var) = 0;                                  \
-    do {                                        \
-        if (p >= end) goto chunk_end;           \
-        (var) = ((var) << 7) | (*p & 0x7F);     \
-    } while (*p++ & 0x80);                      \
-} while (0)
-
 static int chmd_read_headers(struct mspack_system *sys, struct mspack_file *fh,
                              struct mschmd_header *chm, int entire)
 {
-  unsigned int section, name_len, x, errors, num_chunks;
-  unsigned char buf[0x54], *chunk = NULL, *name, *p, *end;
+  unsigned int errors, num_chunks;
+  unsigned char buf[0x54], *chunk = NULL;
+  const unsigned char *name, *p, *end;
   struct mschmd_file *fi, *link = NULL;
-  off_t offset, length;
-  int num_entries;
+  off_t offset_hs0, filelen;
+  int num_entries, err = 0;
 
   /* initialise pointers */
   chm->files         = NULL;
@@ -312,7 +305,7 @@ static int chmd_read_headers(struct mspack_system *sys, struct mspack_file *fh,
   /* chmhst3_OffsetCS0 does not exist in version 1 or 2 CHM files.
    * The offset will be corrected later, once HS1 is read.
    */
-  if (read_off64(&offset,           &buf[chmhst_OffsetHS0],  sys, fh) ||
+  if (read_off64(&offset_hs0,       &buf[chmhst_OffsetHS0],  sys, fh) ||
       read_off64(&chm->dir_offset,  &buf[chmhst_OffsetHS1],  sys, fh) ||
       read_off64(&chm->sec0.offset, &buf[chmhst3_OffsetCS0], sys, fh))
   {
@@ -320,7 +313,7 @@ static int chmd_read_headers(struct mspack_system *sys, struct mspack_file *fh,
   }
 
   /* seek to header section 0 */
-  if (sys->seek(fh, offset, MSPACK_SYS_SEEK_START)) {
+  if (sys->seek(fh, offset_hs0, MSPACK_SYS_SEEK_START)) {
     return MSPACK_ERR_SEEK;
   }
 
@@ -332,6 +325,18 @@ static int chmd_read_headers(struct mspack_system *sys, struct mspack_file *fh,
     return MSPACK_ERR_DATAFORMAT;
   }
 
+  /* compare declared CHM file size against actual size */
+  if (!mspack_sys_filelen(sys, fh, &filelen)) {
+    if (chm->length > filelen) {
+      sys->message(fh, "WARNING; file possibly truncated by %" LD " bytes",
+                   chm->length - filelen);
+    }
+    else if (chm->length < filelen) {
+      sys->message(fh, "WARNING; possible %" LD " extra bytes at end of file",
+                   filelen - chm->length);
+    }
+  }
+
   /* seek to header section 1 */
   if (sys->seek(fh, chm->dir_offset, MSPACK_SYS_SEEK_START)) {
     return MSPACK_ERR_SEEK;
@@ -412,12 +417,13 @@ static int chmd_read_headers(struct mspack_system *sys, struct mspack_file *fh,
   }
 
   /* seek to the first PMGL chunk, and reduce the number of chunks to read */
-  if ((x = chm->first_pmgl) != 0) {
-    if (sys->seek(fh,(off_t) (x * chm->chunk_size), MSPACK_SYS_SEEK_CUR)) {
+  if (chm->first_pmgl != 0) {
+    off_t pmgl_offset = (off_t) chm->first_pmgl * (off_t) chm->chunk_size;
+    if (sys->seek(fh, pmgl_offset, MSPACK_SYS_SEEK_CUR)) {
       return MSPACK_ERR_SEEK;
     }
   }
-  num_chunks = chm->last_pmgl - x + 1;
+  num_chunks = chm->last_pmgl - chm->first_pmgl + 1;
 
   if (!(chunk = (unsigned char *) sys->alloc(sys, (size_t)chm->chunk_size))) {
     return MSPACK_ERR_NOMEMORY;
@@ -449,12 +455,15 @@ static int chmd_read_headers(struct mspack_system *sys, struct mspack_file *fh,
     num_entries = EndGetI16(end);
 
     while (num_entries--) {
-      READ_ENCINT(name_len);
-      if (name_len > (unsigned int) (end - p)) goto chunk_end;
+      unsigned int name_len, section;
+      off_t offset, length;
+      name_len = read_encint(&p, end, &err);
+      if (err || (name_len > (unsigned int) (end - p))) goto encint_err;
       name = p; p += name_len;
-      READ_ENCINT(section);
-      READ_ENCINT(offset);
-      READ_ENCINT(length);
+      section = read_encint(&p, end, &err);
+      offset = read_encint(&p, end, &err);
+      length = read_encint(&p, end, &err);
+      if (err) goto encint_err;
 
       /* ignore blank or one-char (e.g. "/") filenames we'd return as blank */
       if (name_len < 2 || !name[0] || !name[1]) continue;
@@ -482,7 +491,7 @@ static int chmd_read_headers(struct mspack_system *sys, struct mspack_file *fh,
                                      : (struct mschmd_section *) (&chm->sec1));
       fi->offset   = offset;
       fi->length   = length;
-      sys->copy(name, fi->filename, (size_t) name_len);
+      sys->copy((unsigned char *) name, fi->filename, (size_t) name_len);
       fi->filename[name_len] = '\0';
 
       if (name[0] == ':' && name[1] == ':') {
@@ -510,10 +519,10 @@ static int chmd_read_headers(struct mspack_system *sys, struct mspack_file *fh,
     }
 
     /* this is reached either when num_entries runs out, or if
-     * reading data from the chunk reached a premature end of chunk */
-  chunk_end:
+     * an ENCINT is badly encoded */
+  encint_err:
     if (num_entries >= 0) {
-      D(("chunk ended before all entries could be read"))
+      D(("bad encint before all entries could be read"))
       errors++;
     }
 
@@ -572,7 +581,10 @@ static int chmd_fast_find(struct mschm_decompressor *base,
             }
 
             /* found result. loop around for next chunk if this is PMGI */
-            if (chunk[3] == 0x4C) break; else READ_ENCINT(n);
+            if (chunk[3] == 0x4C) break;
+
+            n = read_encint(&p, end, &err);
+            if (err) goto encint_err;
         }
     }
     else {
@@ -599,11 +611,12 @@ static int chmd_fast_find(struct mschm_decompressor *base,
 
     /* if we found a file, read it */
     if (result > 0) {
-        READ_ENCINT(sec);
+        sec = read_encint(&p, end, &err);
         f_ptr->section  = (sec == 0) ? (struct mschmd_section *) &chm->sec0
                                      : (struct mschmd_section *) &chm->sec1;
-        READ_ENCINT(f_ptr->offset);
-        READ_ENCINT(f_ptr->length);
+        f_ptr->offset = read_encint(&p, end, &err);
+        f_ptr->length = read_encint(&p, end, &err);
+        if (err) goto encint_err;
     }
     else if (result < 0) {
         err = MSPACK_ERR_DATAFORMAT;
@@ -612,8 +625,8 @@ static int chmd_fast_find(struct mschm_decompressor *base,
     sys->close(fh);
     return self->error = err;
 
- chunk_end:
-    D(("read beyond end of chunk entries"))
+ encint_err:
+    D(("bad encint in PGMI/PGML chunk"))
     sys->close(fh);
     return self->error = MSPACK_ERR_DATAFORMAT;
 }
@@ -697,7 +710,7 @@ static int search_chunk(struct mschmd_header *chm,
     const unsigned char *start, *end, *p;
     unsigned int qr_size, num_entries, qr_entries, qr_density, name_len;
     unsigned int L, R, M, fname_len, entries_off, is_pmgl;
-    int cmp;
+    int cmp, err = 0;
 
     fname_len = strlen(filename);
 
@@ -755,8 +768,8 @@ static int search_chunk(struct mschmd_header *chm,
 
             /* compare filename with entry QR points to */
             p = &chunk[entries_off + (M ? EndGetI16(start - (M << 1)) : 0)];
-            READ_ENCINT(name_len);
-            if (name_len > (unsigned int) (end - p)) goto chunk_end;
+            name_len = read_encint(&p, end, &err);
+            if (err || (name_len > (unsigned int) (end - p))) goto encint_err;
             cmp = compare(filename, (char *)p, fname_len, name_len);
 
             if (cmp == 0) break;
@@ -792,8 +805,8 @@ static int search_chunk(struct mschmd_header *chm,
      */
     *result = NULL;
     while (num_entries-- > 0) {
-        READ_ENCINT(name_len);
-        if (name_len > (unsigned int) (end - p)) goto chunk_end;
+        name_len = read_encint(&p, end, &err);
+        if (err || (name_len > (unsigned int) (end - p))) goto encint_err;
         cmp = compare(filename, (char *)p, fname_len, name_len);
         p += name_len;
 
@@ -810,21 +823,21 @@ static int search_chunk(struct mschmd_header *chm,
 
         /* read and ignore the rest of this entry */
         if (is_pmgl) {
-            READ_ENCINT(R); /* skip section */
-            READ_ENCINT(R); /* skip offset */
-            READ_ENCINT(R); /* skip length */
+            while (p < end && (*p++ & 0x80)); /* skip section ENCINT */
+            while (p < end && (*p++ & 0x80)); /* skip offset ENCINT */
+            while (p < end && (*p++ & 0x80)); /* skip length ENCINT */
         }
         else {
             *result = p; /* store potential final result */
-            READ_ENCINT(R); /* skip chunk number */
+            while (p < end && (*p++ & 0x80)); /* skip chunk number ENCINT */
         }
     }
 
      /* PMGL? not found. PMGI? maybe found */
      return (is_pmgl) ? 0 : (*result ? 1 : 0);
 
- chunk_end:
-    D(("reached end of chunk data while searching"))
+ encint_err:
+    D(("bad encint while searching"))
     return -1;
 }
 
@@ -938,14 +951,19 @@ static int chmd_extract(struct mschm_decompressor *base,
   switch (file->section->id) {
   case 0: /* Uncompressed section file */
     /* simple seek + copy */
-    if (sys->seek(self->d->infh, file->section->chm->sec0.offset
-                  + file->offset, MSPACK_SYS_SEEK_START))
+    if (sys->seek(self->d->infh, chm->sec0.offset + file->offset,
+                  MSPACK_SYS_SEEK_START))
     {
       self->error = MSPACK_ERR_SEEK;
     }
     else {
       unsigned char buf[512];
       off_t length = file->length;
+      off_t maxlen = chm->length - sys->tell(self->d->infh);
+      if (length > maxlen) {
+        sys->message(fh, "WARNING; file is %" LD " bytes longer than CHM file",
+                     length - maxlen);
+      }
       while (length > 0) {
         int run = sizeof(buf);
         if ((off_t)run > length) run = (int)length;
@@ -963,7 +981,7 @@ static int chmd_extract(struct mschm_decompressor *base,
     break;
 
   case 1: /* MSCompressed section file */
-    /* (re)initialise compression state if we it is not yet initialised,
+    /* (re)initialise compression state if not yet initialised,
      * or we have advanced too far and have to backtrack
      */
     if (!self->d->state || (file->offset < self->d->offset)) {
@@ -974,6 +992,12 @@ static int chmd_extract(struct mschm_decompressor *base,
       if (chmd_init_decomp(self, file)) break;
     }
 
+    /* check file offset is not impossible */
+    if (file->offset > self->d->length) {
+        self->error = MSPACK_ERR_DECRUNCH;
+        break;
+    }
+
     /* seek to input data */
     if (sys->seek(self->d->infh, self->d->inoffset, MSPACK_SYS_SEEK_START)) {
       self->error = MSPACK_ERR_SEEK;
@@ -988,8 +1012,15 @@ static int chmd_extract(struct mschm_decompressor *base,
 
     /* if getting to the correct offset was error free, unpack file */
     if (!self->error) {
+      off_t length = file->length;
+      off_t maxlen = self->d->length - file->offset;
+      if (length > maxlen) {
+        sys->message(fh, "WARNING; file is %" LD " bytes longer than "
+                     "compressed section", length - maxlen);
+        length = maxlen + 1; /* should decompress but still error out */
+      }
       self->d->outfh = fh;
-      self->error = lzxd_decompress(self->d->state, file->length);
+      self->error = lzxd_decompress(self->d->state, length);
     }
 
     /* save offset in input source stream, in case there is a section 0
@@ -1052,8 +1083,8 @@ static int chmd_init_decomp(struct mschm_decompressor_p *self,
   if (err) return self->error = err;
 
   /* read ControlData */
-  if (sec->control->length < lzxcd_SIZEOF) {
-    D(("ControlData file is too short"))
+  if (sec->control->length != lzxcd_SIZEOF) {
+    D(("ControlData file is wrong size"))
     return self->error = MSPACK_ERR_DATAFORMAT;
   }
   if (!(data = read_sys_file(self, sec->control))) {
@@ -1125,8 +1156,8 @@ static int chmd_init_decomp(struct mschm_decompressor_p *self,
     entry = 0;
     offset = 0;
     err = read_spaninfo(self, sec, &length);
+    if (err) return self->error = err;
   }
-  if (err) return self->error = err;
 
   /* get offset of compressed data stream:
    * = offset of uncompressed section from start of file
@@ -1136,6 +1167,7 @@ static int chmd_init_decomp(struct mschm_decompressor_p *self,
 
   /* set start offset and overall remaining stream length */
   self->d->offset = entry * LZX_FRAME_SIZE;
+  self->d->length = length;
   length -= self->d->offset;
 
   /* initialise LZX stream */
@@ -1172,6 +1204,11 @@ static int read_reset_table(struct mschm_decompressor_p *self,
         D(("ResetTable file is too short"))
         return 0;
     }
+    if (sec->rtable->length > 1000000) { /* arbitrary upper limit */
+        D(("ResetTable >1MB (%"LD"), report if genuine", sec->rtable->length))
+        return 0;
+    }
+
     if (!(data = read_sys_file(self, sec->rtable))) {
         D(("can't read reset table"))
         return 0;
@@ -1246,6 +1283,12 @@ static int read_spaninfo(struct mschm_decompressor_p *self,
         return MSPACK_ERR_DATAFORMAT;
     }
 
+    /* unconditionally set length here, because gcc -Wuninitialized isn't
+     * clever enough to recognise that read_sys_file() will always set
+     * self->error to a non-zero value if it returns NULL, and gcc warnings
+     * spook humans (even false positives) */
+    *length_ptr = 0;
+
     /* read the SpanInfo file */
     if (!(data = read_sys_file(self, sec->spaninfo))) {
         D(("can't read SpanInfo file"))
@@ -1364,14 +1407,51 @@ static int chmd_error(struct mschm_decompressor *base) {
 static int read_off64(off_t *var, unsigned char *mem,
                       struct mspack_system *sys, struct mspack_file *fh)
 {
-#if LARGEFILE_SUPPORT
+#if SIZEOF_OFF_T >= 8
     *var = EndGetI64(mem);
 #else
-    *var = EndGetI32(mem);
-    if ((*var & 0x80000000) || EndGetI32(mem+4)) {
-        sys->message(fh, (char *)largefile_msg);
+    if ((mem[3] & 0x80) | mem[4] | mem[5] | mem[6] | mem[7]) {
+        sys->message(fh, "library not compiled to support large files.");
         return 1;
     }
+    *var = EndGetI32(mem);
 #endif
     return 0;
 }
+
+#if SIZEOF_OFF_T >= 8
+  /* 63 bits allowed: 9 * 7 bits/byte, last byte must be 0x00-0x7F */
+# define ENCINT_MAX_BYTES 9
+# define ENCINT_BAD_LAST_BYTE 0x80
+#else
+  /* 31 bits allowed: 5 * 7 bits/byte, last byte must be 0x00-0x07 */
+# define ENCINT_MAX_BYTES 5
+# define ENCINT_BAD_LAST_BYTE 0xF1
+#endif
+
+/***************************************
+ * READ_ENCINT
+ ***************************************
+ * Reads an ENCINT from memory. If running on a system with a 32-bit off_t,
+ * ENCINTs up to 0x7FFFFFFF are accepted, values beyond that are an error.
+ */
+static off_t read_encint(const unsigned char **p, const unsigned char *end,
+                         int *err)
+{
+    off_t result = 0;
+    unsigned char c = 0x80;
+    int i = 0;
+    while ((c & 0x80) && (i++ < ENCINT_MAX_BYTES)) {
+        if (*p >= end) {
+            *err = 1;
+            return 0;
+        }
+        c = *(*p)++;
+        result = (result << 7) | (c & 0x7F);
+    }
+    if (i == ENCINT_MAX_BYTES && (c & ENCINT_BAD_LAST_BYTE)) {
+        *err = 1;
+        return 0;
+    }
+    return result;
+}
diff --git a/utils/rbutilqt/mspack/kwajd.c b/utils/rbutilqt/mspack/kwajd.c
index 24e0b0613b..2f40508fa7 100644
--- a/utils/rbutilqt/mspack/kwajd.c
+++ b/utils/rbutilqt/mspack/kwajd.c
@@ -1,5 +1,5 @@
 /* This file is part of libmspack.
- * (C) 2003-2011 Stuart Caie.
+ * (C) 2003-2023 Stuart Caie.
  *
  * KWAJ is a format very similar to SZDD. KWAJ method 3 (LZH) was
  * written by Jeff Johnson.
@@ -97,27 +97,30 @@ static struct mskwajd_header *kwajd_open(struct mskwaj_decompressor *base,
     struct mskwajd_header *hdr;
     struct mspack_system *sys;
     struct mspack_file *fh;
+    int err;
 
     if (!self) return NULL;
     sys = self->system;
 
-    fh  = sys->open(sys, filename, MSPACK_SYS_OPEN_READ);
-    hdr = (struct mskwajd_header *) sys->alloc(sys, sizeof(struct mskwajd_header_p));
-    if (fh && hdr) {
-        ((struct mskwajd_header_p *) hdr)->fh = fh;
-        self->error = kwajd_read_headers(sys, fh, hdr);
-    }
-    else {
-        if (!fh)  self->error = MSPACK_ERR_OPEN;
-        if (!hdr) self->error = MSPACK_ERR_NOMEMORY;
-    }
-    
-    if (self->error) {
-        if (fh) sys->close(fh);
-        sys->free(hdr);
-        hdr = NULL;
+    fh = sys->open(sys, filename, MSPACK_SYS_OPEN_READ);
+    if (!fh) {
+        self->error = MSPACK_ERR_OPEN;
+        return NULL;
     }
 
+    hdr = (struct mskwajd_header *) sys->alloc(sys, sizeof(struct mskwajd_header_p));
+    if (!hdr) {
+        sys->close(fh);
+        self->error = MSPACK_ERR_NOMEMORY;
+        return NULL;
+    }
+
+    ((struct mskwajd_header_p *) hdr)->fh = fh;
+    if ((err = kwajd_read_headers(sys, fh, hdr))) {
+        kwajd_close(base, hdr);
+        self->error = err;
+        return NULL;
+    }
     return hdr;
 }
 
@@ -138,6 +141,8 @@ static void kwajd_close(struct mskwaj_decompressor *base,
     self->system->close(hdr_p->fh);
 
     /* free the memory associated */
+    self->system->free(hdr->filename);
+    self->system->free(hdr->extra);
     self->system->free(hdr);
 
     self->error = MSPACK_ERR_OK;
@@ -200,7 +205,7 @@ static int kwajd_read_headers(struct mspack_system *sys,
     if (hdr->headers & (MSKWAJ_HDR_HASFILENAME | MSKWAJ_HDR_HASFILEEXT)) {
         int len;
         /* allocate memory for maximum length filename */
-        char *fn = (char *) sys->alloc(sys, (size_t) 13);
+        char *fn = (char *) sys->alloc(sys, 13);
         if (!(hdr->filename = fn)) return MSPACK_ERR_NOMEMORY;
 
         /* copy filename if present */
@@ -236,7 +241,7 @@ static int kwajd_read_headers(struct mspack_system *sys,
     if (hdr->headers & MSKWAJ_HDR_HASEXTRATEXT) {
         if (sys->read(fh, &buf[0], 2) != 2) return MSPACK_ERR_READ;
         i = EndGetI16(&buf[0]);
-        hdr->extra = (char *) sys->alloc(sys, (size_t)i+1);
+        hdr->extra = (char *) sys->alloc(sys, i+1);
         if (! hdr->extra) return MSPACK_ERR_NOMEMORY;
         if (sys->read(fh, hdr->extra, i) != i) return MSPACK_ERR_READ;
         hdr->extra[i] = '\0';
@@ -280,7 +285,7 @@ static int kwajd_extract(struct mskwaj_decompressor *base,
         hdr->comp_type == MSKWAJ_COMP_XOR)
     {
         /* NONE is a straight copy. XOR is a copy xored with 0xFF */
-        unsigned char *buf = (unsigned char *) sys->alloc(sys, (size_t) KWAJ_INPUT_SIZE);
+        unsigned char *buf = (unsigned char *) sys->alloc(sys, KWAJ_INPUT_SIZE);
         if (buf) {
             int read, i;
             while ((read = sys->read(fh, buf, KWAJ_INPUT_SIZE)) > 0) {
@@ -301,7 +306,7 @@ static int kwajd_extract(struct mskwaj_decompressor *base,
     }
     else if (hdr->comp_type == MSKWAJ_COMP_SZDD) {
         self->error = lzss_decompress(sys, fh, outfh, KWAJ_INPUT_SIZE,
-                                      LZSS_MODE_EXPAND);
+                                      LZSS_MODE_QBASIC);
     }
     else if (hdr->comp_type == MSKWAJ_COMP_LZH) {
         struct kwajd_stream *lzh = lzh_init(sys, fh, outfh);
@@ -435,17 +440,14 @@ static struct kwajd_stream *lzh_init(struct mspack_system *sys,
 
 static int lzh_decompress(struct kwajd_stream *lzh)
 {
-    register unsigned int bit_buffer;
-    register int bits_left, i;
-    register unsigned short sym;
-    unsigned char *i_ptr, *i_end, lit_run = 0;
-    int j, pos = 0, len, offset, err;
-    unsigned int types[6];
+    DECLARE_HUFF_VARS;
+    unsigned int types[6], i, j, pos = 0, len, offset, lit_run = 0;
+    int err;
 
     /* reset global state */
     INIT_BITS;
     RESTORE_BITS;
-    memset(&lzh->window[0], LZSS_WINDOW_FILL, (size_t) LZSS_WINDOW_SIZE);
+    memset(&lzh->window[0], LZSS_WINDOW_FILL, LZSS_WINDOW_SIZE);
 
     /* read 6 encoding types (for byte alignment) but only 5 are needed */
     for (i = 0; i < 6; i++) READ_BITS_SAFE(types[i], 4);
@@ -501,9 +503,7 @@ static int lzh_read_lens(struct kwajd_stream *lzh,
                          unsigned int type, unsigned int numsyms,
                          unsigned char *lens)
 {
-    register unsigned int bit_buffer;
-    register int bits_left;
-    unsigned char *i_ptr, *i_end;
+    DECLARE_BIT_VARS;
     unsigned int i, c, sel;
     int err;
 
diff --git a/utils/rbutilqt/mspack/lzx.h b/utils/rbutilqt/mspack/lzx.h
index a6152f622b..281fe5f0fb 100644
--- a/utils/rbutilqt/mspack/lzx.h
+++ b/utils/rbutilqt/mspack/lzx.h
@@ -67,7 +67,6 @@ struct lzxd_stream {
   unsigned int   block_remaining; /* uncompressed bytes still left to decode */
 
   signed int     intel_filesize;  /* magic header value used for transform   */
-  signed int     intel_curpos;    /* current offset in transform space       */
 
   unsigned char  intel_started;   /* has intel E8 decoding started?          */
   unsigned char  block_type;      /* type of the current block               */
diff --git a/utils/rbutilqt/mspack/lzxd.c b/utils/rbutilqt/mspack/lzxd.c
index 88cfd90c2a..565d5f08e9 100644
--- a/utils/rbutilqt/mspack/lzxd.c
+++ b/utils/rbutilqt/mspack/lzxd.c
@@ -1,5 +1,5 @@
 /* This file is part of libmspack.
- * (C) 2003-2013 Stuart Caie.
+ * (C) 2003-2023 Stuart Caie.
  *
  * The LZX method was created by Jonathan Forbes and Tomi Poutanen, adapted
  * by Microsoft Corporation.
@@ -138,12 +138,7 @@
 static int lzxd_read_lens(struct lzxd_stream *lzx, unsigned char *lens,
                           unsigned int first, unsigned int last)
 {
-  /* bit buffer and huffman symbol decode variables */
-  register unsigned int bit_buffer;
-  register int bits_left, i;
-  register unsigned short sym;
-  unsigned char *i_ptr, *i_end;
-
+  DECLARE_HUFF_VARS;
   unsigned int x, y;
   int z;
 
@@ -315,8 +310,8 @@ struct lzxd_stream *lzxd_init(struct mspack_system *system,
   }
 
   /* allocate decompression window and input buffer */
-  lzx->window = (unsigned char *) system->alloc(system, (size_t) window_size);
-  lzx->inbuf  = (unsigned char *) system->alloc(system, (size_t) input_buffer_size);
+  lzx->window = (unsigned char *) system->alloc(system, window_size);
+  lzx->inbuf  = (unsigned char *) system->alloc(system, input_buffer_size);
   if (!lzx->window || !lzx->inbuf) {
     system->free(lzx->window);
     system->free(lzx->inbuf);
@@ -339,7 +334,6 @@ struct lzxd_stream *lzxd_init(struct mspack_system *system,
   lzx->frame           = 0;
   lzx->reset_interval  = reset_interval;
   lzx->intel_filesize  = 0;
-  lzx->intel_curpos    = 0;
   lzx->intel_started   = 0;
   lzx->error           = MSPACK_ERR_OK;
   lzx->num_offsets     = position_slots[window_bits - 15] << 3;
@@ -392,17 +386,10 @@ void lzxd_set_output_length(struct lzxd_stream *lzx, off_t out_bytes) {
 }
 
 int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
-  /* bitstream and huffman reading variables */
-  register unsigned int bit_buffer;
-  register int bits_left, i=0;
-  unsigned char *i_ptr, *i_end;
-  register unsigned short sym;
-
-  int match_length, length_footer, extra, verbatim_bits, bytes_todo;
-  int this_run, main_element, aligned_bits, j, warned = 0;
-  unsigned char *window, *runsrc, *rundest, buf[12];
-  unsigned int frame_size=0, end_frame, match_offset, window_posn;
-  unsigned int R0, R1, R2;
+  DECLARE_HUFF_VARS;
+  unsigned char *window, *runsrc, *rundest, buf[12], warned = 0;
+  unsigned int frame_size, end_frame, window_posn, R0, R1, R2;
+  int bytes_todo, this_run, i, j;
 
   /* easy answers */
   if (!lzx || (out_bytes < 0)) return MSPACK_ERR_ARGS;
@@ -524,9 +511,9 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
             READ_IF_NEEDED;
             *rundest++ = *i_ptr++;
           }
-          R0 = buf[0] | (buf[1] << 8) | (buf[2]  << 16) | (buf[3]  << 24);
-          R1 = buf[4] | (buf[5] << 8) | (buf[6]  << 16) | (buf[7]  << 24);
-          R2 = buf[8] | (buf[9] << 8) | (buf[10] << 16) | (buf[11] << 24);
+          R0 = EndGetI32(&buf[0]);
+          R1 = EndGetI32(&buf[4]);
+          R2 = EndGetI32(&buf[8]);
           break;
 
         default:
@@ -546,8 +533,12 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
 
       /* decode at least this_run bytes */
       switch (lzx->block_type) {
+      case LZX_BLOCKTYPE_ALIGNED:
       case LZX_BLOCKTYPE_VERBATIM:
         while (this_run > 0) {
+	  int main_element, length_footer, verbatim_bits, aligned_bits, extra;
+	  int match_length;
+	  unsigned int match_offset;
           READ_HUFFSYM(MAINTREE, main_element);
           if (main_element < LZX_NUM_CHARS) {
             /* literal: 0 to LZX_NUM_CHARS-1 */
@@ -572,137 +563,24 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
 
             /* get match offset */
             switch ((match_offset = (main_element >> 3))) {
-            case 0: match_offset = R0;                                  break;
-            case 1: match_offset = R1; R1=R0;        R0 = match_offset; break;
-            case 2: match_offset = R2; R2=R0;        R0 = match_offset; break;
-            case 3: match_offset = 1;  R2=R1; R1=R0; R0 = match_offset; break;
-            default:
-              extra = (match_offset >= 36) ? 17 : extra_bits[match_offset];
-              READ_BITS(verbatim_bits, extra);
-              match_offset = position_base[match_offset] - 2 + verbatim_bits;
-              R2 = R1; R1 = R0; R0 = match_offset;
-            }
-
-            /* LZX DELTA uses max match length to signal even longer match */
-            if (match_length == LZX_MAX_MATCH && lzx->is_delta) {
-                int extra_len = 0;
-                ENSURE_BITS(3); /* 4 entry huffman tree */
-                if (PEEK_BITS(1) == 0) {
-                    REMOVE_BITS(1); /* '0' -> 8 extra length bits */
-                    READ_BITS(extra_len, 8);
-                }
-                else if (PEEK_BITS(2) == 2) {
-                    REMOVE_BITS(2); /* '10' -> 10 extra length bits + 0x100 */
-                    READ_BITS(extra_len, 10);
-                    extra_len += 0x100;
-                }
-                else if (PEEK_BITS(3) == 6) {
-                    REMOVE_BITS(3); /* '110' -> 12 extra length bits + 0x500 */
-                    READ_BITS(extra_len, 12);
-                    extra_len += 0x500;
-                }
-                else {
-                    REMOVE_BITS(3); /* '111' -> 15 extra length bits */
-                    READ_BITS(extra_len, 15);
-                }
-                match_length += extra_len;
-            }
-
-            if ((window_posn + match_length) > lzx->window_size) {
-              D(("match ran over window wrap"))
-              return lzx->error = MSPACK_ERR_DECRUNCH;
-            }
-            
-            /* copy match */
-            rundest = &window[window_posn];
-            i = match_length;
-            /* does match offset wrap the window? */
-            if (match_offset > window_posn) {
-              if (match_offset > lzx->offset &&
-                  (match_offset - window_posn) > lzx->ref_data_size)
-              {
-                D(("match offset beyond LZX stream"))
-                return lzx->error = MSPACK_ERR_DECRUNCH;
-              }
-              /* j = length from match offset to end of window */
-              j = match_offset - window_posn;
-              if (j > (int) lzx->window_size) {
-                D(("match offset beyond window boundaries"))
-                return lzx->error = MSPACK_ERR_DECRUNCH;
-              }
-              runsrc = &window[lzx->window_size - j];
-              if (j < i) {
-                /* if match goes over the window edge, do two copy runs */
-                i -= j; while (j-- > 0) *rundest++ = *runsrc++;
-                runsrc = window;
-              }
-              while (i-- > 0) *rundest++ = *runsrc++;
-            }
-            else {
-              runsrc = rundest - match_offset;
-              while (i-- > 0) *rundest++ = *runsrc++;
-            }
-
-            this_run    -= match_length;
-            window_posn += match_length;
-          }
-        } /* while (this_run > 0) */
-        break;
-
-      case LZX_BLOCKTYPE_ALIGNED:
-        while (this_run > 0) {
-          READ_HUFFSYM(MAINTREE, main_element);
-          if (main_element < LZX_NUM_CHARS) {
-            /* literal: 0 to LZX_NUM_CHARS-1 */
-            window[window_posn++] = main_element;
-            this_run--;
-          }
-          else {
-            /* match: LZX_NUM_CHARS + ((slot<<3) | length_header (3 bits)) */
-            main_element -= LZX_NUM_CHARS;
-
-            /* get match length */
-            match_length = main_element & LZX_NUM_PRIMARY_LENGTHS;
-            if (match_length == LZX_NUM_PRIMARY_LENGTHS) {
-              if (lzx->LENGTH_empty) {
-                D(("LENGTH symbol needed but tree is empty"))
-                return lzx->error = MSPACK_ERR_DECRUNCH;
-              } 
-              READ_HUFFSYM(LENGTH, length_footer);
-              match_length += length_footer;
-            }
-            match_length += LZX_MIN_MATCH;
-
-            /* get match offset */
-            switch ((match_offset = (main_element >> 3))) {
-            case 0: match_offset = R0;                             break;
-            case 1: match_offset = R1; R1 = R0; R0 = match_offset; break;
-            case 2: match_offset = R2; R2 = R0; R0 = match_offset; break;
+            case 0: match_offset = R0; break;
+            case 1: match_offset = R1; R1=R0; R0 = match_offset; break;
+            case 2: match_offset = R2; R2=R0; R0 = match_offset; break;
             default:
               extra = (match_offset >= 36) ? 17 : extra_bits[match_offset];
               match_offset = position_base[match_offset] - 2;
-              if (extra > 3) {
-                /* verbatim and aligned bits */
-                extra -= 3;
-                READ_BITS(verbatim_bits, extra);
-                match_offset += (verbatim_bits << 3);
+              if (extra >= 3 && lzx->block_type == LZX_BLOCKTYPE_ALIGNED) {
+                if (extra > 3) {
+                  READ_BITS(verbatim_bits, extra - 3); /* 1-14 bits */
+                  match_offset += verbatim_bits << 3;
+                }
                 READ_HUFFSYM(ALIGNED, aligned_bits);
                 match_offset += aligned_bits;
               }
-              else if (extra == 3) {
-                /* aligned bits only */
-                READ_HUFFSYM(ALIGNED, aligned_bits);
-                match_offset += aligned_bits;
-              }
-              else if (extra > 0) { /* extra==1, extra==2 */
-                /* verbatim bits only */
-                READ_BITS(verbatim_bits, extra);
+              else if (extra) {
+                READ_BITS(verbatim_bits, extra); /* 1-17 bits */
                 match_offset += verbatim_bits;
               }
-              else /* extra == 0 */ {
-                /* ??? not defined in LZX specification! */
-                match_offset = 1;
-              }
               /* update repeated offset LRU queue */
               R2 = R1; R1 = R0; R0 = match_offset;
             }
@@ -742,7 +620,7 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
             i = match_length;
             /* does match offset wrap the window? */
             if (match_offset > window_posn) {
-              if (match_offset > lzx->offset &&
+	      if ((off_t)match_offset > lzx->offset &&
                   (match_offset - window_posn) > lzx->ref_data_size)
               {
                 D(("match offset beyond LZX stream"))
@@ -784,7 +662,7 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
           }
           else {
             if (i > this_run) i = this_run;
-            lzx->sys->copy(i_ptr, rundest, (size_t) i);
+            lzx->sys->copy(i_ptr, rundest, i);
             rundest  += i;
             i_ptr    += i;
             this_run -= i;
@@ -827,11 +705,11 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
 
     /* does this intel block _really_ need decoding? */
     if (lzx->intel_started && lzx->intel_filesize &&
-        (lzx->frame <= 32768) && (frame_size > 10))
+        (lzx->frame < 32768) && (frame_size > 10))
     {
       unsigned char *data    = &lzx->e8_buf[0];
       unsigned char *dataend = &lzx->e8_buf[frame_size - 10];
-      signed int curpos      = lzx->intel_curpos;
+      signed int curpos      = (int) lzx->offset;
       signed int filesize    = lzx->intel_filesize;
       signed int abs_off, rel_off;
 
@@ -841,7 +719,7 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
 
       while (data < dataend) {
         if (*data++ != 0xE8) { curpos++; continue; }
-        abs_off = data[0] | (data[1]<<8) | (data[2]<<16) | (data[3]<<24);
+        abs_off = EndGetI32(data);
         if ((abs_off >= -curpos) && (abs_off < filesize)) {
           rel_off = (abs_off >= 0) ? abs_off - curpos : abs_off + filesize;
           data[0] = (unsigned char) rel_off;
@@ -852,11 +730,9 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
         data += 4;
         curpos += 5;
       }
-      lzx->intel_curpos += frame_size;
     }
     else {
       lzx->o_ptr = &lzx->window[lzx->frame_posn];
-      if (lzx->intel_filesize) lzx->intel_curpos += frame_size;
     }
     lzx->o_end = &lzx->o_ptr[frame_size];
 
diff --git a/utils/rbutilqt/mspack/macros.h b/utils/rbutilqt/mspack/macros.h
new file mode 100644
index 0000000000..427b705b36
--- /dev/null
+++ b/utils/rbutilqt/mspack/macros.h
@@ -0,0 +1,64 @@
+/* This file is part of libmspack.
+ * (C) 2003-2020 Stuart Caie.
+ *
+ * libmspack is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License (LGPL) version 2.1
+ *
+ * For further details, see the file COPYING.LIB distributed with libmspack
+ */
+
+#ifndef MSPACK_MACROS_H
+#define MSPACK_MACROS_H 1
+
+/* define LD and LU as printf-format for signed and unsigned long offsets */
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# define PRId64 "lld"
+# define PRIu64 "llu"
+# define PRId32 "ld"
+# define PRIu32 "lu"
+#endif
+
+#if SIZEOF_OFF_T >= 8
+# define LD PRId64
+# define LU PRIu64
+#else
+# define LD PRId32
+# define LU PRIu32
+#endif
+
+/* endian-neutral reading of little-endian data */
+#define __egi32(a,n) (((unsigned int) ((unsigned char *)(a))[n+3] << 24) | \
+                      ((unsigned int) ((unsigned char *)(a))[n+2] << 16) | \
+                      ((unsigned int) ((unsigned char *)(a))[n+1] <<  8) | \
+                      ((unsigned int) ((unsigned char *)(a))[n]))
+#define EndGetI64(a) (((unsigned long long int) __egi32(a,4) << 32) | __egi32(a,0))
+#define EndGetI32(a) __egi32(a,0)
+#define EndGetI16(a) ((((a)[1])<<8)|((a)[0]))
+
+/* endian-neutral reading of big-endian data */
+#define EndGetM32(a) (((unsigned int) ((unsigned char *)(a))[0] << 24) | \
+                      ((unsigned int) ((unsigned char *)(a))[1] << 16) | \
+                      ((unsigned int) ((unsigned char *)(a))[2] <<  8) | \
+                      ((unsigned int) ((unsigned char *)(a))[3]))
+#define EndGetM16(a) ((((a)[0])<<8)|((a)[1]))
+
+/* D(("formatstring", args)) prints debug messages if DEBUG defined */
+#if DEBUG
+ /* http://gcc.gnu.org/onlinedocs/gcc/Function-Names.html */
+# if __STDC_VERSION__ < 199901L
+#  if __GNUC__ >= 2
+#   define __func__ __FUNCTION__
+#  else
+#   define __func__ "<unknown>"
+#  endif
+# endif
+# include <stdio.h>
+# define D(x) do { printf("%s:%d (%s) ",__FILE__, __LINE__, __func__); \
+                   printf x ; fputc('\n', stdout); fflush(stdout);} while (0);
+#else
+# define D(x)
+#endif
+
+#endif
diff --git a/utils/rbutilqt/mspack/mszipd.c b/utils/rbutilqt/mspack/mszipd.c
index c1b02b1207..aaf4ffe19c 100644
--- a/utils/rbutilqt/mspack/mszipd.c
+++ b/utils/rbutilqt/mspack/mszipd.c
@@ -1,5 +1,5 @@
 /* This file is part of libmspack.
- * (C) 2003-2010 Stuart Caie.
+ * (C) 2003-2023 Stuart Caie.
  *
  * The deflate method was created by Phil Katz. MSZIP is equivalent to the
  * deflate method.
@@ -89,10 +89,7 @@ static const unsigned char bitlen_order[19] = {
 #define INF_ERR_HUFFSYM     (-14) /* out of bits decoding huffman symbol     */
 
 static int zip_read_lens(struct mszipd_stream *zip) {
-  /* for the bit buffer and huffman decoding */
-  register unsigned int bit_buffer;
-  register int bits_left;
-  unsigned char *i_ptr, *i_end;
+  DECLARE_BIT_VARS;
 
   /* bitlen Huffman codes -- immediate lookup, 7 bit max code length */
   unsigned short bl_table[(1 << 7)];
@@ -155,13 +152,9 @@ static int zip_read_lens(struct mszipd_stream *zip) {
 
 /* a clean implementation of RFC 1951 / inflate */
 static int inflate(struct mszipd_stream *zip) {
-  unsigned int last_block, block_type, distance, length, this_run, i;
-
-  /* for the bit buffer and huffman decoding */
-  register unsigned int bit_buffer;
-  register int bits_left;
-  register unsigned short sym;
-  unsigned char *i_ptr, *i_end;
+  DECLARE_HUFF_VARS;
+  unsigned int last_block, block_type, distance, length, this_run;
+  int i;
 
   RESTORE_BITS;
 
@@ -359,7 +352,7 @@ struct mszipd_stream *mszipd_init(struct mspack_system *system,
   }
 
   /* allocate input buffer */
-  zip->inbuf  = (unsigned char *) system->alloc(system, (size_t) input_buffer_size);
+  zip->inbuf  = (unsigned char *) system->alloc(system, input_buffer_size);
   if (!zip->inbuf) {
     system->free(zip);
     return NULL;
@@ -467,11 +460,7 @@ int mszipd_decompress(struct mszipd_stream *zip, off_t out_bytes) {
 }
 
 int mszipd_decompress_kwaj(struct mszipd_stream *zip) {
-    /* for the bit buffer */
-    register unsigned int bit_buffer;
-    register int bits_left;
-    unsigned char *i_ptr, *i_end;
-
+    DECLARE_BIT_VARS;
     int i, error, block_len;
 
     /* unpack blocks until block_len == 0 */
diff --git a/utils/rbutilqt/mspack/qtmd.c b/utils/rbutilqt/mspack/qtmd.c
index 58e4787b7f..13658032b0 100644
--- a/utils/rbutilqt/mspack/qtmd.c
+++ b/utils/rbutilqt/mspack/qtmd.c
@@ -1,5 +1,5 @@
 /* This file is part of libmspack.
- * (C) 2003-2004 Stuart Caie.
+ * (C) 2003-2023 Stuart Caie.
  *
  * The Quantum method was created by David Stafford, adapted by Microsoft
  * Corporation.
@@ -254,14 +254,12 @@ struct qtmd_stream *qtmd_init(struct mspack_system *system,
 }
 
 int qtmd_decompress(struct qtmd_stream *qtm, off_t out_bytes) {
+  DECLARE_BIT_VARS;
   unsigned int frame_todo, frame_end, window_posn, match_offset, range;
-  unsigned char *window, *i_ptr, *i_end, *runsrc, *rundest;
+  unsigned char *window, *runsrc, *rundest;
   int i, j, selector, extra, sym, match_length;
   unsigned short H, L, C, symf;
 
-  register unsigned int bit_buffer;
-  register unsigned char bits_left;
-
   /* easy answers */
   if (!qtm || (out_bytes < 0)) return MSPACK_ERR_ARGS;
   if (qtm->error) return qtm->error;
diff --git a/utils/rbutilqt/mspack/readbits.h b/utils/rbutilqt/mspack/readbits.h
index 9b237a3693..846e8454f7 100644
--- a/utils/rbutilqt/mspack/readbits.h
+++ b/utils/rbutilqt/mspack/readbits.h
@@ -13,6 +13,7 @@
 /* this header defines macros that read data streams by
  * the individual bits
  *
+ * DECLARE_BIT_VARS  declares local variables
  * INIT_BITS         initialises bitstream state in state structure
  * STORE_BITS        stores bitstream state in state structure
  * RESTORE_BITS      restores bitstream state from state structure
@@ -92,13 +93,20 @@
 # endif
 #endif
 
+typedef unsigned int bitbuf_type;
+
 #if HAVE_LIMITS_H
 # include <limits.h>
 #endif
 #ifndef CHAR_BIT
 # define CHAR_BIT (8)
 #endif
-#define BITBUF_WIDTH (sizeof(bit_buffer) * CHAR_BIT)
+#define BITBUF_WIDTH (sizeof(bitbuf_type) * CHAR_BIT)
+
+#define DECLARE_BIT_VARS \
+   unsigned char *i_ptr, *i_end; \
+   register bitbuf_type bit_buffer; \
+   register int bits_left
 
 #define INIT_BITS do {                          \
     BITS_VAR->i_ptr      = &BITS_VAR->inbuf[0]; \
@@ -136,7 +144,7 @@
     unsigned char needed = (bits), bitrun;                      \
     (val) = 0;                                                  \
     while (needed > 0) {                                        \
-        if (bits_left <= (BITBUF_WIDTH - 16)) READ_BYTES;       \
+        if (bits_left <= (int)(BITBUF_WIDTH - 16)) READ_BYTES;	\
         bitrun = (bits_left < needed) ? bits_left : needed;     \
         (val) = ((val) << bitrun) | PEEK_BITS(bitrun);          \
         REMOVE_BITS(bitrun);                                    \
@@ -148,12 +156,13 @@
 # define PEEK_BITS(nbits)   (bit_buffer >> (BITBUF_WIDTH - (nbits)))
 # define REMOVE_BITS(nbits) ((bit_buffer <<= (nbits)), (bits_left -= (nbits)))
 # define INJECT_BITS(bitdata,nbits) ((bit_buffer |= \
-    (bitdata) << (BITBUF_WIDTH - (nbits) - bits_left)), (bits_left += (nbits)))
+    (bitbuf_type)(bitdata) << (BITBUF_WIDTH - (nbits) - bits_left)), \
+    (bits_left += (nbits)))
 #else /* BITS_ORDER_LSB */
-# define PEEK_BITS(nbits)   (bit_buffer & ((1 << (nbits))-1))
+# define PEEK_BITS(nbits)   (bit_buffer & ((bitbuf_type)(1 << (nbits))-1))
 # define REMOVE_BITS(nbits) ((bit_buffer >>= (nbits)), (bits_left -= (nbits)))
 # define INJECT_BITS(bitdata,nbits) ((bit_buffer |= \
-    (bitdata) << bits_left), (bits_left += (nbits)))
+    (bitbuf_type)(bitdata) << bits_left), (bits_left += (nbits)))
 #endif
 
 #ifdef BITS_LSB_TABLE
diff --git a/utils/rbutilqt/mspack/readhuff.h b/utils/rbutilqt/mspack/readhuff.h
index 4d94225789..f6e449f1d2 100644
--- a/utils/rbutilqt/mspack/readhuff.h
+++ b/utils/rbutilqt/mspack/readhuff.h
@@ -28,35 +28,40 @@
 # define HUFF_MAXBITS 16
 #endif
 
+#define DECLARE_HUFF_VARS \
+   DECLARE_BIT_VARS; \
+   register int huff_idx; \
+   register unsigned short huff_sym
+
 /* Decodes the next huffman symbol from the input bitstream into var.
  * Do not use this macro on a table unless build_decode_table() succeeded.
  */
-#define READ_HUFFSYM(tbl, var) do {                     \
-    ENSURE_BITS(HUFF_MAXBITS);                          \
-    sym = HUFF_TABLE(tbl, PEEK_BITS(TABLEBITS(tbl)));   \
-    if (sym >= MAXSYMBOLS(tbl)) HUFF_TRAVERSE(tbl);     \
-    (var) = sym;                                        \
-    i = HUFF_LEN(tbl, sym);                             \
-    REMOVE_BITS(i);                                     \
+#define READ_HUFFSYM(tbl, var) do {                                 \
+    ENSURE_BITS(HUFF_MAXBITS);                                      \
+    huff_sym = HUFF_TABLE(tbl, PEEK_BITS(TABLEBITS(tbl)));          \
+    if (huff_sym >= MAXSYMBOLS(tbl)) HUFF_TRAVERSE(tbl);            \
+    (var) = huff_sym;                                               \
+    huff_idx = HUFF_LEN(tbl, huff_sym);                             \
+    REMOVE_BITS(huff_idx);                                          \
 } while (0)
 
 #ifdef BITS_ORDER_LSB
-# define HUFF_TRAVERSE(tbl) do {                        \
-    i = TABLEBITS(tbl) - 1;                             \
-    do {                                                \
-        if (i++ > HUFF_MAXBITS) HUFF_ERROR;             \
-        sym = HUFF_TABLE(tbl,                           \
-            (sym << 1) | ((bit_buffer >> i) & 1));      \
-    } while (sym >= MAXSYMBOLS(tbl));                   \
+# define HUFF_TRAVERSE(tbl) do {                                    \
+    huff_idx = TABLEBITS(tbl) - 1;                                  \
+    do {                                                            \
+        if (huff_idx++ > HUFF_MAXBITS) HUFF_ERROR;                  \
+        huff_sym = HUFF_TABLE(tbl,                                  \
+            (huff_sym << 1) | ((bit_buffer >> huff_idx) & 1));      \
+    } while (huff_sym >= MAXSYMBOLS(tbl));                          \
 } while (0)
 #else
-#define HUFF_TRAVERSE(tbl) do {                         \
-    i = 1 << (BITBUF_WIDTH - TABLEBITS(tbl));           \
-    do {                                                \
-        if ((i >>= 1) == 0) HUFF_ERROR;                 \
-        sym = HUFF_TABLE(tbl,                           \
-            (sym << 1) | ((bit_buffer & i) ? 1 : 0));   \
-    } while (sym >= MAXSYMBOLS(tbl));                   \
+#define HUFF_TRAVERSE(tbl) do {                                     \
+    huff_idx = 1 << (BITBUF_WIDTH - TABLEBITS(tbl));                \
+    do {                                                            \
+        if ((huff_idx >>= 1) == 0) HUFF_ERROR;                      \
+        huff_sym = HUFF_TABLE(tbl,                                  \
+            (huff_sym << 1) | ((bit_buffer & huff_idx) ? 1 : 0));   \
+    } while (huff_sym >= MAXSYMBOLS(tbl));                          \
 } while (0)
 #endif
 
diff --git a/utils/rbutilqt/mspack/system-mspack.c b/utils/rbutilqt/mspack/system-mspack.c
index 9d4886a8db..3d8d1eef8f 100644
--- a/utils/rbutilqt/mspack/system-mspack.c
+++ b/utils/rbutilqt/mspack/system-mspack.c
@@ -13,11 +13,6 @@
 
 #include "system-mspack.h"
 
-#ifndef LARGEFILE_SUPPORT
-const char *largefile_msg = "library not compiled to support large files.";
-#endif
-
-
 int mspack_version(int entity) {
   switch (entity) {
    /* CHM decoder version 1 -> 2 changes:
diff --git a/utils/rbutilqt/mspack/system-mspack.h b/utils/rbutilqt/mspack/system-mspack.h
index a0e6cf3ca8..5c356036b4 100644
--- a/utils/rbutilqt/mspack/system-mspack.h
+++ b/utils/rbutilqt/mspack/system-mspack.h
@@ -20,6 +20,7 @@ extern "C" {
 #endif
 
 #include "mspack.h"
+#include "macros.h"
 
 /* fix for problem with GCC 4 and glibc (thanks to Ville Skytta)
  * http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=150429
@@ -28,24 +29,6 @@ extern "C" {
 # undef read
 #endif
 
-#ifdef DEBUG
-# include <stdio.h>
-/* Old GCCs don't have __func__, but __FUNCTION__:
- * http://gcc.gnu.org/onlinedocs/gcc/Function-Names.html
- */
-# if __STDC_VERSION__ < 199901L
-#  if __GNUC__ >= 2
-#   define __func__ __FUNCTION__
-#  else
-#   define __func__ "<unknown>"
-#  endif
-# endif
-# define D(x) do { printf("%s:%d (%s) ",__FILE__, __LINE__, __func__); \
-                   printf x ; fputc('\n', stdout); fflush(stdout);} while (0);
-#else
-# define D(x)
-#endif
-
 /* CAB supports searching through files over 4GB in size, and the CHM file
  * format actively uses 64-bit offsets. These can only be fully supported
  * if the system the code runs on supports large files. If not, the library
@@ -57,36 +40,6 @@ extern "C" {
 # include <limits.h>
 #endif
 
-#if ((defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS >= 64) || \
-     (defined(FILESIZEBITS)      && FILESIZEBITS      >= 64) || \
-     (defined(SIZEOF_OFF_T)      && SIZEOF_OFF_T      >= 8)  || \
-     defined(_LARGEFILE_SOURCE) || defined(_LARGEFILE64_SOURCE))
-# define LARGEFILE_SUPPORT 1
-# define LD "lld"
-# define LU "llu"
-#else
-extern const char *largefile_msg;
-# define LD "ld"
-# define LU "lu"
-#endif
-
-/* endian-neutral reading of little-endian data */
-#define __egi32(a,n) ( ((((unsigned char *) a)[n+3]) << 24) | \
-		       ((((unsigned char *) a)[n+2]) << 16) | \
-		       ((((unsigned char *) a)[n+1]) <<  8) | \
-		       ((((unsigned char *) a)[n+0])))
-#define EndGetI64(a) ((((unsigned long long int) __egi32(a,4)) << 32) | \
-		      ((unsigned int) __egi32(a,0)))
-#define EndGetI32(a) __egi32(a,0)
-#define EndGetI16(a) ((((a)[1])<<8)|((a)[0]))
-
-/* endian-neutral reading of big-endian data */
-#define EndGetM32(a) (((((unsigned char *) a)[0]) << 24) | \
-		      ((((unsigned char *) a)[1]) << 16) | \
-		      ((((unsigned char *) a)[2]) <<  8) | \
-		      ((((unsigned char *) a)[3])))
-#define EndGetM16(a) ((((a)[0])<<8)|((a)[1]))
-
 extern struct mspack_system *mspack_default_system;
 
 /* returns the length of a file opened for reading */
diff --git a/utils/rbutilqt/preview.cpp b/utils/rbutilqt/preview.cpp
index ba241dfe01..7de9cbee61 100644
--- a/utils/rbutilqt/preview.cpp
+++ b/utils/rbutilqt/preview.cpp
@@ -79,9 +79,9 @@ PreviewLabel::PreviewLabel(QWidget * parent, Qt::WindowFlags f)
 void PreviewLabel::mouseMoveEvent(QMouseEvent * event)
 {
     hovertimer.start();
-    mousepos = event->globalPos();
+    mousepos = event->globalPosition().toPoint();
 }
-void PreviewLabel::enterEvent(QEvent * event)
+void PreviewLabel::enterEvent(QEnterEvent * event)
 {
     (void) event;
     hovertimer.start();
@@ -119,4 +119,3 @@ void PreviewLabel::setText(QString text)
     QLabel::setText(text);
     preview->setText(text);
 }
-
diff --git a/utils/rbutilqt/preview.h b/utils/rbutilqt/preview.h
index 7462413f0a..a57854c0a8 100644
--- a/utils/rbutilqt/preview.h
+++ b/utils/rbutilqt/preview.h
@@ -60,7 +60,7 @@ public:
     void setText(QString text);
 private slots:
     void mouseMoveEvent(QMouseEvent * event);
-    void enterEvent(QEvent * event);
+    void enterEvent(QEnterEvent * event);
     void leaveEvent(QEvent * event);
     void timeout();
 
diff --git a/utils/rbutilqt/quazip/README.ROCKBOX b/utils/rbutilqt/quazip/README.ROCKBOX
index 2e1dca737f..f4e3211cad 100644
--- a/utils/rbutilqt/quazip/README.ROCKBOX
+++ b/utils/rbutilqt/quazip/README.ROCKBOX
@@ -3,7 +3,7 @@ These files are distributed under the LGPL v2.1 or later. Only source files
 actually used in Rockbox Utility are included, further sources have been left
 out. Check the quazip source distribution for those.
 
-The source files have been last synced with the project's release 1.1 at
-https://github.com/stachenov/quazip/ on October 11, 2020.
+The source files have been last synced with the project's release 1.6 at
+https://github.com/stachenov/quazip/ from March 5, 2025.
 
 
diff --git a/utils/rbutilqt/quazip/minizip_crypt.h b/utils/rbutilqt/quazip/minizip_crypt.h
index 2e833f7f3c..a82252bdf2 100644
--- a/utils/rbutilqt/quazip/minizip_crypt.h
+++ b/utils/rbutilqt/quazip/minizip_crypt.h
@@ -90,13 +90,7 @@ static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t FAR
 #    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
 #  endif
 
-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
-    const char *passwd;         /* password string */
-    unsigned char *buf;         /* where to write header */
-    int bufSize;
-    unsigned long* pkeys;
-    const z_crc_t FAR * pcrc_32_tab;
-    unsigned long crcForCrypting;
+static int crypthead(const char *passwd, unsigned char *buf, int bufSize, unsigned long *pkeys, const z_crc_t FAR *pcrc_32_tab, unsigned long crcForCrypting)
 {
     int n;                       /* index in random header */
     int t;                       /* temporary */
diff --git a/utils/rbutilqt/quazip/qioapi.cpp b/utils/rbutilqt/quazip/qioapi.cpp
index 60f101d7e9..85aebbedc9 100644
--- a/utils/rbutilqt/quazip/qioapi.cpp
+++ b/utils/rbutilqt/quazip/qioapi.cpp
@@ -32,51 +32,67 @@
 #define SEEK_SET    0
 #endif
 
-voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,voidpf file,int mode)
+voidpf call_zopen64(const zlib_filefunc64_32_def* pfilefunc, voidpf file, int mode)
 {
-    if (pfilefunc->zfile_func64.zopen64_file != nullptr)
-        return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,file,mode);
-    else
-    {
-        return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,file,mode);
-    }
+    auto func = pfilefunc->zfile_func64.zopen64_file != nullptr
+        ? pfilefunc->zfile_func64.zopen64_file
+        : pfilefunc->zopen32_file;
+    return (*func)(pfilefunc->zfile_func64.opaque, file, mode);
 }
 
-int call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
+namespace {
+
+int zseek64(const zlib_filefunc64_32_def* pfilefunc, voidpf filestream, ZPOS64_T offset, int origin)
 {
-    if (pfilefunc->zfile_func64.zseek64_file != nullptr)
-        return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
-    else
-    {
-        uLong offsetTruncated = (uLong)offset;
-        if (offsetTruncated != offset)
-            return -1;
-        else
-            return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
-    }
+    return (*pfilefunc->zfile_func64.zseek64_file)(pfilefunc->zfile_func64.opaque, filestream, offset, origin);
 }
 
-ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
+
+int zseek32(const zlib_filefunc64_32_def* pfilefunc, voidpf filestream, ZPOS64_T offset, int origin)
 {
-    if (pfilefunc->zfile_func64.zseek64_file != nullptr)
-        return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
-    else
-    {
-        uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
-        if ((tell_uLong) == ((uLong)-1))
-            return (ZPOS64_T)-1;
-        else
-            return tell_uLong;
-    }
+    uLong offsetTruncated = static_cast<uLong>(offset);
+    if (offsetTruncated != offset)
+        return -1;
+    return (*pfilefunc->zseek32_file)(pfilefunc->zfile_func64.opaque, filestream, offsetTruncated, origin);
+}
+
+}
+
+int call_zseek64(const zlib_filefunc64_32_def* pfilefunc, voidpf filestream, ZPOS64_T offset, int origin)
+{
+    auto func = pfilefunc->zfile_func64.zseek64_file != nullptr ? zseek64 : zseek32;
+    return (*func)(pfilefunc, filestream, offset, origin);
+
+}
+
+namespace {
+
+ZPOS64_T ztell64(const zlib_filefunc64_32_def* pfilefunc, voidpf filestream)
+{
+    return (*pfilefunc->zfile_func64.ztell64_file) (pfilefunc->zfile_func64.opaque, filestream);
+}
+
+ZPOS64_T ztell32(const zlib_filefunc64_32_def* pfilefunc, voidpf filestream)
+{
+    uLong tell_uLong = (*pfilefunc->ztell32_file)(pfilefunc->zfile_func64.opaque, filestream);
+    if (tell_uLong == static_cast<uLong>(-1))
+        return static_cast<ZPOS64_T>(-1);
+    return tell_uLong;
+}
+
+}
+
+ZPOS64_T call_ztell64(const zlib_filefunc64_32_def* pfilefunc, voidpf filestream)
+{
+    auto *func = pfilefunc->zfile_func64.zseek64_file != nullptr ? ztell64 : ztell32;
+    return (*func)(pfilefunc, filestream);
+
 }
 
 /// @cond internal
 struct QIODevice_descriptor {
     // Position only used for writing to sequential devices.
-    qint64 pos;
-    inline QIODevice_descriptor():
-        pos(0)
-    {}
+    qint64 pos{0};
 };
 /// @endcond
 
@@ -94,28 +110,27 @@ voidpf ZCALLBACK qiodevice_open_file_func (
         desiredMode = QIODevice::ReadWrite;
     else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
         desiredMode = QIODevice::WriteOnly;
+    else
+        return nullptr;
     if (iodevice->isOpen()) {
-        if ((iodevice->openMode() & desiredMode) == desiredMode) {
-            if (desiredMode != QIODevice::WriteOnly
-                    && iodevice->isSequential()) {
-                // We can use sequential devices only for writing.
-                delete d;
-                return nullptr;
-            } else {
-                if ((desiredMode & QIODevice::WriteOnly) != 0) {
-                    // open for writing, need to seek existing device
-                    if (!iodevice->isSequential()) {
-                        iodevice->seek(0);
-                    } else {
-                        d->pos = iodevice->pos();
-                    }
-                }
-            }
-            return iodevice;
-        } else {
+        if ((iodevice->openMode() & desiredMode) != desiredMode) {
             delete d;
             return nullptr;
         }
+        if (desiredMode != QIODevice::WriteOnly && iodevice->isSequential()) {
+            // We can use sequential devices only for writing.
+            delete d;
+            return nullptr;
+        }
+        if ((desiredMode & QIODevice::WriteOnly) != 0) {
+            // open for writing, need to seek existing device
+            if (!iodevice->isSequential()) {
+              iodevice->seek(0);
+            } else {
+              d->pos = iodevice->pos();
+            }
+        }
+        return iodevice;
     }
     iodevice->open(desiredMode);
     if (iodevice->isOpen()) {
@@ -124,13 +139,11 @@ voidpf ZCALLBACK qiodevice_open_file_func (
             iodevice->close();
             delete d;
             return nullptr;
-        } else {
-            return iodevice;
         }
-    } else {
-        delete d;
-        return nullptr;
+        return iodevice;
     }
+    delete d;
+    return nullptr;
 }
 
 
@@ -142,9 +155,9 @@ uLong ZCALLBACK qiodevice_read_file_func (
 {
     QIODevice_descriptor *d = reinterpret_cast<QIODevice_descriptor*>(opaque);
     QIODevice *iodevice = reinterpret_cast<QIODevice*>(stream);
-    qint64 ret64 = iodevice->read((char*)buf,size);
+    qint64 ret64 = iodevice->read(static_cast<char*>(buf),size);
     uLong ret;
-    ret = (uLong) ret64;
+    ret = static_cast<uLong>(ret64);
     if (ret64 != -1) {
         d->pos += ret64;
     }
@@ -165,7 +178,7 @@ uLong ZCALLBACK qiodevice_write_file_func (
     if (ret64 != -1) {
         d->pos += ret64;
     }
-    ret = (uLong) ret64;
+    ret = static_cast<uLong>(ret64);
     return ret;
 }
 
@@ -209,24 +222,22 @@ int ZCALLBACK qiodevice_seek_file_func (
 {
     QIODevice *iodevice = reinterpret_cast<QIODevice*>(stream);
     if (iodevice->isSequential()) {
-        if (origin == ZLIB_FILEFUNC_SEEK_END
-                && offset == 0) {
+        if (origin == ZLIB_FILEFUNC_SEEK_END && offset == 0) {
             // sequential devices are always at end (needed in mdAppend)
             return 0;
-        } else {
-            qWarning("qiodevice_seek_file_func() called for sequential device");
-            return -1;
         }
+        qWarning("qiodevice_seek_file_func() called for sequential device");
+        return -1;
     }
     uLong qiodevice_seek_result=0;
     int ret;
     switch (origin)
     {
     case ZLIB_FILEFUNC_SEEK_CUR :
-        qiodevice_seek_result = ((QIODevice*)stream)->pos() + offset;
+        qiodevice_seek_result = (static_cast<QIODevice*>(stream))->pos() + offset;
         break;
     case ZLIB_FILEFUNC_SEEK_END :
-        qiodevice_seek_result = ((QIODevice*)stream)->size() - offset;
+        qiodevice_seek_result = (static_cast<QIODevice*>(stream))->size() - offset;
         break;
     case ZLIB_FILEFUNC_SEEK_SET :
         qiodevice_seek_result = offset;
@@ -246,24 +257,22 @@ int ZCALLBACK qiodevice64_seek_file_func (
 {
     QIODevice *iodevice = reinterpret_cast<QIODevice*>(stream);
     if (iodevice->isSequential()) {
-        if (origin == ZLIB_FILEFUNC_SEEK_END
-                && offset == 0) {
+        if (origin == ZLIB_FILEFUNC_SEEK_END && offset == 0) {
             // sequential devices are always at end (needed in mdAppend)
             return 0;
-        } else {
-            qWarning("qiodevice_seek_file_func() called for sequential device");
-            return -1;
         }
+        qWarning("qiodevice_seek_file_func() called for sequential device");
+        return -1;
     }
     qint64 qiodevice_seek_result=0;
     int ret;
     switch (origin)
     {
     case ZLIB_FILEFUNC_SEEK_CUR :
-        qiodevice_seek_result = ((QIODevice*)stream)->pos() + offset;
+        qiodevice_seek_result = (static_cast<QIODevice*>(stream))->pos() + offset;
         break;
     case ZLIB_FILEFUNC_SEEK_END :
-        qiodevice_seek_result = ((QIODevice*)stream)->size() - offset;
+        qiodevice_seek_result = (static_cast<QIODevice*>(stream))->size() - offset;
         break;
     case ZLIB_FILEFUNC_SEEK_SET :
         qiodevice_seek_result = offset;
diff --git a/utils/rbutilqt/quazip/quazip.cpp b/utils/rbutilqt/quazip/quazip.cpp
index 29a278da29..1b3056662e 100644
--- a/utils/rbutilqt/quazip/quazip.cpp
+++ b/utils/rbutilqt/quazip/quazip.cpp
@@ -79,10 +79,9 @@ class QuaZipPrivate {
     inline QTextCodec *getDefaultFileNameCodec()
     {
         if (defaultFileNameCodec == nullptr) {
-            return QTextCodec::codecForLocale();
-        } else {
-            return defaultFileNameCodec;
+          return QTextCodec::codecForLocale();
         }
+        return defaultFileNameCodec;
     }
     /// The constructor for the corresponding QuaZip constructor.
     inline QuaZipPrivate(QuaZip *q):
@@ -245,9 +244,8 @@ bool QuaZip::open(Mode mode, zlib_filefunc_def* ioApi)
     if (p->zipName.isEmpty()) {
       qWarning("QuaZip::open(): set either ZIP file name or IO device first");
       return false;
-    } else {
-      ioDevice = new QFile(p->zipName);
     }
+    ioDevice = new QFile(p->zipName);
   }
   unsigned flags = 0;
   switch(mode) {
@@ -267,25 +265,23 @@ bool QuaZip::open(Mode mode, zlib_filefunc_def* ioApi)
               }
           }
       }
-      if(p->unzFile_f!=nullptr) {
-        if (ioDevice->isSequential()) {
-            unzClose(p->unzFile_f);
-            if (!p->zipName.isEmpty())
-                delete ioDevice;
-            qWarning("QuaZip::open(): "
-                     "only mdCreate can be used with "
-                     "sequential devices");
-            return false;
-        }
-        p->mode=mode;
-        p->ioDevice = ioDevice;
-        return true;
-      } else {
-        p->zipError=UNZ_OPENERROR;
+      if (p->unzFile_f == nullptr) {
+        p->zipError = UNZ_OPENERROR;
         if (!p->zipName.isEmpty())
           delete ioDevice;
         return false;
       }
+      if (ioDevice->isSequential()) {
+          unzClose(p->unzFile_f);
+          if (!p->zipName.isEmpty())
+              delete ioDevice;
+          qWarning("QuaZip::open(): only mdCreate can be used with sequential devices");
+          return false;
+      }
+      p->mode = mode;
+      p->ioDevice = ioDevice;
+      return true;
+
     case mdCreate:
     case mdAppend:
     case mdAdd:
@@ -313,30 +309,28 @@ bool QuaZip::open(Mode mode, zlib_filefunc_def* ioApi)
               zipSetFlags(p->zipFile_f, flags);
           }
       }
-      if(p->zipFile_f!=nullptr) {
-        if (ioDevice->isSequential()) {
-            if (mode != mdCreate) {
-                zipClose(p->zipFile_f, nullptr);
-                qWarning("QuaZip::open(): "
-                        "only mdCreate can be used with "
-                         "sequential devices");
-                if (!p->zipName.isEmpty())
-                    delete ioDevice;
-                return false;
-            }
-            zipSetFlags(p->zipFile_f, ZIP_SEQUENTIAL);
-        }
-        p->mode=mode;
-        p->ioDevice = ioDevice;
-        return true;
-      } else {
-        p->zipError=UNZ_OPENERROR;
+      if(p->zipFile_f == nullptr) {
+        p->zipError = UNZ_OPENERROR;
         if (!p->zipName.isEmpty())
           delete ioDevice;
         return false;
       }
+      if (ioDevice->isSequential()) {
+        if (mode != mdCreate) {
+          zipClose(p->zipFile_f, nullptr);
+          qWarning("QuaZip::open(): only mdCreate can be used with sequential devices");
+          if (!p->zipName.isEmpty())
+              delete ioDevice;
+          return false;
+        }
+        zipSetFlags(p->zipFile_f, ZIP_SEQUENTIAL);
+      }
+      p->mode=mode;
+      p->ioDevice = ioDevice;
+      return true;
+
     default:
-      qWarning("QuaZip::open(): unknown mode: %d", (int)mode);
+      qWarning("QuaZip::open(): unknown mode: %d", static_cast<int>(mode));
       if (!p->zipName.isEmpty())
         delete ioDevice;
       return false;
@@ -349,7 +343,6 @@ void QuaZip::close()
   p->zipError=UNZ_OK;
   switch(p->mode) {
     case mdNotOpen:
-      qWarning("QuaZip::close(): ZIP is not open");
       return;
     case mdUnzip:
       p->zipError=unzClose(p->unzFile_f);
@@ -362,7 +355,7 @@ void QuaZip::close()
         : p->commentCodec->fromUnicode(p->comment).constData());
       break;
     default:
-      qWarning("QuaZip::close(): unknown mode: %d", (int)p->mode);
+      qWarning("QuaZip::close(): unknown mode: %d", static_cast<int>(p->mode));
       return;
   }
   // opened by name, need to delete the internal IO device
@@ -371,8 +364,7 @@ void QuaZip::close()
       p->ioDevice = nullptr;
   }
   p->clearDirectoryMap();
-  if(p->zipError==UNZ_OK)
-    p->mode=mdNotOpen;
+  p->mode=mdNotOpen;
 }
 
 void QuaZip::setZipName(const QString& zipName)
@@ -397,7 +389,7 @@ void QuaZip::setIoDevice(QIODevice *ioDevice)
 
 int QuaZip::getEntriesCount()const
 {
-  QuaZip *fakeThis=(QuaZip*)this; // non-const
+  QuaZip *fakeThis=const_cast<QuaZip*>(this); // non-const
   fakeThis->p->zipError=UNZ_OK;
   if(p->mode!=mdUnzip) {
     qWarning("QuaZip::getEntriesCount(): ZIP is not open in mdUnzip mode");
@@ -406,12 +398,12 @@ int QuaZip::getEntriesCount()const
   unz_global_info64 globalInfo;
   if((fakeThis->p->zipError=unzGetGlobalInfo64(p->unzFile_f, &globalInfo))!=UNZ_OK)
     return p->zipError;
-  return (int)globalInfo.number_entry;
+  return static_cast<int>(globalInfo.number_entry);
 }
 
 QString QuaZip::getComment()const
 {
-  QuaZip *fakeThis=(QuaZip*)this; // non-const
+  QuaZip *fakeThis=const_cast<QuaZip*>(this); // non-const
   fakeThis->p->zipError=UNZ_OK;
   if(p->mode!=mdUnzip) {
     qWarning("QuaZip::getComment(): ZIP is not open in mdUnzip mode");
@@ -520,17 +512,16 @@ bool QuaZip::getCurrentFileInfo(QuaZipFileInfo *info)const
     if (info == nullptr) { // Very unlikely because of the overloads
         return false;
     }
-    if (getCurrentFileInfo(&info64)) {
-        info64.toQuaZipFileInfo(*info);
-        return true;
-    } else {
+    if (!getCurrentFileInfo(&info64)) {
         return false;
     }
+    info64.toQuaZipFileInfo(*info);
+    return true;
 }
 
 bool QuaZip::getCurrentFileInfo(QuaZipFileInfo64 *info)const
 {
-  QuaZip *fakeThis=(QuaZip*)this; // non-const
+  QuaZip *fakeThis=const_cast<QuaZip*>(this); // non-const
   fakeThis->p->zipError=UNZ_OK;
   if(p->mode!=mdUnzip) {
     qWarning("QuaZip::getCurrentFileInfo(): ZIP is not open in mdUnzip mode");
@@ -575,7 +566,7 @@ bool QuaZip::getCurrentFileInfo(QuaZipFileInfo64 *info)const
 
 QString QuaZip::getCurrentFileName()const
 {
-  QuaZip *fakeThis=(QuaZip*)this; // non-const
+  QuaZip *fakeThis=const_cast<QuaZip*>(this); // non-const
   fakeThis->p->zipError=UNZ_OK;
   if(p->mode!=mdUnzip) {
     qWarning("QuaZip::getCurrentFileName(): ZIP is not open in mdUnzip mode");
@@ -758,28 +749,25 @@ bool QuaZipPrivate::getFileInfoList(QList<TFileInfo> *result) const
 QStringList QuaZip::getFileNameList() const
 {
     QStringList list;
-    if (p->getFileInfoList(&list))
-        return list;
-    else
+    if (!p->getFileInfoList(&list))
         return QStringList();
+    return list;
 }
 
 QList<QuaZipFileInfo> QuaZip::getFileInfoList() const
 {
     QList<QuaZipFileInfo> list;
-    if (p->getFileInfoList(&list))
-        return list;
-    else
+    if (!p->getFileInfoList(&list))
         return QList<QuaZipFileInfo>();
+    return list;
 }
 
 QList<QuaZipFileInfo64> QuaZip::getFileInfoList64() const
 {
     QList<QuaZipFileInfo64> list;
-    if (p->getFileInfoList(&list))
-        return list;
-    else
+    if (!p->getFileInfoList(&list))
         return QList<QuaZipFileInfo64>();
+    return list;
 }
 
 Qt::CaseSensitivity QuaZip::convertCaseSensitivity(QuaZip::CaseSensitivity cs)
diff --git a/utils/rbutilqt/quazip/quazip.h b/utils/rbutilqt/quazip/quazip.h
index 486d5885bf..5f5107d32d 100644
--- a/utils/rbutilqt/quazip/quazip.h
+++ b/utils/rbutilqt/quazip/quazip.h
@@ -127,10 +127,6 @@ class QUAZIP_EXPORT QuaZip {
             CaseSensitivity cs);
   private:
     QuaZipPrivate *p;
-    // not (and will not be) implemented
-    QuaZip(const QuaZip& that);
-    // not (and will not be) implemented
-    QuaZip& operator=(const QuaZip& that);
   public:
     /// Constructs QuaZip object.
     /** Call setName() before opening constructed object. */
@@ -140,6 +136,10 @@ class QUAZIP_EXPORT QuaZip {
     /// Constructs QuaZip object associated with ZIP file represented by \a ioDevice.
     /** The IO device must be seekable, otherwise an error will occur when opening. */
     QuaZip(QIODevice *ioDevice);
+    // not (and will not be) implemented
+    QuaZip(const QuaZip& that) = delete;
+    // not (and will not be) implemented
+    QuaZip& operator=(const QuaZip& that) = delete;
     /// Destroys QuaZip object.
     /** Calls close() if necessary. */
     ~QuaZip();
@@ -213,6 +213,11 @@ class QUAZIP_EXPORT QuaZip {
      * but at least it makes your programs work instead of crashing. Note that
      * if the auto-close flag is cleared, then this is a non-issue, and
      * commit() isn't called.
+     *
+     * Closing an already closed (or never opened) instance is safe,
+     * regardless of whether the first close attempt was successful.
+     * This second close does nothing, but is considered a success,
+     * as far as getZipError() is concerned.
       */
     void close();
     /// Sets the codec used to encode/decode file names inside archive.
@@ -298,9 +303,9 @@ class QUAZIP_EXPORT QuaZip {
     QString getComment() const;
     /// Sets the global comment in the ZIP file.
     /** The comment will be written to the archive on close operation.
-     * QuaZip makes a distinction between a null QByteArray() comment 
-     * and an empty &quot;&quot; comment in the QuaZip::mdAdd mode. 
-     * A null comment is the default and it means &quot;don't change 
+     * QuaZip makes a distinction between a null QByteArray() comment
+     * and an empty &quot;&quot; comment in the QuaZip::mdAdd mode.
+     * A null comment is the default and it means &quot;don't change
      * the comment&quot;. An empty comment removes the original comment.
      *
      * \sa open()
diff --git a/utils/rbutilqt/quazip/quazip_global.h b/utils/rbutilqt/quazip/quazip_global.h
index de581bd7c4..ffbf3b5486 100644
--- a/utils/rbutilqt/quazip/quazip_global.h
+++ b/utils/rbutilqt/quazip/quazip_global.h
@@ -25,7 +25,7 @@ Original ZIP package is copyrighted by Gilles Vollant and contributors,
 see quazip/(un)zip.h files for details. Basically it's the zlib license.
 */
 
-#include <QtCore/qglobal.h>
+#include <QtCore/QtGlobal>
 
 /**
   This is automatically defined when building a static library, but when
diff --git a/utils/rbutilqt/quazip/quazip_qt_compat.h b/utils/rbutilqt/quazip/quazip_qt_compat.h
index d1c912a04d..0dde011f1d 100644
--- a/utils/rbutilqt/quazip/quazip_qt_compat.h
+++ b/utils/rbutilqt/quazip/quazip_qt_compat.h
@@ -9,8 +9,8 @@
  * Some includes are repeated just in case we want to split this file later.
  */
 
-#include <Qt>
-#include <QtGlobal>
+#include <QtCore/Qt>
+#include <QtCore/QtGlobal>
 
 // Legacy encodings are still everywhere, but the Qt team decided we
 // don't need them anymore and moved them out of Core in Qt 6.
@@ -30,10 +30,9 @@ inline bool quazip_close(QIODevice *device) {
     if (file != nullptr) {
         // We have to call the ugly commit() instead:
         return file->commit();
-    } else {
-        device->close();
-        return true;
     }
+    device->close();
+    return true;
 }
 #else
 inline bool quazip_close(QIODevice *device) {
@@ -46,12 +45,12 @@ inline bool quazip_close(QIODevice *device) {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
 using Qt::SkipEmptyParts;
 #else
-#include <QString>
+#include <QtCore/QString>
 const auto SkipEmptyParts = QString::SplitBehavior::SkipEmptyParts;
 #endif
 
 // and yet another... (why didn't they just make qSort delegate to std::sort?)
-#include <QList>
+#include <QtCore/QList>
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
 #include <algorithm>
 template<typename T, typename C>
@@ -59,7 +58,7 @@ inline void quazip_sort(T begin, T end, C comparator) {
     std::sort(begin, end, comparator);
 }
 #else
-#include <QtAlgorithms>
+#include <QtCore/QtAlgorithms>
 template<typename T, typename C>
 inline void quazip_sort(T begin, T end, C comparator) {
     qSort(begin, end, comparator);
@@ -67,8 +66,8 @@ inline void quazip_sort(T begin, T end, C comparator) {
 #endif
 
 // this is a stupid rename...
-#include <QDateTime>
-#include <QFileInfo>
+#include <QtCore/QDateTime>
+#include <QtCore/QFileInfo>
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
 inline QDateTime quazip_ctime(const QFileInfo &fi) {
     return fi.birthTime();
@@ -79,16 +78,61 @@ inline QDateTime quazip_ctime(const QFileInfo &fi) {
 }
 #endif
 
+// this is just a slightly better alternative
+#include <QtCore/QFileInfo>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+inline bool quazip_is_symlink(const QFileInfo &fi) {
+    return fi.isSymbolicLink();
+}
+#else
+inline bool quazip_is_symlink(const QFileInfo &fi) {
+    // also detects *.lnk on Windows, but better than nothing
+    return fi.isSymLink();
+}
+#endif
+
+// I'm not even sure what this one is, but nevertheless
+#include <QtCore/QFileInfo>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
+inline QString quazip_symlink_target(const QFileInfo &fi) {
+    return fi.symLinkTarget();
+}
+#else
+inline QString quazip_symlink_target(const QFileInfo &fi) {
+    return fi.readLink(); // What's the difference? I've no idea.
+}
+#endif
+
+// deprecation
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+#include <QtCore/QTimeZone>
+inline QDateTime quazip_since_epoch() {
+    return QDateTime(QDate(1970, 1, 1), QTime(0, 0), QTimeZone::utc());
+}
+
+inline QDateTime quazip_since_epoch_ntfs() {
+    return QDateTime(QDate(1601, 1, 1), QTime(0, 0), QTimeZone::utc());
+}
+#else
+inline QDateTime quazip_since_epoch() {
+    return QDateTime(QDate(1970, 1, 1), QTime(0, 0), Qt::UTC);
+}
+
+inline QDateTime quazip_since_epoch_ntfs() {
+    return QDateTime(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
+}
+#endif
+
 // this is not a deprecation but an improvement, for a change
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #if (QT_VERSION >= 0x040700)
 inline quint64 quazip_ntfs_ticks(const QDateTime &time, int fineTicks) {
-    QDateTime base(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
+    QDateTime base = quazip_since_epoch_ntfs();
     return base.msecsTo(time) * 10000 + fineTicks;
 }
 #else
 inline quint64 quazip_ntfs_ticks(const QDateTime &time, int fineTicks) {
-    QDateTime base(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
+    QDateTime base = quazip_since_epoch_ntfs();
     QDateTime utc = time.toUTC();
     return (static_cast<qint64>(base.date().daysTo(utc.date()))
             * Q_INT64_C(86400000)
@@ -98,7 +142,7 @@ inline quint64 quazip_ntfs_ticks(const QDateTime &time, int fineTicks) {
 #endif
 
 // yet another improvement...
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) // Yay! Finally a way to get time as qint64!
 inline qint64 quazip_to_time64_t(const QDateTime &time) {
     return time.toSecsSinceEpoch();
@@ -109,7 +153,7 @@ inline qint64 quazip_to_time64_t(const QDateTime &time) {
 }
 #endif
 
-#include <QTextStream>
+#include <QtCore/QTextStream>
 // and another stupid move
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
 const auto quazip_endl = Qt::endl;
diff --git a/utils/rbutilqt/quazip/quazipfile.cpp b/utils/rbutilqt/quazip/quazipfile.cpp
index d70acf7fe3..4a5f2f9b84 100644
--- a/utils/rbutilqt/quazip/quazipfile.cpp
+++ b/utils/rbutilqt/quazip/quazipfile.cpp
@@ -285,7 +285,7 @@ bool QuaZipFile::open(OpenMode mode, int *method, int *level, bool raw, const ch
       }
       if(p->zip->getMode()!=QuaZip::mdUnzip) {
         qWarning("QuaZipFile::open(): file open mode %d incompatible with ZIP open mode %d",
-            (int)mode, (int)p->zip->getMode());
+            (int)mode, static_cast<int>(p->zip->getMode()));
         return false;
       }
       if(!p->zip->hasCurrentFile()) {
@@ -293,13 +293,13 @@ bool QuaZipFile::open(OpenMode mode, int *method, int *level, bool raw, const ch
         return false;
       }
     }
-    p->setZipError(unzOpenCurrentFile3(p->zip->getUnzFile(), method, level, (int)raw, password));
-    if(p->zipError==UNZ_OK) {
-      setOpenMode(mode);
-      p->raw=raw;
-      return true;
-    } else
+    p->setZipError(unzOpenCurrentFile3(p->zip->getUnzFile(), method, level, static_cast<int>(raw), password));
+    if(p->zipError != UNZ_OK) {
       return false;
+    }
+    setOpenMode(mode);
+    p->raw=raw;
+    return true;
   }
   qWarning("QuaZipFile::open(): open mode %d not supported by this function", (int)mode);
   return false;
@@ -327,7 +327,7 @@ bool QuaZipFile::open(OpenMode mode, const QuaZipNewInfo& info,
     }
     if(p->zip->getMode()!=QuaZip::mdCreate&&p->zip->getMode()!=QuaZip::mdAppend&&p->zip->getMode()!=QuaZip::mdAdd) {
       qWarning("QuaZipFile::open(): file open mode %d incompatible with ZIP open mode %d",
-          (int)mode, (int)p->zip->getMode());
+          (int)mode, static_cast<int>(p->zip->getMode()));
       return false;
     }
     info_z.tmz_date.tm_year=info.dateTime.date().year();
@@ -337,8 +337,8 @@ bool QuaZipFile::open(OpenMode mode, const QuaZipNewInfo& info,
     info_z.tmz_date.tm_min=info.dateTime.time().minute();
     info_z.tmz_date.tm_sec=info.dateTime.time().second();
     info_z.dosDate = 0;
-    info_z.internal_fa=(uLong)info.internalAttr;
-    info_z.external_fa=(uLong)info.externalAttr;
+    info_z.internal_fa=static_cast<uLong>(info.internalAttr);
+    info_z.external_fa=static_cast<uLong>(info.externalAttr);
     if (p->zip->isDataDescriptorWritingEnabled())
         zipSetFlags(p->zip->getZipFile(), ZIP_WRITE_DATA_DESCRIPTOR);
     else
@@ -353,23 +353,23 @@ bool QuaZipFile::open(OpenMode mode, const QuaZipNewInfo& info,
           p->zip->isUtf8Enabled()
             ? info.comment.toUtf8().constData()
             : p->zip->getCommentCodec()->fromUnicode(info.comment).constData(),
-          method, level, (int)raw,
+          method, level, static_cast<int>(raw),
           windowBits, memLevel, strategy,
-          password, (uLong)crc,
+          password, static_cast<uLong>(crc),
           (p->zip->getOsCode() << 8) | QUAZIP_VERSION_MADE_BY,
           0,
           p->zip->isZip64Enabled()));
-    if(p->zipError==UNZ_OK) {
-      p->writePos=0;
-      setOpenMode(mode);
-      p->raw=raw;
-      if(raw) {
-        p->crc=crc;
-        p->uncompressedSize=info.uncompressedSize;
-      }
-      return true;
-    } else
+    if (p->zipError != UNZ_OK) {
       return false;
+    }
+    p->writePos=0;
+    setOpenMode(mode);
+    p->raw=raw;
+    if(raw) {
+      p->crc=crc;
+      p->uncompressedSize=info.uncompressedSize;
+    }
+    return true;
   }
   qWarning("QuaZipFile::open(): open mode %d not supported by this function", (int)mode);
   return false;
@@ -395,8 +395,7 @@ qint64 QuaZipFile::pos()const
       // but thankfully bytesAvailable() returns the number of
       // bytes buffered, so we know how far ahead we are.
     return unztell64(p->zip->getUnzFile()) - QIODevice::bytesAvailable();
-  else
-    return p->writePos;
+  return p->writePos;
 }
 
 bool QuaZipFile::atEnd()const
@@ -413,8 +412,7 @@ bool QuaZipFile::atEnd()const
       // the same problem as with pos()
     return QIODevice::bytesAvailable() == 0
         && unzeof(p->zip->getUnzFile())==1;
-  else
-    return true;
+  return true;
 }
 
 qint64 QuaZipFile::size()const
@@ -425,8 +423,7 @@ qint64 QuaZipFile::size()const
   }
   if(openMode()&ReadOnly)
     return p->raw?csize():usize();
-  else
-    return p->writePos;
+  return p->writePos;
 }
 
 qint64 QuaZipFile::csize()const
@@ -454,12 +451,11 @@ qint64 QuaZipFile::usize()const
 bool QuaZipFile::getFileInfo(QuaZipFileInfo *info)
 {
     QuaZipFileInfo64 info64;
-    if (getFileInfo(&info64)) {
-        info64.toQuaZipFileInfo(*info);
-        return true;
-    } else {
+    if (!getFileInfo(&info64)) {
         return false;
     }
+    info64.toQuaZipFileInfo(*info);
+    return true;
 }
 
 bool QuaZipFile::getFileInfo(QuaZipFileInfo64 *info)
@@ -498,9 +494,9 @@ void QuaZipFile::close()
 qint64 QuaZipFile::readData(char *data, qint64 maxSize)
 {
   p->setZipError(UNZ_OK);
-  qint64 bytesRead=unzReadCurrentFile(p->zip->getUnzFile(), data, (unsigned)maxSize);
+  qint64 bytesRead=unzReadCurrentFile(p->zip->getUnzFile(), data, static_cast<unsigned>(maxSize));
   if (bytesRead < 0) {
-    p->setZipError((int) bytesRead);
+    p->setZipError(static_cast<int>(bytesRead));
     return -1;
   }
   return bytesRead;
@@ -509,12 +505,12 @@ qint64 QuaZipFile::readData(char *data, qint64 maxSize)
 qint64 QuaZipFile::writeData(const char* data, qint64 maxSize)
 {
   p->setZipError(ZIP_OK);
-  p->setZipError(zipWriteInFileInZip(p->zip->getZipFile(), data, (uint)maxSize));
-  if(p->zipError!=ZIP_OK) return -1;
-  else {
-    p->writePos+=maxSize;
-    return maxSize;
+  p->setZipError(zipWriteInFileInZip(p->zip->getZipFile(), data, static_cast<uint>(maxSize)));
+  if (p->zipError != ZIP_OK) {
+    return -1;
   }
+  p->writePos += maxSize;
+  return maxSize;
 }
 
 QString QuaZipFile::getFileName() const
diff --git a/utils/rbutilqt/quazip/quazipfile.h b/utils/rbutilqt/quazip/quazipfile.h
index b49c50b9f3..26c715c747 100644
--- a/utils/rbutilqt/quazip/quazipfile.h
+++ b/utils/rbutilqt/quazip/quazipfile.h
@@ -81,9 +81,9 @@ class QUAZIP_EXPORT QuaZipFile: public QIODevice {
     QuaZipFile& operator=(const QuaZipFile& that);
   protected:
     /// Implementation of the QIODevice::readData().
-    qint64 readData(char *data, qint64 maxSize);
+    qint64 readData(char *data, qint64 maxSize) override;
     /// Implementation of the QIODevice::writeData().
-    qint64 writeData(const char *data, qint64 maxSize);
+    qint64 writeData(const char *data, qint64 maxSize) override;
   public:
     /// Constructs a QuaZipFile instance.
     /** You should use setZipName() and setFileName() or setZip() before
@@ -174,7 +174,7 @@ class QUAZIP_EXPORT QuaZipFile: public QIODevice {
     /** Closes file if open, destructs internal QuaZip object (if it
      * exists and \em is internal, of course).
      **/
-    virtual ~QuaZipFile();
+    ~QuaZipFile() override;
     /// Returns the ZIP archive file name.
     /** If this object was created by passing QuaZip pointer to the
      * constructor, this function will return that QuaZip's file name
@@ -201,7 +201,7 @@ class QUAZIP_EXPORT QuaZipFile: public QIODevice {
      * Returns null string if there is no file name set yet. This is the
      * case when this QuaZipFile operates on the existing QuaZip object
      * (constructor QuaZipFile(QuaZip*,QObject*) or setZip() was used).
-     * 
+     *
      * \sa getActualFileName
      **/
     QString getFileName() const;
@@ -289,7 +289,7 @@ class QUAZIP_EXPORT QuaZipFile: public QIODevice {
      * QuaZipFile does not support unbuffered reading. So do not pass
      * QIODevice::Unbuffered flag in \a mode, or open will fail.
      **/
-    virtual bool open(OpenMode mode);
+    bool open(OpenMode mode) override;
     /// Opens a file for reading.
     /** \overload
      * Argument \a password specifies a password to decrypt the file. If
@@ -323,7 +323,8 @@ class QUAZIP_EXPORT QuaZipFile: public QIODevice {
      * use the raw mode (see below).
      *
      * Arguments \a method and \a level specify compression method and
-     * level. The only method supported is Z_DEFLATED, but you may also
+     * level. The only compression methods supported are
+     * Z_DEFLATED and Z_BZIP2ED. But you may also
      * specify 0 for no compression. If all of the files in the archive
      * use both method 0 and either level 0 is explicitly specified or
      * data descriptor writing is disabled with
@@ -332,6 +333,10 @@ class QUAZIP_EXPORT QuaZipFile: public QIODevice {
      * format version, should you need that. Except for this, \a level
      * has no other effects with method 0.
      *
+     * If the method is \a Z_BZIP2ED, then the level must be specified
+     * explicitly (1 to 9), as the bzip2 backend doesn't support
+     * \a Z_DEFAULT_COMPRESSION.
+     *
      * If \a raw is \c true, no compression is performed. In this case,
      * \a crc and uncompressedSize field of the \a info are required.
      *
@@ -343,7 +348,7 @@ class QUAZIP_EXPORT QuaZipFile: public QIODevice {
         int method =Z_DEFLATED, int level =Z_DEFAULT_COMPRESSION, bool raw =false,
         int windowBits =-MAX_WBITS, int memLevel =DEF_MEM_LEVEL, int strategy =Z_DEFAULT_STRATEGY);
     /// Returns \c true, but \ref quazipfile-sequential "beware"!
-    virtual bool isSequential()const;
+    bool isSequential()const override;
     /// Returns current position in the file.
     /** Implementation of the QIODevice::pos(). When reading, this
      * function is a wrapper to the ZIP/UNZIP unztell(), therefore it is
@@ -366,7 +371,7 @@ class QUAZIP_EXPORT QuaZipFile: public QIODevice {
      * Error code returned by getZipError() is not affected by this
      * function call.
      **/
-    virtual qint64 pos()const;
+    qint64 pos()const override;
     /// Returns \c true if the end of file was reached.
     /** This function returns \c false in the case of error. This means
      * that you called this function on either not open file, or a file
@@ -384,7 +389,7 @@ class QUAZIP_EXPORT QuaZipFile: public QIODevice {
      * Error code returned by getZipError() is not affected by this
      * function call.
      **/
-    virtual bool atEnd()const;
+    bool atEnd()const override;
     /// Returns file size.
     /** This function returns csize() if the file is open for reading in
      * raw mode, usize() if it is open for reading in normal mode and
@@ -398,7 +403,7 @@ class QUAZIP_EXPORT QuaZipFile: public QIODevice {
      * name would be very misguiding otherwise, so just keep in mind
      * this inconsistence.
      **/
-    virtual qint64 size()const;
+    qint64 size()const override;
     /// Returns compressed file size.
     /** Equivalent to calling getFileInfo() and then getting
      * compressedSize field, but more convenient and faster.
@@ -446,11 +451,11 @@ class QUAZIP_EXPORT QuaZipFile: public QIODevice {
     /// Closes the file.
     /** Call getZipError() to determine if the close was successful.
      **/
-    virtual void close();
+    void close() override;
     /// Returns the error code returned by the last ZIP/UNZIP API call.
     int getZipError() const;
     /// Returns the number of bytes available for reading.
-    virtual qint64 bytesAvailable() const;
+    qint64 bytesAvailable() const override;
     /// Returns the local extra field
     /**
       There are two (optional) local extra fields associated with a file.
diff --git a/utils/rbutilqt/quazip/quazipfileinfo.cpp b/utils/rbutilqt/quazip/quazipfileinfo.cpp
index 3f58b40216..c0b73f3d76 100644
--- a/utils/rbutilqt/quazip/quazipfileinfo.cpp
+++ b/utils/rbutilqt/quazip/quazipfileinfo.cpp
@@ -24,6 +24,8 @@ see quazip/(un)zip.h files for details. Basically it's the zlib license.
 
 #include "quazipfileinfo.h"
 
+#include "quazip_qt_compat.h"
+
 #include <QtCore/QDataStream>
 
 static QFile::Permissions permissionsFromExternalAttr(quint32 externalAttr) {
@@ -117,7 +119,7 @@ static QDateTime getNTFSTime(const QByteArray &extra, int position,
     timeReader >> time;
     if (time == 0)
         return dateTime;
-    QDateTime base(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
+    QDateTime base = quazip_since_epoch_ntfs();
     dateTime = base.addMSecs(time / 10000);
     if (fineTicks != nullptr) {
         *fineTicks = static_cast<int>(time % 10000);
@@ -161,7 +163,7 @@ QDateTime QuaZipFileInfo64::getExtTime(const QByteArray &extra, int flag)
         qint32 time;
         input >> time;
         if (nextFlag == flag) {
-            QDateTime base(QDate(1970, 1, 1), QTime(0, 0), Qt::UTC);
+            QDateTime base = quazip_since_epoch();
             dateTime = base.addSecs(time);
             return dateTime;
         }
diff --git a/utils/rbutilqt/quazip/quazipnewinfo.cpp b/utils/rbutilqt/quazip/quazipnewinfo.cpp
index 659e4f7720..2813026c0d 100644
--- a/utils/rbutilqt/quazip/quazipnewinfo.cpp
+++ b/utils/rbutilqt/quazip/quazipnewinfo.cpp
@@ -105,6 +105,15 @@ QuaZipNewInfo::QuaZipNewInfo(const QString& name, const QString& file):
   }
 }
 
+QuaZipNewInfo::QuaZipNewInfo(const QString& name, const QString& file, const QDateTime& dateTime):
+  name(name), dateTime(dateTime), internalAttr(0), externalAttr(0), uncompressedSize(0)
+{
+  QFileInfo info(file);
+  if (info.exists()) {
+    QuaZipNewInfo_setPermissions(this, info.permissions(), info.isDir(), quazip_is_symlink(info));
+  }
+}
+
 void QuaZipNewInfo::setFileDateTime(const QString& file)
 {
   QFileInfo info(file);
@@ -177,14 +186,12 @@ static void setNTFSTime(QByteArray &extra, const QDateTime &time, int position,
                     timesPos = i - 4; // the beginning of the NTFS times tag
                     ntfsTimesLength = tagsize;
                     break;
-                } else {
-                    i += tagsize;
                 }
+                i += tagsize;
             }
             break; // I ain't going to search for yet another NTFS record!
-        } else {
-            i += length;
         }
+        i += length;
     }
     if (ntfsPos == -1) {
         // No NTFS record, need to create one.
diff --git a/utils/rbutilqt/quazip/quazipnewinfo.h b/utils/rbutilqt/quazip/quazipnewinfo.h
index bad70c27d3..ee53d9bb93 100644
--- a/utils/rbutilqt/quazip/quazipnewinfo.h
+++ b/utils/rbutilqt/quazip/quazipnewinfo.h
@@ -94,10 +94,18 @@ struct QUAZIP_EXPORT QuaZipNewInfo {
    * is inaccessible (e. g. you do not have read permission for the
    * directory file in), uses current time and zero permissions. Other attributes are
    * initialized with zeros, comment and extra field with null values.
-   * 
    * \sa setFileDateTime()
    **/
   QuaZipNewInfo(const QString& name, const QString& file);
+  /// Constructs QuaZipNewInfo instance.
+  /** Initializes name with \a name and provided timestamp.  Permissions are taken
+   * from the specified file. If the \a file does not exists or
+   * is inaccessible (e. g. you do not have read permission for the
+   * directory file in), uses zero permissions. Other attributes are
+   * initialized with zeros, comment and extra field with null values.
+   * \sa setFileDateTime()
+   **/
+  QuaZipNewInfo(const QString& name, const QString& file, const QDateTime& dateTime);
   /// Initializes the new instance from existing file info.
   /** Mainly used when copying files between archives.
    *
diff --git a/utils/rbutilqt/quazip/unzip.c b/utils/rbutilqt/quazip/unzip.c
index 3e147d7d82..a39365df91 100644
--- a/utils/rbutilqt/quazip/unzip.c
+++ b/utils/rbutilqt/quazip/unzip.c
@@ -223,13 +223,8 @@ local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, v
         *pi = (int)c;
         return UNZ_OK;
     }
-    else
-    {
-        if (ZERROR64(*pzlib_filefunc_def,filestream))
-            return UNZ_ERRNO;
-        else
-            return UNZ_EOF;
-    }
+
+    return ZERROR64(*pzlib_filefunc_def, filestream) ? UNZ_ERRNO : UNZ_EOF;
 }
 
 
@@ -780,8 +775,7 @@ extern unzFile ZEXPORT unzOpen2 (voidpf file,
         fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
         return unzOpenInternal(file, &zlib_filefunc64_32_def_fill, 0, UNZ_DEFAULT_FLAGS);
     }
-    else
-        return unzOpenInternal(file, NULL, 0, UNZ_DEFAULT_FLAGS);
+    return unzOpenInternal(file, NULL, 0, UNZ_DEFAULT_FLAGS);
 }
 
 extern unzFile ZEXPORT unzOpen2_64 (voidpf file,
@@ -795,8 +789,7 @@ extern unzFile ZEXPORT unzOpen2_64 (voidpf file,
         zlib_filefunc64_32_def_fill.zseek32_file = NULL;
         return unzOpenInternal(file, &zlib_filefunc64_32_def_fill, 1, UNZ_DEFAULT_FLAGS);
     }
-    else
-        return unzOpenInternal(file, NULL, 1, UNZ_DEFAULT_FLAGS);
+    return unzOpenInternal(file, NULL, 1, UNZ_DEFAULT_FLAGS);
 }
 
 extern unzFile ZEXPORT unzOpen (voidpf file)
@@ -874,8 +867,8 @@ extern int ZEXPORT unzGetFileFlags (unzFile file, unsigned* pflags)
 */
 local void unz64local_DosDateToTmuDate (ZPOS64_T ulDosDate, tm_unz* ptm)
 {
-    ZPOS64_T uDate;
-    uDate = (ZPOS64_T)(ulDosDate>>16);
+    ZPOS64_T uDate = ulDosDate >> 16;
+
     ptm->tm_mday = (uInt)(uDate&0x1f) ;
     ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
     ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
@@ -1782,7 +1775,7 @@ extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
 
             pfile_in_zip_read_info->stream.next_in =
                 (Bytef*)pfile_in_zip_read_info->read_buffer;
-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
+            pfile_in_zip_read_info->stream.avail_in = uReadThis;
         }
 
         if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
@@ -1949,10 +1942,7 @@ extern int ZEXPORT unzeof (unzFile file)
     if (pfile_in_zip_read_info==NULL)
         return UNZ_PARAMERROR;
 
-    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-        return 1;
-    else
-        return 0;
+    return pfile_in_zip_read_info->rest_read_uncompressed == 0 ? 1 : 0;
 }
 
 
@@ -2069,7 +2059,7 @@ extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uS
     unz64_s* s;
     uLong uReadThis ;
     if (file==NULL)
-        return (int)UNZ_PARAMERROR;
+        return UNZ_PARAMERROR;
     s=(unz64_s*)file;
 
     uReadThis = uSizeBuf;
diff --git a/utils/rbutilqt/quazip/zip.c b/utils/rbutilqt/quazip/zip.c
index dc8e15fc21..7788b88aa7 100644
--- a/utils/rbutilqt/quazip/zip.c
+++ b/utils/rbutilqt/quazip/zip.c
@@ -316,8 +316,7 @@ local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def,
 
     if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
         return ZIP_ERRNO;
-    else
-        return ZIP_OK;
+    return ZIP_OK;
 }
 
 local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
@@ -368,13 +367,8 @@ local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,vo
         *pi = (int)c;
         return ZIP_OK;
     }
-    else
-    {
-        if (ZERROR64(*pzlib_filefunc_def,filestream))
-            return ZIP_ERRNO;
-        else
-            return ZIP_EOF;
-    }
+
+    return ZERROR64(*pzlib_filefunc_def, filestream) ? ZIP_ERRNO : ZIP_EOF;
 }
 
 
@@ -830,7 +824,7 @@ int LoadCentralDirectoryRecord(zip64_internal* pziinit)
   {
     ZPOS64_T size_central_dir_to_read = size_central_dir;
     size_t buf_size = SIZEDATA_INDATABLOCK;
-    void* buf_read = (void*)ALLOC(buf_size);
+    void* buf_read = ALLOC(buf_size);
     if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
       err=ZIP_ERRNO;
 
@@ -934,11 +928,9 @@ extern zipFile ZEXPORT zipOpen3 (voidpf file, int append, zipcharpc* globalcomme
         TRYFREE(zi);
         return NULL;
     }
-    else
-    {
-        *zi = ziinit;
-        return (zipFile)zi;
-    }
+
+    *zi = ziinit;
+    return (zipFile)zi;
 }
 
 extern zipFile ZEXPORT zipOpen2 (voidpf file, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
@@ -949,8 +941,7 @@ extern zipFile ZEXPORT zipOpen2 (voidpf file, int append, zipcharpc* globalcomme
         fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
         return zipOpen3(file, append, globalcomment, &zlib_filefunc64_32_def_fill, ZIP_DEFAULT_FLAGS);
     }
-    else
-        return zipOpen3(file, append, globalcomment, NULL, ZIP_DEFAULT_FLAGS);
+    return zipOpen3(file, append, globalcomment, NULL, ZIP_DEFAULT_FLAGS);
 }
 
 extern zipFile ZEXPORT zipOpen2_64 (voidpf file, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
@@ -963,8 +954,7 @@ extern zipFile ZEXPORT zipOpen2_64 (voidpf file, int append, zipcharpc* globalco
         zlib_filefunc64_32_def_fill.zseek32_file = NULL;
         return zipOpen3(file, append, globalcomment, &zlib_filefunc64_32_def_fill, ZIP_DEFAULT_FLAGS);
     }
-    else
-        return zipOpen3(file, append, globalcomment, NULL, ZIP_DEFAULT_FLAGS);
+    return zipOpen3(file, append, globalcomment, NULL, ZIP_DEFAULT_FLAGS);
 }
 
 
@@ -998,17 +988,17 @@ int Write_LocalFileHeader(zip64_internal* zi, const char* filename,
     else if(zi->ci.zip64)
       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
     else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)version_to_extract,2);
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,version_to_extract,2);
   }
 
   if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,zi->ci.flag,2);
 
   if (err==ZIP_OK)
     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
 
   if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,zi->ci.dosDate,4);
 
   /* CRC / Compressed size / Uncompressed size will be filled in later and rewritten later */
   if (err==ZIP_OK)
@@ -1063,11 +1053,11 @@ int Write_LocalFileHeader(zip64_internal* zi, const char* filename,
       /* Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file) */
       zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
 
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, HeaderID,2);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, DataSize,2);
 
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, UncompressedSize,8);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, CompressedSize,8);
   }
 
   return err;
@@ -1112,6 +1102,17 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename,
       return ZIP_PARAMERROR;
 #endif
 
+    // The filename and comment length must fit in 16 bits.
+    if ((filename!=NULL) && (strlen(filename)>0xffff))
+        return ZIP_PARAMERROR;
+    if ((comment!=NULL) && (strlen(comment)>0xffff))
+        return ZIP_PARAMERROR;
+    // The extra field length must fit in 16 bits. If the member also requires
+    // a Zip64 extra block, that will also need to fit within that 16-bit
+    // length, but that will be checked for later.
+    if ((size_extrafield_local>0xffff) || (size_extrafield_global>0xffff))
+        return ZIP_PARAMERROR;
+
     zi = (zip64_internal*)file;
 
     if (zi->in_opened_file_inzip == 1)
@@ -1187,11 +1188,11 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename,
     zi->ci.size_centralExtra = size_extrafield_global;
     zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
     /* version info */
-    zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)version_to_extract,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+4,versionMadeBy,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+6,version_to_extract,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+8,zi->ci.flag,2);
     zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
+    zip64local_putValue_inmemory(zi->ci.central_header+12,zi->ci.dosDate,4);
     zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
     zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
     zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
@@ -1203,12 +1204,12 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename,
     if (zipfi==NULL)
         zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
     else
-        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
+        zip64local_putValue_inmemory(zi->ci.central_header+36,zipfi->internal_fa,2);
 
     if (zipfi==NULL)
         zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
     else
-        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
+        zip64local_putValue_inmemory(zi->ci.central_header+38,zipfi->external_fa,4);
 
     if(zi->ci.pos_local_header >= 0xffffffff)
       zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
@@ -1299,7 +1300,7 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename,
         zi->ci.pcrc_32_tab = get_crc_table();
         /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
         if (crcForCrypting == 0) {
-            crcForCrypting = (uLong)zi->ci.dosDate << 16; /* ATTANTION! Without this row, you don't unpack your password protected archive in other app. */
+            crcForCrypting = zi->ci.dosDate << 16; /* ATTANTION! Without this row, you don't unpack your password protected archive in other app. */
         }
         sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
         zi->ci.crypt_header_size = sizeHead;
@@ -1645,7 +1646,7 @@ extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_s
 
     if (!zi->ci.raw)
     {
-        crc32 = (uLong)zi->ci.crc32;
+        crc32 = zi->ci.crc32;
         uncompressed_size = zi->ci.totalUncompressedData;
     }
     compressed_size = zi->ci.totalCompressedData;
@@ -1736,11 +1737,11 @@ extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_s
 
       /* Update the extra info size field */
       zi->ci.size_centralExtra += datasize + 4;
-      zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
+      zip64local_putValue_inmemory(zi->ci.central_header+30,zi->ci.size_centralExtra,2);
     }
 
     if (err==ZIP_OK)
-        err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
+        err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, zi->ci.size_centralheader);
 
     TRYFREE(zi->ci.central_header);
 
@@ -1874,7 +1875,7 @@ int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centra
   if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
   {
     ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
   }
   return err;
 }
@@ -1910,7 +1911,7 @@ int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir,
   }
 
   if (err==ZIP_OK) /* size of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,size_centraldir,4);
 
   if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
   {
diff --git a/utils/rbutilqt/rbutil.ini b/utils/rbutilqt/rbutil.ini
index 2ec4354dc7..f4711afd99 100644
--- a/utils/rbutilqt/rbutil.ini
+++ b/utils/rbutilqt/rbutil.ini
@@ -1,15 +1,5 @@
 [general]
-; server information
 build_info_url=https://download.rockbox.org/build-info
-; genlang -- used to get list of strings (only really old builds)
-genlang_url=https://www.rockbox.org/genlang/?lang=%LANG%&t=%TARGET%&rev=%REVISION%&f=%FEATURES%
-; themes
-themes_url=https://themes.rockbox.org/
-themes_info_url=https://themes.rockbox.org/rbutilqt.php?target=%TARGET%&release=%RELEASE%&revision=%REVISION%&rbutilver=%RBUTILVER%
-
-[bootloader]
-info_url=https://download.rockbox.org/bootloader/bootloaders-info
-download_url=https://download.rockbox.org/bootloader
 
 ; [platforms] is used to determine the order in the device tree.
 ; Only devices present in this section will get displayed!
@@ -868,7 +858,7 @@ encoder=rbspeex
 status=disabled
 
 [aigoerosq.hifiwalkerh2.v13]
-name="HIFI WALKER H2 (v1.3+) (Hosted)"
+name="HIFI WALKER H2 (V1.3+) (Hosted)"
 bootloadermethod=file
 bootloadername=/hifiwalker/H2-v13-patched.upt
 bootloaderfile=/update.upt
@@ -881,7 +871,7 @@ encoder=rbspeex
 status=disabled
 
 [erosqnative.hw4]
-name="AIGO Eros Q V2.2"
+name="AIGO Eros Q V2.2 - V2.3"
 bootloadermethod=file
 bootloadername=/aigo/native/erosqnative-hw4-erosq_2024.upt
 bootloaderfile=/update.upt
@@ -894,7 +884,7 @@ playerpic=aigoerosq
 encoder=rbspeex
 
 [erosqnative.hw4.hifiwalkerh2]
-name="HIFI WALKER H2 V1.9 - V2.0"
+name="HIFI WALKER H2 V1.9 - V2.3"
 bootloadermethod=file
 bootloadername=/aigo/native/erosqnative-hw4-erosq_2024.upt
 bootloaderfile=/update.upt
@@ -907,7 +897,7 @@ playerpic=aigoerosq
 encoder=rbspeex
 
 [erosqnative.hw4.surfansf20]
-name="Surfans F20 V3.4"
+name="Surfans F20 V3.4 - V3.5"
 bootloadermethod=file
 bootloadername=/aigo/native/erosqnative-hw4-erosq_2024.upt
 bootloaderfile=/update.upt
@@ -1096,6 +1086,15 @@ name="Sansa View"
 [066f3780]
 name="Sansa Fuze+ (Recovery Mode)"
 
+[601a4740]
+name="Ingenic JZ4740 (Recovery Mode)"
+
+[601a4760]
+name="Ingenic JZ4760 (Recovery Mode)"
+
+[a1081000]
+name="Ingenic X1000 (Recovery Mode)"
+
 ; languages to be shown for voicefile creation.
 ; The language string is sent to the server when retrieving the list of
 ; strings. Each entry name is the code for the language and used for storing in
diff --git a/utils/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp
index 56d6d34845..011ac74359 100644
--- a/utils/rbutilqt/rbutilqt.cpp
+++ b/utils/rbutilqt/rbutilqt.cpp
@@ -89,7 +89,7 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
     QIcon windowIcon(":/icons/rockbox-clef.svg");
     this->setWindowIcon(windowIcon);
     ui.logoLabel->load(QLatin1String(":/icons/rockbox-logo.svg"));
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_MACOS)
     // don't translate menu entries that are handled specially on OS X
     // (Configure, Quit). Qt handles them for us if they use english string.
     ui.action_Configure->setText("Configure");
@@ -111,12 +111,13 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
     }
 #endif
 
-#if !defined(Q_OS_WIN32) && !defined(Q_OS_MACX)
+#if !defined(Q_OS_WIN32) && !defined(Q_OS_MACOS)
     /* eject funtionality is not available on Linux right now. */
     ui.buttonEject->setEnabled(false);
 #endif
     updateDevice();
     downloadInfo();
+    // XXX download latest rbutil.ini via rbutilini_url
 
     m_gotInfo = false;
     m_auto = false;
@@ -333,11 +334,7 @@ void RbUtilQt::about()
     QFile credits(":/docs/CREDITS");
     credits.open(QIODevice::ReadOnly);
     QTextStream r(&credits);
-#if QT_VERSION < 0x060000
-    r.setCodec(QTextCodec::codecForName("UTF-8"));
-#else
     r.setEncoding(QStringConverter::Utf8);
-#endif
     while(!r.atEnd()) {
         QString line = r.readLine();
         // filter out header.
@@ -634,7 +631,7 @@ void RbUtilQt::checkUpdate(void)
     url += "win32/";
 #elif defined(Q_OS_LINUX)
     url += "linux/";
-#elif defined(Q_OS_MACX)
+#elif defined(Q_OS_MACOS)
     url += "macosx/";
 #endif
 
@@ -669,7 +666,7 @@ void RbUtilQt::downloadUpdateDone(QNetworkReply::NetworkError error)
         for(int i=0; i < rbutilList.size(); i++)
         {
             QString item = rbutilList.at(i);
-#if defined(Q_OS_LINUX) 
+#if defined(Q_OS_LINUX)
 #if defined(__amd64__)
             // skip if it isn't a 64 bit build
             if( !item.contains("64bit"))
@@ -701,7 +698,7 @@ void RbUtilQt::downloadUpdateDone(QNetworkReply::NetworkError error)
             url += "win32/";
 #elif defined(Q_OS_LINUX)
             url += "linux/";
-#elif defined(Q_OS_MACX)
+#elif defined(Q_OS_MACOS)
             url += "macosx/";
 #endif
             url += foundVersion;
@@ -748,4 +745,3 @@ void RbUtilQt::eject(void)
                    "fails please use your computers eject funtionality."));
     }
 }
-
diff --git a/utils/rbutilqt/rbutilqt.qrc b/utils/rbutilqt/rbutilqt.qrc
index 7ea638c54b..c0dddf1ffe 100644
--- a/utils/rbutilqt/rbutilqt.qrc
+++ b/utils/rbutilqt/rbutilqt.qrc
@@ -41,6 +41,8 @@
         <file alias="icons/rockbox-logo.svg">../../docs/logo/rockbox-logo.svg</file>
     </qresource>
     <qresource>
+        <file>icons/players/agptekrocker-small.png</file>
+        <file>icons/players/aigoerosq-small.png</file>
         <file>icons/players/archosfmrecorder-small.png</file>
         <file>icons/players/archosondiofm-small.png</file>
         <file>icons/players/archosondiosp-small.png</file>
@@ -48,6 +50,7 @@
         <file>icons/players/archosrecorder-small.png</file>
         <file>icons/players/archosrecorderv2-small.png</file>
         <file>icons/players/cowond2-small.png</file>
+        <file>icons/players/erosqnative-small.png</file>
         <file>icons/players/gigabeatfx-small.png</file>
         <file>icons/players/gigabeats-small.png</file>
         <file>icons/players/gogearhdd1630-small.png</file>
@@ -90,6 +93,9 @@
         <file>icons/players/vibe500-small.png</file>
         <file>icons/players/vx747-small.png</file>
         <file>icons/players/vx777-small.png</file>
+        <file>icons/players/xduoox20-small.png</file>
+        <file>icons/players/xduoox3-small.png</file>
+        <file>icons/players/xduoox3ii-small.png</file>
     </qresource>
     <qresource prefix="/ini">
         <file>rbutil.ini</file>
diff --git a/utils/rbutilqt/test/test-httpget.cpp b/utils/rbutilqt/test/test-httpget.cpp
index 86f1a6e13e..a4824febdb 100644
--- a/utils/rbutilqt/test/test-httpget.cpp
+++ b/utils/rbutilqt/test/test-httpget.cpp
@@ -39,12 +39,8 @@
 
         quint16 port(void) { return this->serverPort(); }
 
-#if QT_VERSION < 0x050000
-        void incomingConnection(int socket)
-#else
         // Qt 5 uses a different prototype for this function!
         void incomingConnection(qintptr socket)
-#endif
         {
             // When a new client connects, the server constructs a QTcpSocket and all
             // communication with the client is done over this QTcpSocket. QTcpSocket
@@ -549,4 +545,3 @@ QTEST_MAIN(TestHttpGet)
 // this include is needed because we don't use a separate header file for the
 // test class. It also needs to be at the end.
 #include "test-httpget.moc"
-
diff --git a/utils/rbutilqt/test/test-playerbuildinfo.cpp b/utils/rbutilqt/test/test-playerbuildinfo.cpp
index aa42cd0992..cb261820d7 100644
--- a/utils/rbutilqt/test/test-playerbuildinfo.cpp
+++ b/utils/rbutilqt/test/test-playerbuildinfo.cpp
@@ -213,7 +213,7 @@ void TestPlayerBuildInfo::testBuildInfo()
 
     RbSettings::setValue(RbSettings::CurrentPlatform, target);
     QVariant result = PlayerBuildInfo::instance()->value(item, type);
-    if(result.canConvert(QMetaType::QStringList))
+    if(result.canConvert(QMetaType(QMetaType::QStringList)))
         QCOMPARE(result.toStringList().join(","), QString(expected));
     else
         QCOMPARE(result.toString(), QString(expected));
@@ -253,7 +253,7 @@ void TestPlayerBuildInfo::testPlayerInfo()
     QFETCH(QString, expected);
 
     QVariant result = PlayerBuildInfo::instance()->value(item, target);
-    if(result.canConvert(QMetaType::QStringList))
+    if(result.canConvert(QMetaType(QMetaType::QStringList)))
         QCOMPARE(result.toStringList().join(","), QString(expected));
     else
         QCOMPARE(result.toString(), QString(expected));
@@ -265,4 +265,3 @@ QTEST_MAIN(TestPlayerBuildInfo)
 // this include is needed because we don't use a separate header file for the
 // test class. It also needs to be at the end.
 #include "test-playerbuildinfo.moc"
-
diff --git a/utils/rbutilqt/themesinstallwindow.cpp b/utils/rbutilqt/themesinstallwindow.cpp
index f9d32430e3..e3ee8bc43a 100644
--- a/utils/rbutilqt/themesinstallwindow.cpp
+++ b/utils/rbutilqt/themesinstallwindow.cpp
@@ -114,9 +114,6 @@ void ThemesInstallWindow::downloadDone(QNetworkReply::NetworkError error)
     themesInfo.open();
 
     QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this);
-#if QT_VERSION < 0x060000
-    iniDetails.setIniCodec(QTextCodec::codecForName("UTF-8"));
-#endif
     QStringList tl = iniDetails.childGroups();
     LOG_INFO() << "Theme site result:"
                << iniDetails.value("error/code").toString()
@@ -190,9 +187,6 @@ void ThemesInstallWindow::updateSize(void)
     long size = 0;
     // sum up size for all selected themes
     QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this);
-#if QT_VERSION < 0x060000
-    iniDetails.setIniCodec(QTextCodec::codecForName("UTF-8"));
-#endif
     int items = ui.listThemes->selectedItems().size();
     for(int i = 0; i < items; i++) {
         iniDetails.beginGroup(ui.listThemes->selectedItems()
@@ -211,10 +205,6 @@ void ThemesInstallWindow::updateDetails(QListWidgetItem* cur, QListWidgetItem* p
         return;
 
     QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this);
-#if QT_VERSION < 0x060000
-    iniDetails.setIniCodec(QTextCodec::codecForName("UTF-8"));
-#endif
-
     QCoreApplication::processEvents();
     ui.themeDescription->setText(tr("fetching details for %1")
         .arg(cur->data(Qt::DisplayRole).toString()));
@@ -393,4 +383,3 @@ void ThemesInstallWindow::changeEvent(QEvent *e)
         QWidget::changeEvent(e);
     }
 }
-
diff --git a/utils/rbutilqt/zlib/zconf.h b/utils/rbutilqt/zlib/zconf.h
index 3c21403fce..a391fb9ac5 100644
--- a/utils/rbutilqt/zlib/zconf.h
+++ b/utils/rbutilqt/zlib/zconf.h
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
diff --git a/utils/regtools/headergen_v1.cpp b/utils/regtools/headergen_v1.cpp
index 155ff2389f..708d6a45fd 100644
--- a/utils/regtools/headergen_v1.cpp
+++ b/utils/regtools/headergen_v1.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 by Amaury Pouly
  *
diff --git a/utils/regtools/headergen_v2.cpp b/utils/regtools/headergen_v2.cpp
index 734b073892..bf81a562f5 100644
--- a/utils/regtools/headergen_v2.cpp
+++ b/utils/regtools/headergen_v2.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2015 by Amaury Pouly
  *
diff --git a/utils/regtools/include/soc_desc.hpp b/utils/regtools/include/soc_desc.hpp
index 8afc8f56c0..899ef3b429 100644
--- a/utils/regtools/include/soc_desc.hpp
+++ b/utils/regtools/include/soc_desc.hpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/include/soc_desc_v1.hpp b/utils/regtools/include/soc_desc_v1.hpp
index b9185e35dd..97c9aba0b9 100644
--- a/utils/regtools/include/soc_desc_v1.hpp
+++ b/utils/regtools/include/soc_desc_v1.hpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/regtools/lib/soc_desc.cpp b/utils/regtools/lib/soc_desc.cpp
index d85a1366da..aa614dfec1 100644
--- a/utils/regtools/lib/soc_desc.cpp
+++ b/utils/regtools/lib/soc_desc.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/lib/soc_desc_v1.cpp b/utils/regtools/lib/soc_desc_v1.cpp
index d585485493..ea451c7d87 100644
--- a/utils/regtools/lib/soc_desc_v1.cpp
+++ b/utils/regtools/lib/soc_desc_v1.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/analyser.cpp b/utils/regtools/qeditor/analyser.cpp
index aa422cbc6f..f2c1ce7dd6 100644
--- a/utils/regtools/qeditor/analyser.cpp
+++ b/utils/regtools/qeditor/analyser.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/analyser.h b/utils/regtools/qeditor/analyser.h
index a099399a3b..0194e7edc2 100644
--- a/utils/regtools/qeditor/analyser.h
+++ b/utils/regtools/qeditor/analyser.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/backend.cpp b/utils/regtools/qeditor/backend.cpp
index a8264c6e50..bb0061dfe6 100644
--- a/utils/regtools/qeditor/backend.cpp
+++ b/utils/regtools/qeditor/backend.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/backend.h b/utils/regtools/qeditor/backend.h
index 19e2cb5616..25a4b481f6 100644
--- a/utils/regtools/qeditor/backend.h
+++ b/utils/regtools/qeditor/backend.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/main.cpp b/utils/regtools/qeditor/main.cpp
index 86a8b96763..3ac3f240d5 100644
--- a/utils/regtools/qeditor/main.cpp
+++ b/utils/regtools/qeditor/main.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/mainwindow.cpp b/utils/regtools/qeditor/mainwindow.cpp
index 69138a91b7..8789326714 100644
--- a/utils/regtools/qeditor/mainwindow.cpp
+++ b/utils/regtools/qeditor/mainwindow.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/mainwindow.h b/utils/regtools/qeditor/mainwindow.h
index 5d0bf4ed06..5dba8407e9 100644
--- a/utils/regtools/qeditor/mainwindow.h
+++ b/utils/regtools/qeditor/mainwindow.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/regdisplaypanel.cpp b/utils/regtools/qeditor/regdisplaypanel.cpp
index 1c2f1db9a9..c65417f428 100644
--- a/utils/regtools/qeditor/regdisplaypanel.cpp
+++ b/utils/regtools/qeditor/regdisplaypanel.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/regdisplaypanel.h b/utils/regtools/qeditor/regdisplaypanel.h
index a34b9319d5..b9c157b3c3 100644
--- a/utils/regtools/qeditor/regdisplaypanel.h
+++ b/utils/regtools/qeditor/regdisplaypanel.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/regedit.cpp b/utils/regtools/qeditor/regedit.cpp
index bf86792c1e..a3e2a9d957 100644
--- a/utils/regtools/qeditor/regedit.cpp
+++ b/utils/regtools/qeditor/regedit.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/regedit.h b/utils/regtools/qeditor/regedit.h
index 893ec73421..6be3fc4853 100644
--- a/utils/regtools/qeditor/regedit.h
+++ b/utils/regtools/qeditor/regedit.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/regtab.cpp b/utils/regtools/qeditor/regtab.cpp
index c6a1f41ee9..c422caca65 100644
--- a/utils/regtools/qeditor/regtab.cpp
+++ b/utils/regtools/qeditor/regtab.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/regtab.h b/utils/regtools/qeditor/regtab.h
index b56747f4d1..3c3f74b76e 100644
--- a/utils/regtools/qeditor/regtab.h
+++ b/utils/regtools/qeditor/regtab.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/settings.cpp b/utils/regtools/qeditor/settings.cpp
index cc77a2e051..064d80634f 100644
--- a/utils/regtools/qeditor/settings.cpp
+++ b/utils/regtools/qeditor/settings.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/settings.h b/utils/regtools/qeditor/settings.h
index 3030ff38b0..f84353739c 100644
--- a/utils/regtools/qeditor/settings.h
+++ b/utils/regtools/qeditor/settings.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/std_analysers.cpp b/utils/regtools/qeditor/std_analysers.cpp
index 1acd25e7fc..96aea6a167 100644
--- a/utils/regtools/qeditor/std_analysers.cpp
+++ b/utils/regtools/qeditor/std_analysers.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/std_analysers.h b/utils/regtools/qeditor/std_analysers.h
index 255ae283b8..9b03a9ef94 100644
--- a/utils/regtools/qeditor/std_analysers.h
+++ b/utils/regtools/qeditor/std_analysers.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/utils.cpp b/utils/regtools/qeditor/utils.cpp
index 458386b389..2ef07c3eb9 100644
--- a/utils/regtools/qeditor/utils.cpp
+++ b/utils/regtools/qeditor/utils.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/qeditor/utils.h b/utils/regtools/qeditor/utils.h
index 655e3ae96f..2492908240 100644
--- a/utils/regtools/qeditor/utils.h
+++ b/utils/regtools/qeditor/utils.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/regtool.cpp b/utils/regtools/regtool.cpp
index 2f7f04b956..1762228e2d 100644
--- a/utils/regtools/regtool.cpp
+++ b/utils/regtools/regtool.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2016 by Amaury Pouly
  *
diff --git a/utils/regtools/swiss_knife.cpp b/utils/regtools/swiss_knife.cpp
index 2ea1fc4ad3..8b29bbc78b 100644
--- a/utils/regtools/swiss_knife.cpp
+++ b/utils/regtools/swiss_knife.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/regtools/tester_v1.cpp b/utils/regtools/tester_v1.cpp
index 3ece431531..2ad17e66b3 100644
--- a/utils/regtools/tester_v1.cpp
+++ b/utils/regtools/tester_v1.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 by Amaury Pouly
  *
diff --git a/utils/rk27utils/rkboottool/rkboottool.c b/utils/rk27utils/rkboottool/rkboottool.c
index 8858d37478..e2bb787c65 100644
--- a/utils/rk27utils/rkboottool/rkboottool.c
+++ b/utils/rk27utils/rkboottool/rkboottool.c
@@ -101,40 +101,40 @@ static void *binary_extract(FILE *fp, uint32_t offset, uint32_t len, int descram
     if ((fp == NULL) || len == 0)
         return NULL;
 
-        /* allocate buff */
-        if ((buff = malloc(len)) == NULL)
-            return NULL;
+    /* allocate buff */
+    if ((buff = malloc(len)) == NULL)
+        return NULL;
 
-        /* seek to the begining of the data */
-        fseek(fp, offset, SEEK_SET);
+    /* seek to the begining of the data */
+    fseek(fp, offset, SEEK_SET);
 
-        /* read into the buffer */
-        ret = fread(buff, 1, len, fp);
+    /* read into the buffer */
+    ret = fread(buff, 1, len, fp);
 
-        if (ret != len)
+    if (ret != len)
+    {
+        free(buff);
+        return NULL;
+    }
+
+    /* descramble */
+    if ( descramble )
+    {
+        buff_ptr = buff;
+        if (encode_mode == PAGE_ENC)
         {
-            free(buff);
-            return NULL;
-        }
-
-        /* descramble */
-        if ( descramble )
-        {
-            buff_ptr = buff;
-            if (encode_mode == PAGE_ENC)
+            while (len >= 0x200)
             {
-                while (len >= 0x200)
-                {
-                    encode_page((uint8_t *)buff_ptr,
-                                (uint8_t *)buff_ptr,
-                                0x200);
+                encode_page((uint8_t *)buff_ptr,
+                            (uint8_t *)buff_ptr,
+                            0x200);
 
-                    buff_ptr += 0x200;
-                    len -= 0x200;
-                }
+                buff_ptr += 0x200;
+                len -= 0x200;
             }
-            encode_page((uint8_t *)buff_ptr, (uint8_t *)buff_ptr, len);
         }
+        encode_page((uint8_t *)buff_ptr, (uint8_t *)buff_ptr, len);
+    }
 
     return buff;
 }
@@ -270,7 +270,7 @@ int main (int argc, char **argv)
         }
 
         fwrite(buff, 1, rkboot_info.s1_len, fp_out);
- 
+
         fprintf(stderr, "[info]: extracted rkboot_s1.bin file\n");
         free(buff);
         fclose(fp_out);
@@ -358,4 +358,3 @@ int main (int argc, char **argv)
     fclose(fp_in);
     return 0;
 }
-
diff --git a/utils/rknanoutils/rkboottool/elf.c b/utils/rknanoutils/rkboottool/elf.c
index 78b29506a2..2e7416ebec 100644
--- a/utils/rknanoutils/rkboottool/elf.c
+++ b/utils/rknanoutils/rkboottool/elf.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Amaury Pouly
  *
diff --git a/utils/rknanoutils/rkboottool/elf.h b/utils/rknanoutils/rkboottool/elf.h
index 2408e0c588..4c7fbdac3c 100644
--- a/utils/rknanoutils/rkboottool/elf.h
+++ b/utils/rknanoutils/rkboottool/elf.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Amaury Pouly
  *
diff --git a/utils/rknanoutils/rkboottool/misc.c b/utils/rknanoutils/rkboottool/misc.c
index 108235e7fd..c03506205d 100644
--- a/utils/rknanoutils/rkboottool/misc.c
+++ b/utils/rknanoutils/rkboottool/misc.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/rknanoutils/rkboottool/misc.h b/utils/rknanoutils/rkboottool/misc.h
index b0658c0d31..eb782496ad 100644
--- a/utils/rknanoutils/rkboottool/misc.h
+++ b/utils/rknanoutils/rkboottool/misc.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Amaury Pouly
  *
diff --git a/utils/rknanoutils/rkload/rkloader.c b/utils/rknanoutils/rkload/rkloader.c
index 4953c7a9a8..d70037d166 100644
--- a/utils/rknanoutils/rkload/rkloader.c
+++ b/utils/rknanoutils/rkload/rkloader.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Amaury Pouly
  *
diff --git a/utils/rockbox_api/generate.php b/utils/rockbox_api/generate.php
index 079e956d9c..986f398029 100755
--- a/utils/rockbox_api/generate.php
+++ b/utils/rockbox_api/generate.php
@@ -11,7 +11,6 @@ echo <<<MOO
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# \$Id$
 #
 # Generated from $svn\x61apps/plugin.h
 #
diff --git a/utils/rockbox_api/update.php b/utils/rockbox_api/update.php
index 69c8584ca2..58f1cdff06 100755
--- a/utils/rockbox_api/update.php
+++ b/utils/rockbox_api/update.php
@@ -102,7 +102,6 @@ echo <<<MOO
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# \$Id$
 #
 # Generated from $svn\x61apps/plugin.h
 #
diff --git a/utils/samsungtools/fwcrypt.c b/utils/samsungtools/fwcrypt.c
index f920406e12..5c3294d93a 100644
--- a/utils/samsungtools/fwcrypt.c
+++ b/utils/samsungtools/fwcrypt.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/samsungtools/fwdecrypt.c b/utils/samsungtools/fwdecrypt.c
index 67dfb315c2..0f2eef8f44 100644
--- a/utils/samsungtools/fwdecrypt.c
+++ b/utils/samsungtools/fwdecrypt.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/samsungtools/samsung.c b/utils/samsungtools/samsung.c
index 2d45b6f068..c6cf8ed509 100644
--- a/utils/samsungtools/samsung.c
+++ b/utils/samsungtools/samsung.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/samsungtools/samsung.h b/utils/samsungtools/samsung.h
index 70ac9c770c..3382902954 100644
--- a/utils/samsungtools/samsung.h
+++ b/utils/samsungtools/samsung.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2012 Amaury Pouly
  *
diff --git a/utils/sansapatcher/main.c b/utils/sansapatcher/main.c
index 56e8712715..f8d75f038a 100644
--- a/utils/sansapatcher/main.c
+++ b/utils/sansapatcher/main.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
diff --git a/utils/sansapatcher/sansaio-posix.c b/utils/sansapatcher/sansaio-posix.c
index 5625ec35a4..b79013400f 100644
--- a/utils/sansapatcher/sansaio-posix.c
+++ b/utils/sansapatcher/sansaio-posix.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
diff --git a/utils/sansapatcher/sansaio-win32.c b/utils/sansapatcher/sansaio-win32.c
index be250136f9..6280e40911 100644
--- a/utils/sansapatcher/sansaio-win32.c
+++ b/utils/sansapatcher/sansaio-win32.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
@@ -61,12 +60,13 @@ void sansa_print_error(char* msg)
     LPSTR pMsgBuf = NULL;
 
     printf(msg);
-    FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
+    if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
                   FORMAT_MESSAGE_IGNORE_INSERTS, NULL, GetLastError(),
-                  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), pMsgBuf,
-                  0, NULL);
-    printf(pMsgBuf);
-    LocalFree(pMsgBuf);
+                   MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&pMsgBuf,
+                       0, NULL)) {
+        printf(pMsgBuf);
+        LocalFree(pMsgBuf);
+    }
 }
 
 int sansa_open(struct sansa_t* sansa, int silent)
@@ -215,4 +215,3 @@ int sansa_write(struct sansa_t* sansa, int nbytes)
     return count;
 }
 #endif
-
diff --git a/utils/sansapatcher/sansaio.h b/utils/sansapatcher/sansaio.h
index 327f8fbd18..ed781e3cc3 100644
--- a/utils/sansapatcher/sansaio.h
+++ b/utils/sansapatcher/sansaio.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
diff --git a/utils/sansapatcher/sansapatcher.c b/utils/sansapatcher/sansapatcher.c
index e3b105dcca..b6030604f0 100644
--- a/utils/sansapatcher/sansapatcher.c
+++ b/utils/sansapatcher/sansapatcher.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
@@ -145,11 +144,7 @@ int sansa_read_partinfo(struct sansa_t* sansa, int silent)
 
 /* Return the first occurrence of NEEDLE in HAYSTACK.  */
 static void *
-sansa_memmem (haystack, haystack_len, needle, needle_len)
-     const void *haystack;
-     size_t haystack_len;
-     const void *needle;
-     size_t needle_len;
+sansa_memmem (const void *haystack, size_t haystack_len, const void *needle, size_t needle_len)
 {
   const char *begin;
   const char *const last_possible
@@ -249,7 +244,7 @@ static const uint32_t keys[][4] = {
     { 0xe494e96e, 0x3ee32966, 0x6f48512b, 0xa93fbb42 }, /* "sansa" */
     { 0xd7b10538, 0xc662945b, 0x1b3fce68, 0xf389c0e6 }, /* "sansa_gh" */
     { 0x1d29ddc0, 0x2579c2cd, 0xce339e1a, 0x75465dfe }, /* sansa 103 */
-    
+
     { 0x2a7968de, 0x15127979, 0x142e60a7, 0xe49c1893 }, /* c200 1.00.03 */
     { 0xbf2d06fa, 0xf0e23d59, 0x29738132, 0xe2d04ca7 }, /* c200 1.00.04 and up*/
     { 0xa913d139, 0xf842f398, 0x3e03f1a6, 0x060ee012 }, /* c200 1.01.05 and up*/
@@ -397,7 +392,7 @@ int is_sansa(struct sansa_t* sansa)
          (sansa->pinfo[0].type != 0x0c) &&
          (sansa->pinfo[0].type != 0x0e)) ||
         (sansa->pinfo[1].type != 0x84) ||
-        (sansa->pinfo[2].type != 0x00) || 
+        (sansa->pinfo[2].type != 0x00) ||
         (sansa->pinfo[3].type != 0x00)) {
         /* Bad partition layout, abort */
         return -1;
@@ -618,7 +613,7 @@ static int load_original_firmware(struct sansa_t* sansa, unsigned char* buf, str
 {
     int ppmi_length;
     int n;
-    
+
     /* Read 512 bytes from PPMI_OFFSET - the PPMI header plus the mi4 header */
     if (sansa_seek_and_read(sansa, sansa->start + PPMI_OFFSET, buf, 512) < 0) {
         return -1;
@@ -836,7 +831,7 @@ int sansa_update_of(struct sansa_t* sansa, const char* filename)
     struct mi4header_t mi4header;
     unsigned char buf[512];
 
-    /* Step 1 - check we have an OF on the Sansa to upgrade. We expect the 
+    /* Step 1 - check we have an OF on the Sansa to upgrade. We expect the
        Rockbox bootloader to be installed and the OF to be after it on disk. */
 
     /* Read 512 bytes from PPMI_OFFSET - the PPMI header */
@@ -906,7 +901,7 @@ int sansa_update_of(struct sansa_t* sansa, const char* filename)
         fprintf(stderr,"[ERR]  Short write in sansa_update_of\n");
         return -1;
     }
-    
+
     /* Step 4 - zero out the nvparams section - we have to do this or we end up
        with multiple copies of the nvparams data and don't know which one to
        work with for the database rebuild disabling trick in our bootloader */
@@ -917,7 +912,7 @@ int sansa_update_of(struct sansa_t* sansa, const char* filename)
                        sansa->start+NVPARAMS_OFFSET+0x200);
             return -1;
         }
-        
+
         memset(sansa->sectorbuf,0,NVPARAMS_SIZE);
         n=sansa_write(sansa, NVPARAMS_SIZE);
         if (n < NVPARAMS_SIZE) {
@@ -925,7 +920,7 @@ int sansa_update_of(struct sansa_t* sansa, const char* filename)
             return -1;
         }
     }
-    
+
     return 0;
 }
 
@@ -972,4 +967,3 @@ int sansa_update_ppbl(struct sansa_t* sansa, const char* filename)
 
     return 0;
 }
-
diff --git a/utils/sansapatcher/sansapatcher.h b/utils/sansapatcher/sansapatcher.h
index 259143e38a..98399eeeb6 100644
--- a/utils/sansapatcher/sansapatcher.h
+++ b/utils/sansapatcher/sansapatcher.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006-2007 Dave Chapman
  *
diff --git a/utils/scsi/rbscsi.c b/utils/scsi/rbscsi.c
index b44203152f..72a87ccc4a 100644
--- a/utils/scsi/rbscsi.c
+++ b/utils/scsi/rbscsi.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/scsi/rbscsi.h b/utils/scsi/rbscsi.h
index d2b4b71edb..867936e43b 100644
--- a/utils/scsi/rbscsi.h
+++ b/utils/scsi/rbscsi.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2014 by Amaury Pouly
  *
diff --git a/utils/skinupdater/skinupdater.c b/utils/skinupdater/skinupdater.c
index fe7edbb81b..e9cbb8d984 100644
--- a/utils/skinupdater/skinupdater.c
+++ b/utils/skinupdater/skinupdater.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: tag_table.c 26346 2010-05-28 02:30:27Z jdgordon $
  *
  * Copyright (C) 2010 Jonathan Gordon
  *
diff --git a/utils/skinupdater/tag_table.c b/utils/skinupdater/tag_table.c
index a777880560..b337463b7d 100644
--- a/utils/skinupdater/tag_table.c
+++ b/utils/skinupdater/tag_table.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: tag_table.c 26297 2010-05-26 03:53:06Z jdgordon $
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/skinupdater/tag_table.h b/utils/skinupdater/tag_table.h
index 7cbabfe768..75cd0e367f 100644
--- a/utils/skinupdater/tag_table.h
+++ b/utils/skinupdater/tag_table.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: tag_table.h 26292 2010-05-25 22:24:08Z bieber $
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/skinupdater/updatetheme.pl b/utils/skinupdater/updatetheme.pl
index 42ef24c7e8..0e437bcc3b 100755
--- a/utils/skinupdater/updatetheme.pl
+++ b/utils/skinupdater/updatetheme.pl
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id: wpsbuild.pl 24813 2010-02-21 19:10:57Z kugel $
 #
 
 # usage: updatetheme.pl theme.zip workingdir [options passed to skinupdater]
diff --git a/utils/tcctool/README b/utils/tcctool/README
index 2031f6fdb9..d49be988e0 100644
--- a/utils/tcctool/README
+++ b/utils/tcctool/README
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  ****************************************************************************/
 
diff --git a/utils/tcctool/tcctool.c b/utils/tcctool/tcctool.c
index 2372714a49..8c26e39775 100644
--- a/utils/tcctool/tcctool.c
+++ b/utils/tcctool/tcctool.c
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Dave Chapman
  *
diff --git a/utils/themeeditor/CMakeLists.txt b/utils/themeeditor/CMakeLists.txt
index 42a3e19c1b..8720ada7c3 100644
--- a/utils/themeeditor/CMakeLists.txt
+++ b/utils/themeeditor/CMakeLists.txt
@@ -13,6 +13,8 @@
 # KIND, either express or implied.
 #
 
+add_compile_definitions(QT_NO_USE_NODISCARD_FILE_OPEN)
+
 add_executable(RockboxThemeEditor WIN32 MACOSX_BUNDLE
     graphics/rbalbumart.cpp
     graphics/rbalbumart.h
@@ -110,6 +112,8 @@ set_target_properties(RockboxThemeEditor PROPERTIES AUTOMOC ON)
 set_target_properties(RockboxThemeEditor PROPERTIES AUTORCC ON)
 set_target_properties(RockboxThemeEditor PROPERTIES AUTOUIC ON)
 
+target_compile_features(RockboxThemeEditor PRIVATE cxx_std_17 c_std_11)
+
 target_link_libraries(RockboxThemeEditor
     Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Core
     skin_parser z ${QUAZIP_LIBRARY})
diff --git a/utils/themeeditor/README b/utils/themeeditor/README
index adfeb7b29d..483d0b5c5e 100644
--- a/utils/themeeditor/README
+++ b/utils/themeeditor/README
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/addresourcedir.php b/utils/themeeditor/addresourcedir.php
index cd34433077..787976d988 100755
--- a/utils/themeeditor/addresourcedir.php
+++ b/utils/themeeditor/addresourcedir.php
@@ -7,7 +7,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/buildtargetdb.php b/utils/themeeditor/buildtargetdb.php
index a5ae650426..ded6510158 100755
--- a/utils/themeeditor/buildtargetdb.php
+++ b/utils/themeeditor/buildtargetdb.php
@@ -7,7 +7,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbalbumart.cpp b/utils/themeeditor/graphics/rbalbumart.cpp
index bb9bd12369..2d62b233a6 100644
--- a/utils/themeeditor/graphics/rbalbumart.cpp
+++ b/utils/themeeditor/graphics/rbalbumart.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbalbumart.h b/utils/themeeditor/graphics/rbalbumart.h
index d862f25659..021b124cbc 100644
--- a/utils/themeeditor/graphics/rbalbumart.h
+++ b/utils/themeeditor/graphics/rbalbumart.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbfont.cpp b/utils/themeeditor/graphics/rbfont.cpp
index 895e32750e..f27bcc8a12 100644
--- a/utils/themeeditor/graphics/rbfont.cpp
+++ b/utils/themeeditor/graphics/rbfont.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbfont.h b/utils/themeeditor/graphics/rbfont.h
index c13f809c94..6dcd162323 100644
--- a/utils/themeeditor/graphics/rbfont.h
+++ b/utils/themeeditor/graphics/rbfont.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbfontcache.cpp b/utils/themeeditor/graphics/rbfontcache.cpp
index 7ec77e11a1..0e358ba38e 100644
--- a/utils/themeeditor/graphics/rbfontcache.cpp
+++ b/utils/themeeditor/graphics/rbfontcache.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbfontcache.h b/utils/themeeditor/graphics/rbfontcache.h
index 62d82b7188..db0aa57aa2 100644
--- a/utils/themeeditor/graphics/rbfontcache.h
+++ b/utils/themeeditor/graphics/rbfontcache.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbimage.cpp b/utils/themeeditor/graphics/rbimage.cpp
index 31159ecf75..5c62184a90 100644
--- a/utils/themeeditor/graphics/rbimage.cpp
+++ b/utils/themeeditor/graphics/rbimage.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbimage.h b/utils/themeeditor/graphics/rbimage.h
index 6caddae399..4440e2fcd4 100644
--- a/utils/themeeditor/graphics/rbimage.h
+++ b/utils/themeeditor/graphics/rbimage.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbmovable.cpp b/utils/themeeditor/graphics/rbmovable.cpp
index 1507c77a71..4d72539dc3 100644
--- a/utils/themeeditor/graphics/rbmovable.cpp
+++ b/utils/themeeditor/graphics/rbmovable.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -56,6 +55,8 @@ void RBMovable::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
         painter->fillRect(bottomLeftHandle(), Qt::green);
         painter->fillRect(bottomRightHandle(), Qt::green);
     }
+    (void)option;
+    (void)widget;
 }
 
 QVariant RBMovable::itemChange(GraphicsItemChange change, const QVariant &value)
diff --git a/utils/themeeditor/graphics/rbmovable.h b/utils/themeeditor/graphics/rbmovable.h
index b4ade98f0c..1e9b03010d 100644
--- a/utils/themeeditor/graphics/rbmovable.h
+++ b/utils/themeeditor/graphics/rbmovable.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbprogressbar.cpp b/utils/themeeditor/graphics/rbprogressbar.cpp
index 678f3dd68b..8f1119298b 100644
--- a/utils/themeeditor/graphics/rbprogressbar.cpp
+++ b/utils/themeeditor/graphics/rbprogressbar.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbprogressbar.h b/utils/themeeditor/graphics/rbprogressbar.h
index 69686098ed..24f41e707c 100644
--- a/utils/themeeditor/graphics/rbprogressbar.h
+++ b/utils/themeeditor/graphics/rbprogressbar.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbrenderinfo.cpp b/utils/themeeditor/graphics/rbrenderinfo.cpp
index bcccc4c887..091f81a480 100644
--- a/utils/themeeditor/graphics/rbrenderinfo.cpp
+++ b/utils/themeeditor/graphics/rbrenderinfo.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbrenderinfo.h b/utils/themeeditor/graphics/rbrenderinfo.h
index e24603315a..cb553992b5 100644
--- a/utils/themeeditor/graphics/rbrenderinfo.h
+++ b/utils/themeeditor/graphics/rbrenderinfo.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbscene.cpp b/utils/themeeditor/graphics/rbscene.cpp
index c80cb2357d..03f72c5cbe 100644
--- a/utils/themeeditor/graphics/rbscene.cpp
+++ b/utils/themeeditor/graphics/rbscene.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbscene.h b/utils/themeeditor/graphics/rbscene.h
index 33c641dcb0..d40c5c21ba 100644
--- a/utils/themeeditor/graphics/rbscene.h
+++ b/utils/themeeditor/graphics/rbscene.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbscreen.cpp b/utils/themeeditor/graphics/rbscreen.cpp
index 2e814a084f..e15ec69b76 100644
--- a/utils/themeeditor/graphics/rbscreen.cpp
+++ b/utils/themeeditor/graphics/rbscreen.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -31,7 +30,7 @@
 
 RBScreen::RBScreen(const RBRenderInfo& info, bool remote,
                    QGraphicsItem *parent)
-                       :QGraphicsItem(parent), backdrop(0), project(project),
+                       :QGraphicsItem(parent), backdrop(0), project(info.project()),
                        albumArt(0), customUI(0), defaultView(0), ax(false)
 {
 
@@ -141,7 +140,8 @@ void RBScreen::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
     {
         painter->fillRect(0, 0, width, height, bgColor);
     }
-
+    (void)option;
+    (void)widget;
 }
 
 void RBScreen::loadViewport(QString name, RBViewport *view)
diff --git a/utils/themeeditor/graphics/rbscreen.h b/utils/themeeditor/graphics/rbscreen.h
index 3a9a6ddeb3..06fee5b79f 100644
--- a/utils/themeeditor/graphics/rbscreen.h
+++ b/utils/themeeditor/graphics/rbscreen.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbtext.cpp b/utils/themeeditor/graphics/rbtext.cpp
index 8de5d57897..07f4dad7aa 100644
--- a/utils/themeeditor/graphics/rbtext.cpp
+++ b/utils/themeeditor/graphics/rbtext.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: rbfont.cpp 27301 2010-07-05 22:15:17Z bieber $
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -48,4 +47,7 @@ void RBText::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
         painter->drawImage(0, 0, *image, 0, 0, image->width(), image->height());
     else
         painter->drawImage(0, 0, *image, offset, 0, maxWidth, image->height());
+
+    (void)option;
+    (void)widget;
 }
diff --git a/utils/themeeditor/graphics/rbtext.h b/utils/themeeditor/graphics/rbtext.h
index b4d9ae3c54..650395f058 100644
--- a/utils/themeeditor/graphics/rbtext.h
+++ b/utils/themeeditor/graphics/rbtext.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: rbfont.cpp 27301 2010-07-05 22:15:17Z bieber $
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbtextcache.cpp b/utils/themeeditor/graphics/rbtextcache.cpp
index 0116b80311..673e9a76cc 100644
--- a/utils/themeeditor/graphics/rbtextcache.cpp
+++ b/utils/themeeditor/graphics/rbtextcache.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbtextcache.h b/utils/themeeditor/graphics/rbtextcache.h
index a0c0e42e8d..af05785aef 100644
--- a/utils/themeeditor/graphics/rbtextcache.h
+++ b/utils/themeeditor/graphics/rbtextcache.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbtoucharea.cpp b/utils/themeeditor/graphics/rbtoucharea.cpp
index eee858e28f..cb45f24ae1 100644
--- a/utils/themeeditor/graphics/rbtoucharea.cpp
+++ b/utils/themeeditor/graphics/rbtoucharea.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -59,12 +58,14 @@ void RBTouchArea::paint(QPainter *painter,
         painter->setPen(Qt::NoPen);
         painter->drawRect(size);
     }
+    (void)option;
+    (void)widget;
 }
 
 void RBTouchArea::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     if(action[0] == '&')
-        action = action.right(action.count() - 1);
+        action = action.right(action.size() - 1);
 
     action = action.toLower();
 
diff --git a/utils/themeeditor/graphics/rbtoucharea.h b/utils/themeeditor/graphics/rbtoucharea.h
index 91d9ef24ac..b48d6c98a4 100644
--- a/utils/themeeditor/graphics/rbtoucharea.h
+++ b/utils/themeeditor/graphics/rbtoucharea.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbviewport.cpp b/utils/themeeditor/graphics/rbviewport.cpp
index fea1055935..2ff0b50fa1 100644
--- a/utils/themeeditor/graphics/rbviewport.cpp
+++ b/utils/themeeditor/graphics/rbviewport.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/graphics/rbviewport.h b/utils/themeeditor/graphics/rbviewport.h
index 8e17ac15de..aebdbdeadb 100644
--- a/utils/themeeditor/graphics/rbviewport.h
+++ b/utils/themeeditor/graphics/rbviewport.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -120,8 +119,6 @@ private:
     int baseParam;
     ParseTreeNode* node;
     SkinDocument* doc;
-
-    bool mirrored;
 };
 
 #endif // RBVIEWPORT_H
diff --git a/utils/themeeditor/gui/codeeditor.cpp b/utils/themeeditor/gui/codeeditor.cpp
index 08bbfc2071..bdfc592326 100644
--- a/utils/themeeditor/gui/codeeditor.cpp
+++ b/utils/themeeditor/gui/codeeditor.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * This file has been copied from Nokia's Qt Examples, with minor modifications
  * made available under the LGPL version 2.1, as the original file was licensed
diff --git a/utils/themeeditor/gui/codeeditor.h b/utils/themeeditor/gui/codeeditor.h
index 9968cf5093..9a5c908de3 100644
--- a/utils/themeeditor/gui/codeeditor.h
+++ b/utils/themeeditor/gui/codeeditor.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * This file has been copied from Nokia's Qt Examples, with minor modifications
  * made available under the LGPL version 2.1, as the original file was licensed
diff --git a/utils/themeeditor/gui/configdocument.cpp b/utils/themeeditor/gui/configdocument.cpp
index 0083899770..f5b5bc016a 100644
--- a/utils/themeeditor/gui/configdocument.cpp
+++ b/utils/themeeditor/gui/configdocument.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/configdocument.h b/utils/themeeditor/gui/configdocument.h
index 41b74e1599..7717ec482d 100644
--- a/utils/themeeditor/gui/configdocument.h
+++ b/utils/themeeditor/gui/configdocument.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/devicestate.cpp b/utils/themeeditor/gui/devicestate.cpp
index 019ce1711e..4accb4b707 100644
--- a/utils/themeeditor/gui/devicestate.cpp
+++ b/utils/themeeditor/gui/devicestate.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -483,7 +482,7 @@ void DeviceState::setData(QString tag, QVariant data)
         break;
 
     case Combo:
-        if(data.type() == QVariant::String)
+        if(data.typeId() == QMetaType::QString)
             dynamic_cast<QComboBox*>
                     (found.second)->
                     setCurrentIndex(dynamic_cast<QComboBox*>
diff --git a/utils/themeeditor/gui/devicestate.h b/utils/themeeditor/gui/devicestate.h
index bff27ce678..5446867f8c 100644
--- a/utils/themeeditor/gui/devicestate.h
+++ b/utils/themeeditor/gui/devicestate.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/editorwindow.cpp b/utils/themeeditor/gui/editorwindow.cpp
index 10dc4067df..33708d4057 100644
--- a/utils/themeeditor/gui/editorwindow.cpp
+++ b/utils/themeeditor/gui/editorwindow.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/editorwindow.h b/utils/themeeditor/gui/editorwindow.h
index bd71c9a5dc..755c554519 100644
--- a/utils/themeeditor/gui/editorwindow.h
+++ b/utils/themeeditor/gui/editorwindow.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/fontdownloader.cpp b/utils/themeeditor/gui/fontdownloader.cpp
index adc2e98ab3..630867367b 100644
--- a/utils/themeeditor/gui/fontdownloader.cpp
+++ b/utils/themeeditor/gui/fontdownloader.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -165,6 +164,7 @@ void FontDownloader::finished()
 void FontDownloader::netError(QNetworkReply::NetworkError code)
 {
     ui->label->setText(tr("Network error: ") + reply->errorString());
+    (void)code;
 }
 
 void FontDownloader::closeEvent(QCloseEvent *event)
diff --git a/utils/themeeditor/gui/fontdownloader.h b/utils/themeeditor/gui/fontdownloader.h
index 2b8ae1980a..96e24aafdb 100644
--- a/utils/themeeditor/gui/fontdownloader.h
+++ b/utils/themeeditor/gui/fontdownloader.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/newprojectdialog.cpp b/utils/themeeditor/gui/newprojectdialog.cpp
index 2e9cbd609c..bf5639a6ab 100644
--- a/utils/themeeditor/gui/newprojectdialog.cpp
+++ b/utils/themeeditor/gui/newprojectdialog.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/newprojectdialog.h b/utils/themeeditor/gui/newprojectdialog.h
index 7d1a710a1d..2f133fe9fd 100644
--- a/utils/themeeditor/gui/newprojectdialog.h
+++ b/utils/themeeditor/gui/newprojectdialog.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/preferencesdialog.cpp b/utils/themeeditor/gui/preferencesdialog.cpp
index 4ab6fdadcc..b069149540 100644
--- a/utils/themeeditor/gui/preferencesdialog.cpp
+++ b/utils/themeeditor/gui/preferencesdialog.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/preferencesdialog.h b/utils/themeeditor/gui/preferencesdialog.h
index 1701a8c4c2..baae6c1ec5 100644
--- a/utils/themeeditor/gui/preferencesdialog.h
+++ b/utils/themeeditor/gui/preferencesdialog.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/projectexporter.cpp b/utils/themeeditor/gui/projectexporter.cpp
index ae47758dcf..6cc4a8729b 100644
--- a/utils/themeeditor/gui/projectexporter.cpp
+++ b/utils/themeeditor/gui/projectexporter.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/projectexporter.h b/utils/themeeditor/gui/projectexporter.h
index 353aadda1c..ed1d247cb5 100644
--- a/utils/themeeditor/gui/projectexporter.h
+++ b/utils/themeeditor/gui/projectexporter.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/rbconsole.cpp b/utils/themeeditor/gui/rbconsole.cpp
index 51af64a812..e744ecc4ac 100644
--- a/utils/themeeditor/gui/rbconsole.cpp
+++ b/utils/themeeditor/gui/rbconsole.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/rbconsole.h b/utils/themeeditor/gui/rbconsole.h
index b6f38cc56e..0625c6d665 100644
--- a/utils/themeeditor/gui/rbconsole.h
+++ b/utils/themeeditor/gui/rbconsole.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/skindocument.cpp b/utils/themeeditor/gui/skindocument.cpp
index 807478807d..4129b73065 100644
--- a/utils/themeeditor/gui/skindocument.cpp
+++ b/utils/themeeditor/gui/skindocument.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/skindocument.h b/utils/themeeditor/gui/skindocument.h
index bf47897b0b..f0f7de82fe 100644
--- a/utils/themeeditor/gui/skindocument.h
+++ b/utils/themeeditor/gui/skindocument.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/skinhighlighter.cpp b/utils/themeeditor/gui/skinhighlighter.cpp
index 9236cce2b6..71290f0356 100644
--- a/utils/themeeditor/gui/skinhighlighter.cpp
+++ b/utils/themeeditor/gui/skinhighlighter.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/skinhighlighter.h b/utils/themeeditor/gui/skinhighlighter.h
index 4d5c68ba52..de3e4700fe 100644
--- a/utils/themeeditor/gui/skinhighlighter.h
+++ b/utils/themeeditor/gui/skinhighlighter.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/skintimer.cpp b/utils/themeeditor/gui/skintimer.cpp
index d4b191e25d..b37719e5bc 100644
--- a/utils/themeeditor/gui/skintimer.cpp
+++ b/utils/themeeditor/gui/skintimer.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/skintimer.h b/utils/themeeditor/gui/skintimer.h
index 3ede0bcf61..7a732eab9c 100644
--- a/utils/themeeditor/gui/skintimer.h
+++ b/utils/themeeditor/gui/skintimer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/skinviewer.cpp b/utils/themeeditor/gui/skinviewer.cpp
index ab4d522f2a..908556e800 100644
--- a/utils/themeeditor/gui/skinviewer.cpp
+++ b/utils/themeeditor/gui/skinviewer.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/skinviewer.h b/utils/themeeditor/gui/skinviewer.h
index c1b978c414..9b49e017ad 100644
--- a/utils/themeeditor/gui/skinviewer.h
+++ b/utils/themeeditor/gui/skinviewer.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/syntaxcompleter.cpp b/utils/themeeditor/gui/syntaxcompleter.cpp
index 3bf53a1d0c..6588ae6ff9 100644
--- a/utils/themeeditor/gui/syntaxcompleter.cpp
+++ b/utils/themeeditor/gui/syntaxcompleter.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/syntaxcompleter.h b/utils/themeeditor/gui/syntaxcompleter.h
index 7baa66f634..bd52a95c27 100644
--- a/utils/themeeditor/gui/syntaxcompleter.h
+++ b/utils/themeeditor/gui/syntaxcompleter.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/gui/targetdownloader.cpp b/utils/themeeditor/gui/targetdownloader.cpp
index ee362f980f..ae62867d7e 100644
--- a/utils/themeeditor/gui/targetdownloader.cpp
+++ b/utils/themeeditor/gui/targetdownloader.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -130,6 +129,7 @@ void TargetDownloader::finished()
 void TargetDownloader::netError(QNetworkReply::NetworkError code)
 {
     ui->label->setText(tr("Network error: ") + reply->errorString());
+    (void)code;
 }
 
 void TargetDownloader::closeEvent(QCloseEvent *event)
diff --git a/utils/themeeditor/gui/targetdownloader.h b/utils/themeeditor/gui/targetdownloader.h
index 0d2c4578b6..3b6e4513f7 100644
--- a/utils/themeeditor/gui/targetdownloader.h
+++ b/utils/themeeditor/gui/targetdownloader.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/includetargets.pl b/utils/themeeditor/includetargets.pl
index 3708c6a55c..86c909aa3a 100755
--- a/utils/themeeditor/includetargets.pl
+++ b/utils/themeeditor/includetargets.pl
@@ -7,7 +7,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2010 Robert Bieber
 #
diff --git a/utils/themeeditor/main.cpp b/utils/themeeditor/main.cpp
index 1a082759e7..4cd1bf03c1 100644
--- a/utils/themeeditor/main.cpp
+++ b/utils/themeeditor/main.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/models/parsetreemodel.cpp b/utils/themeeditor/models/parsetreemodel.cpp
index cc1e9777bd..cd5276f303 100644
--- a/utils/themeeditor/models/parsetreemodel.cpp
+++ b/utils/themeeditor/models/parsetreemodel.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -246,11 +245,14 @@ bool ParseTreeModel::setData(const QModelIndex &index, const QVariant &value,
         }
         else if(tolower(param->type_code) == 'i')
         {
-            if(!value.canConvert(QVariant::Int))
+            bool ok = false;
+            int number = value.toInt(&ok);
+
+            if (!ok)
                 return false;
 
             param->type = skin_tag_parameter::INTEGER;
-            param->data.number = value.toInt();
+            param->data.number = number;
         }
         else
         {
diff --git a/utils/themeeditor/models/parsetreemodel.h b/utils/themeeditor/models/parsetreemodel.h
index bef8cc8f48..ac43ad7ae7 100644
--- a/utils/themeeditor/models/parsetreemodel.h
+++ b/utils/themeeditor/models/parsetreemodel.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index 64ff34e5c4..a2377ddee9 100644
--- a/utils/themeeditor/models/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -1079,7 +1078,7 @@ QVariant ParseTreeNode::evalTag(const RBRenderInfo& info, bool conditional,
             child = val.toInt();
             child = branches * child / 100;
         }
-        else if(val.type() == QVariant::Bool)
+        else if(val.typeId() == QMetaType::Bool)
         {
             /* Boolean values have to be reversed, because conditionals are
              * always of the form %?tag<true|false>
@@ -1097,7 +1096,7 @@ QVariant ParseTreeNode::evalTag(const RBRenderInfo& info, bool conditional,
             else
                 child = 1;
         }
-        else if(val.type() == QVariant::String)
+        else if(val.typeId() == QMetaType::QString)
         {
             if(val.toString().length() > 0)
                 child = 0;
@@ -1181,18 +1180,18 @@ void ParseTreeNode::modParam(QVariant value, int index)
     }
     else if(param)
     {
-        if(value.type() == QVariant::Double)
+        if(value.typeId() == QMetaType::Double)
         {
             param->type = skin_tag_parameter::DECIMAL;
             param->data.number = static_cast<int>(value.toDouble() * 10);
         }
-        else if(value.type() == QVariant::String)
+        else if(value.typeId() == QMetaType::QString)
         {
             param->type = skin_tag_parameter::STRING;
             free(param->data.text);
             param->data.text = strdup(value.toString().toStdString().c_str());
         }
-        else if(value.type() == QVariant::Int)
+        else if(value.typeId() == QMetaType::Int)
         {
             param->type = skin_tag_parameter::INTEGER;
             param->data.number = value.toInt();
diff --git a/utils/themeeditor/models/parsetreenode.h b/utils/themeeditor/models/parsetreenode.h
index af998faf11..633c2c0f84 100644
--- a/utils/themeeditor/models/parsetreenode.h
+++ b/utils/themeeditor/models/parsetreenode.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/models/projectmodel.cpp b/utils/themeeditor/models/projectmodel.cpp
index 2663e8b426..1185c200bb 100644
--- a/utils/themeeditor/models/projectmodel.cpp
+++ b/utils/themeeditor/models/projectmodel.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
@@ -100,6 +99,7 @@ ProjectModel::~ProjectModel()
 int ProjectModel::rowCount(const QModelIndex& parent) const
 {
     return files.count();
+    (void)parent;
 }
 
 QVariant ProjectModel::data(const QModelIndex &index, int role) const
diff --git a/utils/themeeditor/models/projectmodel.h b/utils/themeeditor/models/projectmodel.h
index 4afca2837e..259a8c9028 100644
--- a/utils/themeeditor/models/projectmodel.h
+++ b/utils/themeeditor/models/projectmodel.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/models/targetdata.cpp b/utils/themeeditor/models/targetdata.cpp
index 59ec5fccb2..f76308e3a2 100644
--- a/utils/themeeditor/models/targetdata.cpp
+++ b/utils/themeeditor/models/targetdata.cpp
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/models/targetdata.h b/utils/themeeditor/models/targetdata.h
index 89bb78bdc3..41f8044797 100644
--- a/utils/themeeditor/models/targetdata.h
+++ b/utils/themeeditor/models/targetdata.h
@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Robert Bieber
  *
diff --git a/utils/themeeditor/resources/deviceoptions b/utils/themeeditor/resources/deviceoptions
index 4b883ae422..4100ce2336 100644
--- a/utils/themeeditor/resources/deviceoptions
+++ b/utils/themeeditor/resources/deviceoptions
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2010 Robert Bieber
 #
diff --git a/utils/themeeditor/resources/tagdb b/utils/themeeditor/resources/tagdb
index 9fde2e39e6..c29a309c46 100644
--- a/utils/themeeditor/resources/tagdb
+++ b/utils/themeeditor/resources/tagdb
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # Copyright (C) 2010 Robert Bieber
 #
diff --git a/utils/themeeditor/themeeditor.nsi b/utils/themeeditor/themeeditor.nsi
index 445ed8ad21..b84fe44638 100644
--- a/utils/themeeditor/themeeditor.nsi
+++ b/utils/themeeditor/themeeditor.nsi
@@ -4,7 +4,6 @@
 ;   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 ;   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 ;                     \/            \/     \/    \/            \/
-; $Id$
 ;
 ; Copyright (c) 2010 Dominik Riebeling
 ;
diff --git a/utils/zenutils/libraries/zlib123/zlib/ChangeLog b/utils/zenutils/libraries/zlib123/zlib/ChangeLog
index 7f6869d323..d3da27ec90 100644
--- a/utils/zenutils/libraries/zlib123/zlib/ChangeLog
+++ b/utils/zenutils/libraries/zlib123/zlib/ChangeLog
@@ -599,7 +599,6 @@ Changes in 1.0.6 (19 Jan 1998)
 - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
 - added makelcc.bat for lcc-win32 (Tom St Denis)
 - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
 - check for unistd.h in configure (for off_t)
 - remove useless check parameter in inflate_blocks_free
 - avoid useless assignment of s->check to itself in inflate_blocks_new
diff --git a/utils/zenutils/libraries/zlib123/zlib/adler32.c b/utils/zenutils/libraries/zlib123/zlib/adler32.c
index 007ba26277..257bd3cdba 100644
--- a/utils/zenutils/libraries/zlib123/zlib/adler32.c
+++ b/utils/zenutils/libraries/zlib123/zlib/adler32.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #define ZLIB_INTERNAL
 #include "zlib.h"
diff --git a/utils/zenutils/libraries/zlib123/zlib/compress.c b/utils/zenutils/libraries/zlib123/zlib/compress.c
index df04f0148e..04c242ffe0 100644
--- a/utils/zenutils/libraries/zlib123/zlib/compress.c
+++ b/utils/zenutils/libraries/zlib123/zlib/compress.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #define ZLIB_INTERNAL
 #include "zlib.h"
diff --git a/utils/zenutils/libraries/zlib123/zlib/crc32.c b/utils/zenutils/libraries/zlib123/zlib/crc32.c
index f658a9ef55..1f7f00c64a 100644
--- a/utils/zenutils/libraries/zlib123/zlib/crc32.c
+++ b/utils/zenutils/libraries/zlib123/zlib/crc32.c
@@ -9,7 +9,6 @@
  * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
  */
 
-/* @(#) $Id$ */
 
 /*
   Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
diff --git a/utils/zenutils/libraries/zlib123/zlib/deflate.c b/utils/zenutils/libraries/zlib123/zlib/deflate.c
index e2886abda3..489cbf1fdd 100644
--- a/utils/zenutils/libraries/zlib123/zlib/deflate.c
+++ b/utils/zenutils/libraries/zlib123/zlib/deflate.c
@@ -47,7 +47,6 @@
  *
  */
 
-/* @(#) $Id$ */
 
 #include "deflate.h"
 
diff --git a/utils/zenutils/libraries/zlib123/zlib/deflate.h b/utils/zenutils/libraries/zlib123/zlib/deflate.h
index 05a5ab3a2c..23924c9324 100644
--- a/utils/zenutils/libraries/zlib123/zlib/deflate.h
+++ b/utils/zenutils/libraries/zlib123/zlib/deflate.h
@@ -8,7 +8,6 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id$ */
 
 #ifndef DEFLATE_H
 #define DEFLATE_H
diff --git a/utils/zenutils/libraries/zlib123/zlib/example.c b/utils/zenutils/libraries/zlib123/zlib/example.c
index 6c8a0ee763..86494ef709 100644
--- a/utils/zenutils/libraries/zlib123/zlib/example.c
+++ b/utils/zenutils/libraries/zlib123/zlib/example.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/utils/zenutils/libraries/zlib123/zlib/gzio.c b/utils/zenutils/libraries/zlib123/zlib/gzio.c
index 7e90f4928f..be2d603fcc 100644
--- a/utils/zenutils/libraries/zlib123/zlib/gzio.c
+++ b/utils/zenutils/libraries/zlib123/zlib/gzio.c
@@ -5,7 +5,6 @@
  * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.
  */
 
-/* @(#) $Id$ */
 
 #include <stdio.h>
 
diff --git a/utils/zenutils/libraries/zlib123/zlib/minigzip.c b/utils/zenutils/libraries/zlib123/zlib/minigzip.c
index 4524b96a1d..47e9b010ec 100644
--- a/utils/zenutils/libraries/zlib123/zlib/minigzip.c
+++ b/utils/zenutils/libraries/zlib123/zlib/minigzip.c
@@ -13,7 +13,6 @@
  * or in pipe mode.
  */
 
-/* @(#) $Id$ */
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/utils/zenutils/libraries/zlib123/zlib/trees.c b/utils/zenutils/libraries/zlib123/zlib/trees.c
index 395e4e1681..907e7a69b1 100644
--- a/utils/zenutils/libraries/zlib123/zlib/trees.c
+++ b/utils/zenutils/libraries/zlib123/zlib/trees.c
@@ -29,7 +29,6 @@
  *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
-/* @(#) $Id$ */
 
 /* #define GEN_TREES_H */
 
diff --git a/utils/zenutils/libraries/zlib123/zlib/uncompr.c b/utils/zenutils/libraries/zlib123/zlib/uncompr.c
index b59e3d0def..c3c9fa6cb9 100644
--- a/utils/zenutils/libraries/zlib123/zlib/uncompr.c
+++ b/utils/zenutils/libraries/zlib123/zlib/uncompr.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #define ZLIB_INTERNAL
 #include "zlib.h"
diff --git a/utils/zenutils/libraries/zlib123/zlib/zconf.h b/utils/zenutils/libraries/zlib123/zlib/zconf.h
index 03a9431c8b..9a3704ee1a 100644
--- a/utils/zenutils/libraries/zlib123/zlib/zconf.h
+++ b/utils/zenutils/libraries/zlib123/zlib/zconf.h
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
diff --git a/utils/zenutils/libraries/zlib123/zlib/zconf.in.h b/utils/zenutils/libraries/zlib123/zlib/zconf.in.h
index 03a9431c8b..9a3704ee1a 100644
--- a/utils/zenutils/libraries/zlib123/zlib/zconf.in.h
+++ b/utils/zenutils/libraries/zlib123/zlib/zconf.in.h
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
diff --git a/utils/zenutils/libraries/zlib123/zlib/zutil.c b/utils/zenutils/libraries/zlib123/zlib/zutil.c
index f82e53ba59..70f3f9296f 100644
--- a/utils/zenutils/libraries/zlib123/zlib/zutil.c
+++ b/utils/zenutils/libraries/zlib123/zlib/zutil.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #include "zutil.h"
 
diff --git a/utils/zenutils/libraries/zlib123/zlib/zutil.h b/utils/zenutils/libraries/zlib123/zlib/zutil.h
index b7d5eff81b..2acfac770c 100644
--- a/utils/zenutils/libraries/zlib123/zlib/zutil.h
+++ b/utils/zenutils/libraries/zlib123/zlib/zutil.h
@@ -8,7 +8,6 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id$ */
 
 #ifndef ZUTIL_H
 #define ZUTIL_H
diff --git a/wps/WPSLIST b/wps/WPSLIST
index 76ec8dc5b8..3e0ba230e0 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # WPSLIST
 #
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index 52492f6b71..e3e8c178ec 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -5,7 +5,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 use strict;