diff --git a/Makefile.am b/Makefile.am
index 948a117..9768a98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = src 
+SUBDIRS = src data
diff --git a/configure.in b/configure.in
index 83ea713..a47cec4 100644
--- a/configure.in
+++ b/configure.in
@@ -24,4 +24,49 @@ AC_CHECK_LIB(SDL_gfx, rotozoomSurfaceXY,,check_sdl_gfx="no")
 # Check for libpng
 AC_CHECK_LIB(png, png_read_image,,check_png="no")
 
-AC_OUTPUT(Makefile src/Makefile)
+AC_ARG_ENABLE(platform,
+			  [  --enable-platform=X        specify the targeted platform],
+			  [GMENU2X_PLATFORM="$enableval"], [GMENU2X_PLATFORM="default"])
+
+case "$GMENU2X_PLATFORM" in
+	gp2x)
+		AC_DEFINE(PLATFORM_GP2X)
+		PLATFORM="gp2x"
+		SCREEN_RES="320x240"
+	;;
+	dingux)
+		AC_DEFINE(PLATFORM_DINGUX)
+		PLATFORM="dingux"
+		SCREEN_RES="320x240"
+	;;
+	nanonote)
+		AC_DEFINE(PLATFORM_NANONOTE)
+		PLATFORM="nanonote"
+		SCREEN_RES="320x240"
+	;;
+	pandora)
+		AC_DEFINE(PLATFORM_PANDORA)
+		PLATFORM="pandora"
+		SCREEN_RES="800x480"
+	;;
+	default)
+		AC_MSG_WARN([*** No --enable-platform specified. Defaulting to "pc".])
+		AC_DEFINE(PLATFORM_PC)
+		PLATFORM="pc"
+		SCREEN_RES="800x480"
+	;;
+	pc)
+		AC_DEFINE(PLATFORM_PC)
+		PLATFORM="pc"
+		SCREEN_RES="800x480"
+	;;
+	*)
+		AC_MSG_ERROR([*** Unknown platform.])
+	;;
+esac
+
+AC_SUBST(PLATFORM)
+AC_SUBST(SCREEN_RES)
+
+
+AC_OUTPUT(Makefile src/Makefile data/Makefile)
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..9538540
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,9 @@
+
+#pkgdata_DATA = platform/@PLATFORM@ translations skins/@SCREEN_RES@
+
+install-data-local:
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+	$(MKDIR_P) "$(DESTDIR)$(pkgdatadir)/skins"
+	cp -r platform/@PLATFORM@/* "$(DESTDIR)$(pkgdatadir)"
+	cp -r translations "$(DESTDIR)$(pkgdatadir)"
+	cp -r skins/@SCREEN_RES@/* "$(DESTDIR)$(pkgdatadir)/skins"
diff --git a/dingoo/input.conf b/data/platform/dingux/input.conf
similarity index 100%
rename from dingoo/input.conf
rename to data/platform/dingux/input.conf
diff --git a/nanonote/gmenu2x.conf b/data/platform/nanonote/gmenu2x.conf
similarity index 100%
rename from nanonote/gmenu2x.conf
rename to data/platform/nanonote/gmenu2x.conf
diff --git a/nanonote/gmenu2x.sh b/data/platform/nanonote/gmenu2x.sh
similarity index 60%
rename from nanonote/gmenu2x.sh
rename to data/platform/nanonote/gmenu2x.sh
index b3473c0..de9f17f 100755
--- a/nanonote/gmenu2x.sh
+++ b/data/platform/nanonote/gmenu2x.sh
@@ -5,7 +5,7 @@ source /etc/profile
 #setfont2 /usr/share/setfont2/un-fuzzy-6x10-font.pnm
 #loadunimap /usr/share/setfont2/ben_uni.trans
 
-setfont  /usr/share/kbd/consolefonts/kernel-6x11-font
+setfont /usr/share/kbd/consolefonts/kernel-6x11-font
 
 clear
-cd /usr/share/gmenu2x && ./gmenu2x
+/usr/bin/gmenu2x.bin
diff --git a/nanonote/input.conf b/data/platform/nanonote/input.conf
similarity index 100%
rename from nanonote/input.conf
rename to data/platform/nanonote/input.conf
diff --git a/nanonote/scripts/services.sh b/data/platform/nanonote/scripts/services.sh
similarity index 100%
rename from nanonote/scripts/services.sh
rename to data/platform/nanonote/scripts/services.sh
diff --git a/nanonote/scripts/usboff.sh b/data/platform/nanonote/scripts/usboff.sh
similarity index 100%
rename from nanonote/scripts/usboff.sh
rename to data/platform/nanonote/scripts/usboff.sh
diff --git a/nanonote/scripts/usbon.sh b/data/platform/nanonote/scripts/usbon.sh
similarity index 100%
rename from nanonote/scripts/usbon.sh
rename to data/platform/nanonote/scripts/usbon.sh
diff --git a/nanonote/sections/applications/abook b/data/platform/nanonote/sections/applications/abook
similarity index 100%
rename from nanonote/sections/applications/abook
rename to data/platform/nanonote/sections/applications/abook
diff --git a/nanonote/sections/applications/aewan b/data/platform/nanonote/sections/applications/aewan
similarity index 100%
rename from nanonote/sections/applications/aewan
rename to data/platform/nanonote/sections/applications/aewan
diff --git a/nanonote/sections/applications/ase b/data/platform/nanonote/sections/applications/ase
similarity index 100%
rename from nanonote/sections/applications/ase
rename to data/platform/nanonote/sections/applications/ase
diff --git a/nanonote/sections/applications/bc b/data/platform/nanonote/sections/applications/bc
similarity index 100%
rename from nanonote/sections/applications/bc
rename to data/platform/nanonote/sections/applications/bc
diff --git a/nanonote/sections/applications/calcurse b/data/platform/nanonote/sections/applications/calcurse
similarity index 100%
rename from nanonote/sections/applications/calcurse
rename to data/platform/nanonote/sections/applications/calcurse
diff --git a/nanonote/sections/applications/centerim b/data/platform/nanonote/sections/applications/centerim
similarity index 100%
rename from nanonote/sections/applications/centerim
rename to data/platform/nanonote/sections/applications/centerim
diff --git a/nanonote/sections/applications/ctronome b/data/platform/nanonote/sections/applications/ctronome
similarity index 100%
rename from nanonote/sections/applications/ctronome
rename to data/platform/nanonote/sections/applications/ctronome
diff --git a/nanonote/sections/applications/dgclock b/data/platform/nanonote/sections/applications/dgclock
similarity index 100%
rename from nanonote/sections/applications/dgclock
rename to data/platform/nanonote/sections/applications/dgclock
diff --git a/nanonote/sections/applications/elinks b/data/platform/nanonote/sections/applications/elinks
similarity index 100%
rename from nanonote/sections/applications/elinks
rename to data/platform/nanonote/sections/applications/elinks
diff --git a/nanonote/sections/applications/emacs b/data/platform/nanonote/sections/applications/emacs
similarity index 100%
rename from nanonote/sections/applications/emacs
rename to data/platform/nanonote/sections/applications/emacs
diff --git a/nanonote/sections/applications/gmu b/data/platform/nanonote/sections/applications/gmu
similarity index 100%
rename from nanonote/sections/applications/gmu
rename to data/platform/nanonote/sections/applications/gmu
diff --git a/nanonote/sections/applications/gnuplot b/data/platform/nanonote/sections/applications/gnuplot
similarity index 100%
rename from nanonote/sections/applications/gnuplot
rename to data/platform/nanonote/sections/applications/gnuplot
diff --git a/nanonote/sections/applications/hnb b/data/platform/nanonote/sections/applications/hnb
similarity index 100%
rename from nanonote/sections/applications/hnb
rename to data/platform/nanonote/sections/applications/hnb
diff --git a/nanonote/sections/applications/ikog b/data/platform/nanonote/sections/applications/ikog
similarity index 100%
rename from nanonote/sections/applications/ikog
rename to data/platform/nanonote/sections/applications/ikog
diff --git a/nanonote/sections/applications/joe b/data/platform/nanonote/sections/applications/joe
similarity index 100%
rename from nanonote/sections/applications/joe
rename to data/platform/nanonote/sections/applications/joe
diff --git a/nanonote/sections/applications/links b/data/platform/nanonote/sections/applications/links
similarity index 100%
rename from nanonote/sections/applications/links
rename to data/platform/nanonote/sections/applications/links
diff --git a/nanonote/sections/applications/lynx b/data/platform/nanonote/sections/applications/lynx
similarity index 100%
rename from nanonote/sections/applications/lynx
rename to data/platform/nanonote/sections/applications/lynx
diff --git a/nanonote/sections/applications/mathomatic b/data/platform/nanonote/sections/applications/mathomatic
similarity index 100%
rename from nanonote/sections/applications/mathomatic
rename to data/platform/nanonote/sections/applications/mathomatic
diff --git a/nanonote/sections/applications/mcabber b/data/platform/nanonote/sections/applications/mcabber
similarity index 100%
rename from nanonote/sections/applications/mcabber
rename to data/platform/nanonote/sections/applications/mcabber
diff --git a/nanonote/sections/applications/mediatomb b/data/platform/nanonote/sections/applications/mediatomb
similarity index 100%
rename from nanonote/sections/applications/mediatomb
rename to data/platform/nanonote/sections/applications/mediatomb
diff --git a/nanonote/sections/applications/minicom b/data/platform/nanonote/sections/applications/minicom
similarity index 100%
rename from nanonote/sections/applications/minicom
rename to data/platform/nanonote/sections/applications/minicom
diff --git a/nanonote/sections/applications/mutt b/data/platform/nanonote/sections/applications/mutt
similarity index 100%
rename from nanonote/sections/applications/mutt
rename to data/platform/nanonote/sections/applications/mutt
diff --git a/nanonote/sections/applications/nanomap b/data/platform/nanonote/sections/applications/nanomap
similarity index 100%
rename from nanonote/sections/applications/nanomap
rename to data/platform/nanonote/sections/applications/nanomap
diff --git a/nanonote/sections/applications/netsurf b/data/platform/nanonote/sections/applications/netsurf
similarity index 100%
rename from nanonote/sections/applications/netsurf
rename to data/platform/nanonote/sections/applications/netsurf
diff --git a/nanonote/sections/applications/nightsky b/data/platform/nanonote/sections/applications/nightsky
similarity index 100%
rename from nanonote/sections/applications/nightsky
rename to data/platform/nanonote/sections/applications/nightsky
diff --git a/nanonote/sections/applications/pyclock b/data/platform/nanonote/sections/applications/pyclock
similarity index 100%
rename from nanonote/sections/applications/pyclock
rename to data/platform/nanonote/sections/applications/pyclock
diff --git a/nanonote/sections/applications/qc b/data/platform/nanonote/sections/applications/qc
similarity index 100%
rename from nanonote/sections/applications/qc
rename to data/platform/nanonote/sections/applications/qc
diff --git a/nanonote/sections/applications/qstardict b/data/platform/nanonote/sections/applications/qstardict
similarity index 100%
rename from nanonote/sections/applications/qstardict
rename to data/platform/nanonote/sections/applications/qstardict
diff --git a/nanonote/sections/applications/sc b/data/platform/nanonote/sections/applications/sc
similarity index 100%
rename from nanonote/sections/applications/sc
rename to data/platform/nanonote/sections/applications/sc
diff --git a/nanonote/sections/applications/sdcv b/data/platform/nanonote/sections/applications/sdcv
similarity index 100%
rename from nanonote/sections/applications/sdcv
rename to data/platform/nanonote/sections/applications/sdcv
diff --git a/nanonote/sections/applications/snownews b/data/platform/nanonote/sections/applications/snownews
similarity index 100%
rename from nanonote/sections/applications/snownews
rename to data/platform/nanonote/sections/applications/snownews
diff --git a/nanonote/sections/applications/stardict b/data/platform/nanonote/sections/applications/stardict
similarity index 100%
rename from nanonote/sections/applications/stardict
rename to data/platform/nanonote/sections/applications/stardict
diff --git a/nanonote/sections/applications/tunec b/data/platform/nanonote/sections/applications/tunec
similarity index 100%
rename from nanonote/sections/applications/tunec
rename to data/platform/nanonote/sections/applications/tunec
diff --git a/nanonote/sections/applications/vim b/data/platform/nanonote/sections/applications/vim
similarity index 100%
rename from nanonote/sections/applications/vim
rename to data/platform/nanonote/sections/applications/vim
diff --git a/nanonote/sections/applications/w3m b/data/platform/nanonote/sections/applications/w3m
similarity index 100%
rename from nanonote/sections/applications/w3m
rename to data/platform/nanonote/sections/applications/w3m
diff --git a/nanonote/sections/applications/zgv b/data/platform/nanonote/sections/applications/zgv
similarity index 100%
rename from nanonote/sections/applications/zgv
rename to data/platform/nanonote/sections/applications/zgv
diff --git a/nanonote/sections/games/alex4 b/data/platform/nanonote/sections/games/alex4
similarity index 100%
rename from nanonote/sections/games/alex4
rename to data/platform/nanonote/sections/games/alex4
diff --git a/nanonote/sections/games/allegro-demo b/data/platform/nanonote/sections/games/allegro-demo
similarity index 100%
rename from nanonote/sections/games/allegro-demo
rename to data/platform/nanonote/sections/games/allegro-demo
diff --git a/nanonote/sections/games/backgammon b/data/platform/nanonote/sections/games/backgammon
similarity index 100%
rename from nanonote/sections/games/backgammon
rename to data/platform/nanonote/sections/games/backgammon
diff --git a/nanonote/sections/games/brainless b/data/platform/nanonote/sections/games/brainless
similarity index 100%
rename from nanonote/sections/games/brainless
rename to data/platform/nanonote/sections/games/brainless
diff --git a/nanonote/sections/games/dunnet b/data/platform/nanonote/sections/games/dunnet
similarity index 100%
rename from nanonote/sections/games/dunnet
rename to data/platform/nanonote/sections/games/dunnet
diff --git a/nanonote/sections/games/freedroid b/data/platform/nanonote/sections/games/freedroid
similarity index 100%
rename from nanonote/sections/games/freedroid
rename to data/platform/nanonote/sections/games/freedroid
diff --git a/nanonote/sections/games/gnuchess b/data/platform/nanonote/sections/games/gnuchess
similarity index 100%
rename from nanonote/sections/games/gnuchess
rename to data/platform/nanonote/sections/games/gnuchess
diff --git a/nanonote/sections/games/gottet b/data/platform/nanonote/sections/games/gottet
similarity index 100%
rename from nanonote/sections/games/gottet
rename to data/platform/nanonote/sections/games/gottet
diff --git a/nanonote/sections/games/qball b/data/platform/nanonote/sections/games/qball
similarity index 100%
rename from nanonote/sections/games/qball
rename to data/platform/nanonote/sections/games/qball
diff --git a/nanonote/sections/games/sokoban b/data/platform/nanonote/sections/games/sokoban
similarity index 100%
rename from nanonote/sections/games/sokoban
rename to data/platform/nanonote/sections/games/sokoban
diff --git a/nanonote/sections/games/supertux b/data/platform/nanonote/sections/games/supertux
similarity index 100%
rename from nanonote/sections/games/supertux
rename to data/platform/nanonote/sections/games/supertux
diff --git a/nanonote/sections/games/tetris b/data/platform/nanonote/sections/games/tetris
similarity index 100%
rename from nanonote/sections/games/tetris
rename to data/platform/nanonote/sections/games/tetris
diff --git a/nanonote/sections/games/tile b/data/platform/nanonote/sections/games/tile
similarity index 100%
rename from nanonote/sections/games/tile
rename to data/platform/nanonote/sections/games/tile
diff --git a/nanonote/sections/games/worm b/data/platform/nanonote/sections/games/worm
similarity index 100%
rename from nanonote/sections/games/worm
rename to data/platform/nanonote/sections/games/worm
diff --git a/nanonote/sections/programming/.gitignore b/data/platform/nanonote/sections/programming/.gitignore
similarity index 100%
rename from nanonote/sections/programming/.gitignore
rename to data/platform/nanonote/sections/programming/.gitignore
diff --git a/nanonote/sections/programming/gforth b/data/platform/nanonote/sections/programming/gforth
similarity index 100%
rename from nanonote/sections/programming/gforth
rename to data/platform/nanonote/sections/programming/gforth
diff --git a/nanonote/sections/programming/guile b/data/platform/nanonote/sections/programming/guile
similarity index 100%
rename from nanonote/sections/programming/guile
rename to data/platform/nanonote/sections/programming/guile
diff --git a/nanonote/sections/programming/lua b/data/platform/nanonote/sections/programming/lua
similarity index 100%
rename from nanonote/sections/programming/lua
rename to data/platform/nanonote/sections/programming/lua
diff --git a/nanonote/sections/programming/octave b/data/platform/nanonote/sections/programming/octave
similarity index 100%
rename from nanonote/sections/programming/octave
rename to data/platform/nanonote/sections/programming/octave
diff --git a/nanonote/sections/programming/python b/data/platform/nanonote/sections/programming/python
similarity index 100%
rename from nanonote/sections/programming/python
rename to data/platform/nanonote/sections/programming/python
diff --git a/nanonote/sections/programming/tcl b/data/platform/nanonote/sections/programming/tcl
similarity index 100%
rename from nanonote/sections/programming/tcl
rename to data/platform/nanonote/sections/programming/tcl
diff --git a/nanonote/sections/settings/.gitignore b/data/platform/nanonote/sections/settings/.gitignore
similarity index 100%
rename from nanonote/sections/settings/.gitignore
rename to data/platform/nanonote/sections/settings/.gitignore
diff --git a/nanonote/sections/terminals/ash-color b/data/platform/nanonote/sections/terminals/ash-color
similarity index 100%
rename from nanonote/sections/terminals/ash-color
rename to data/platform/nanonote/sections/terminals/ash-color
diff --git a/nanonote/sections/terminals/ash-default b/data/platform/nanonote/sections/terminals/ash-default
similarity index 100%
rename from nanonote/sections/terminals/ash-default
rename to data/platform/nanonote/sections/terminals/ash-default
diff --git a/nanonote/sections/terminals/bash b/data/platform/nanonote/sections/terminals/bash
similarity index 100%
rename from nanonote/sections/terminals/bash
rename to data/platform/nanonote/sections/terminals/bash
diff --git a/nanonote/sections/terminals/byobu b/data/platform/nanonote/sections/terminals/byobu
similarity index 100%
rename from nanonote/sections/terminals/byobu
rename to data/platform/nanonote/sections/terminals/byobu
diff --git a/nanonote/sections/terminals/fbterm b/data/platform/nanonote/sections/terminals/fbterm
similarity index 100%
rename from nanonote/sections/terminals/fbterm
rename to data/platform/nanonote/sections/terminals/fbterm
diff --git a/nanonote/sections/terminals/jfbterm b/data/platform/nanonote/sections/terminals/jfbterm
similarity index 100%
rename from nanonote/sections/terminals/jfbterm
rename to data/platform/nanonote/sections/terminals/jfbterm
diff --git a/nanonote/sections/terminals/nanoterm b/data/platform/nanonote/sections/terminals/nanoterm
similarity index 100%
rename from nanonote/sections/terminals/nanoterm
rename to data/platform/nanonote/sections/terminals/nanoterm
diff --git a/nanonote/sections/terminals/screen b/data/platform/nanonote/sections/terminals/screen
similarity index 100%
rename from nanonote/sections/terminals/screen
rename to data/platform/nanonote/sections/terminals/screen
diff --git a/nanonote/sections/utilities/.gitignore b/data/platform/nanonote/sections/utilities/.gitignore
similarity index 100%
rename from nanonote/sections/utilities/.gitignore
rename to data/platform/nanonote/sections/utilities/.gitignore
diff --git a/nanonote/sections/utilities/alsamixer b/data/platform/nanonote/sections/utilities/alsamixer
similarity index 100%
rename from nanonote/sections/utilities/alsamixer
rename to data/platform/nanonote/sections/utilities/alsamixer
diff --git a/nanonote/sections/utilities/htop b/data/platform/nanonote/sections/utilities/htop
similarity index 100%
rename from nanonote/sections/utilities/htop
rename to data/platform/nanonote/sections/utilities/htop
diff --git a/nanonote/sections/utilities/mc b/data/platform/nanonote/sections/utilities/mc
similarity index 100%
rename from nanonote/sections/utilities/mc
rename to data/platform/nanonote/sections/utilities/mc
diff --git a/nanonote/sections/utilities/mediatomb b/data/platform/nanonote/sections/utilities/mediatomb
similarity index 100%
rename from nanonote/sections/utilities/mediatomb
rename to data/platform/nanonote/sections/utilities/mediatomb
diff --git a/nanonote/sections/utilities/powertop b/data/platform/nanonote/sections/utilities/powertop
similarity index 100%
rename from nanonote/sections/utilities/powertop
rename to data/platform/nanonote/sections/utilities/powertop
diff --git a/pandora/gmenu2x.conf b/data/platform/pandora/gmenu2x.conf
similarity index 100%
rename from pandora/gmenu2x.conf
rename to data/platform/pandora/gmenu2x.conf
diff --git a/input.conf b/data/platform/pandora/input.conf
similarity index 100%
rename from input.conf
rename to data/platform/pandora/input.conf
diff --git a/pandora/scripts/services.sh b/data/platform/pandora/scripts/services.sh
similarity index 100%
rename from pandora/scripts/services.sh
rename to data/platform/pandora/scripts/services.sh
diff --git a/pandora/scripts/usboff.sh b/data/platform/pandora/scripts/usboff.sh
similarity index 100%
rename from pandora/scripts/usboff.sh
rename to data/platform/pandora/scripts/usboff.sh
diff --git a/pandora/scripts/usbon.sh b/data/platform/pandora/scripts/usbon.sh
similarity index 100%
rename from pandora/scripts/usbon.sh
rename to data/platform/pandora/scripts/usbon.sh
diff --git a/pandora/sections/applications/ebook b/data/platform/pandora/sections/applications/ebook
similarity index 100%
rename from pandora/sections/applications/ebook
rename to data/platform/pandora/sections/applications/ebook
diff --git a/pandora/sections/applications/mplayer b/data/platform/pandora/sections/applications/mplayer
similarity index 100%
rename from pandora/sections/applications/mplayer
rename to data/platform/pandora/sections/applications/mplayer
diff --git a/pandora/sections/applications/music b/data/platform/pandora/sections/applications/music
similarity index 100%
rename from pandora/sections/applications/music
rename to data/platform/pandora/sections/applications/music
diff --git a/pandora/sections/applications/photo b/data/platform/pandora/sections/applications/photo
similarity index 100%
rename from pandora/sections/applications/photo
rename to data/platform/pandora/sections/applications/photo
diff --git a/pandora/sections/emulators/Amiga b/data/platform/pandora/sections/emulators/Amiga
similarity index 100%
rename from pandora/sections/emulators/Amiga
rename to data/platform/pandora/sections/emulators/Amiga
diff --git a/pandora/sections/emulators/GBAdvance b/data/platform/pandora/sections/emulators/GBAdvance
similarity index 100%
rename from pandora/sections/emulators/GBAdvance
rename to data/platform/pandora/sections/emulators/GBAdvance
diff --git a/pandora/sections/emulators/GameBoy b/data/platform/pandora/sections/emulators/GameBoy
similarity index 100%
rename from pandora/sections/emulators/GameBoy
rename to data/platform/pandora/sections/emulators/GameBoy
diff --git a/pandora/sections/emulators/Genesis b/data/platform/pandora/sections/emulators/Genesis
similarity index 100%
rename from pandora/sections/emulators/Genesis
rename to data/platform/pandora/sections/emulators/Genesis
diff --git a/pandora/sections/emulators/Mame b/data/platform/pandora/sections/emulators/Mame
similarity index 100%
rename from pandora/sections/emulators/Mame
rename to data/platform/pandora/sections/emulators/Mame
diff --git a/pandora/sections/emulators/NK SNES b/data/platform/pandora/sections/emulators/NK SNES
similarity index 100%
rename from pandora/sections/emulators/NK SNES
rename to data/platform/pandora/sections/emulators/NK SNES
diff --git a/pandora/sections/emulators/NeoGeo b/data/platform/pandora/sections/emulators/NeoGeo
similarity index 100%
rename from pandora/sections/emulators/NeoGeo
rename to data/platform/pandora/sections/emulators/NeoGeo
diff --git a/pandora/sections/emulators/NeoGeo Pocket b/data/platform/pandora/sections/emulators/NeoGeo Pocket
similarity index 100%
rename from pandora/sections/emulators/NeoGeo Pocket
rename to data/platform/pandora/sections/emulators/NeoGeo Pocket
diff --git a/pandora/sections/emulators/Nintendo b/data/platform/pandora/sections/emulators/Nintendo
similarity index 100%
rename from pandora/sections/emulators/Nintendo
rename to data/platform/pandora/sections/emulators/Nintendo
diff --git a/pandora/sections/emulators/PcEngine b/data/platform/pandora/sections/emulators/PcEngine
similarity index 100%
rename from pandora/sections/emulators/PcEngine
rename to data/platform/pandora/sections/emulators/PcEngine
diff --git a/pandora/sections/emulators/PlayStation b/data/platform/pandora/sections/emulators/PlayStation
similarity index 100%
rename from pandora/sections/emulators/PlayStation
rename to data/platform/pandora/sections/emulators/PlayStation
diff --git a/pandora/sections/emulators/SSnes b/data/platform/pandora/sections/emulators/SSnes
similarity index 100%
rename from pandora/sections/emulators/SSnes
rename to data/platform/pandora/sections/emulators/SSnes
diff --git a/pandora/sections/emulators/fishyNES b/data/platform/pandora/sections/emulators/fishyNES
similarity index 100%
rename from pandora/sections/emulators/fishyNES
rename to data/platform/pandora/sections/emulators/fishyNES
diff --git a/pandora/sections/emulators/hu6280 b/data/platform/pandora/sections/emulators/hu6280
similarity index 100%
rename from pandora/sections/emulators/hu6280
rename to data/platform/pandora/sections/emulators/hu6280
diff --git a/pandora/sections/games/Barrage b/data/platform/pandora/sections/games/Barrage
similarity index 100%
rename from pandora/sections/games/Barrage
rename to data/platform/pandora/sections/games/Barrage
diff --git a/pandora/sections/games/CDogs b/data/platform/pandora/sections/games/CDogs
similarity index 100%
rename from pandora/sections/games/CDogs
rename to data/platform/pandora/sections/games/CDogs
diff --git a/pandora/sections/games/ClonkFront b/data/platform/pandora/sections/games/ClonkFront
similarity index 100%
rename from pandora/sections/games/ClonkFront
rename to data/platform/pandora/sections/games/ClonkFront
diff --git a/pandora/sections/games/Nethack b/data/platform/pandora/sections/games/Nethack
similarity index 100%
rename from pandora/sections/games/Nethack
rename to data/platform/pandora/sections/games/Nethack
diff --git a/pandora/sections/games/PaybackDemo b/data/platform/pandora/sections/games/PaybackDemo
similarity index 100%
rename from pandora/sections/games/PaybackDemo
rename to data/platform/pandora/sections/games/PaybackDemo
diff --git a/pandora/sections/games/S-Tris 2 b/data/platform/pandora/sections/games/S-Tris 2
similarity index 100%
rename from pandora/sections/games/S-Tris 2
rename to data/platform/pandora/sections/games/S-Tris 2
diff --git a/pandora/sections/games/beat2x b/data/platform/pandora/sections/games/beat2x
similarity index 100%
rename from pandora/sections/games/beat2x
rename to data/platform/pandora/sections/games/beat2x
diff --git a/pandora/sections/games/blazar b/data/platform/pandora/sections/games/blazar
similarity index 100%
rename from pandora/sections/games/blazar
rename to data/platform/pandora/sections/games/blazar
diff --git a/pandora/sections/games/duke3d b/data/platform/pandora/sections/games/duke3d
similarity index 100%
rename from pandora/sections/games/duke3d
rename to data/platform/pandora/sections/games/duke3d
diff --git a/pandora/sections/games/hexahop b/data/platform/pandora/sections/games/hexahop
similarity index 100%
rename from pandora/sections/games/hexahop
rename to data/platform/pandora/sections/games/hexahop
diff --git a/pandora/sections/games/ladykiller b/data/platform/pandora/sections/games/ladykiller
similarity index 100%
rename from pandora/sections/games/ladykiller
rename to data/platform/pandora/sections/games/ladykiller
diff --git a/pandora/sections/games/myriad b/data/platform/pandora/sections/games/myriad
similarity index 100%
rename from pandora/sections/games/myriad
rename to data/platform/pandora/sections/games/myriad
diff --git a/pandora/sections/games/openglad b/data/platform/pandora/sections/games/openglad
similarity index 100%
rename from pandora/sections/games/openglad
rename to data/platform/pandora/sections/games/openglad
diff --git a/pandora/sections/games/openjazz b/data/platform/pandora/sections/games/openjazz
similarity index 100%
rename from pandora/sections/games/openjazz
rename to data/platform/pandora/sections/games/openjazz
diff --git a/pandora/sections/games/puzzleland b/data/platform/pandora/sections/games/puzzleland
similarity index 100%
rename from pandora/sections/games/puzzleland
rename to data/platform/pandora/sections/games/puzzleland
diff --git a/pandora/sections/games/rubido b/data/platform/pandora/sections/games/rubido
similarity index 100%
rename from pandora/sections/games/rubido
rename to data/platform/pandora/sections/games/rubido
diff --git a/pandora/sections/games/scummvm b/data/platform/pandora/sections/games/scummvm
similarity index 100%
rename from pandora/sections/games/scummvm
rename to data/platform/pandora/sections/games/scummvm
diff --git a/pandora/sections/games/smashgp b/data/platform/pandora/sections/games/smashgp
similarity index 100%
rename from pandora/sections/games/smashgp
rename to data/platform/pandora/sections/games/smashgp
diff --git a/pandora/sections/games/smw b/data/platform/pandora/sections/games/smw
similarity index 100%
rename from pandora/sections/games/smw
rename to data/platform/pandora/sections/games/smw
diff --git a/pandora/sections/games/sokoban b/data/platform/pandora/sections/games/sokoban
similarity index 100%
rename from pandora/sections/games/sokoban
rename to data/platform/pandora/sections/games/sokoban
diff --git a/pandora/sections/games/supertux b/data/platform/pandora/sections/games/supertux
similarity index 100%
rename from pandora/sections/games/supertux
rename to data/platform/pandora/sections/games/supertux
diff --git a/pandora/sections/games/vektar b/data/platform/pandora/sections/games/vektar
similarity index 100%
rename from pandora/sections/games/vektar
rename to data/platform/pandora/sections/games/vektar
diff --git a/pandora/sections/settings/exit b/data/platform/pandora/sections/settings/exit
similarity index 100%
rename from pandora/sections/settings/exit
rename to data/platform/pandora/sections/settings/exit
diff --git a/pandora/sections/settings/originalsettings b/data/platform/pandora/sections/settings/originalsettings
similarity index 100%
rename from pandora/sections/settings/originalsettings
rename to data/platform/pandora/sections/settings/originalsettings
diff --git a/pandora/sections/settings/system b/data/platform/pandora/sections/settings/system
similarity index 100%
rename from pandora/sections/settings/system
rename to data/platform/pandora/sections/settings/system
diff --git a/nanonote/skins/2010-12-14/icons/dgclock.png b/data/skins/320x240/2010-12-14/icons/dgclock.png
similarity index 100%
rename from nanonote/skins/2010-12-14/icons/dgclock.png
rename to data/skins/320x240/2010-12-14/icons/dgclock.png
diff --git a/nanonote/skins/2010-12-14/icons/duck.png b/data/skins/320x240/2010-12-14/icons/duck.png
similarity index 100%
rename from nanonote/skins/2010-12-14/icons/duck.png
rename to data/skins/320x240/2010-12-14/icons/duck.png
diff --git a/nanonote/skins/2010-12-14/icons/gmu.png b/data/skins/320x240/2010-12-14/icons/gmu.png
similarity index 100%
rename from nanonote/skins/2010-12-14/icons/gmu.png
rename to data/skins/320x240/2010-12-14/icons/gmu.png
diff --git a/nanonote/skins/2010-12-14/icons/leaf_red.png b/data/skins/320x240/2010-12-14/icons/leaf_red.png
similarity index 100%
rename from nanonote/skins/2010-12-14/icons/leaf_red.png
rename to data/skins/320x240/2010-12-14/icons/leaf_red.png
diff --git a/nanonote/skins/2010-12-14/icons/nanomap.png b/data/skins/320x240/2010-12-14/icons/nanomap.png
similarity index 100%
rename from nanonote/skins/2010-12-14/icons/nanomap.png
rename to data/skins/320x240/2010-12-14/icons/nanomap.png
diff --git a/nanonote/skins/2010-12-14/icons/nightsky.png b/data/skins/320x240/2010-12-14/icons/nightsky.png
similarity index 100%
rename from nanonote/skins/2010-12-14/icons/nightsky.png
rename to data/skins/320x240/2010-12-14/icons/nightsky.png
diff --git a/nanonote/skins/2010-12-14/icons/stardict.png b/data/skins/320x240/2010-12-14/icons/stardict.png
similarity index 100%
rename from nanonote/skins/2010-12-14/icons/stardict.png
rename to data/skins/320x240/2010-12-14/icons/stardict.png
diff --git a/nanonote/skins/2010-12-14/icons/utilities-terminal.png b/data/skins/320x240/2010-12-14/icons/utilities-terminal.png
similarity index 100%
rename from nanonote/skins/2010-12-14/icons/utilities-terminal.png
rename to data/skins/320x240/2010-12-14/icons/utilities-terminal.png
diff --git a/nanonote/skins/2010-12-14/icons/vido.png b/data/skins/320x240/2010-12-14/icons/vido.png
similarity index 100%
rename from nanonote/skins/2010-12-14/icons/vido.png
rename to data/skins/320x240/2010-12-14/icons/vido.png
diff --git a/nanonote/skins/2010-12-14/sections/terminals.png b/data/skins/320x240/2010-12-14/sections/terminals.png
similarity index 100%
rename from nanonote/skins/2010-12-14/sections/terminals.png
rename to data/skins/320x240/2010-12-14/sections/terminals.png
diff --git a/nanonote/skins/Default/icons/abook.png b/data/skins/320x240/Default/icons/abook.png
similarity index 100%
rename from nanonote/skins/Default/icons/abook.png
rename to data/skins/320x240/Default/icons/abook.png
diff --git a/nanonote/skins/Default/icons/about.png b/data/skins/320x240/Default/icons/about.png
similarity index 100%
rename from nanonote/skins/Default/icons/about.png
rename to data/skins/320x240/Default/icons/about.png
diff --git a/nanonote/skins/Default/icons/aewan.png b/data/skins/320x240/Default/icons/aewan.png
similarity index 100%
rename from nanonote/skins/Default/icons/aewan.png
rename to data/skins/320x240/Default/icons/aewan.png
diff --git a/nanonote/skins/Default/icons/allegro.png b/data/skins/320x240/Default/icons/allegro.png
similarity index 100%
rename from nanonote/skins/Default/icons/allegro.png
rename to data/skins/320x240/Default/icons/allegro.png
diff --git a/nanonote/skins/Default/icons/alsamixer.png b/data/skins/320x240/Default/icons/alsamixer.png
similarity index 100%
rename from nanonote/skins/Default/icons/alsamixer.png
rename to data/skins/320x240/Default/icons/alsamixer.png
diff --git a/nanonote/skins/Default/icons/ase.png b/data/skins/320x240/Default/icons/ase.png
similarity index 100%
rename from nanonote/skins/Default/icons/ase.png
rename to data/skins/320x240/Default/icons/ase.png
diff --git a/nanonote/skins/Default/icons/backgammon.png b/data/skins/320x240/Default/icons/backgammon.png
similarity index 100%
rename from nanonote/skins/Default/icons/backgammon.png
rename to data/skins/320x240/Default/icons/backgammon.png
diff --git a/nanonote/skins/Default/icons/bc.png b/data/skins/320x240/Default/icons/bc.png
similarity index 100%
rename from nanonote/skins/Default/icons/bc.png
rename to data/skins/320x240/Default/icons/bc.png
diff --git a/nanonote/skins/Default/icons/brainless.png b/data/skins/320x240/Default/icons/brainless.png
similarity index 100%
rename from nanonote/skins/Default/icons/brainless.png
rename to data/skins/320x240/Default/icons/brainless.png
diff --git a/nanonote/skins/Default/icons/browser.png b/data/skins/320x240/Default/icons/browser.png
similarity index 100%
rename from nanonote/skins/Default/icons/browser.png
rename to data/skins/320x240/Default/icons/browser.png
diff --git a/nanonote/skins/Default/icons/calc.png b/data/skins/320x240/Default/icons/calc.png
similarity index 100%
rename from nanonote/skins/Default/icons/calc.png
rename to data/skins/320x240/Default/icons/calc.png
diff --git a/nanonote/skins/Default/icons/calcurse.png b/data/skins/320x240/Default/icons/calcurse.png
similarity index 100%
rename from nanonote/skins/Default/icons/calcurse.png
rename to data/skins/320x240/Default/icons/calcurse.png
diff --git a/nanonote/skins/Default/icons/chess.png b/data/skins/320x240/Default/icons/chess.png
similarity index 100%
rename from nanonote/skins/Default/icons/chess.png
rename to data/skins/320x240/Default/icons/chess.png
diff --git a/nanonote/skins/Default/icons/configure.png b/data/skins/320x240/Default/icons/configure.png
similarity index 100%
rename from nanonote/skins/Default/icons/configure.png
rename to data/skins/320x240/Default/icons/configure.png
diff --git a/nanonote/skins/Default/icons/ctronome.png b/data/skins/320x240/Default/icons/ctronome.png
similarity index 100%
rename from nanonote/skins/Default/icons/ctronome.png
rename to data/skins/320x240/Default/icons/ctronome.png
diff --git a/nanonote/skins/Default/icons/date.png b/data/skins/320x240/Default/icons/date.png
similarity index 100%
rename from nanonote/skins/Default/icons/date.png
rename to data/skins/320x240/Default/icons/date.png
diff --git a/nanonote/skins/Default/icons/dgclock.png b/data/skins/320x240/Default/icons/dgclock.png
similarity index 100%
rename from nanonote/skins/Default/icons/dgclock.png
rename to data/skins/320x240/Default/icons/dgclock.png
diff --git a/nanonote/skins/Default/icons/ebook.png b/data/skins/320x240/Default/icons/ebook.png
similarity index 100%
rename from nanonote/skins/Default/icons/ebook.png
rename to data/skins/320x240/Default/icons/ebook.png
diff --git a/nanonote/skins/Default/icons/editor.png b/data/skins/320x240/Default/icons/editor.png
similarity index 100%
rename from nanonote/skins/Default/icons/editor.png
rename to data/skins/320x240/Default/icons/editor.png
diff --git a/nanonote/skins/Default/icons/emacs.png b/data/skins/320x240/Default/icons/emacs.png
similarity index 100%
rename from nanonote/skins/Default/icons/emacs.png
rename to data/skins/320x240/Default/icons/emacs.png
diff --git a/nanonote/skins/Default/icons/empathy.png b/data/skins/320x240/Default/icons/empathy.png
similarity index 100%
rename from nanonote/skins/Default/icons/empathy.png
rename to data/skins/320x240/Default/icons/empathy.png
diff --git a/nanonote/skins/Default/icons/exit.png b/data/skins/320x240/Default/icons/exit.png
similarity index 100%
rename from nanonote/skins/Default/icons/exit.png
rename to data/skins/320x240/Default/icons/exit.png
diff --git a/nanonote/skins/Default/icons/explorer.png b/data/skins/320x240/Default/icons/explorer.png
similarity index 100%
rename from nanonote/skins/Default/icons/explorer.png
rename to data/skins/320x240/Default/icons/explorer.png
diff --git a/nanonote/skins/Default/icons/freedroid.png b/data/skins/320x240/Default/icons/freedroid.png
similarity index 100%
rename from nanonote/skins/Default/icons/freedroid.png
rename to data/skins/320x240/Default/icons/freedroid.png
diff --git a/nanonote/skins/Default/icons/generic.png b/data/skins/320x240/Default/icons/generic.png
similarity index 100%
rename from nanonote/skins/Default/icons/generic.png
rename to data/skins/320x240/Default/icons/generic.png
diff --git a/nanonote/skins/Default/icons/gforth.png b/data/skins/320x240/Default/icons/gforth.png
similarity index 100%
rename from nanonote/skins/Default/icons/gforth.png
rename to data/skins/320x240/Default/icons/gforth.png
diff --git a/nanonote/skins/Default/icons/gmu.png b/data/skins/320x240/Default/icons/gmu.png
similarity index 100%
rename from nanonote/skins/Default/icons/gmu.png
rename to data/skins/320x240/Default/icons/gmu.png
diff --git a/nanonote/skins/Default/icons/gnuplot.png b/data/skins/320x240/Default/icons/gnuplot.png
similarity index 100%
rename from nanonote/skins/Default/icons/gnuplot.png
rename to data/skins/320x240/Default/icons/gnuplot.png
diff --git a/nanonote/skins/Default/icons/gottet.png b/data/skins/320x240/Default/icons/gottet.png
similarity index 100%
rename from nanonote/skins/Default/icons/gottet.png
rename to data/skins/320x240/Default/icons/gottet.png
diff --git a/nanonote/skins/Default/icons/htop.png b/data/skins/320x240/Default/icons/htop.png
similarity index 100%
rename from nanonote/skins/Default/icons/htop.png
rename to data/skins/320x240/Default/icons/htop.png
diff --git a/nanonote/skins/Default/icons/imgv.png b/data/skins/320x240/Default/icons/imgv.png
similarity index 100%
rename from nanonote/skins/Default/icons/imgv.png
rename to data/skins/320x240/Default/icons/imgv.png
diff --git a/nanonote/skins/Default/icons/irc.png b/data/skins/320x240/Default/icons/irc.png
similarity index 100%
rename from nanonote/skins/Default/icons/irc.png
rename to data/skins/320x240/Default/icons/irc.png
diff --git a/nanonote/skins/Default/icons/leaf_red.png b/data/skins/320x240/Default/icons/leaf_red.png
similarity index 100%
rename from nanonote/skins/Default/icons/leaf_red.png
rename to data/skins/320x240/Default/icons/leaf_red.png
diff --git a/nanonote/skins/Default/icons/links.png b/data/skins/320x240/Default/icons/links.png
similarity index 100%
rename from nanonote/skins/Default/icons/links.png
rename to data/skins/320x240/Default/icons/links.png
diff --git a/nanonote/skins/Default/icons/lynx.png b/data/skins/320x240/Default/icons/lynx.png
similarity index 100%
rename from nanonote/skins/Default/icons/lynx.png
rename to data/skins/320x240/Default/icons/lynx.png
diff --git a/nanonote/skins/Default/icons/mathomatic.png b/data/skins/320x240/Default/icons/mathomatic.png
similarity index 100%
rename from nanonote/skins/Default/icons/mathomatic.png
rename to data/skins/320x240/Default/icons/mathomatic.png
diff --git a/nanonote/skins/Default/icons/mc.png b/data/skins/320x240/Default/icons/mc.png
similarity index 100%
rename from nanonote/skins/Default/icons/mc.png
rename to data/skins/320x240/Default/icons/mc.png
diff --git a/nanonote/skins/Default/icons/mcabber.png b/data/skins/320x240/Default/icons/mcabber.png
similarity index 100%
rename from nanonote/skins/Default/icons/mcabber.png
rename to data/skins/320x240/Default/icons/mcabber.png
diff --git a/nanonote/skins/Default/icons/mplayer.png b/data/skins/320x240/Default/icons/mplayer.png
similarity index 100%
rename from nanonote/skins/Default/icons/mplayer.png
rename to data/skins/320x240/Default/icons/mplayer.png
diff --git a/nanonote/skins/Default/icons/music.png b/data/skins/320x240/Default/icons/music.png
similarity index 100%
rename from nanonote/skins/Default/icons/music.png
rename to data/skins/320x240/Default/icons/music.png
diff --git a/nanonote/skins/Default/icons/mutt.png b/data/skins/320x240/Default/icons/mutt.png
similarity index 100%
rename from nanonote/skins/Default/icons/mutt.png
rename to data/skins/320x240/Default/icons/mutt.png
diff --git a/nanonote/skins/Default/icons/nanomap.png b/data/skins/320x240/Default/icons/nanomap.png
similarity index 100%
rename from nanonote/skins/Default/icons/nanomap.png
rename to data/skins/320x240/Default/icons/nanomap.png
diff --git a/nanonote/skins/Default/icons/nightsky.png b/data/skins/320x240/Default/icons/nightsky.png
similarity index 100%
rename from nanonote/skins/Default/icons/nightsky.png
rename to data/skins/320x240/Default/icons/nightsky.png
diff --git a/nanonote/skins/Default/icons/octave.png b/data/skins/320x240/Default/icons/octave.png
similarity index 100%
rename from nanonote/skins/Default/icons/octave.png
rename to data/skins/320x240/Default/icons/octave.png
diff --git a/nanonote/skins/Default/icons/photo.png b/data/skins/320x240/Default/icons/photo.png
similarity index 100%
rename from nanonote/skins/Default/icons/photo.png
rename to data/skins/320x240/Default/icons/photo.png
diff --git a/nanonote/skins/Default/icons/poweroff.png b/data/skins/320x240/Default/icons/poweroff.png
similarity index 100%
rename from nanonote/skins/Default/icons/poweroff.png
rename to data/skins/320x240/Default/icons/poweroff.png
diff --git a/nanonote/skins/Default/icons/powertop.png b/data/skins/320x240/Default/icons/powertop.png
similarity index 100%
rename from nanonote/skins/Default/icons/powertop.png
rename to data/skins/320x240/Default/icons/powertop.png
diff --git a/nanonote/skins/Default/icons/qball.png b/data/skins/320x240/Default/icons/qball.png
similarity index 100%
rename from nanonote/skins/Default/icons/qball.png
rename to data/skins/320x240/Default/icons/qball.png
diff --git a/nanonote/skins/Default/icons/qstardict.png b/data/skins/320x240/Default/icons/qstardict.png
similarity index 100%
rename from nanonote/skins/Default/icons/qstardict.png
rename to data/skins/320x240/Default/icons/qstardict.png
diff --git a/nanonote/skins/Default/icons/rss.png b/data/skins/320x240/Default/icons/rss.png
similarity index 100%
rename from nanonote/skins/Default/icons/rss.png
rename to data/skins/320x240/Default/icons/rss.png
diff --git a/nanonote/skins/Default/icons/sc.png b/data/skins/320x240/Default/icons/sc.png
similarity index 100%
rename from nanonote/skins/Default/icons/sc.png
rename to data/skins/320x240/Default/icons/sc.png
diff --git a/nanonote/skins/Default/icons/section.png b/data/skins/320x240/Default/icons/section.png
similarity index 100%
rename from nanonote/skins/Default/icons/section.png
rename to data/skins/320x240/Default/icons/section.png
diff --git a/nanonote/skins/Default/icons/skin.png b/data/skins/320x240/Default/icons/skin.png
similarity index 100%
rename from nanonote/skins/Default/icons/skin.png
rename to data/skins/320x240/Default/icons/skin.png
diff --git a/nanonote/skins/Default/icons/stardict.png b/data/skins/320x240/Default/icons/stardict.png
similarity index 100%
rename from nanonote/skins/Default/icons/stardict.png
rename to data/skins/320x240/Default/icons/stardict.png
diff --git a/nanonote/skins/Default/icons/sticker.png b/data/skins/320x240/Default/icons/sticker.png
similarity index 100%
rename from nanonote/skins/Default/icons/sticker.png
rename to data/skins/320x240/Default/icons/sticker.png
diff --git a/nanonote/skins/Default/icons/supertux.png b/data/skins/320x240/Default/icons/supertux.png
similarity index 100%
rename from nanonote/skins/Default/icons/supertux.png
rename to data/skins/320x240/Default/icons/supertux.png
diff --git a/nanonote/skins/Default/icons/tclsh.png b/data/skins/320x240/Default/icons/tclsh.png
similarity index 100%
rename from nanonote/skins/Default/icons/tclsh.png
rename to data/skins/320x240/Default/icons/tclsh.png
diff --git a/nanonote/skins/Default/icons/tetris.png b/data/skins/320x240/Default/icons/tetris.png
similarity index 100%
rename from nanonote/skins/Default/icons/tetris.png
rename to data/skins/320x240/Default/icons/tetris.png
diff --git a/nanonote/skins/Default/icons/tile.png b/data/skins/320x240/Default/icons/tile.png
similarity index 100%
rename from nanonote/skins/Default/icons/tile.png
rename to data/skins/320x240/Default/icons/tile.png
diff --git a/nanonote/skins/Default/icons/tv.png b/data/skins/320x240/Default/icons/tv.png
similarity index 100%
rename from nanonote/skins/Default/icons/tv.png
rename to data/skins/320x240/Default/icons/tv.png
diff --git a/nanonote/skins/Default/icons/usb.png b/data/skins/320x240/Default/icons/usb.png
similarity index 100%
rename from nanonote/skins/Default/icons/usb.png
rename to data/skins/320x240/Default/icons/usb.png
diff --git a/nanonote/skins/Default/icons/utilities-terminal.png b/data/skins/320x240/Default/icons/utilities-terminal.png
similarity index 100%
rename from nanonote/skins/Default/icons/utilities-terminal.png
rename to data/skins/320x240/Default/icons/utilities-terminal.png
diff --git a/nanonote/skins/Default/icons/vim.png b/data/skins/320x240/Default/icons/vim.png
similarity index 100%
rename from nanonote/skins/Default/icons/vim.png
rename to data/skins/320x240/Default/icons/vim.png
diff --git a/nanonote/skins/Default/icons/w3m.png b/data/skins/320x240/Default/icons/w3m.png
similarity index 100%
rename from nanonote/skins/Default/icons/w3m.png
rename to data/skins/320x240/Default/icons/w3m.png
diff --git a/nanonote/skins/Default/icons/wallpaper.png b/data/skins/320x240/Default/icons/wallpaper.png
similarity index 100%
rename from nanonote/skins/Default/icons/wallpaper.png
rename to data/skins/320x240/Default/icons/wallpaper.png
diff --git a/nanonote/skins/Default/icons/worm.png b/data/skins/320x240/Default/icons/worm.png
similarity index 100%
rename from nanonote/skins/Default/icons/worm.png
rename to data/skins/320x240/Default/icons/worm.png
diff --git a/nanonote/skins/Default/icons/zgv.png b/data/skins/320x240/Default/icons/zgv.png
similarity index 100%
rename from nanonote/skins/Default/icons/zgv.png
rename to data/skins/320x240/Default/icons/zgv.png
diff --git a/nanonote/skins/Default/imgs/battery/0.png b/data/skins/320x240/Default/imgs/battery/0.png
similarity index 100%
rename from nanonote/skins/Default/imgs/battery/0.png
rename to data/skins/320x240/Default/imgs/battery/0.png
diff --git a/nanonote/skins/Default/imgs/battery/1.png b/data/skins/320x240/Default/imgs/battery/1.png
similarity index 100%
rename from nanonote/skins/Default/imgs/battery/1.png
rename to data/skins/320x240/Default/imgs/battery/1.png
diff --git a/nanonote/skins/Default/imgs/battery/2.png b/data/skins/320x240/Default/imgs/battery/2.png
similarity index 100%
rename from nanonote/skins/Default/imgs/battery/2.png
rename to data/skins/320x240/Default/imgs/battery/2.png
diff --git a/nanonote/skins/Default/imgs/battery/3.png b/data/skins/320x240/Default/imgs/battery/3.png
similarity index 100%
rename from nanonote/skins/Default/imgs/battery/3.png
rename to data/skins/320x240/Default/imgs/battery/3.png
diff --git a/nanonote/skins/Default/imgs/battery/4.png b/data/skins/320x240/Default/imgs/battery/4.png
similarity index 100%
rename from nanonote/skins/Default/imgs/battery/4.png
rename to data/skins/320x240/Default/imgs/battery/4.png
diff --git a/nanonote/skins/Default/imgs/battery/5.png b/data/skins/320x240/Default/imgs/battery/5.png
similarity index 100%
rename from nanonote/skins/Default/imgs/battery/5.png
rename to data/skins/320x240/Default/imgs/battery/5.png
diff --git a/nanonote/skins/Default/imgs/battery/ac.png b/data/skins/320x240/Default/imgs/battery/ac.png
similarity index 100%
rename from nanonote/skins/Default/imgs/battery/ac.png
rename to data/skins/320x240/Default/imgs/battery/ac.png
diff --git a/nanonote/skins/Default/imgs/bottombar.png b/data/skins/320x240/Default/imgs/bottombar.png
similarity index 100%
rename from nanonote/skins/Default/imgs/bottombar.png
rename to data/skins/320x240/Default/imgs/bottombar.png
diff --git a/nanonote/skins/Default/imgs/buttons/a.png b/data/skins/320x240/Default/imgs/buttons/a.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/a.png
rename to data/skins/320x240/Default/imgs/buttons/a.png
diff --git a/nanonote/skins/Default/imgs/buttons/b.png b/data/skins/320x240/Default/imgs/buttons/b.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/b.png
rename to data/skins/320x240/Default/imgs/buttons/b.png
diff --git a/nanonote/skins/Default/imgs/buttons/down.png b/data/skins/320x240/Default/imgs/buttons/down.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/down.png
rename to data/skins/320x240/Default/imgs/buttons/down.png
diff --git a/nanonote/skins/Default/imgs/buttons/l.png b/data/skins/320x240/Default/imgs/buttons/l.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/l.png
rename to data/skins/320x240/Default/imgs/buttons/l.png
diff --git a/nanonote/skins/Default/imgs/buttons/left.png b/data/skins/320x240/Default/imgs/buttons/left.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/left.png
rename to data/skins/320x240/Default/imgs/buttons/left.png
diff --git a/nanonote/skins/Default/imgs/buttons/r.png b/data/skins/320x240/Default/imgs/buttons/r.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/r.png
rename to data/skins/320x240/Default/imgs/buttons/r.png
diff --git a/nanonote/skins/Default/imgs/buttons/right.png b/data/skins/320x240/Default/imgs/buttons/right.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/right.png
rename to data/skins/320x240/Default/imgs/buttons/right.png
diff --git a/nanonote/skins/Default/imgs/buttons/sectionl.png b/data/skins/320x240/Default/imgs/buttons/sectionl.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/sectionl.png
rename to data/skins/320x240/Default/imgs/buttons/sectionl.png
diff --git a/nanonote/skins/Default/imgs/buttons/sectionr.png b/data/skins/320x240/Default/imgs/buttons/sectionr.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/sectionr.png
rename to data/skins/320x240/Default/imgs/buttons/sectionr.png
diff --git a/nanonote/skins/Default/imgs/buttons/select.png b/data/skins/320x240/Default/imgs/buttons/select.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/select.png
rename to data/skins/320x240/Default/imgs/buttons/select.png
diff --git a/nanonote/skins/Default/imgs/buttons/start.png b/data/skins/320x240/Default/imgs/buttons/start.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/start.png
rename to data/skins/320x240/Default/imgs/buttons/start.png
diff --git a/nanonote/skins/Default/imgs/buttons/stick.png b/data/skins/320x240/Default/imgs/buttons/stick.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/stick.png
rename to data/skins/320x240/Default/imgs/buttons/stick.png
diff --git a/nanonote/skins/Default/imgs/buttons/up.png b/data/skins/320x240/Default/imgs/buttons/up.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/up.png
rename to data/skins/320x240/Default/imgs/buttons/up.png
diff --git a/nanonote/skins/Default/imgs/buttons/vol+.png b/data/skins/320x240/Default/imgs/buttons/vol+.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/vol+.png
rename to data/skins/320x240/Default/imgs/buttons/vol+.png
diff --git a/nanonote/skins/Default/imgs/buttons/vol-.png b/data/skins/320x240/Default/imgs/buttons/vol-.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/vol-.png
rename to data/skins/320x240/Default/imgs/buttons/vol-.png
diff --git a/nanonote/skins/Default/imgs/buttons/x.png b/data/skins/320x240/Default/imgs/buttons/x.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/x.png
rename to data/skins/320x240/Default/imgs/buttons/x.png
diff --git a/nanonote/skins/Default/imgs/buttons/y.png b/data/skins/320x240/Default/imgs/buttons/y.png
similarity index 100%
rename from nanonote/skins/Default/imgs/buttons/y.png
rename to data/skins/320x240/Default/imgs/buttons/y.png
diff --git a/nanonote/skins/Default/imgs/cpu.png b/data/skins/320x240/Default/imgs/cpu.png
similarity index 100%
rename from nanonote/skins/Default/imgs/cpu.png
rename to data/skins/320x240/Default/imgs/cpu.png
diff --git a/nanonote/skins/Default/imgs/file.png b/data/skins/320x240/Default/imgs/file.png
similarity index 100%
rename from nanonote/skins/Default/imgs/file.png
rename to data/skins/320x240/Default/imgs/file.png
diff --git a/nanonote/skins/Default/imgs/folder.png b/data/skins/320x240/Default/imgs/folder.png
similarity index 100%
rename from nanonote/skins/Default/imgs/folder.png
rename to data/skins/320x240/Default/imgs/folder.png
diff --git a/nanonote/skins/Default/imgs/font.png b/data/skins/320x240/Default/imgs/font.png
similarity index 100%
rename from nanonote/skins/Default/imgs/font.png
rename to data/skins/320x240/Default/imgs/font.png
diff --git a/nanonote/skins/Default/imgs/go-up.png b/data/skins/320x240/Default/imgs/go-up.png
similarity index 100%
rename from nanonote/skins/Default/imgs/go-up.png
rename to data/skins/320x240/Default/imgs/go-up.png
diff --git a/nanonote/skins/Default/imgs/inet.png b/data/skins/320x240/Default/imgs/inet.png
similarity index 100%
rename from nanonote/skins/Default/imgs/inet.png
rename to data/skins/320x240/Default/imgs/inet.png
diff --git a/nanonote/skins/Default/imgs/l_disabled.png b/data/skins/320x240/Default/imgs/l_disabled.png
similarity index 100%
rename from nanonote/skins/Default/imgs/l_disabled.png
rename to data/skins/320x240/Default/imgs/l_disabled.png
diff --git a/nanonote/skins/Default/imgs/l_enabled.png b/data/skins/320x240/Default/imgs/l_enabled.png
similarity index 100%
rename from nanonote/skins/Default/imgs/l_enabled.png
rename to data/skins/320x240/Default/imgs/l_enabled.png
diff --git a/nanonote/skins/Default/imgs/manual.png b/data/skins/320x240/Default/imgs/manual.png
similarity index 100%
rename from nanonote/skins/Default/imgs/manual.png
rename to data/skins/320x240/Default/imgs/manual.png
diff --git a/nanonote/skins/Default/imgs/menu.png b/data/skins/320x240/Default/imgs/menu.png
similarity index 100%
rename from nanonote/skins/Default/imgs/menu.png
rename to data/skins/320x240/Default/imgs/menu.png
diff --git a/nanonote/skins/Default/imgs/mute.png b/data/skins/320x240/Default/imgs/mute.png
similarity index 100%
rename from nanonote/skins/Default/imgs/mute.png
rename to data/skins/320x240/Default/imgs/mute.png
diff --git a/nanonote/skins/Default/imgs/phones.png b/data/skins/320x240/Default/imgs/phones.png
similarity index 100%
rename from nanonote/skins/Default/imgs/phones.png
rename to data/skins/320x240/Default/imgs/phones.png
diff --git a/nanonote/skins/Default/imgs/r_disabled.png b/data/skins/320x240/Default/imgs/r_disabled.png
similarity index 100%
rename from nanonote/skins/Default/imgs/r_disabled.png
rename to data/skins/320x240/Default/imgs/r_disabled.png
diff --git a/nanonote/skins/Default/imgs/r_enabled.png b/data/skins/320x240/Default/imgs/r_enabled.png
similarity index 100%
rename from nanonote/skins/Default/imgs/r_enabled.png
rename to data/skins/320x240/Default/imgs/r_enabled.png
diff --git a/nanonote/skins/Default/imgs/samba.png b/data/skins/320x240/Default/imgs/samba.png
similarity index 100%
rename from nanonote/skins/Default/imgs/samba.png
rename to data/skins/320x240/Default/imgs/samba.png
diff --git a/nanonote/skins/Default/imgs/sd.png b/data/skins/320x240/Default/imgs/sd.png
similarity index 100%
rename from nanonote/skins/Default/imgs/sd.png
rename to data/skins/320x240/Default/imgs/sd.png
diff --git a/nanonote/skins/Default/imgs/selection.png b/data/skins/320x240/Default/imgs/selection.png
similarity index 100%
rename from nanonote/skins/Default/imgs/selection.png
rename to data/skins/320x240/Default/imgs/selection.png
diff --git a/nanonote/skins/Default/imgs/topbar.png b/data/skins/320x240/Default/imgs/topbar.png
similarity index 100%
rename from nanonote/skins/Default/imgs/topbar.png
rename to data/skins/320x240/Default/imgs/topbar.png
diff --git a/nanonote/skins/Default/imgs/volume.png b/data/skins/320x240/Default/imgs/volume.png
similarity index 100%
rename from nanonote/skins/Default/imgs/volume.png
rename to data/skins/320x240/Default/imgs/volume.png
diff --git a/nanonote/skins/Default/imgs/webserver.png b/data/skins/320x240/Default/imgs/webserver.png
similarity index 100%
rename from nanonote/skins/Default/imgs/webserver.png
rename to data/skins/320x240/Default/imgs/webserver.png
diff --git a/nanonote/skins/Default/sections/applications.png b/data/skins/320x240/Default/sections/applications.png
similarity index 100%
rename from nanonote/skins/Default/sections/applications.png
rename to data/skins/320x240/Default/sections/applications.png
diff --git a/nanonote/skins/Default/sections/emulators.png b/data/skins/320x240/Default/sections/emulators.png
similarity index 100%
rename from nanonote/skins/Default/sections/emulators.png
rename to data/skins/320x240/Default/sections/emulators.png
diff --git a/nanonote/skins/Default/sections/games.png b/data/skins/320x240/Default/sections/games.png
similarity index 100%
rename from nanonote/skins/Default/sections/games.png
rename to data/skins/320x240/Default/sections/games.png
diff --git a/nanonote/skins/Default/sections/programming.png b/data/skins/320x240/Default/sections/programming.png
similarity index 100%
rename from nanonote/skins/Default/sections/programming.png
rename to data/skins/320x240/Default/sections/programming.png
diff --git a/nanonote/skins/Default/sections/settings.png b/data/skins/320x240/Default/sections/settings.png
similarity index 100%
rename from nanonote/skins/Default/sections/settings.png
rename to data/skins/320x240/Default/sections/settings.png
diff --git a/nanonote/skins/Default/sections/terminals.png b/data/skins/320x240/Default/sections/terminals.png
similarity index 100%
rename from nanonote/skins/Default/sections/terminals.png
rename to data/skins/320x240/Default/sections/terminals.png
diff --git a/nanonote/skins/Default/sections/utilities.png b/data/skins/320x240/Default/sections/utilities.png
similarity index 100%
rename from nanonote/skins/Default/sections/utilities.png
rename to data/skins/320x240/Default/sections/utilities.png
diff --git a/nanonote/skins/Default/skin.conf b/data/skins/320x240/Default/skin.conf
similarity index 100%
rename from nanonote/skins/Default/skin.conf
rename to data/skins/320x240/Default/skin.conf
diff --git a/nanonote/skins/Default/wallpapers/README b/data/skins/320x240/Default/wallpapers/README
similarity index 100%
rename from nanonote/skins/Default/wallpapers/README
rename to data/skins/320x240/Default/wallpapers/README
diff --git a/nanonote/skins/Default/wallpapers/a.png b/data/skins/320x240/Default/wallpapers/a.png
similarity index 100%
rename from nanonote/skins/Default/wallpapers/a.png
rename to data/skins/320x240/Default/wallpapers/a.png
diff --git a/nanonote/skins/Default/wallpapers/b.png b/data/skins/320x240/Default/wallpapers/b.png
similarity index 100%
rename from nanonote/skins/Default/wallpapers/b.png
rename to data/skins/320x240/Default/wallpapers/b.png
diff --git a/nanonote/skins/Default/wallpapers/c.png b/data/skins/320x240/Default/wallpapers/c.png
similarity index 100%
rename from nanonote/skins/Default/wallpapers/c.png
rename to data/skins/320x240/Default/wallpapers/c.png
diff --git a/nanonote/skins/Default/wallpapers/d.png b/data/skins/320x240/Default/wallpapers/d.png
similarity index 100%
rename from nanonote/skins/Default/wallpapers/d.png
rename to data/skins/320x240/Default/wallpapers/d.png
diff --git a/nanonote/skins/Default/wallpapers/default.png b/data/skins/320x240/Default/wallpapers/default.png
similarity index 100%
rename from nanonote/skins/Default/wallpapers/default.png
rename to data/skins/320x240/Default/wallpapers/default.png
diff --git a/nanonote/skins/Default/wallpapers/hicksonst.png b/data/skins/320x240/Default/wallpapers/hicksonst.png
similarity index 100%
rename from nanonote/skins/Default/wallpapers/hicksonst.png
rename to data/skins/320x240/Default/wallpapers/hicksonst.png
diff --git a/nanonote/skins/Default/wallpapers/open.png b/data/skins/320x240/Default/wallpapers/open.png
similarity index 100%
rename from nanonote/skins/Default/wallpapers/open.png
rename to data/skins/320x240/Default/wallpapers/open.png
diff --git a/nanonote/skins/Default/wallpapers/pandora-nova-desat.png b/data/skins/320x240/Default/wallpapers/pandora-nova-desat.png
similarity index 100%
rename from nanonote/skins/Default/wallpapers/pandora-nova-desat.png
rename to data/skins/320x240/Default/wallpapers/pandora-nova-desat.png
diff --git a/nanonote/skins/Default/wallpapers/qi.png b/data/skins/320x240/Default/wallpapers/qi.png
similarity index 100%
rename from nanonote/skins/Default/wallpapers/qi.png
rename to data/skins/320x240/Default/wallpapers/qi.png
diff --git a/nanonote/skins/Default/wallpapers/socratesg.png b/data/skins/320x240/Default/wallpapers/socratesg.png
similarity index 100%
rename from nanonote/skins/Default/wallpapers/socratesg.png
rename to data/skins/320x240/Default/wallpapers/socratesg.png
diff --git a/pandora/skins/Default/icons/about.png b/data/skins/800x480/Default/icons/about.png
similarity index 100%
rename from pandora/skins/Default/icons/about.png
rename to data/skins/800x480/Default/icons/about.png
diff --git a/pandora/skins/Default/icons/configure.png b/data/skins/800x480/Default/icons/configure.png
similarity index 100%
rename from pandora/skins/Default/icons/configure.png
rename to data/skins/800x480/Default/icons/configure.png
diff --git a/pandora/skins/Default/icons/ebook.png b/data/skins/800x480/Default/icons/ebook.png
similarity index 100%
rename from pandora/skins/Default/icons/ebook.png
rename to data/skins/800x480/Default/icons/ebook.png
diff --git a/pandora/skins/Default/icons/exit.png b/data/skins/800x480/Default/icons/exit.png
similarity index 100%
rename from pandora/skins/Default/icons/exit.png
rename to data/skins/800x480/Default/icons/exit.png
diff --git a/pandora/skins/Default/icons/explorer.png b/data/skins/800x480/Default/icons/explorer.png
similarity index 100%
rename from pandora/skins/Default/icons/explorer.png
rename to data/skins/800x480/Default/icons/explorer.png
diff --git a/pandora/skins/Default/icons/generic.png b/data/skins/800x480/Default/icons/generic.png
similarity index 100%
rename from pandora/skins/Default/icons/generic.png
rename to data/skins/800x480/Default/icons/generic.png
diff --git a/pandora/skins/Default/icons/mplayer.png b/data/skins/800x480/Default/icons/mplayer.png
similarity index 100%
rename from pandora/skins/Default/icons/mplayer.png
rename to data/skins/800x480/Default/icons/mplayer.png
diff --git a/pandora/skins/Default/icons/music.png b/data/skins/800x480/Default/icons/music.png
similarity index 100%
rename from pandora/skins/Default/icons/music.png
rename to data/skins/800x480/Default/icons/music.png
diff --git a/pandora/skins/Default/icons/photo.png b/data/skins/800x480/Default/icons/photo.png
similarity index 100%
rename from pandora/skins/Default/icons/photo.png
rename to data/skins/800x480/Default/icons/photo.png
diff --git a/pandora/skins/Default/icons/section.png b/data/skins/800x480/Default/icons/section.png
similarity index 100%
rename from pandora/skins/Default/icons/section.png
rename to data/skins/800x480/Default/icons/section.png
diff --git a/pandora/skins/Default/icons/skin.png b/data/skins/800x480/Default/icons/skin.png
similarity index 100%
rename from pandora/skins/Default/icons/skin.png
rename to data/skins/800x480/Default/icons/skin.png
diff --git a/pandora/skins/Default/icons/tv.png b/data/skins/800x480/Default/icons/tv.png
similarity index 100%
rename from pandora/skins/Default/icons/tv.png
rename to data/skins/800x480/Default/icons/tv.png
diff --git a/pandora/skins/Default/icons/usb.png b/data/skins/800x480/Default/icons/usb.png
similarity index 100%
rename from pandora/skins/Default/icons/usb.png
rename to data/skins/800x480/Default/icons/usb.png
diff --git a/pandora/skins/Default/icons/wallpaper.png b/data/skins/800x480/Default/icons/wallpaper.png
similarity index 100%
rename from pandora/skins/Default/icons/wallpaper.png
rename to data/skins/800x480/Default/icons/wallpaper.png
diff --git a/pandora/skins/Default/imgs/battery/0.png b/data/skins/800x480/Default/imgs/battery/0.png
similarity index 100%
rename from pandora/skins/Default/imgs/battery/0.png
rename to data/skins/800x480/Default/imgs/battery/0.png
diff --git a/pandora/skins/Default/imgs/battery/1.png b/data/skins/800x480/Default/imgs/battery/1.png
similarity index 100%
rename from pandora/skins/Default/imgs/battery/1.png
rename to data/skins/800x480/Default/imgs/battery/1.png
diff --git a/pandora/skins/Default/imgs/battery/2.png b/data/skins/800x480/Default/imgs/battery/2.png
similarity index 100%
rename from pandora/skins/Default/imgs/battery/2.png
rename to data/skins/800x480/Default/imgs/battery/2.png
diff --git a/pandora/skins/Default/imgs/battery/3.png b/data/skins/800x480/Default/imgs/battery/3.png
similarity index 100%
rename from pandora/skins/Default/imgs/battery/3.png
rename to data/skins/800x480/Default/imgs/battery/3.png
diff --git a/pandora/skins/Default/imgs/battery/4.png b/data/skins/800x480/Default/imgs/battery/4.png
similarity index 100%
rename from pandora/skins/Default/imgs/battery/4.png
rename to data/skins/800x480/Default/imgs/battery/4.png
diff --git a/pandora/skins/Default/imgs/battery/5.png b/data/skins/800x480/Default/imgs/battery/5.png
similarity index 100%
rename from pandora/skins/Default/imgs/battery/5.png
rename to data/skins/800x480/Default/imgs/battery/5.png
diff --git a/pandora/skins/Default/imgs/battery/ac.png b/data/skins/800x480/Default/imgs/battery/ac.png
similarity index 100%
rename from pandora/skins/Default/imgs/battery/ac.png
rename to data/skins/800x480/Default/imgs/battery/ac.png
diff --git a/pandora/skins/Default/imgs/bottombar.png b/data/skins/800x480/Default/imgs/bottombar.png
similarity index 100%
rename from pandora/skins/Default/imgs/bottombar.png
rename to data/skins/800x480/Default/imgs/bottombar.png
diff --git a/pandora/skins/Default/imgs/buttons/a.png b/data/skins/800x480/Default/imgs/buttons/a.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/a.png
rename to data/skins/800x480/Default/imgs/buttons/a.png
diff --git a/pandora/skins/Default/imgs/buttons/b.png b/data/skins/800x480/Default/imgs/buttons/b.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/b.png
rename to data/skins/800x480/Default/imgs/buttons/b.png
diff --git a/pandora/skins/Default/imgs/buttons/down.png b/data/skins/800x480/Default/imgs/buttons/down.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/down.png
rename to data/skins/800x480/Default/imgs/buttons/down.png
diff --git a/pandora/skins/Default/imgs/buttons/l.png b/data/skins/800x480/Default/imgs/buttons/l.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/l.png
rename to data/skins/800x480/Default/imgs/buttons/l.png
diff --git a/pandora/skins/Default/imgs/buttons/left.png b/data/skins/800x480/Default/imgs/buttons/left.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/left.png
rename to data/skins/800x480/Default/imgs/buttons/left.png
diff --git a/pandora/skins/Default/imgs/buttons/r.png b/data/skins/800x480/Default/imgs/buttons/r.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/r.png
rename to data/skins/800x480/Default/imgs/buttons/r.png
diff --git a/pandora/skins/Default/imgs/buttons/right.png b/data/skins/800x480/Default/imgs/buttons/right.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/right.png
rename to data/skins/800x480/Default/imgs/buttons/right.png
diff --git a/pandora/skins/Default/imgs/buttons/sectionl.png b/data/skins/800x480/Default/imgs/buttons/sectionl.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/sectionl.png
rename to data/skins/800x480/Default/imgs/buttons/sectionl.png
diff --git a/pandora/skins/Default/imgs/buttons/sectionr.png b/data/skins/800x480/Default/imgs/buttons/sectionr.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/sectionr.png
rename to data/skins/800x480/Default/imgs/buttons/sectionr.png
diff --git a/pandora/skins/Default/imgs/buttons/select.png b/data/skins/800x480/Default/imgs/buttons/select.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/select.png
rename to data/skins/800x480/Default/imgs/buttons/select.png
diff --git a/pandora/skins/Default/imgs/buttons/start.png b/data/skins/800x480/Default/imgs/buttons/start.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/start.png
rename to data/skins/800x480/Default/imgs/buttons/start.png
diff --git a/pandora/skins/Default/imgs/buttons/stick.png b/data/skins/800x480/Default/imgs/buttons/stick.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/stick.png
rename to data/skins/800x480/Default/imgs/buttons/stick.png
diff --git a/pandora/skins/Default/imgs/buttons/up.png b/data/skins/800x480/Default/imgs/buttons/up.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/up.png
rename to data/skins/800x480/Default/imgs/buttons/up.png
diff --git a/pandora/skins/Default/imgs/buttons/vol+.png b/data/skins/800x480/Default/imgs/buttons/vol+.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/vol+.png
rename to data/skins/800x480/Default/imgs/buttons/vol+.png
diff --git a/pandora/skins/Default/imgs/buttons/vol-.png b/data/skins/800x480/Default/imgs/buttons/vol-.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/vol-.png
rename to data/skins/800x480/Default/imgs/buttons/vol-.png
diff --git a/pandora/skins/Default/imgs/buttons/x.png b/data/skins/800x480/Default/imgs/buttons/x.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/x.png
rename to data/skins/800x480/Default/imgs/buttons/x.png
diff --git a/pandora/skins/Default/imgs/buttons/y.png b/data/skins/800x480/Default/imgs/buttons/y.png
similarity index 100%
rename from pandora/skins/Default/imgs/buttons/y.png
rename to data/skins/800x480/Default/imgs/buttons/y.png
diff --git a/pandora/skins/Default/imgs/cpu.png b/data/skins/800x480/Default/imgs/cpu.png
similarity index 100%
rename from pandora/skins/Default/imgs/cpu.png
rename to data/skins/800x480/Default/imgs/cpu.png
diff --git a/pandora/skins/Default/imgs/file.png b/data/skins/800x480/Default/imgs/file.png
similarity index 100%
rename from pandora/skins/Default/imgs/file.png
rename to data/skins/800x480/Default/imgs/file.png
diff --git a/pandora/skins/Default/imgs/folder.png b/data/skins/800x480/Default/imgs/folder.png
similarity index 100%
rename from pandora/skins/Default/imgs/folder.png
rename to data/skins/800x480/Default/imgs/folder.png
diff --git a/pandora/skins/Default/imgs/font.png b/data/skins/800x480/Default/imgs/font.png
similarity index 100%
rename from pandora/skins/Default/imgs/font.png
rename to data/skins/800x480/Default/imgs/font.png
diff --git a/pandora/skins/Default/imgs/go-up.png b/data/skins/800x480/Default/imgs/go-up.png
similarity index 100%
rename from pandora/skins/Default/imgs/go-up.png
rename to data/skins/800x480/Default/imgs/go-up.png
diff --git a/pandora/skins/Default/imgs/inet.png b/data/skins/800x480/Default/imgs/inet.png
similarity index 100%
rename from pandora/skins/Default/imgs/inet.png
rename to data/skins/800x480/Default/imgs/inet.png
diff --git a/pandora/skins/Default/imgs/l_disabled.png b/data/skins/800x480/Default/imgs/l_disabled.png
similarity index 100%
rename from pandora/skins/Default/imgs/l_disabled.png
rename to data/skins/800x480/Default/imgs/l_disabled.png
diff --git a/pandora/skins/Default/imgs/l_enabled.png b/data/skins/800x480/Default/imgs/l_enabled.png
similarity index 100%
rename from pandora/skins/Default/imgs/l_enabled.png
rename to data/skins/800x480/Default/imgs/l_enabled.png
diff --git a/pandora/skins/Default/imgs/manual.png b/data/skins/800x480/Default/imgs/manual.png
similarity index 100%
rename from pandora/skins/Default/imgs/manual.png
rename to data/skins/800x480/Default/imgs/manual.png
diff --git a/pandora/skins/Default/imgs/menu.png b/data/skins/800x480/Default/imgs/menu.png
similarity index 100%
rename from pandora/skins/Default/imgs/menu.png
rename to data/skins/800x480/Default/imgs/menu.png
diff --git a/pandora/skins/Default/imgs/mute.png b/data/skins/800x480/Default/imgs/mute.png
similarity index 100%
rename from pandora/skins/Default/imgs/mute.png
rename to data/skins/800x480/Default/imgs/mute.png
diff --git a/pandora/skins/Default/imgs/phones.png b/data/skins/800x480/Default/imgs/phones.png
similarity index 100%
rename from pandora/skins/Default/imgs/phones.png
rename to data/skins/800x480/Default/imgs/phones.png
diff --git a/pandora/skins/Default/imgs/r_disabled.png b/data/skins/800x480/Default/imgs/r_disabled.png
similarity index 100%
rename from pandora/skins/Default/imgs/r_disabled.png
rename to data/skins/800x480/Default/imgs/r_disabled.png
diff --git a/pandora/skins/Default/imgs/r_enabled.png b/data/skins/800x480/Default/imgs/r_enabled.png
similarity index 100%
rename from pandora/skins/Default/imgs/r_enabled.png
rename to data/skins/800x480/Default/imgs/r_enabled.png
diff --git a/pandora/skins/Default/imgs/samba.png b/data/skins/800x480/Default/imgs/samba.png
similarity index 100%
rename from pandora/skins/Default/imgs/samba.png
rename to data/skins/800x480/Default/imgs/samba.png
diff --git a/pandora/skins/Default/imgs/sd.png b/data/skins/800x480/Default/imgs/sd.png
similarity index 100%
rename from pandora/skins/Default/imgs/sd.png
rename to data/skins/800x480/Default/imgs/sd.png
diff --git a/pandora/skins/Default/imgs/selection.png b/data/skins/800x480/Default/imgs/selection.png
similarity index 100%
rename from pandora/skins/Default/imgs/selection.png
rename to data/skins/800x480/Default/imgs/selection.png
diff --git a/pandora/skins/Default/imgs/topbar.png b/data/skins/800x480/Default/imgs/topbar.png
similarity index 100%
rename from pandora/skins/Default/imgs/topbar.png
rename to data/skins/800x480/Default/imgs/topbar.png
diff --git a/pandora/skins/Default/imgs/volume.png b/data/skins/800x480/Default/imgs/volume.png
similarity index 100%
rename from pandora/skins/Default/imgs/volume.png
rename to data/skins/800x480/Default/imgs/volume.png
diff --git a/pandora/skins/Default/imgs/webserver.png b/data/skins/800x480/Default/imgs/webserver.png
similarity index 100%
rename from pandora/skins/Default/imgs/webserver.png
rename to data/skins/800x480/Default/imgs/webserver.png
diff --git a/pandora/skins/Default/sections/applications.png b/data/skins/800x480/Default/sections/applications.png
similarity index 100%
rename from pandora/skins/Default/sections/applications.png
rename to data/skins/800x480/Default/sections/applications.png
diff --git a/pandora/skins/Default/sections/emulators.png b/data/skins/800x480/Default/sections/emulators.png
similarity index 100%
rename from pandora/skins/Default/sections/emulators.png
rename to data/skins/800x480/Default/sections/emulators.png
diff --git a/pandora/skins/Default/sections/games.png b/data/skins/800x480/Default/sections/games.png
similarity index 100%
rename from pandora/skins/Default/sections/games.png
rename to data/skins/800x480/Default/sections/games.png
diff --git a/pandora/skins/Default/sections/settings.png b/data/skins/800x480/Default/sections/settings.png
similarity index 100%
rename from pandora/skins/Default/sections/settings.png
rename to data/skins/800x480/Default/sections/settings.png
diff --git a/pandora/skins/Default/skin.conf b/data/skins/800x480/Default/skin.conf
similarity index 100%
rename from pandora/skins/Default/skin.conf
rename to data/skins/800x480/Default/skin.conf
diff --git a/pandora/skins/Default/wallpapers/README b/data/skins/800x480/Default/wallpapers/README
similarity index 100%
rename from pandora/skins/Default/wallpapers/README
rename to data/skins/800x480/Default/wallpapers/README
diff --git a/pandora/skins/Default/wallpapers/a.png b/data/skins/800x480/Default/wallpapers/a.png
similarity index 100%
rename from pandora/skins/Default/wallpapers/a.png
rename to data/skins/800x480/Default/wallpapers/a.png
diff --git a/pandora/skins/Default/wallpapers/b.png b/data/skins/800x480/Default/wallpapers/b.png
similarity index 100%
rename from pandora/skins/Default/wallpapers/b.png
rename to data/skins/800x480/Default/wallpapers/b.png
diff --git a/pandora/skins/Default/wallpapers/c.png b/data/skins/800x480/Default/wallpapers/c.png
similarity index 100%
rename from pandora/skins/Default/wallpapers/c.png
rename to data/skins/800x480/Default/wallpapers/c.png
diff --git a/pandora/skins/Default/wallpapers/d.png b/data/skins/800x480/Default/wallpapers/d.png
similarity index 100%
rename from pandora/skins/Default/wallpapers/d.png
rename to data/skins/800x480/Default/wallpapers/d.png
diff --git a/pandora/skins/Default/wallpapers/default.png b/data/skins/800x480/Default/wallpapers/default.png
similarity index 100%
rename from pandora/skins/Default/wallpapers/default.png
rename to data/skins/800x480/Default/wallpapers/default.png
diff --git a/pandora/skins/Default/wallpapers/hicksonst.png b/data/skins/800x480/Default/wallpapers/hicksonst.png
similarity index 100%
rename from pandora/skins/Default/wallpapers/hicksonst.png
rename to data/skins/800x480/Default/wallpapers/hicksonst.png
diff --git a/pandora/skins/Default/wallpapers/open.png b/data/skins/800x480/Default/wallpapers/open.png
similarity index 100%
rename from pandora/skins/Default/wallpapers/open.png
rename to data/skins/800x480/Default/wallpapers/open.png
diff --git a/pandora/skins/Default/wallpapers/pandora-nova-desat.png b/data/skins/800x480/Default/wallpapers/pandora-nova-desat.png
similarity index 100%
rename from pandora/skins/Default/wallpapers/pandora-nova-desat.png
rename to data/skins/800x480/Default/wallpapers/pandora-nova-desat.png
diff --git a/pandora/skins/Default/wallpapers/qi.png b/data/skins/800x480/Default/wallpapers/qi.png
similarity index 100%
rename from pandora/skins/Default/wallpapers/qi.png
rename to data/skins/800x480/Default/wallpapers/qi.png
diff --git a/pandora/skins/Default/wallpapers/socratesg.png b/data/skins/800x480/Default/wallpapers/socratesg.png
similarity index 100%
rename from pandora/skins/Default/wallpapers/socratesg.png
rename to data/skins/800x480/Default/wallpapers/socratesg.png
diff --git a/nanonote/translations/Basque b/data/translations/Basque
similarity index 100%
rename from nanonote/translations/Basque
rename to data/translations/Basque
diff --git a/nanonote/translations/Catalan b/data/translations/Catalan
similarity index 100%
rename from nanonote/translations/Catalan
rename to data/translations/Catalan
diff --git a/nanonote/translations/Danish b/data/translations/Danish
similarity index 100%
rename from nanonote/translations/Danish
rename to data/translations/Danish
diff --git a/nanonote/translations/Dutch b/data/translations/Dutch
similarity index 100%
rename from nanonote/translations/Dutch
rename to data/translations/Dutch
diff --git a/nanonote/translations/Finnish b/data/translations/Finnish
similarity index 100%
rename from nanonote/translations/Finnish
rename to data/translations/Finnish
diff --git a/nanonote/translations/French b/data/translations/French
similarity index 100%
rename from nanonote/translations/French
rename to data/translations/French
diff --git a/nanonote/translations/German b/data/translations/German
similarity index 100%
rename from nanonote/translations/German
rename to data/translations/German
diff --git a/nanonote/translations/Italian b/data/translations/Italian
similarity index 100%
rename from nanonote/translations/Italian
rename to data/translations/Italian
diff --git a/nanonote/translations/Norwegian b/data/translations/Norwegian
similarity index 100%
rename from nanonote/translations/Norwegian
rename to data/translations/Norwegian
diff --git a/nanonote/translations/Portuguese (Portugal) b/data/translations/Portuguese (Portugal)
similarity index 100%
rename from nanonote/translations/Portuguese (Portugal)
rename to data/translations/Portuguese (Portugal)
diff --git a/nanonote/translations/Russian b/data/translations/Russian
similarity index 100%
rename from nanonote/translations/Russian
rename to data/translations/Russian
diff --git a/nanonote/translations/Slovak b/data/translations/Slovak
similarity index 100%
rename from nanonote/translations/Slovak
rename to data/translations/Slovak
diff --git a/nanonote/translations/Spanish b/data/translations/Spanish
similarity index 100%
rename from nanonote/translations/Spanish
rename to data/translations/Spanish
diff --git a/nanonote/translations/Swedish b/data/translations/Swedish
similarity index 100%
rename from nanonote/translations/Swedish
rename to data/translations/Swedish
diff --git a/nanonote/translations/Turkish b/data/translations/Turkish
similarity index 100%
rename from nanonote/translations/Turkish
rename to data/translations/Turkish
diff --git a/pandora/input.conf b/pandora/input.conf
deleted file mode 100644
index 2893d96..0000000
--- a/pandora/input.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-a=keyboard,122
-b=keyboard,120
-x=keyboard,115
-y=keyboard,121
-l=keyboard,113
-r=keyboard,112
-select=keyboard,27
-start=keyboard,13
-up=keyboard,273
-down=keyboard,274
-left=keyboard,276
-right=keyboard,275
diff --git a/pandora/translations/Basque b/pandora/translations/Basque
deleted file mode 100644
index 1895e61..0000000
--- a/pandora/translations/Basque
+++ /dev/null
@@ -1,129 +0,0 @@
-Settings=Aukerak
-Configure GMenu2X's options=GMenu2X aukerak konfiguratu
-Activate Usb on SD=Sd-aren usb-a aktibatu
-Activate Usb on Nand=Nand-aren usb-a aktibatu
-Info about GMenu2X=GMenu2X-ri buruzkoak erakutsi
-About=Honi buruz...
-Add section=Sekzioa gehitu
-Rename section=Sekzioaren izena aldatu
-Delete section=Sekzioa ezabatu
-Scan for applications and games=Jokuak eta programak bilatu
-applications=Programak
-Edit link=Esteka aldatu
-Title=Izenburua
-Link title=Estekaren izenburua
-Description=Azalpena
-Link description=Azalpenaren esteka
-Section=sekzioa
-The section this link belongs to=Esteka honen sekzioa da
-Icon=Ikonoa
-Select an icon for the link: $1=Estekarentzako ikonoa aukeratu: $1
-Manual=Eskuliburua
-Select a graphic/textual manual or a readme=Aukeratu eskuliburua(testua edo grafikoa)
-Cpu clock frequency to set when launching this link=Programa hau abiarazteko PUZ abiadura ezarri
-Volume to set for this link=Esteka honentzako bolumena ezarri
-Parameters=Parametroak
-Parameters to pass to the application=Programara pasatuko diren parametroak
-Selector Directory=Selektorearen karpeta
-Directory to scan for the selector=Selektorearekin eskaneatuko den direktorioa
-Selector Browser=Selektorearen arakatzailea
-Allow the selector to change directory=Selektoreari direktorioz aldatzea baimendu
-Selector Filter=Selektorearen iragazkia
-Filter for the selector (Separate values with a comma)=Selektorearentzako iragazkiak(Balioak komekin banandu)
-Selector Screenshots=Selektorearen pantaila-argazkia
-Directory of the screenshots for the selector=Selektorearen pantaila-argazkien direktorioa
-Selector Aliases=Selektorearen aliasak
-File containing a list of aliases for the selector=Aliasen zerrenda duen artxiboaren izena
-Don't Leave=Ez irten
-Don't quit GMenu2X when launching this link=Lotura hau abiaraztean ez amaitu Gmenu2x
-Save last selection=Azken aukera gogoratu
-Save the last selected link and section on exit=Azken aukera eta esteka gorde irtetean
-Clock for GMenu2X=GMenu2X-ren erlojua
-Set the cpu working frequency when running GMenu2X=Gmenu2x-rentzako PUZ abiadura ezarri
-Maximum overclock=Overclock muga
-Set the maximum overclock for launching links=Ezarri daitekeen overclockik handiena
-Global Volume=Bolumen orokorra
-Set the default volume for the gp2x soundcard=Aurrezarritako bolumen maila
-Output logs=log artxiboak
-Logs the output of the links. Use the Log Viewer to read them.=esteken log-ak gorde. Log irakurlea erabili irakurtzeko.
-Number of columns=Zutabe zenbakia
-Set the number of columns of links to display on a page=Orri bakoitzeko erakutsiko diren zutabeak
-Number of rows=Ilara zenbakia
-Set the number of rows of links to display on a page=Orri bakoitzeko erakutsiko diren ilarak
-Top Bar Color=Goiko barraren kolorea
-Color of the top bar=Goian dagoen barraren kolorea
-Bottom Bar Color=Beheko barraren kolorea
-Color of the bottom bar=Behean dagoen barraren kolorea
-Selection Color=aukeratutakoaren kolorea
-Color of the selection and other interface details=Aukeratutako testuaren kolorea eta interfacearen beste aukera batzuk
-You should disable Usb Networking to do this.=Usb sarea desaktibatu beharko zenuke.
-Operation not permitted.=Baimendu gabeko operazioa.
-Language=Hizkuntza
-Set the language used by GMenu2X=Aukeratu Gmenu2x-ren hizkuntza
-Increase=Handitu
-Decrease=txikitu
-Change color component=Kolore konponentea aldatu
-Increase value=Balioa handitu
-Decrease value=Balioa txikitu
-Switch=Aldatu
-Change value=Balioa aldatu
-Edit=Editatu
-Clear=Garbitu
-Select a directory=Direktorioa aukeratu
-Select a file=Artxiboa aukeratu ezazu
-Clock (default: 200)=Maiztasuna (Aurrezarritakoa: 200)
-Volume (default: -1)=bolumena (Aurrezarritakoa: -1)
-Enter folder=Karpetan sartu
-Confirm=Berretsi
-Enter folder/Confirm=karpetan sartu/Berretsi
-Up one folder=Karpeta bat gora
-Select an application=Programa aukeratu
-Space=espazio-barra
-Shift=Shift
-Cancel=Cancelar
-OK=Ok
-Backspace=Backspace
-Skin=Maskara
-Set the skin used by GMenu2X=GMenu2X-ren maskara aukeratu
-Add link in $1=esteka sortu... $1
-Edit $1=Aldatu $1
-Delete $1 link=honen esteka ezabatu $1
-Deleting $1=Ezabatzen $1
-Are you sure?=Ziur zaude?
-Insert a name for the new section=Sekzio berrirako izena sartu
-Insert a new name for this section=Sekzio honetarako izen berria sartu
-Yes=Bai
-No=Ez
-You will lose all the links in this section.=Sekzio honetako esteka guztiak galduko dira
-Exit=Irten
-Link Scanner=Esteka bilatzailea
-Scanning SD filesystem...=SD txartela arakatzen...
-Scanning NAND filesystem...=NAND memoria arakatzen...
-$1 files found.=$1 aurkitutako artxiboak(s).
-Creating links...=Estekak sortzen...
-$1 links created.=$1 esteka sorturik(s).
-Version $1 (Build date: $2)=Bertsioa $1 (data: $2)
-Log Viewer=Log irakurlea
-Displays last launched program's output=Abiarazitako azken programa erakutsi
-Do you want to delete the log file?=Log-ak ezabatu nahi dituzu?
-USB Enabled (SD)=USB-a piztuta (SD)
-USB Enabled (Nand)=USB-a piztuta (Nand)
-Turn off=Desaktibatu
-Launching $1=Abiarazten $1
-Change page=Orria aldatu
-Page=Orria
-Scroll=scroll
-Untitled=Izenburu gabekoa
-Change GMenu2X wallpaper=GMenu2X-ren atzeko irudia aldatu
-Activate/deactivate tv-out=Tv-out piztu/itzali
-Select wallpaper=aukeratu atzekaldeko irudia
-Gamma=Gama
-Set gp2x gamma value (default: 10)=Gp2x-ren gama balioa ezarri (aurrezarritakoa: 10)
-Tv-Out encoding=tv-out-ren kodeketa
-Encoding of the tv-out signal=TV-out-ren seinalearen kodeketa
-Tweak RAM Timings=Ram denborak hobetu
-This usually speeds up the application at the cost of stability=programa azkarrago doa estabilitatearen truke.
-Gamma (default: 0)=Gama (aurrezarritakoa: 0)
-Gamma value to set when launching this link=Esteka hau abiarazteko erabiltzen den gama balioa
-Wrapper=Itzuli
-Explicitly relaunch GMenu2X after this link's execution ends=Amaitzerakoan gmenu2x birkargatu
diff --git a/pandora/translations/Catalan b/pandora/translations/Catalan
deleted file mode 100644
index 94a53db..0000000
--- a/pandora/translations/Catalan
+++ /dev/null
@@ -1,137 +0,0 @@
-Settings=Preferències
-Configure GMenu2X's options=Configura les opcions del GMenu2X
-Activate Usb on SD=Activa USB per la SD
-Activate Usb on Nand=Activa USB per la Nand
-Info about GMenu2X=Informació del GMenu2X
-About=Informació
-Add section=Afegir secció
-Rename section=Re anomenar secció
-Delete section=Eliminar secció
-Scan for applications and games=Buscar aplicacions i jocs
-applications=Aplicacions
-Edit link=Editar enllaç
-Title=Títol
-Link title=Títol de l'enllaç
-Description=Descripció
-Link description=Descripció de l'enllaç
-Section=Secció
-The section this link belongs to=Secció a la que pertany l'enllaç
-Icon=Icona
-Select an icon for the link: $1=Selecciona una icona per l'enllaç: $1
-Manual=Manual
-Select a graphic/textual manual or a readme=Selecciona un manual gràfic/text o un "readme"
-Cpu clock frequency to set when launching this link=Ajust del rellotge de la cpu per aquest enllaç
-Volume to set for this link=Ajust del volum de l'enllaç
-Parameters=Paràmetres
-Parameters to pass to the application=Paràmetres que s'envien a l'aplicació
-Selector Directory=Directori del Selector
-Directory to scan for the selector=Directori a explorar amb el selector
-Selector Browser=Explorador del selector
-Allow the selector to change directory=Permetre al selector canviar de directori
-Selector Filter=Filtre del selector
-Filter for the selector (Separate values with a comma)=Filtre per el selector (Separar valors amb comes)
-Selector Screenshots=Captures de pantalla del selector
-Directory of the screenshots for the selector=Directori de captures de pantalla per el selector
-Selector Aliases=Alias del selector
-File containing a list of aliases for the selector=Fitxer que conté la llista d'alias per el selector
-Explicitly relaunch GMenu2X after this link's execution ends=Força recarregar el GMenu2X a l'acabar l'execució de l'enllaç
-Don't Leave=No sortir
-Don't quit GMenu2X when launching this link=No tancar GMenu2X al carregar aquest enllaç
-Save last selection=Recordar l'última selecció
-Save the last selected link and section on exit=Recordar l'última secció i enllaç seleccionat al sortir
-Clock for GMenu2X=Rellotge per al GMenu2X
-Set the cpu working frequency when running GMenu2X=Ajustar la freqüència de treball de la cpu a l'executar GMenu2X
-Maximum overclock=Overclock màxim
-Set the maximum overclock for launching links=Ajustar al màxim overclock per a carregar enllaços
-Global Volume=Volum global
-Set the default volume for the gp2x soundcard=Ajusta el volum per defecte del so a la gp2x
-Output logs=Fitxers de Log
-Logs the output of the links. Use the Log Viewer to read them.=Enregistra els Logs dels enllaços. Usa el lector de registres per llegir-los.
-Number of columns=Número de columnes
-Set the number of columns of links to display on a page=Ajusta el número de columnes d'enllaços a mostrar per pàgina
-Number of rows=Número de línies
-Set the number of rows of links to display on a page=Ajusta el número de línies d'enllaços a mostrar per pàgina
-Top Bar Color=Color de barra superior
-Color of the top bar=Color de la barra superior
-Bottom Bar Color=Color de barra inferior
-Color of the bottom bar=Color de la barra inferior
-Selection Color=Color selecció
-Color of the selection and other interface details=Color de la selecció i altres detalls de la interfície
-You should disable Usb Networking to do this.=Ha de desactivar la Xarxa per USB per fer això.
-Operation not permitted.=Operació no permesa.
-Language=Idioma
-Set the language used by GMenu2X=Ajusta l'idioma utilitzat al GMenu2X
-Increase=Augmentar
-Decrease=Reduïr
-Change color component=Canviar component cromàtic
-Increase value=Incrementar valor
-Decrease value=Reduir valor
-Switch=Canviar
-Change value=Canviar valor
-Edit=Modificar
-Clear=Netejar
-Select a directory=Selecciona un directori
-Select a file=Selecciona un fitxer
-Clock (default: 200)=Freqüència (predeterminada: 200)
-Volume (default: -1)=Volum (predeterminat: -1)
-Enter folder=Entrar a la carpeta
-Wrapper=Retornar
-Confirm=Confirmar
-Enter folder/Confirm=Entrar a la carpeta/Confirmar
-Up one folder=Pujar una carpeta
-Select an application=Selecciona un programa
-Space=Espai
-Shift=Majúscules
-Cancel=Cancel·lar
-OK=Acceptar
-Backspace=Retrocés
-Skin=Tema
-Set the skin used by GMenu2X=Selecciona el tema a utilitzar al GMenu2X
-Add link in $1=Afegir enllaç a $1
-Edit $1=Modificar $1
-Delete $1 link=Eliminar l'enllaç de $1
-Deleting $1=Eliminant $1
-Are you sure?=Estàs segur?
-Insert a name for the new section=Introduir nom per a la nova secció
-Insert a new name for this section=Introduir nou nom per a la secció
-Yes=Si
-No=No
-You will lose all the links in this section.=Es perdran tots els enllaços d'aquesta secció.
-Exit=Sortir
-Link Scanner=Buscador d'enllaços
-Scanning SD filesystem...=Explorant el sistema de fitxers de la SD...
-Scanning NAND filesystem...=Explorant el sistema de fitxers de la NAND...
-$1 files found.=$1 Fitxer(s) trobat(s).
-Creating links...=Creant enllaços...
-$1 links created.=$1 enllaç(os) creat(s).
-Version $1 (Build date: $2)=Versió $1 (Compilació: $2)
-Log Viewer=Visor de Logs
-Displays last launched program's output=Mostra la sortida de l'últim programa executat
-Do you want to delete the log file?=¿Desitja eliminar el fitxer de registre de successos?
-USB Enabled (SD)=USB Activat (SD)
-USB Enabled (Nand)=USB Activat (Nand)
-Turn off=Desactivar
-Launching $1=Executant $1
-Change page=Canviar pàgina
-Page=Pàgina
-Scroll=Desplaçament
-Untitled=Sense títol
-Change GMenu2X wallpaper=Canvia el fons del GMenu2X
-Activate/deactivate tv-out=Activa/desactiva la sortida de TV
-Select wallpaper=Selecciona la imatge de fons
-Gamma=Gamma
-Set gp2x gamma value (default: 10)=Ajustar el valor gama de la gp2x (predeterminat: 10)
-Tv-Out encoding=Codificació de sortida de TV
-Encoding of the tv-out signal=Codificació de la senyal de sortida de TV
-Tweak RAM Timings=Modifica la sincronització de RAM
-This usually speeds up the application at the cost of stability=Normalment accelera l'aplicació a costa de l'estabilitat
-Gamma (default: 0)=Gamma (predeterminat: 0)
-Gamma value to set when launching this link=Valor de gamma que utilitzarà a l'executar aquest enllaç
-Wallpaper=Fons d'escriptori
-Configure skin=Configura el Tema
-Message Box Color=Color de caixa de text
-Message Box Border Color=Color de la vora de la caixa de text
-Message Box Selection Color=Color de la selecció de la caixa de text
-Background color of the message box=Color de fons de la caixa de text
-Border color of the message box=Color de la vora de la caixa de text
-Color of the selection of the message box=Color de la selecció de la caixa de text
diff --git a/pandora/translations/Danish b/pandora/translations/Danish
deleted file mode 100644
index ecd2099..0000000
--- a/pandora/translations/Danish
+++ /dev/null
@@ -1,129 +0,0 @@
-settings=Indstillinger
-Configure GMenu2X's options=Konfigurer GMenu2X's Indstillinger
-Activate Usb on SD=Aktiver Usb på SD
-Activate Usb on Nand=Aktiver Usb på Nand
-Info about GMenu2X=Information om GMenu2X
-Activate/deactivate tv-out=Aktiver/deaktiver tv-udgang
-Exit GMenu2X to the official frontend=Lukker GMenu2X
-Change GMenu2X wallpaper=Skift baggrund
-About=Om
-Add section=Tilføj sektion
-Rename section=Ændre navn på sektion
-Delete section=Slet sektion
-Scan for applications and games=Skan hukommelsen for applikationer og spil
-applications=applikationer
-Edit link=Rediger genveje
-Title=Titel
-Link title=Genvejs titel
-Description=Beskrivelse
-Link description=Genvejs beskrivelse
-Section=Seektion
-The section this link belongs to=Sektionen for denne genvej
-Icon=Ikon
-Select an icon for the link=Vælg et ikon til denne genvej
-Manual=Manual
-Select a graphic/textual manual or a readme=Vælg en grafisk/tekstbaseret manual eller en readme fil
-Cpu clock frequency to set when launching this link=Cpu-clockfrekvens indstilling for denne genvej
-Volume to set for this link=Lydstyrke indstilling for denne genvej
-Parameters=Parametre
-Parameters to pass to the application=Angiv parametre for applikationen 
-Selector Directory=Selector oversigt
-Directory to scan for the selector=Angiv Mappe som selector skal skanne
-Selector Browser=Selector Browser
-Allow the selector to change directory=Tillad selector at ændre mappe
-Selector Filter=Selector filter
-Filter for the selector (Separate values with a comma)=Filter til selector (separer værdier med komma)
-Selector Screenshots= Selector Screenshots
-Directory of the screenshots for the selector=Mappe med Screenshots af selector
-Selector Aliases=Selector alias
-File containing a list of aliases for the selector=Fil som indeholder en liste over alias for selector
-Explicitly relaunch GMenu2X after this link's execution ends=Tving GMenu2X til at genstarte når denne genvej køres
-Don't Leave=Forlad ikke
-Don't quit GMenu2X when launching this link=Afslut ikke GMenu2X når denne genvej startes
-Save last selection=Gem sidste ændring
-Save the last selected link and section on exit= Gem sidst valgte genvej og sektion ved afslutning
-Clock for GMenu2X=Clockfrekvens for GMenu2X
-Set the cpu working frequency when running GMenu2X=Indstil cpu-clockfrekvens for GMenu2X
-Maximum overclock=Maksimal clockfrekvens
-Set the maximum overclock for launching links=Indstil maksimal clockfrekvens ved opstart af genvej
-Global Volume=Global lydstyrke
-Set the default volume for the gp2x soundcard=Indstil standard lydstyrke for gp2x lydkort
-Output logs=Vis logs
-Logs the output of the links. Use the Log Viewer to read them.=Danner logs for genvejene. Anvend Vis log for at åbne dem.
-Number of columns=Antal spalter
-Set the number of columns of links to display on a page=Angiv antallet af spalter for genveje per side 
-Number of rows=Antal rækker
-Set the number of rows of links to display on a page= Angiv antallet af rækker for genveje per side 
-Top Bar Color=Øverste bjælkes farve
-Color of the top bar= Øverste bjælkes farve 
-Bottom Bar Color=Nederste bjælkes farve
-Color of the bottom bar=Nederste bjælkes farve 
-Selection Color=Markørens farve
-Color of the selection and other interface details= Markøren og grænseflades farve 
-You should disable Usb Networking to do this.=Du bør fravælge USB netværket nå du vælger dette
-Operation not permitted.=Dette er ikke tilladt.  
-Language=Sprog
-Set the language used by GMenu2X=Indstil sprog der anvendes i GMenu2X
-Increase=Op
-Decrease=Ned
-Change color component=Ændre farven på komponent
-Increase value=Op
-Decrease value=Ned
-Switch=Ændre
-Change value=Ændre værdi
-Edit=Rediger
-Clear=Ryd
-Select a directory=Vælg en mappe
-Select a file=Vælg en fil
-Clock (default: 200)=Clockfrekvens (normal: 200)
-Volume (default: -1)=Lydstyrke (normal: -1)
-Wrapper=Wrapper
-Enter folder=Åbn mappe
-Confirm=Bekræft
-Enter folder/Confirm=Åbn mappe/Bekræft
-Up one folder=Tilbage
-Select an application=Vælg en applikation
-Space=Mellemrum
-Shift=Skift
-Cancel=Afbryd
-OK=OK
-Backspace=Slet
-Skin=Tema
-Set the skin used by GMenu2X =Angiv tema for GMenu2X 
-Add link in $1=Tilføj genvej i $1
-Edit $1=Rediger $1
-Delete $1 link=Slet $1
-Deleting $1=Sletter $1
-Are you sure?=Er du sikker?
-Insert a name for the new section=Angiv navn for den nye sektion
-Insert a new name for this section=Angiv nyt navn for denne sektion 
-Yes=Ja
-No=Nej
-You will lose all the links in this section.=Du vil miste alle genveje i denne sektion.
-Exit=Afslut
-Link Scanner=Skan genveje
-Scanning SD filesystem...=Skanner SD filsystem...
-Scanning NAND filesystem...=Skanner NAND filsystem...
-$1 files found.=$1 fil(er) fundet.
-Creating links...=Opretter genveje...
-$1 links created.=$1 genvej(e) oprettet.
-Version $1 (Build date: $2)=Version $1 (den: $2)
-Log Viewer=Vis log
-Displays last launched program's output=Vis log fra sidst kørte program
-Do you want to delete the log file?=Vil du slette denne log fil?
-USB Enabled (SD)=USB Aktiveret (SD)
-USB Enabled (Nand)=USB Aktiveret (Nand)
-Turn off=Afbryd
-Launching $1=Starter $1
-Change page=Skift side
-Page=Side
-Scroll=Rulle
-Untitled=Ikke navngivet
-Wallpaper=Baggrund
-Configure skin=Konfigurer tema
-Message Box Color=Farve på Konfigurations vinduet
-Message Box Border Color= Farve på Konfig vinduets kant
-Message Box Selection Color=Konfig vinduets markør farve 
-Background color of the message box= Konfigurations vinduets baggrundsfarve
-Border color of the message box=Farve på Konfigurations vinduets kant
-Color of the selection of the message box=Farven på markøren i Konfigurations vinduet
diff --git a/pandora/translations/Dutch b/pandora/translations/Dutch
deleted file mode 100644
index eaa3062..0000000
--- a/pandora/translations/Dutch
+++ /dev/null
@@ -1,118 +0,0 @@
-Settings=Instellingen
-Configure GMenu2X's options=Instellingen van GMenu2X
-Activate Usb on SD=Activeer USB op SD
-Activate Usb on Nand=Activeer USB op Nand
-Info about GMenu2X=Informatie over GMenu2X
-About=Over
-Add section=Groep toevoegen
-Rename section=Groep hernoemen
-Delete section=Groep verwijderen
-Scan for applications and games=Zoek applicaties en spellen
-applications=applicaties
-Edit link=Wijzig snelkoppeling
-Title=Naam
-Link title=Naam van de snelkoppeling
-Description=Omschrijving
-Link description=Omschrijving van de snelkoppeling
-Section=Groep
-The section this link belongs to=De groep waartoe deze snelkoppeling behoort
-Icon=Pictogram
-Select an icon for the link: $1=Selecteer een pictogram voor de snelkoppeling: $1
-Manual=Handleiding
-Select a graphic/textual manual or a readme=Selecteer een grafische/tekstuele handleiding of een readme/leesmij
-Cpu clock frequency to set when launching this link=Kloksnelheid voor het starten van deze snelkoppeling
-Volume to set for this link=Volume-instelling voor deze snelkoppeling
-Parameters=Parameters
-Parameters to pass to the application=Parameters om door te geven aan de applicatie
-Selector Directory=Kiezer map
-Directory to scan for the selector=Map met bestanden voor de kiezer
-Selector Browser=Kiezer navigatie
-Allow the selector to change directory=Wisselen van map mogelijk maken in kiezer
-Selector Filter=Kiezer filter
-Filter for the selector (Separate values with a comma)=Filter voor de kiezer (komma-gescheiden)
-Selector Screenshots=Kiezer schermafdrukken
-Directory of the screenshots for the selector=Map met schermafdrukken voor de kiezer
-Selector Aliases=Kiezer aliassen
-File containing a list of aliases for the selector=Bestand met aliassen voor de kiezer
-Explicitly relaunch GMenu2X after this link's execution ends=GMenux2X altijd herstarten na uitvoeren snelkoppeling
-Don't Leave=Niet verlaten
-Don't quit GMenu2X when launching this link=GMenu2X niet verlaten bij uitvoeren snelkoppeling
-Save last selection=Bewaar laatste keuze
-Save the last selected link and section on exit=Bewaar de laatst gekozen snelkoppeling en groep
-Clock for GMenu2X=Kloksnelheid voor GMenu2X
-Set the cpu working frequency when running GMenu2X=Stel de kloksnelheid in voor het draaien van Gmenu2X
-Maximum overclock=Maximale overkloksnelheid
-Set the maximum overclock for launching links=Stel maximaal toegestane overkloksnelheid in
-Global Volume=Hoofdvolume
-Set the default volume for the gp2x soundcard=Stel het standaardvolume in voor de gp2x geluidskaart
-Output logs=Uitvoer naar logboek
-Logs the output of the links. Use the Log Viewer to read them.=Logt de uitvoer van snelkoppelingen. Gebruik de log viewer om de log te lezen.
-Number of columns=Aantal kolommen
-Set the number of columns of links to display on a page=Stel het aantal getoonde pictogrammen in (horizontaal)
-Number of rows=Aantal rijen
-Set the number of rows of links to display on a page=Stel het aantal getoonde pictogrammen in (verticaal)
-Top Bar Color=Kleur bovenste balk
-Color of the top bar=Kleur van de bovenste balk
-Bottom Bar Color=Kleur onderste balk
-Color of the bottom bar=Kleur van de onderste balk
-Selection Color=Kleur selectie
-Color of the selection and other interface details=Kleur van de selectie en andere interface details
-You should disable Usb Networking to do this.=Zet USB Netwerk uit om dit te gebruiken.
-Operation not permitted.=Handeling niet toegestaan.
-Language=Taal
-Set the language used by GMenu2X=Stel de taal van GMenu2X in
-Increase=Verhoog
-Decrease=Verlaag
-Change color component=Wijzig kleur component
-Increase value=Verhoog waarde
-Decrease value=Verlaag waarde
-Switch=Wissel
-Change value=Wijzig waarde
-Edit=Bewerk
-Clear=Wis
-Select a directory=Selecteer een map
-Select a file=Selecteer een bestand
-Clock (default: 200)=Kloksnelheid (standaard: 200)
-Volume (default: -1)=Volume (standaard: -1)
-Wrapper=Schil
-Enter folder=Open map
-Confirm=Bevestig
-Enter folder/Confirm=Open map/Bevestig
-Up one folder=Map omhoog
-Select an application=Selecteer een applicatie
-Space=Spatie
-Shift=Shift
-Cancel=Annuleer
-OK=OK
-Backspace=Backspace
-Skin=Skin
-Set the skin used by GMenu2X=Kies de skin voor GMenu2X
-Add link in $1=Voeg snelkoppeling toe in $1
-Edit $1=Wijzig $1
-Delete $1 link=Verwijder snelkoppeling $1
-Deleting $1=Verwijdert $1
-Are you sure?=Weet u het zeker?
-Insert a name for the new section=Geef een naam voor de nieuwe groep
-Insert a new name for this section=Geef een nieuwe naam voor deze groep
-Yes=Ja
-No=Nee
-You will lose all the links in this section.=Alle snelkoppelingen in deze groep worden gewist.
-Exit=Verlaat
-Link Scanner=Snelkoppeling-Scanner
-Scanning SD filesystem...=Scant het SD-bestandssysteem...
-Scanning NAND filesystem...=Scant het NAND-bestandssysteem...
-$1 files found.=$1 bestand(en) gevonden.
-Creating links...=Snelkoppelingen aanmaken...
-$1 links created.=$1 Snelkoppeling(en) aangemaakt.
-Version $1 (Build date: $2)=Versie $1 (Datum build: $2)
-Log Viewer=Logbestand lezer
-Displays last launched program's output=Toont de uitvoer van het laatst gestarte programma
-Do you want to delete the log file?=Wilt u het logbestand verwijderen?
-USB Enabled (SD)=USB geactiveerd (SD)
-USB Enabled (Nand)=USB geactiveerd (Nand)
-Turn off=Zet uit
-Launching $1=Start $1
-Change page=Wijzig pagina
-Page=Pagina
-Scroll=Scroll
-Untitled=Naamloos
diff --git a/pandora/translations/Finnish b/pandora/translations/Finnish
deleted file mode 100644
index c01f595..0000000
--- a/pandora/translations/Finnish
+++ /dev/null
@@ -1,117 +0,0 @@
-Settings=Asetukset
-Configure GMenu2X's options=Muuta GMenu2X:n asetuksia
-Activate Usb on SD=Aktivoi USB SD-kortille
-Activate Usb on Nand=Aktivoi USB NAND-muistille
-Info about GMenu2X=Tietoa GMenu2X:st�
-About=Tietoa
-Add section=Lis�� v�lilehti
-Rename section=Nime� v�lilehti uudelleen
-Delete section=Poista v�lilehti
-Scan for applications and games=Etsi ohjelmia ja pelej�
-applications=ohjelmat
-Edit link=Muokkaa linkki�
-Title=Otsikko
-Link title=Linkin otsikko
-Description=Kuvaus
-Link description=Linkin kuvaus
-Section=V�lilehti
-The section this link belongs to=V�lilehti johon t�m� linkki kuuluu
-Icon=Kuvake
-Select an icon for the link: $1=Valitse kuvake linkille: $1
-Manual=Ohjetiedosto
-Select a graphic/textual manual or a readme=Valitse graafinen/tekstipohjainen ohjetiedosto
-Cpu clock frequency to set when launching this link=CPU kellotaajuus t�m�n linkin k�ynnistyksess�
-Volume to set for this link=��nenvoimakkuus t�lle linkille
-Parameters=Parametrit
-Parameters to pass to the application=Ohjelmalle annettavat parametrit
-Selector Directory=Ohjelmanvalitsimen hakemisto
-Directory to scan for the selector=Hakemisto joka skannataan ohjelmanvalitsimelle
-Selector Browser=Ohjelmanvalitsimen selain
-Allow the selector to change directory=Anna ohjelmanvalitsimen vaihtaa hakemistoa
-Selector Filter=Ohjelmavalitsimen filtteri
-Filter for the selector (Separate values with a comma)=Filtteri ohjelmanvalitsimelle (Eroita arvot pilkulla)
-Selector Screenshots=Kuvakaappaukset ohjelmanvalitsimesta
-Directory of the screenshots for the selector=Ohjelmanvalitsimen kuvakaappausten hakemisto
-Selector Aliases=Ohjelmanvalitsimen peitenimet
-File containing a list of aliases for the selector=Tiedosto, joka sis�lt�� listan peitenimist� ohjelmavalitsimelle
-Explicitly relaunch GMenu2X after this link's execution ends=K�ynnist� GMenu2X uudelleen kun linkin ajo on suoritettu
-Don't Leave=�l� poistu
-Don't quit GMenu2X when launching this link=�l� sulje GMenu2X:�� kun linkki k�ynnistet��n
-Save last selection=Muista viimeisin valinta
-Save the last selected link and section on exit=Muista viimeisin valinta ja v�lilehti poistuttaessa
-Clock for GMenu2X=Kellotaajuus GMenu2X:lle
-Set the cpu working frequency when running GMenu2X=S��d� CPU kellotaajuutta GMenu2X:lle
-Maximum overclock=Ylikellotusrajoitus
-Set the maximum overclock for launching links=S��d� suurin mahdollinen ylikellotus k�ynnistett�ess� linkkej�
-Global Volume=Yleinen ��nenvoimakkuus
-Set the default volume fo the gp2x soundcard=S��d� perus��nenvoimakkuus gp2x:n ��nikortille
-Output logs=Tulosteloki
-Logs the output of the links. Use the Log Viewer to read them.=Kirjoita linkkien tuloste lokiin. K�yt� lokilukijaa niiden lukemiseen.
-Number of columns=Sarakkeiden lukum��r�
-Set the number of columns of links to display on a page=Aseta linkkisarakkeiden lukum��r� sivulla
-Number of rows=Rivien lukum��r�
-Set the number of rows of links to display on a page=Aseta linkkirivien lukum��r� sivulla
-Top Bar Color=V�ri yl�palkille
-Color of the top bar=Yl�palkin v�ri
-Color of the bottom bar=Alapalkin v�ri
-Selection Color=Valinnan v�ri
-Color of the selection and other interface details=Valinnan ja muiden ykstiyiskohtien v�ri
-You should disable Usb Networking to do this.=Usb Networking:in pit�� olla poissa k�yt�st� jotta voit tehd� t�m�n.
-Operation not permitted.=Toiminto ei ole sallittu.
-Language=Kieli
-Set the language used by GMenu2X=Valitse GMenu2X:n k�ytt�m� kieli
-Increase=Lis��
-Decrease=V�henn�
-Change color component=Vaihda v�rikomponenttia
-Increase value=Nosta arvoa
-Decrease value=Laske arvoa
-Switch=Vaihda
-Change value=Vaihda arvoa
-Edit=Muokkaa
-Clear=Tyhjenn�
-Select a directory=Valitse hakemisto
-Select a file=Valitse tiedosto
-Clock (default: 200)=Kellotaajuus (oletusarvo: 200)
-Volume (default: -1)=��nenvoimakkuus (oletusarvo: -1)
-Wrapper=Wrapperi
-Enter folder=Avaa kansio
-Confirm=Vahvista
-Enter folder/Confirm=Avaa kansio/Vahvista
-Up one folder=Yksi hakemisto yl�sp�in
-Select an application=Valitse ohjelma
-Space=V�lily�nti
-Shift=Vaihto
-Cancel=Peruuta
-OK=OK
-Backspace=Askelpalautin
-Skin=Teema
-Set the skin used by GMenu2X=Aseta GMenu2X:n k�ytt�m� teema
-Add link in $1=Lis�� linkki v�lilehteen $1
-Edit $1=Muokkaa v�lilehte� $1
-Delete $1 link=Poista v�lilehti $1
-Deleting $1=Poistetaan v�lilehte� $1
-Are you sure?=Oletko varma?
-Insert a name for the new section=Anna uuden v�lilehden nimi
-Insert a new name for this section=Anna uusi nimi t�lle v�lilehdelle
-Yes=Kyll�
-No=Ei
-You will lose all the links in this section.=Menet�t kaikki t�ss� v�lilehdess� olevat linkit.
-Exit=Poistu
-Link Scanner=Linkkiskanneri
-Scanning SD filesystem...=Skannataan SD-tiedostoj�rjestelm��...
-Scanning NAND filesystem...=Skannataan NAND-tiedostoj�rjestelm��...
-$1 files found.=$1 tiedosto(a) l�ydetty.
-Creating links...=Luodaan linkkej�...
-$1 links created.=$1 linkki(�) luotu.
-Version $1 (Build date: $2)=Versio $1 (K��nt�p�iv�m��r�: $2)
-Log Viewer=Lokilukija
-Displays last launched program's output=N�ytt�� viimeksi k�ynnistetyn ohjelman tulosteen
-Do you want to delete the log file?=Haluatko poistaa logitiedoston?
-USB Enabled (SD)=USB Aktivoitu (SD)
-USB Enabled (Nand)=USB Aktivoitu (Nand)
-Turn off=Sammuta
-Launching $1=K�ynnistet��n $1
-Change page=Vaihda sivua
-Page=Sivu
-Scroll=Vierit�
-Untitled=Nime�m�t�n
diff --git a/pandora/translations/French b/pandora/translations/French
deleted file mode 100644
index f3d6081..0000000
--- a/pandora/translations/French
+++ /dev/null
@@ -1,129 +0,0 @@
-Settings=Configurations
-Configure GMenu2X's options=Configurer les options de GMenu2X
-Activate Usb on SD=Activer l'Usb sur la SD
-Activate Usb on Nand=Activer l'Usb sur la Nand
-Info about GMenu2X=Information sur GMenu2X
-About=A propos de
-Add section=Ajouter une section
-Rename section=Renommer une section
-Delete section=Supprimer une section
-Scan for applications and games=Rechercher des applications et des jeux
-applications=applications
-Edit link=Editer un lien
-Title=Titre
-Link title=Titre du lien
-Description=Description
-Link description=Description du lien
-Section=Section
-The section this link belongs to=La section à laquelle appartient ce lien
-Icon=Icône
-Select an icon for the link: $1=Selectionner une icône pour le lien: $1
-Manual=Manuel
-Select a graphic/textual manual or a readme=Selectionner un manuel graphique/textuel ou un readme
-Cpu clock frequency to set when launching this link=Fréquence d'horloge CPU à définir lorsqu'on lance ce lien
-Volume to set for this link=Volume à définir pour ce lien
-Parameters=Paramètres
-Parameters to pass to the application=Paramètres à donner à l'application
-Selector Directory=Répertoire de Selector
-Directory to scan for the selector=Répertoire à rechercher pour le selector
-Selector Browser=Explorateur de Selector
-Allow the selector to change directory=Laisser le Selector de changer le répertoire
-Selector Filter=Filtre de Selector
-Filter for the selector (Separate values with a comma)=Filtre pour le Selector (Séparer les valeurs avec une virgule)
-Selector Screenshots=Les captures d'écran de Selector
-Directory of the screenshots for the selector=Répertoire des captures d'écran pour le selector
-Selector Aliases=Aliases de Selector
-File containing a list of aliases for the selector=Fichier contenant une liste d'aliases pour selector
-Explicitly relaunch GMenu2X after this link's execution ends=Relancer explicitement GMenu2X après la fin de l'execution de ce lien
-Don't Leave=Ne quitter pas
-Don't quit GMenu2X when launching this link=Ne pas quitter GMenu2X lorsqu'on lance ce lien
-Save last selection=Sauvegarder la dernière sélection
-Save the last selected link and section on exit=Sauvegarder le dernier lien sélectionné et section en sortant
-Clock for GMenu2X=Horloge pour GMenu2X
-Set the cpu working frequency when running GMenu2X=Définir la féquence de fonctionnement du CPU lorsqu'on utilise GMenu2X
-Maximum overclock=Overclock maximum
-Set the maximum overclock for launching links=Définir l'overclock maximum pour lancer des liens
-Global Volume=Volume global
-Set the default volume for the gp2x soundcard=Définir le volume par défaut pour la carte sonore de la GP2x
-Output logs=Logs de sortie
-Logs the output of the links. Use the Log Viewer to read them.=Loguer la sortie des liens. Utiliser le lecteur de log pour les lire
-Number of columns=Nombre de colonnes
-Set the number of columns of links to display on a page=Définir le nombre de colonnes de liens à afficher sur une page
-Number of rows=Nombres de rangées
-Set the number of rows of links to display on a page=Définir le nombre de rangées de liens à afficher sur une page
-Top Bar Color=Couleur de la bar supérieur
-Color of the top bar=Couleur de la bar supérieur
-Bottom Bar Color=Couleur de la bar inférieur
-Color of the bottom bar=Couleur de la bar inférieur
-Selection Color=Couleur de sélection
-Color of the selection and other interface details=Couleur de la sélection et des autres détails de l'interface
-You should disable Usb Networking to do this.=Vous devez désactiver le réseau Usb pour faire ceci.
-Operation not permitted.=Opération non permise
-Language=Langue
-Set the language used by GMenu2X=Définir la langue utilisée par GMenu2X
-Increase=Augmenter
-Decrease=Diminuer
-Change color component=Changer la couleur composante
-Increase value=Augmenter la valeur
-Decrease value=Diminuer la valeur
-Switch=Changer
-Change value=Changer la valeur
-Edit=Editer
-Clear=Effacer
-Select a directory=Sélectionner un répertoire
-Select a file=Sélectionner un fichier
-Clock (default: 200)=Fréquence (par défaut: 200)
-Volume (default: -1)=Volume (par défaut: -1)
-Wrapper=Wrapper
-Enter folder=Enter dans le répertoire
-Confirm=Confirmer
-Enter folder/Confirm=Entrer un répertoire/Confirmer
-Up one folder=Remonter d'un répertoire
-Select an application=Sélectionner une application
-Space=Espace
-Shift=Majuscule
-Cancel=Annuler
-OK=OK
-Backspace=Backspace
-Skin=Skin
-Set the skin used by GMenu2X=Définir la skin utilisé par GMenu2X
-Add link in $1=Ajouter un lien dans $1
-Edit $1=Editer $1
-Delete $1 link=Effacer le lien $1
-Deleting $1=Effacement de $1
-Are you sure?=Êtes vous sûr?
-Insert a name for the new section=Saisir un nom pour cette nouvelle section
-Insert a new name for this section=Saisir un nouveau nom pour cette section
-Yes=Oui
-No=Non
-You will lose all the links in this section.=Vous perdrez tous les liens dans cette section.
-Exit=Quitter
-Link Scanner=Scanneur de lien
-Scanning SD filesystem...=Scanne du sytème de fichier de la SD...
-Scanning NAND filesystem...=Scanne du sytème de fichier de la NAND...
-$1 files found.=$1 fichiers trouvés.
-Creating links...=Création de liens...
-$1 links created.=$1 liens créés.
-Version $1 (Build date: $2)=Version $1 (Date de compilation: $2)
-Log Viewer=Visualisateur de log
-Displays last launched program's output=Afficher la sortie du dernier programme lancé
-Do you want to delete the log file?=Voulez vous effacer le fichier de log?
-USB Enabled (SD)=USB Activé (SD)
-USB Enabled (Nand)=USB Activé (Nand)
-Turn off=Désactiver
-Launching $1=Lancement de $1
-Change page=Changer de page
-Page=Page
-Scroll=Défilement
-Untitled=Sans titre
-Change GMenu2X wallpaper=Changer l'arrière-plan de GMenu2X
-Activate/deactivate tv-out=Activer/desactiver la sortie TV.
-Select wallpaper=Sélectionner l'arrière-plan
-Gamma=Gamma
-Set gp2x gamma value (default: 10)=Définir la valeur de gamma de la gp2x (par défaut: 10)
-Tv-Out encoding=Encodage de la sortie TV
-Encoding of the tv-out signal=Encodage du signal de la sortie TV
-Tweak RAM Timings=Modification des timings de la RAM
-This usually speeds up the application at the cost of stability=Ceci accélère, normalement, l'application mais en contre partie de la stabilité
-Gamma (default: 0)=Gamma (par défaut: 0)
-Gamma value to set when launching this link=Valeur de gamma à définir lors du lancement de ce lien
\ No newline at end of file
diff --git a/pandora/translations/German b/pandora/translations/German
deleted file mode 100644
index c34ba94..0000000
--- a/pandora/translations/German
+++ /dev/null
@@ -1,129 +0,0 @@
-Settings=Einstellungen
-Configure GMenu2X's options=Optionen des GMenu2X konfigurieren
-Activate Usb on SD=Aktiviert USB für die SD-Karte
-Activate Usb on Nand=Aktiviert USB für den Nand-Speicher
-Info about GMenu2X=Informationen über GMenu2X
-About=Über
-Add section=Sektion hinzufügen
-Rename section=Sektion umbenennen
-Delete section=Sektion löschen
-Scan for applications and games= Nach Anwendungen und Spielen scannen
-applications=Anwendungen
-Edit link=Link bearbeiten
-Title=Titel
-Link title=Linktitel
-Description=Beschreibung
-Link description=Beschreibung für diesen Link
-Section=Sektion
-The section this link belongs to=Zum Link gehörende Sektion
-Icon=Icon
-Select an icon for the link: $1=Icon für diesen Link wählen: $1
-Manual=Anleitung
-Select a graphic/textual manual or a readme=Wähle eine Graphik/Text Anleitung oder Readme
-Cpu clock frequency to set when launching this link=CPU-Takt, mit welchem dieser Link gestartet wird
-Volume to set for this link=Lautstärke für diesen Link
-Parameters=Parameter
-Parameters to pass to the application=Parameter, die an die Anwendung übergeben werden
-Selector Directory=Selector Verzeichnis
-Directory to scan for the selector=Vom Selector zu scannendes Verzeichnis
-Selector Browser=Selector Browser
-Allow the selector to change directory=Erlaube dem Selector, das Verzeichnis zu wechseln
-Selector Filter=Selector Filter
-Filter for the selector (Separate values with a comma)=Filter für den Selector (Werte mit Komma trennen)
-Selector Screenshots=Selector Screenshots
-Directory of the screenshots for the selector=Screenshot-Verzeichnis für den Selector
-Selector Aliases=Selector Alternativnamen
-File containing a list of aliases for the selector=Datei mit Liste von Alternativnamen für den Selector
-Explicitly relaunch GMenu2X after this link's execution ends=GMenu2X nach Beenden der Anwendung umgehend Neustarten
-Don't Leave=Nicht verlassen
-Don't quit GMenu2X when launching this link=Beim starten dieses Links GMenu2X nicht beenden
-Save last selection=Letzte Auswahl speichern
-Save the last selected link and section on exit=Speichert den zuletzt gewählten Link und die Sektion beim Beenden
-Clock for GMenu2X=Taktfrequenz für GMenu2X
-Set the cpu working frequency when running GMenu2X=Stellt den CPU Arbeitstakt für GMenu2X ein
-Maximum overclock=Maximale Übertaktung
-Set the maximum overclock for launching links=Einstellen der maximalen Taktfrequenz zum Starten von Links
-Global Volume=Allgemeine Lautstärke
-Set the default volume for the gp2x soundcard=Einstellen der Standardlautstärke des GP2X Soundchips
-Output logs=Ausgabeprotokolle
-Logs the output of the links. Use the Log Viewer to read them.=Protokolliert Ausgabe der Links. Benutz den Log Viewer zum Lesen.
-Number of columns=Anzahl der Spalten
-Set the number of columns of links to display on a page=Anzahl der Spalten mit Links, pro Seite
-Number of rows=Anzahl der Zeilen
-Set the number of rows of links to display on a page=Anzahl der Zeilen mit Links, pro Seite
-Top Bar Color=Farbe der Kopfleiste
-Color of the top bar= Stellt Farbe und Transparenz der oberen Menüleiste ein
-Bottom Bar Color=Farbe der Fußleiste
-Color of the bottom bar=Stellt Farbe und Transparenz der unteren Menüleiste ein
-Selection Color=Farbe der Auswahl
-Color of the selection and other interface details=Farbe der Auswahl-Hervorhebung und anderer Interface-Details
-You should disable Usb Networking to do this.=Du solltest USB Networking deaktivieren um dies zu tun.
-Operation not permitted.=Operation nicht gestattet.
-Language=Sprache
-Set the language used by GMenu2X=Einstellen der GMenu2X-Sprache
-Increase=Erhöhen
-Decrease=Verringern
-Change color component=Farbkomponente ändern
-Increase value=Wert erhöhen
-Decrease value=Wert verringern
-Switch=Wechseln
-Change value=Wert ändern
-Edit=Bearbeiten
-Clear=Leeren
-Select a directory=Verzeichnis wählen
-Select a file=Datei wählen
-Clock (default: 200)=Taktfrequenz (Standard: 200)
-Volume (default: -1)=Lautstärke (Standard: -1)
-Wrapper=Wrapper
-Enter folder=Ordner öffnen
-Confirm=Bestätigen
-Enter folder/Confirm=Ordner öffnen/Bestätigen
-Up one folder=Einen Ordner Aufwärts
-Select an application=Anwendung wählen
-Space=Leer
-Shift=Umschalt
-Cancel=Abbrechen
-OK=OK
-Backspace=Rücktaste
-Skin=Skin
-Set the skin used by GMenu2X=Skin für GMenu2X auswählen
-Add link in $1=Link in "$1" hinzufügen
-Edit $1="$1" bearbeiten
-Delete $1 link=Link "$1" löschen
-Deleting $1="$1" wird gelöscht
-Are you sure?=Sind Sie sicher?
-Insert a name for the new section=Name für die neue Sektion
-Insert a new name for this section=Neuer Name für diese Sektion
-Yes=Ja
-No=Nein
-You will lose all the links in this section.=Alle Links in dieser Sektion gehen verloren.
-Exit=Beenden
-Link Scanner=Links suchen
-Scanning SD filesystem...=SD-Karte wird durchsucht...
-Scanning NAND filesystem...=NAND-Speicher wird durchsucht...
-$1 files found.=$1 Datei(en) gefunden.
-Creating links...=Verknüpfungen werden erstellt.
-$1 links created.=$1 Verknüpfung(en) erstellt.
-Version $1 (Build date: $2)=Version $1 vom $2
-Log Viewer=Log-Viewer
-Displays last launched program's output=Zeigt die Ausgabe der zuletzt gestarteten Anwendung an
-Do you want to delete the log file?=Möchten Sie diese Log-Datei löschen?
-USB Enabled (SD)=USB aktiviert (SD)
-USB Enabled (Nand)=USB aktiviert (Nand)
-Turn off=Abschalten
-Launching $1=$1 wird gestartet
-Change page=Seite wechseln
-Page=Seite
-Scroll=Scrollen
-Untitled=Unbenannt
-Change GMenu2X wallpaper=Ändert das GMenu2X Hintergrundbild
-Activate/deactivate tv-out=Aktiviert/deaktiviert TV-O ut
-Select wallpaper=Hintergrundbild wählen
-Gamma=Gamma
-Set gp2x gamma value (default: 10)=Setzt den GP2X Gamma-Wert (Standard: 10)
-Tv-Out encoding=TV-Out Signal
-Encoding of the tv-out signal=Einstellen der TV-Out Fernsehnorm
-Tweak RAM Timings=Schnellere RAM-Timings
-This usually speeds up the application at the cost of stability=Kann Anwendung beschleunigen, auf Kosten der Stabilität
-Gamma (default: 0)=Gamma (Standard: 0)
-Gamma value to set when launching this link=Bein Starten dieses Links benutzter Gamma-Wert
diff --git a/pandora/translations/Italian b/pandora/translations/Italian
deleted file mode 100644
index 64488f5..0000000
--- a/pandora/translations/Italian
+++ /dev/null
@@ -1,142 +0,0 @@
-Settings=Impostazioni
-Configure GMenu2X's options=Configura le opzioni di GMenu2X
-Activate Usb on SD=Attiva USB sulla SD
-Activate Usb on Nand=Attiva USB sulla Nand
-Info about GMenu2X=Informazioni su GMenu2X
-About=Informazioni
-Add section=Aggiungi sezione
-Rename section=Rinomina sezione
-Delete section=Elimina sezione
-Scan for applications and games=Cerca applicazioni e giochi
-applications=applicazioni
-Edit link: $1=Modifica collegamento: $1
-Title=Titolo
-Link title=Titolo collegamento
-Description=Descrizione
-Link description=Descrizione collegamento
-Section=Sezione
-The section this link belongs to=La sezione alla quale appartiene questo collegamento
-Icon=Icona
-Select an icon for the link: $1=Seleziona un'icona per il collegamento: $1
-Manual=Manuale
-Select a graphic/textual manual or a readme=Seleziona un manuale grafico/testuale o un readme
-Cpu clock frequency to set when launching this link=Clock della cpu da impostare quando si lancia questo collegamento
-Volume to set for this link=Volume da impostare per questo collegamento
-Parameters=Parametri
-Parameters to pass to the application=Parametri da passare all'applicazione
-Selector Directory=Directory del selettore
-Directory to scan for the selector=Directory da utilizzare con il selettore
-Selector Browser=Browser del selettore
-Allow the selector to change directory=Permetti al selettore di cambiare directory
-Selector Filter=Filtro del selettore
-Filter for the selector (Separate values with a comma)=Filtro per il selettore (Separa i valori con virgola)
-Selector Screenshots=Screenshot del selettore
-Directory of the screenshots for the selector=Directory contenente gli screenshot per il selettore
-Selector Aliases=Alias del selettore
-File containing a list of aliases for the selector=File contenente una lista di alias per il selettore
-Explicitly relaunch GMenu2X after this link's execution ends=Rilancia esplicitamente GMenu2X dopo l'esecuzione del collegamento
-Don't Leave=Non lasciare
-Don't quit GMenu2X when launching this link=Non terminare GMenu2X quando viene lanciato questo collegamento
-Save last selection=Salva ultima selezione
-Save the last selected link and section on exit=Salva l'ultimo collegamento e sezione usati quando si esce
-Clock for GMenu2X=Clock per GMenu2X
-Set the cpu working frequency when running GMenu2X=Imposta la frequenza di lavoro per GMenu2X
-Maximum overclock=Overclock massimo
-Set the maximum overclock for launching links=Imposta la frequenza massima per i collegamenti
-Global Volume=Volume globale
-Set the default volume for the gp2x soundcard=Imposta il volume standard per la gp2x
-Output logs=Log dell'output
-Logs the output of the links. Use the Log Viewer to read them.=Tiene traccia dell'output dei collegamenti. Usa il Visualizzatore di Log per leggerlo.
-Number of columns=Numero di colonne
-Set the number of columns of links to display on a page=Imposta il numero di colonne di collegamenti da visualizzare in una pagina
-Number of rows=Numero di righe
-Set the number of rows of links to display on a page=Imposta il numero di righe di collegamenti da visualizzare in una pagina
-Top Bar Color=Colore barra superiore
-Color of the top bar=Colore della barra superiore
-Bottom Bar Color=Colore barra inferiore
-Color of the bottom bar=Colore della barra inferiore
-Selection Color=Colore selezione
-Color of the selection and other interface details=Colore della selezione e altri dettagli dell'interfaccia
-You should disable Usb Networking to do this.=Dovresti disattivare le impostazioni di rete per farlo.
-Operation not permitted.=Operazione non consentita.
-Language=Lingua
-Set the language used by GMenu2X=Imposta la lingua usata da GMenu2X
-Increase=Aumenta
-Decrease=Riduci
-Change color component=Cambia componente cromatico
-Increase value=Incrementa valore
-Decrease value=Decrementa valore
-Switch=Cambia
-Change value=Cambia valore
-Edit=Modifica
-Clear=Svuota
-Select a directory=Seleziona una directory
-Select a file=Seleziona un file
-Clock (default: 200)=Frequenza (predefinito: 200)
-Volume (default: -1)=Volume (predefinito: -1)
-Wrapper=Involucro
-Enter folder=Entra nella cartella
-Confirm=Conferma
-Enter folder/Confirm=Entra nella cartella/Conferma
-Up one folder=Sali di una cartella
-Select an application=Seleziona un'applicazione
-Space=Spazio
-Shift=Maiusc
-Cancel=Annulla
-OK=OK
-Backspace=Backspace
-Skin=Skin
-Set the skin used by GMenu2X=Imposta la skin usata da GMenu2X
-Add link in $1=Aggiungi collegamento in $1
-Edit $1=Modifica $1
-Delete $1 link=Elimina il collegamento $1
-Deleting $1=Rimozione di $1
-Are you sure?=Sei sicuro?
-Insert a name for the new section=Inserisci un nome per la nuova sezione
-Insert a new name for this section=Inserisci un nuovo nome per questa sezione
-Yes=Si
-No=No
-You will lose all the links in this section.=Perderai tutti i collegamenti in questa sezione.
-Exit=Esci
-Link Scanner=Scanner di collegamenti
-Scanning SD filesystem...=Scansione del filesystem della SD...
-Scanning NAND filesystem...=Scansione del filesystem della NAND...
-$1 files found.=$1 file trovati.
-Creating links...=Creazione collegamenti...
-$1 links created.=$1 collegamenti creati.
-Version $1 (Build date: $2)=Versione $1 (Data compilazione: $2)
-Log Viewer=Visualizzatore di log
-Displays last launched program's output=Visualizza l'output dell'ultimo programma eseguito
-Do you want to delete the log file?=Vuoi eliminare il file di log?
-USB Enabled (SD)=USB Attivata (SD)
-USB Enabled (Nand)=USB Attivata (Nand)
-Turn off=Disattiva
-Launching $1=Esecuzione di $1
-Change page=Cambia pagina
-Page=Pagina
-Scroll=Scorri
-Untitled=Senza titolo
-Change GMenu2X wallpaper=Cambia lo sfondo di GMenu2X
-Activate/deactivate tv-out=Attiva/disattiva tv-out
-Select wallpaper=Seleziona sfondo
-Gamma=Gamma
-Set gp2x gamma value (default: 10)=Imposta il valore gamma della gp2x (predefinito: 10)
-Tv-Out encoding=Codifica uscita tv
-Encoding of the tv-out signal=Codifica del segnale dell'uscita tv
-Tweak RAM Timings=Modifica i timings della RAM
-This usually speeds up the application at the cost of stability=Comporta solitamente un miglioramento delle performance al costo di stabilit�
-Gamma (default: 0)=Gamma (predefinito: 0)
-Gamma value to set when launching this link=Valore di gamma da impostare quando si lancia questo collegamento
-Wallpaper=Sfondo
-Configure skin=Configura skin
-Message Box Color=Colore Finestra Messaggi
-Message Box Border Color=Colore Bordo Finestra Messaggi
-Message Box Selection Color=Color Selezione Finestra Messaggi
-Background color of the message box=Colore di sfondo della finestra dei messaggi
-Border color of the message box=Colore del bordo della finestra dei messaggi
-Color of the selection of the message box=Colore della selezione della finestra dei messaggi
-
-Show root=Mostra radice
-Show root folder in the file selection dialogs=Mostra la cartella radice nelle finestre di selezione di file
-Change keys=Cambia tasti
-Launch an application=Esegue un'applicazione
\ No newline at end of file
diff --git a/pandora/translations/Norwegian b/pandora/translations/Norwegian
deleted file mode 100644
index ec61db7..0000000
--- a/pandora/translations/Norwegian
+++ /dev/null
@@ -1,118 +0,0 @@
-Settings=Instillinger
-Configure GMenu2X's options=Konfigurer GMenu2X's innstillinger
-Activate Usb on SD=Aktiver USB på SD
-Activate Usb on Nand=Aktiver USB på Nand
-Info about GMenu2X=Info om GMenu2X
-About=Om
-Add section=Legg til avdeling
-Rename section=Gi nytt navn på avdelning
-Delete section=Slett avdelning
-Scan for applications and games=Skann etter applikasjoner
-applications=applikasjoner
-Edit link=Rediger link
-Title=Tittel
-Link title=Linktittel
-Description=Beskrivelse
-Link description=Linkbeskrivelse
-Section=Avdeling
-The section this link belongs to=Avdelningen som denne linken tilhører
-Icon=Ikon
-Select an icon for the link: $1=Velg et ikon til linken: $1
-Manual=Manual
-Select a graphic/textual manual or a readme=Velg en grafisk/tekstbasert manual eller en readme
-Cpu clock frequency to set when launching this link=CPU-klokk som skal settes når denne linken startes
-Volume to set for this link=Volum som skal settes til denne linken
-Parameters=Parametrer
-Parameters to pass to the application=Parametrer som skal settes til applikasjonen
-Selector Directory=Selectormappe
-Directory to scan for the selector=Mappe som selector skal skanne
-Selector Browser=Selectorutforsker
-Allow the selector to change directory=Tillat selector å bytte mappe
-Selector Filter=Selectorfilter
-Filter for the selector (Separate values with a comma)=Filter for selector (separer verdiene med et komma)
-Selector Screenshots=Screenshots for Selector
-Directory of the screenshots for the selector=Mappe med screenshots til selector
-Selector Aliases=Selectoralias
-File containing a list of aliases for the selector=Fil som inneholder en liste med alias for selector
-Explicitly relaunch GMenu2X after this link's execution ends=Tving GMenu2X i å starte når denne linken er ferdigkjørt
-Don't Leave=Forlat ikke
-Don't quit GMenu2X when launching this link=Ikke avslutt GMenu2X når denne linken kjøres
-Save last selection=Husk siste markering
-Save the last selected link and section on exit=Husk siste link og avdeling ved avslutning
-Clock for GMenu2X=Klokkefrekvens for GMenu2X
-Set the cpu working frequency when running GMenu2X=Sett CPU-frekvensen for GMenu2X
-Maximum overclock=Maks overklokk
-Set the maximum overclock for launching links=Sett maks overklokk for linker
-Global Volume=Mastervolum
-Set the default volume fo the gp2x soundcard=Sett overall mastervolum
-Output logs=Skriv logg
-Logs the output of the links. Use the Log Viewer to read them.=Skriver ut logg for linkene. Bruk loggleseren for å lese dem.
-Number of columns=Antall spalter
-Set the number of columns of links to display on a page=Velg antall spalter med linker som skal vises per side
-Number of rows=Antall rader
-Set the number of rows of links to display on a page=Velg antall rader med linker som skal vises per side
-Top Bar Color=Øverste felts farge
-Color of the top bar=Farge på det øverste feltet
-Bottom Bar Color=Nederste felts farge
-Color of the bottom bar=Färge på det nederste feltet
-Selection Color=Markørfarge
-Color of the selection and other interface details=Farge på markøren og andre deler av grensesnittet
-You should disable Usb Networking to do this.=Du bør slå av USB-nettverket når du gjør dette.
-Operation not permitted.=Utillat operasjon.  
-Language=Språk
-Set the language used by GMenu2X=Still inn språk for GMenu2X
-Increase=Øk
-Decrease=Minsk
-Change color component=Endre fargekomponent
-Increase value=Øk verdi
-Decrease value=Minsk verdi
-Switch=Endre
-Change value=Endre verdi
-Edit=Rediger
-Clear=Rens
-Select a directory=Velg en mappe
-Select a file=Velg en fil
-Clock (default: 200)=Klokkefrekvens (standard: 200)
-Volume (default: -1)=Volum (standard: -1)
-Wrapper=Wrapper
-Enter folder=Åpne mappe
-Confirm=Bekreft
-Enter folder/Confirm=Åpne mappe/Bekrefte
-Up one folder=Opp en mappe
-Select an application=Velg en applikasjon
-Space=Mellomrom
-Shift=Skift
-Cancel=Avbryt
-OK=OK
-Backspace=Backspace
-Skin=Skin
-Set the skin used by GMenu2X=Velg hvilket skin GMenu2X skal bruke
-Add link in $1=Lag link i $1
-Edit $1=Rediger $1
-Delete $1 link=Slett $1
-Deleting $1=Sletter $1
-Are you sure?=Er du sikker?
-Insert a name for the new section=Sett navn for den nye avdelningen
-Insert a new name for this section=Sett navn for denne avdelningen
-Yes=Ja
-No=Nei
-You will lose all the links in this section.=Du vil miste alle linkene i denne avdelingen.
-Exit=Avslutt
-Link Scanner=Linkskanner
-Scanning SD filesystem...=Skanner igjennom minnekortet...
-Scanning NAND filesystem...=Skanner igjennom NAND...
-$1 files found.=$1 fil(er) funnet.
-Creating links...=Lager linker...
-$1 links created.=$1 link(er) er lagd.
-Version $1 (Build date: $2)=Versjon $1 (Bygd den: $2)
-Log Viewer=Loggleser
-Displays last launched program's output=Vis utdata fra siste startede program
-Do you want to delete the log file?=Vil du slette loggen?
-USB Enabled (SD)=USB Aktivert (SD)
-USB Enabled (Nand)=USB Aktivert (NAND)
-Turn off=Slå av
-Launching $1=Starter $1
-Change page=Bytt side
-Page=Side
-Scroll=Rull
-Untitled=Uten navn
\ No newline at end of file
diff --git a/pandora/translations/Portuguese (Portugal) b/pandora/translations/Portuguese (Portugal)
deleted file mode 100644
index 70c9084..0000000
--- a/pandora/translations/Portuguese (Portugal)	
+++ /dev/null
@@ -1,118 +0,0 @@
-Settings= Configurações
-Configure GMenu2X's options=Configurar opções do GMenu2X
-Activate Usb on SD=Activar USB para SD
-Activate Usb on Nand=Activar USB para Nand
-Info about GMenu2X=Informação sobre GMenu2X
-About=Sobre
-Add section=Adicionar Secção
-Rename section= Renomear Secção
-Delete section= Eliminar Secção
-Scan for applications and games=Procurar aplicações e jogos 
-applications=aplicações
-Edit link=Editar Link
-Title=Título
-Link title=Título do Link 
-Description=Descrição
-Link description=Descrição do Link
-Section=Secção
-The section this link belongs to=A secção a que pertence este link 
-Icon=Ícone
-Select an icon for the link: $1=Seleccionar um ícone para o link: $1
-Manual=Manual
-Select a graphic/textual manual or a readme=Seleccionar um manual gráfico e/ou de texto
-Cpu clock frequency to set when launching this link=Frequência de relógio do CPU ao lançar este link 
-Volume to set for this link=Ajustar o volume para este link
-Parameters=Parâmetros
-Parameters to pass to the application=Parâmetros a enviar para a aplicação
-Selector Directory=Directório do Selector
-Directory to scan for the selector=Directório a explorar com o selector
-Selector Browser=Explorador do selector
-Allow the selector to change directory=Permitir ao selector que mude de directório
-Selector Filter=Filtro do selector
-Filter for the selector (Separate values with a comma)=Filtro do selector (Separar valores com virgulas)
-Selector Screenshots=Capturas de ecrã do selector
-Directory of the screenshots for the selector=Directório das capturas de ecrã do selector
-Selector Aliases=Alias do selector
-File containing a list of aliases for the selector=Arquivo que contém a lista de alias para o selector 
-Explicitly relaunch GMenu2X after this link's execution ends=Forçar relançamento do GMenu2x após fim da execução deste link
-Don't Leave=Não Sair
-Don't quit GMenu2X when launching this link=Não sair do GMenu2X ao lançar este link
-Save last selection=Gravar a última selecção
-Save the last selected link and section on exit=Recordar link e secção seleccionadas ao sair
-Clock for GMenu2X=Relógio no GMenu2X
-Set the cpu working frequency when running GMenu2X=Ajustar a frequência do CPU durante a execução do GMenu2X  
-Maximum overclock=Overclock máximo
-Set the maximum overclock for launching links=Ajustar o overclock máximo ao lançar um link
-Global Volume=Volume global
-Set the default volume fo the gp2x soundcard=Ajustar o volume por defeito da gp2x 
-Output logs=Logs de Output
-Logs the output of the links. Use the Log Viewer to read them.=Regista o output dos links. Usar o Leitor de Logs para consultar.
-Number of columns=Número de colunas
-Set the number of columns of links to display on a page=Ajustar o número de colunas (de links) por página 
-Number of rows=Número de filas
-Set the number of rows of links to display on a page=Ajustar o número de filas (de links) por página 
-Top Bar Color=Cor da barra superior
-Color of the top bar= Cor da barra superior
-Bottom Bar Color= Cor da barra inferior
-Color of the bottom bar= Cor da barra inferior
-Selection Color=Cor da selecção
-Color of the selection and other interface details=Cor da selecção e outros detalhes do interface 
-You should disable Usb Networking to do this.=Deve desactivar a função Networking por USB para executar este comando.
-Operation not permitted.=Operação não permitida.
-Language=Idioma
-Set the language used by GMenu2X=Ajustar o idioma usado no GMenu2X 
-Increase=Aumentar
-Decrease=Reduzir
-Change color component=Alterar componente da cor
-Increase value=Aumentar valor
-Decrease value=Reduzir Valor
-Switch=Mudar
-Change value=Mudar Valor
-Edit=Editar
-Clear=Eliminar
-Select a directory=Seleccionar directório
-Select a file=Seleccionar ficheiro
-Clock (default: 200)=Frequência (predefinido: 200)
-Volume (default: -1)=Volume (predefinido: -1)
-Wrapper=Invólucro
-Enter folder=Entrar na Pasta
-Confirm=Confirmar
-Enter folder/Confirm=Entrar na Pasta/Confirmar
-Up one folder=Subir uma pasta
-Select an application=Seleccionar uma aplicação
-Space=Espaço
-Shift=Shift
-Cancel=Cancelar
-OK=OK
-Backspace=Backspace
-Skin=Skin
-Set the skin used by GMenu2X=Seleccionar a Skin a usar pelo GMenu2X
-Add link in $1=Adicionar link em $1
-Edit $1=Modificar $1
-Delete $1 link=Eliminar o link $1
-Deleting $1=Removendo $1
-Are you sure?=Tem a certeza? 
-Insert a name for the new section=Insira o nome da nova secção
-Insert a new name for this section=Insira um novo nome para esta secção
-Yes=Sim
-No=Não
-You will lose all the links in this section.=Perderá todos os links desta secção.
-Exit=Sair
-Link Scanner=Pesquisador de links
-Scanning SD filesystem...=A pesquisar o filesystem do SD...
-Scanning NAND filesystem...=A pesquisar o filesystem do NAND...
-$1 files found.=$1 ficheiros encontrados.
-Creating links...=A criar Links...
-$1 links created.=$1 Links criados.
-Version $1 (Build date: $2)=Versão $1 (Data de compilação: $2)
-Log Viewer=Leitor de Logs
-Displays last launched program's output=Mostra o output do último programa executado
-Do you want to delete the log file?=Deseja eliminar o ficheiro de log?
-USB Enabled (SD)=USB Activado (SD)
-USB Enabled (Nand)=USB Activado (Nand)
-Turn off=Desligar
-Launching $1= A Executar $1
-Change page=Mudar página
-Page=Página
-Scroll=Scroll
-Untitled=Sem título
diff --git a/pandora/translations/Russian b/pandora/translations/Russian
deleted file mode 100644
index 900cab0..0000000
--- a/pandora/translations/Russian
+++ /dev/null
@@ -1,132 +0,0 @@
-Settings=Настройки
-Configure GMenu2X's options=Изменить настройки GMenu2X
-Activate Usb on SD=Активировать SD через USB
-Activate Usb on Nand=Активировать NAND через USB
-Info about GMenu2X=Информация о GMenu2X
-About=Информация
-Add section=Добавить секцию
-Rename section=Переименовать секцию
-Delete section=Удалить секцию
-Scan for applications and games= Поиск игр и приложений
-applications=Приложения
-Edit link=Изменить ссылку
-Title=Заголовок
-Link title=Имя ссылки
-Description=Описание 
-Link description=Описание ссылки
-Section=Секция
-The section this link belongs to=Секция, которой принадлежит ссылка
-Icon=Иконка
-Select an icon for the link: $1=Выберите иконку к ссылке: $1
-Manual=Инструкция
-Select a graphic/textual manual or a readme=Выберите текстовую инструкцию
-Cpu clock frequency to set when launching this link=Частота CPU при запуске данной ссылки
-Volume to set for this link=Громкость установленная для этой ссылки
-Parameters=Параметры
-Parameters to pass to the application=Параметры для передачи приложению
-Selector Directory=Папка проводника
-Directory to scan for the selector=Папка для сканирования проводником
-Selector Browser=Выбрать браузером
-Allow the selector to change directory=Разрешить проводнику выбирать папку
-Selector Filter=Выбрать фильтр
-Filter for the selector (Separate values with a comma)=Фильтр для проводника
-Selector Screenshots=Обзор скриншотов
-Directory of the screenshots for the selector=Папка с скриншотами для проводника
-Selector Aliases=Обзор списков с именами
-File containing a list of aliases for the selector=Файл, содержащий список имён-псевдонимов
-Explicitly relaunch GMenu2X after this link's execution ends=Перезапуск GMenu2X после завершения выполнения ссылки
-Don't Leave=Не покидать
-Don't quit GMenu2X when launching this link=Не выключать Gmenu2X когда запускается эта ссылка
-Save last selection=Сохранять последней выбор
-Save the last selected link and section on exit=Сохранение последней выбранной ссылки и секции при выключение
-Clock for GMenu2X=Частота CPU для Gmenu2X
-Set the cpu working frequency when running GMenu2X=Устанавливает частоту CPU пока запущен Gmenu2X
-Maximum overclock=Максимальная частота CPU
-Set the maximum overclock for launching links=Максимальная частота CPU для запуска ссылок
-Global Volume=Громкость
-Set the default volume for the gp2x soundcard=Устанавливает громкость для звуковой карты GP2X
-Output logs=Отчёты
-Logs the output of the links. Use the Log Viewer to read them.=Создавать отчёты ссылок
-Number of columns=Количество столбцов
-Set the number of columns of links to display on a page=Установите количество столбцов для отображения на странице
-Number of rows=Количество колонок
-Set the number of rows of links to display on a page=Установите количество колонок для отображения на странице
-Top Bar Color=Цвет панели сверху
-Color of the top bar=Выберите цвет панели сверху
-Bottom Bar Color=Цвет панели внизу 
-Color of the bottom bar= Выберите цвет панели внизу
-Selection Color=Цвет панели выбора
-Color of the selection and other interface details=Выберите цвет панели выбора
-You should disable Usb Networking to do this.=Вы должны выключить USB Networking чтобы сделать это.
-Operation not permitted.=Операция не разрешена.
-Language=Язык
-Set the language used by GMenu2X=Выберите язык интерфейса
-Increase=Прибавить 
-Decrease=Убавить
-Change color component=Изменить компонент цвета 
-Increase value=Увеличить значение 
-Decrease value=Уменьшить значение 
-Switch=Переключить
-Change value=Изменить значение 
-Edit=Изменить
-Clear=Очистить 
-Select a directory=Выбрать папку 
-Select a file=Выбрать файл 
-Clock (default: 200)=Частота CPU (Стандарт: 200) 
-Volume (default: -1)=Громкость (Стандарт: -1) 
-Wrapper=Перезапуск 
-Enter folder=Открыть папку 
-Confirm=Подтвердить  
-Enter folder/Confirm=Выбрать папку/подтвердить
-Up one folder=Назад на одну папку 
-Select an application=Выберите приложение 
-Space=Пробел
-Shift=Shift
-Cancel=Выход 
-OK=OK 
-Backspace=Стереть
-Skin=Скин
-Set the skin used by GMenu2X=Выберите скин для GMenu2X
-Add link in $1=Добавить ссылку в $1
-Edit $1=Именить $1 
-Delete $1 link=Удалить ссылку $1
-Deleting $1=Удаление $1
-Are you sure?=Вы уверены? 
-Insert a name for the new section=Впишите имя для новой секции 
-Insert a new name for this section=Впишите новое имя для этой секции 
-Yes=Да 
-No=Нет 
-You will lose all the links in this section.=Вы потеряете все ссылки в этой секции 
-Exit=Выход 
-Link Scanner=Поиск ссылок 
-Scanning SD filesystem...=Сканирование SD... 
-Scanning NAND filesystem...=Сканирование NAND... 
-$1 files found.=$1 Файлов найдено. 
-Creating links...=Создание ссылок... 
-$1 links created.=$1 ссылок создано. 
-Version $1 (Build date: $2)=Версия $1 (Дата сборки: $2) 
-Log Viewer=Отчёты
-Displays last launched program's output=Отображает последний запущенный отчёт программы 
-Do you want to delete the log file?=Вы хотите удалить этот отчёт? 
-USB Enabled (SD)=USB включен (SD) 
-USB Enabled (Nand)=USB включен (Nand) 
-Turn off=Выключить 
-Launching $1=Запуск $1...
-Change page=Изменить страницу 
-Page=Страница 
-Scroll=Прокрутка
-Untitled=Не названный
-
-
-Change GMenu2X wallpaper=Изменить обои Gmenu2X
-Activate/deactivate tv-out=Активировать/дезактивировать ТВ-выход 
-Select wallpaper=Выберите обои
-Gamma=Гамма
-Set gp2x gamma value (default: 10)=Значение гаммы экрана GP2X (стандарт: 10)
-Tv-Out encoding=Технология вывода на ТВ
-Encoding of the tv-out signal=Шифровка ТВ сигнала
-Tweak RAM Timings=Изменение параметров RAM
-This usually speeds up the application at the cost of stability=Это обычно убыстряет приложение
-Gamma (default: 0)=Гамма (стандарт: 0)
-Gamma value to set when launching this link=Значение гаммы при запуске этой ссылки
-
diff --git a/pandora/translations/Slovak b/pandora/translations/Slovak
deleted file mode 100644
index 15bda3a..0000000
--- a/pandora/translations/Slovak
+++ /dev/null
@@ -1,137 +0,0 @@
-Settings=Nastavenia
-Configure GMenu2X's options=Nastaviť voľby pre GMenu2X
-Activate Usb on SD=Aktivovať USB pre SD kartu
-Activate Usb on Nand=Aktivovať USB pre pamäť Nand
-Info about GMenu2X=Informácie o GMenu2X
-About=O programe
-Add section=Pridať sekciu
-Rename section=Premenovať sekciu
-Delete section=Vymazať sekciu
-Scan for applications and games= Hľadať aplikácie a hry
-applications=aplikácie
-Edit link=Upraviť odkaz
-Title=Názov
-Link title=Názov odkazu
-Description=Popis
-Link description=Popis pre odkaz
-Section=Sekcia
-The section this link belongs to=Sekcia, do ktorej patrí tento odkaz
-Icon=Ikona
-Select an icon for the link=Vyberte ikonu pre tento odkaz
-Manual=Návod
-Select a graphic/textual manual or a readme=Vyberte grafický/textový návod alebo readme
-Cpu clock frequency to set when launching this link=Taktovacia frekvencia procesora, s ktorou bude spustený odkaz
-Volume to set for this link=Nastavenie hlasitosti pre tento odkaz
-Parameters=Parametre
-Parameters to pass to the application=Parametre, ktoré majú byť predané aplikácii
-Selector Directory=Adresár selektora
-Directory to scan for the selector=Adresár, v ktorom má byť hľadaný selektor
-Selector Browser=Prehliadač selektora
-Allow the selector to change directory=Povolí selektorovi zmeniť adresár
-Selector Filter=Filter pre selektor
-Filter for the selector (Separate values with a comma)=Filter pre selektor (hodnoty oddeľujte čiarkou)
-Selector Screenshots=Snímky obrazovky selektora
-Directory of the screenshots for the selector=Adresár so snímkami obrazovky selektora
-Selector Aliases=Aliasy selektora
-File containing a list of aliases for the selector=Súbor obsahujúci zoznam aliasov pre selektor
-Explicitly relaunch GMenu2X after this link's execution ends=Explicitne opätovne spustiť GMenu2X po ukončení spustenia tohto odkazu
-Don't Leave=Neopúšťať
-Don't quit GMenu2X when launching this link=Neukončovať GMenu2X pri spúšťaní tohto odkazu
-Save last selection=Ulož posledný výber
-Save the last selected link and section on exit=Ulož naposledy vybraný odkaz a sekciu pri ukončení
-Clock for GMenu2X=Takt. frekvencia pre GMenu2X
-Set the cpu working frequency when running GMenu2X=Nastavte frekvenciu cpu počas behu GMenu2X
-Maximum overclock=Maximálne pretaktovanie
-Set the maximum overclock for launching links=Nastavte maximálne pretaktovanie pre spúšťanie odkazov
-Global Volume=Globálna hlasitosť
-Set the default volume for the gp2x soundcard=Nastavte východziu hlasitosť pre zvukovú kartu gp2x
-Output logs=Výstupné logy
-Logs the output of the links. Use the Log Viewer to read them.=Loguje výstup odkazov. Na prezretie použite Log Viewer.
-Number of columns=Počet stĺpcov
-Set the number of columns of links to display on a page=Nastavte počet stĺpcov pre odkazy zobrazené na stránke
-Number of rows=Počet riadkov
-Set the number of rows of links to display on a page=Počet riadkov odkazov zobrazených na stránke
-Top Bar Color=Farba hornej lišty
-Color of the top bar= Farba hornej lišty
-Bottom Bar Color=Farba spodnej lišty
-Color of the bottom bar=Farba spodnej lišty
-Selection Color=Farba výberu
-Color of the selection and other interface details=Farba výberu a iných detailov interfacu
-You should disable Usb Networking to do this.=Pre vykonanie tejto operácie by ste mali deaktivovať Usb sieťovanie.
-Operation not permitted.=Operácia nepovolená.
-Language=Jazyk
-Set the language used by GMenu2X=Nastavte jazyk pre GMenu2X
-Increase=Zvýšiť 
-Decrease=Znížiť 
-Change color component=Zmeniť farebnú zložku
-Increase value=Zvýšiť hodnotu
-Decrease value=Znížiť hodnotu
-Switch=Prepnúť 
-Change value=Zmeniť hodnotu
-Edit=Upraviť 
-Clear=Vyčistiť 
-Select a directory=Vyberte adresár
-Select a file=Vyberte súbor
-Clock (default: 200)=Takt (štandardne: 200) 
-Volume (default: -1)=Hlasitosť (štandardne: -1) 
-Wrapper=Obaľovač 
-Enter folder=Zadajte priečinok
-Confirm=Potvrdiť 
-Enter folder/Confirm=Zadajte priečinok/Potvrdiť
-Up one folder=O jeden priečinok vyššie
-Select an application=Vyberte aplikáciu
-Space=Medzera
-Shift=Shift 
-Cancel=Zrušiť 
-OK=OK 
-Backspace=Backspace
-Skin=Skin 
-Set the skin used by GMenu2X=Nastavte skin pre GMenu2X
-Add link in $1=Pridať odkaz do $1
-Edit $1=Upraviť $1
-Delete $1 link=Vymazať odkaz na $1
-Deleting $1=Mažem $1
-Are you sure?=Ste si istý? 
-Insert a name for the new section=Zadajte názov novej sekcie
-Insert a new name for this section=Zadajte nový názov pre túto sekciu
-Yes=Áno 
-No=Nie 
-You will lose all the links in this section.=Stratíte všetky odkazy v tejto sekcii. 
-Exit=Ukončiť 
-Link Scanner=Vyhľadávač odkazov
-Scanning SD filesystem...=Prehľadávam súborový systém na SD karte...
-Scanning NAND filesystem...=Prehľadávam súborový systém na pamäti NAND...
-$1 files found.=$1 súbor(ov) nájdených. 
-Creating links...=Vytváram odkazy...
-$1 links created.=$1 odkazov vytvorených.
-Version $1 (Build date: $2)=Verzia $1 (dátum zostavenia: $2)
-Log Viewer=Prehliadač log súborov
-Displays last launched program's output=Zobrazuje výstup naposledy spusteného súboru
-Do you want to delete the log file?=Želáte si vymazať log súbor?
-USB Enabled (SD)=USB aktivované (SD) 
-USB Enabled (Nand)=USB aktivované (Nand) 
-Turn off=Vypnúť 
-Launching $1=Spúšťam $1
-Change page=Zmeniť stránku 
-Page=Stránka 
-Scroll=Skrolovať 
-Untitled=Bez mena
-Change GMenu2X wallpaper=Zmeniť pozadie GMenu2X
-Activate/deactivate tv-out=Aktivovať/deaktivovať výstup na TV
-Select wallpaper=Vyberte pozadie
-Gamma=Gamma
-Set gp2x gamma value (default: 10)=Nastavte hodnotu gamma (implic: 10)
-Tv-Out encoding=Kódovanie výstupu na TV
-Encoding of the tv-out signal=Kódovanie televízneho signálu
-Tweak RAM Timings=Upraviť časovanie RAM
-This usually speeds up the application at the cost of stability=Toto nastavenie zvyčajne zrýchli aplikáciu na úkor stability
-Gamma (default: 0)=Gamma (implic: 0)
-Gamma value to set when launching this link=Hodnota gamma pri spúšťaní tohto odkazu
-Wallpaper=Pozadie
-Configure skin=Nastaviť skin
-Message Box Color=Farba textového okna
-Message Box Border Color=Farba okraja textového okna
-Message Box Selection Color=Farba výberu textového okna
-Background color of the message box=Farba pozadia textového okna
-Border color of the message box=Farba okraja textového okna
-Color of the selection of the message box=Farba výberu textového okna
diff --git a/pandora/translations/Spanish b/pandora/translations/Spanish
deleted file mode 100644
index 74f5a8e..0000000
--- a/pandora/translations/Spanish
+++ /dev/null
@@ -1,129 +0,0 @@
-Settings=Ajustes
-Configure GMenu2X's options=Configura las opciones de GMenu2X
-Activate Usb on SD=Activa USB para SD
-Activate Usb on Nand=Activa USB para Nand
-Info about GMenu2X=Información sobre GMenu2X
-About=Información
-Add section=Añadir sección
-Rename section=Renombrar sección
-Delete section=Eliminar sección
-Scan for applications and games=Buscar aplicaciones y juegos
-applications=aplicaciones
-Edit link=Editar enlace
-Title=Título
-Link title=Título de enlace
-Description=Descripción
-Link description=Descripción de enlace
-Section=Sección
-The section this link belongs to=La sección a la que pertenece el enlace
-Icon=Icono
-Select an icon for the link: $1=Seleccione un icono para el enlace: $1
-Manual=Manual
-Select a graphic/textual manual or a readme=Seleccione un manual gráfico/texto o un leeme
-Cpu clock frequency to set when launching this link=Ajuste del reloj de la cpu para cargar este enlace
-Volume to set for this link=Ajuste del volumen para este enlace
-Parameters=Parámetros
-Parameters to pass to the application=Parámetros que enviar a la aplicación
-Selector Directory=Directorio del Selector
-Directory to scan for the selector=Directorio que explorar con el selector
-Selector Browser=Explorador del selector
-Allow the selector to change directory=Permitir al selector cambiar de directorio
-Selector Filter=Filtro del selector
-Filter for the selector (Separate values with a comma)=Filtro para el selector (Separar valores con comas)
-Selector Screenshots=Capturas de pantalla del selector
-Directory of the screenshots for the selector=Directorio de capturas de pantalla para el selector
-Selector Aliases=Alias del selector
-File containing a list of aliases for the selector=Archivo contenedor de la lista de alias para el selector
-Don't Leave=No salir
-Don't quit GMenu2X when launching this link=No terminar GMenu2X al cargar este enlace
-Save last selection=Recordar última selección
-Save the last selected link and section on exit=Recordar última sección y enlace seleccionado al salir
-Clock for GMenu2X=Reloj para GMenu2X
-Set the cpu working frequency when running GMenu2X=Ajuste la frecuencia de trabajo de cpu al ejecutar GMenu2X
-Maximum overclock=Overclock máximo
-Set the maximum overclock for launching links=Ajuste el máximo overclock para cargar enlaces
-Global Volume=Volumen global
-Set the default volume for the gp2x soundcard=Ajuste el volumen por defecto del sonido en gp2x
-Output logs=Archivos de registro de sucesos
-Logs the output of the links. Use the Log Viewer to read them.=Registra los sucesos de los enlaces. Usa el lector de registros para leerlos.
-Number of columns=Número de columnas
-Set the number of columns of links to display on a page=Ajuste el número de columnas de enlaces que mostrar por página
-Number of rows=Número de líneas
-Set the number of rows of links to display on a page=Ajuste el número de líneas de enlaces que mostrar por página
-Top Bar Color=Color de barra superior
-Color of the top bar=Color de la barra superior
-Bottom Bar Color=Color de barra inferior
-Color of the bottom bar=Color de la barra inferior
-Selection Color=Color de selección
-Color of the selection and other interface details=Color de la selección y otros detalles del interfaz
-You should disable Usb Networking to do this.=Debe desactivar Red por USB para hacer esto.
-Operation not permitted.=Operación no permitida.
-Language=Idioma
-Set the language used by GMenu2X=Ajuste el idioma usado en GMenu2X
-Increase=Aumentar
-Decrease=Reducir
-Change color component=Cambiar componente cromático
-Increase value=Incrementar valor
-Decrease value=Reducir valor
-Switch=Cambiar
-Change value=Cambiar valor
-Edit=Modificar
-Clear=Limpiar
-Select a directory=Selecciona un directorio
-Select a file=Selecciona un archivo
-Clock (default: 200)=Frecuencia (predefinida: 200)
-Volume (default: -1)=Volumen (predefinida: -1)
-Enter folder=Entrar en carpeta
-Confirm=Confirmar
-Enter folder/Confirm=Entrar en carpeta/Confirmar
-Up one folder=Subir una carpeta
-Select an application=Seleccionar un programa
-Space=Espacio
-Shift=Mayúsculas
-Cancel=Cancelar
-OK=Aceptar
-Backspace=Retroceso
-Skin=Máscara
-Set the skin used by GMenu2X=Seleccione la máscara usada en GMenu2X
-Add link in $1=Añadir enlace en $1
-Edit $1=Modificar $1
-Delete $1 link=Eliminar el enlace de $1
-Deleting $1=Eliminando $1
-Are you sure?=¿Estás seguro?
-Insert a name for the new section=Insertar nombre para la nueva sección
-Insert a new name for this section=Insertar nuevo nombre para la sección
-Yes=Si
-No=No
-You will lose all the links in this section.=Se perderán todos los enlaces de esta sección.
-Exit=Salir
-Link Scanner=Buscador de enlaces
-Scanning SD filesystem...=Explorando sistema de archivos de SD...
-Scanning NAND filesystem...=Explorando sistema de archivos de NAND...
-$1 files found.=$1 archivo(s) encontrado(s).
-Creating links...=Creando enlaces...
-$1 links created.=$1 enlace(s) creado(s).
-Version $1 (Build date: $2)=Versión $1 (Compilación: $2)
-Log Viewer=Lector de Registro de Sucesos
-Displays last launched program's output=Muestra la salida del último programa ejecutado
-Do you want to delete the log file?=¿Desea eliminar el archivo de registro de sucesos?
-USB Enabled (SD)=USB Activado (SD)
-USB Enabled (Nand)=USB Activado (Nand)
-Turn off=Desactivar
-Launching $1=Ejecutando $1
-Change page=Cambiar página
-Page=Página
-Scroll=Desplazamiento
-Untitled=Sin titulo
-Change GMenu2X wallpaper=Cambia el fondo de GMenu2X
-Activate/deactivate tv-out=Activa/desactiva salida de tv
-Select wallpaper=Selecciona imagen de fondo
-Gamma=Gama
-Set gp2x gamma value (default: 10)=Ajusta el valor gama de la gp2x (predefinido: 10)
-Tv-Out encoding=Codificación de salida de tv
-Encoding of the tv-out signal=Codificación de la señal de salida de tv
-Tweak RAM Timings=Modifica la sincronización de RAM
-This usually speeds up the application at the cost of stability=Normalmente acelera la aplicación a costa de la estabilidad
-Gamma (default: 0)=Gama (predefinido: 0)
-Gamma value to set when launching this link=Valor de gama que usar al lanzar este enlace
-Wrapper=Retornar
-Explicitly relaunch GMenu2X after this link's execution ends=Forzar recarga de GMenu2X al terminar ejecución del enlace
diff --git a/pandora/translations/Swedish b/pandora/translations/Swedish
deleted file mode 100644
index 5501464..0000000
--- a/pandora/translations/Swedish
+++ /dev/null
@@ -1,119 +0,0 @@
-Settings=Inställningar
-Configure GMenu2X's options=Konfigurera GMenu2X's inställningar
-Activate Usb on SD=Aktivera Usb på SD
-Activate Usb on Nand=Aktivera Usb på Nand
-Info about GMenu2X=Info om GMenu2X
-About=Om
-Add section=Lägg till avdelning
-Rename section=Byt namn på avdelning
-Delete section=Ta bort avdelning
-Scan for applications and games=Scanna efter applikationer
-applications=applikationer
-Edit link=Redigera länk
-Title=Titel
-Link title=Länktitel
-Description=Beskrivning
-Link description=Länkbeskrivning
-Section=Avdelning
-The section this link belongs to=Avdelningen som den här länken tillhör
-Icon=Ikon
-Select an icon for the link: $1=Välj en ikon till länken: $1
-Manual=Manual
-Select a graphic/textual manual or a readme=Välj en grafisk/textbaserad manual eller en readme
-Cpu clock frequency to set when launching this link=Cpu-klockfrekvens att ändra till när denna länk körs
-Volume to set for this link=Volymen som skall sättas för den här länken
-Parameters=Parametrar
-Parameters to pass to the application=Parametrar som skall skickas till applikationen
-Selector Directory=Selectorkatalog
-Directory to scan for the selector=Katalog som selector skall scanna
-Selector Browser=Selectorutforskare
-Allow the selector to change directory=Tillåt selector att byta katalog
-Selector Filter=Selectorfilter
-Filter for the selector (Separate values with a comma)=Filter för selector (separera värdena med kommatecken)
-Selector Screenshots=Skärmdumpar till Selector
-Directory of the screenshots for the selector=Katalog med skärmdumpar till selector
-Selector Aliases=Selectoralias
-File containing a list of aliases for the selector=Fil som innehåller en lista med alias för selector
-Explicitly relaunch GMenu2X after this link's execution ends=Tvinga GMenu2X att starta om när denna länk körts klart
-Don't Leave=Lämna inte
-Don't quit GMenu2X when launching this link=Avsluta inte GMenu2X när denna länk körs
-Save last selection=Spara senaste markeringen
-Save the last selected link and section on exit=Spara senaste länk och avdelning vid avslut
-Clock for GMenu2X=Klockfrekvens för GMenu2X
-Set the cpu working frequency when running GMenu2X=Ställ in cpu-klockfrekvensen för GMenu2X
-Maximum overclock=Maximal överklockning
-Set the maximum overclock for launching links=Sätt maximal överklockning vid start av länk
-Global Volume=Global volym
-Set the default volume fo the gp2x soundcard=Sätt förinställd volym på gp2x ljudkortet
-Output logs=logg utskrift
-Logs the output of the links. Use the Log Viewer to read them.=Skriver ut loggar för länkarna. Använd loggläsaren för att läsa dem.
-Number of columns=Antal spalter
-Set the number of columns of links to display on a page=Välj antal spalter med länkar som skall visas per sida
-Number of rows=Antal rader
-Set the number of rows of links to display on a page=Välj antal rader med länkar som skall visas per sida
-Top Bar Color=Översta fältets färg
-Color of the top bar=Färg på det översta fältet
-Bottom Bar Color=Nedersta fältets färg
-Color of the bottom bar=Färg på det nedersta fältet
-Selection Color=Markörfärg
-Color of the selection and other interface details=Färg på markören och andra delar av gränssnittet
-You should disable Usb Networking to do this.=Du bör slå av usb-nätverket när du gör detta.
-Operation not permitted.=Otillåten användning.  
-Language=Språk
-Set the language used by GMenu2X=Ställ in språk för GMenu2X
-Increase=Öka
-Decrease=Minska
-Change color component=Ändra färg komponent
-Increase value=Öka värde
-Decrease value=Minska värde
-Switch=Ändra
-Change value=Ändra värde
-Edit=Redigera
-Clear=Rensa
-Select a directory=Välj en katalog
-Select a file=Välj en fil
-Clock (default: 200)=Klockfrekvens (förinställd: 200)
-Volume (default: -1)=Volym (förinställd: -1)
-Wrapper=Wrapper
-Enter folder=Öppna katalog
-Confirm=Bekräfta
-Enter folder/Confirm=Öppna katalog/Bekräfta
-Up one folder=Upp en katalog
-Select an application=Välj en applikation
-Space=Mellanslag
-Shift=Skift
-Cancel=Avbryt
-OK=OK
-Backspace=Backsteg
-Skin=Skin
-Set the skin used by GMenu2X=Välj vilket skin GMenu2X ska använda
-Add link in $1=Skapa länk i $1
-Edit $1=Redigera $1
-Delete $1 link=Ta bort $1
-Deleting $1=Tar bort $1
-Are you sure?=Är du säker?
-Insert a name for the new section=Skriv in namn för den nya avdelningen
-Insert a new name for this section=Skriv in namn för den här avdelningen
-Yes=Ja
-No=Nej
-You will lose all the links in this section.=Du kommer att förlora alla länkar i den här
-avdelningen.
-Exit=Avsluta
-Link Scanner=Länkscanner
-Scanning SD filesystem...=Scannar SD filsystem...
-Scanning NAND filesystem...=Scannar NAND filsystem...
-$1 files found.=$1 fil(er) funna.
-Creating links...=Skapar länkar...
-$1 links created.=$1 länk(ar) skapade.
-Version $1 (Build date: $2)=Version $1 (Skapad den: $2)
-Log Viewer=Logg läsare
-Displays last launched program's output=Visa utdata från senast körda program
-Do you want to delete the log file?=Vill du ta bort logg filen?
-USB Enabled (SD)=USB Aktiverad (SD)
-USB Enabled (Nand)=USB Aktiverad (Nand)
-Turn off=Stäng av
-Launching $1=Startar $1
-Change page=Byt sida
-Page=Sida
-Scroll=Rulla
-Untitled=Obetitlad
diff --git a/pandora/translations/Turkish b/pandora/translations/Turkish
deleted file mode 100644
index 7554ced..0000000
--- a/pandora/translations/Turkish
+++ /dev/null
@@ -1,133 +0,0 @@
-Settings=Ayarlar
-Configure GMenu2X's options=GMenu2X'in ayarlarini degistir
-Activate Usb on SD=SD Karti için USB baglantisini aktive et
-Activate Usb on Nand=Nand Bellegi için USB baglantisini aktive et
-Info about GMenu2X=GMenu2X hakkinda bilgi
-About=Hakkinda
-Add section=Bölüm ekle
-Rename section=Bölümü yeniden adlandir
-Delete section=Bölümü sil
-Scan for applications and games=Oyun ve program taramasi
-applications=programlar
-Edit link=Link'i düzenle
-Title=Baslik
-Link title=Link basligi
-Description=Açiklama
-Link description=Link açiklamasi
-Section=Bölüm
-The section this link belongs to=Bu linkin ait oldugu bölüm
-Icon=Icon
-Select an icon for the link: $1=$1 Linki için bir simge seçin:
-Manual=Kullanim kilavuzu
-Select a graphic/textual manual or a readme=Grafik/Text bir kullanim kilavuzu veya readme dosyasi seçin
-Cpu clock frequency to set when launching this link=Bu linki baslatirken kullanilacak CPU hizi
-Volume to set for this link=Bu linkin ses seviyesi
-Parameters=Parametreler
-Parameters to pass to the application=Programa baslatirken aktarilacak parametreler
-Selector Directory=Seçim klasörü
-Directory to scan for the selector=Seçim için taranacak klasör
-Selector Browser=Dosya seçimi
-Allow the selector to change directory=Dosyas seçiminin klasör degistirmesine izin ver
-Selector Filter=Seçim filtresi
-Filter for the selector (Separate values with a comma)=Seçim için filtre (Verileri virgül ile ayirin)
-Selector Screenshots=Seçim Ekran görüntüleri
-Directory of the screenshots for the selector=Seçim için ekran görüntülerinin klasörü
-Selector Aliases=Seçim için alternatif isimler (alias)
-File containing a list of aliases for the selector=Seçim için alternatif isimleri içeren dosya adi
-Explicitly relaunch GMenu2X after this link's execution ends=GMenu2X'i bu linkin çalismasi bittiginde özellikle tekrar baslat
-Don't Leave=Çikma
-Don't quit GMenu2X when launching this link=Bu linki baslatirken GMenu2X'i durdurma
-Save last selection=Son seçimi sakla
-Save the last selected link and section on exit=Son seçilen link ve seçimi çikista sakla
-Clock for GMenu2X=GMenu2X için CPU hizi
-Set the cpu working frequency when running GMenu2X=GMenu2X'in çalistigi CPU hizi
-Maximum overclock=Maksimum overclock hizi
-Set the maximum overclock for launching links=Linkler baslatilirken kullanilacak en yüksek CPU hizini belirleyin
-Global Volume=Genel ses seviyesi
-Set the default volume for the gp2x soundcard=GP2X ses kartinin standart ses seviyesini belirleyin
-Output logs=Çikti kayitlari
-Logs the output of the links. Use the Log Viewer to read them.=Linklerin çiktilarini kaydeder. Kayit gösterici ile okuyabilirsiniz.
-Number of columns=Sütun sayisi
-Set the number of columns of links to display on a page=Bir sayfada gösterilecek sütun sayisini belirleyin
-Number of rows=Satir sayisi
-Set the number of rows of links to display on a page=Bir sayfada gösterilecek satir sayisini belirleyin
-Top Bar Color=Baslik çubugunun rengi
-Color of the top bar=Baslik çubugunun rengini ve saydamligini belirler
-Bottom Bar Color=Statü çubugunun rengi
-Color of the bottom bar=Statü çubugunun rengini ve saydamligini belirler
-Selection Color=Seçim rengi
-Color of the selection and other interface details=Seçim rengi ve baska arabirim detaylarinin rengi
-You should disable Usb Networking to do this.=Bunu yapmadan önce USB-Ag destegini kapatmalisiniz.
-Operation not permitted.=Isleme izin verilmedi.
-Language=Dil
-Set the language used by GMenu2X=GMenu2X'in kullanacagi dili seçin
-Increase=Artir
-Decrease=Azalt
-Change color component=Renk ögesini degistirin
-Increase value=Degeri artir
-Decrease value=Degeri azalt
-Switch=Degistir
-Change value=Degeri degistir
-Edit=Düzenle
-Clear=Temizle
-Select a directory=Bir klasör seç
-Select a file=Bir dosya seç
-Clock (default: 200)=Hiz (Standart: 200)
-Volume (default: -1)=Ses seviyesi (Standart: -1)
-Wrapper=GMenu2X'i Tekrar baslat
-Enter folder=Klasöre gir
-Confirm=Onayla
-Enter folder/Confirm=Klasöre gir / Onayla
-Up one folder=Bir klasör yukari
-Select an application=Bir program seçin
-Space=Bosluk
-Shift=Shift
-Cancel=Vazgeç
-OK=OK
-Backspace=Geri
-Skin=Skin
-Set the skin used by GMenu2X=GMenu2X'in kullanacagi Skin'i seçin
-Add link in $1=$1 bölümüne link ekle
-Edit $1=$1 linkini düzenle
-Delete $1 link=$1 linkini sil
-Deleting $1=$1 linki silinecek
-Are you sure?=Emin misiniz?
-Insert a name for the new section=Yeni bölüm için bir isim girin
-Insert a new name for this section=Bu bölüm için yeni isim girin
-Yes=Evet
-No=Hayir
-You will lose all the links in this section.=Bu bölümdeki tüm linkleri kaybedeceksiniz.
-Exit=Çikis
-Link Scanner=Link taramasi
-Scanning SD filesystem...=SD karti taraniyor...
-Scanning NAND filesystem...=NAND bellegi taraniyor...
-$1 files found.=$1 dosya bulundu.
-Creating links...=Linkler yaratiliyor.
-$1 links created.=$1 link yaratildi.
-Version $1 (Build date: $2)=Version $1 - Derleme: $2
-Log Viewer=Kayit Gösterici
-Displays last launched program's output=Son çalistirilan programin çiktisini gösterir
-Do you want to delete the log file?=Kayit dosyasini silmek istiyor musunuz?
-USB Enabled (SD)=USB aktive edildi (SD)
-USB Enabled (Nand)=USB aktive edildi (Nand)
-Turn off=Kapat
-Launching $1=$1 baslatiliyor
-Change page=Sayfa degistir
-Page=Sayfa
-Scroll=Kaydir
-Untitled=Basliksiz
-Change GMenu2X wallpaper=GMenu2X arka plan resmini degistir
-Activate/deactivate tv-out=TV-Out aktive/deaktive et
-Select wallpaper=Arka plan resmi seç
-Gamma=Gamma
-Set gp2x gamma value (default: 10)=gp2x gamma degerini degistir (Standart: 10)
-Tv-Out encoding=TV-Out Sinyali
-Encoding of the tv-out signal=TV-Out formati ayari
-Tweak RAM Timings=Hafiza hizlandirmasi
-This usually speeds up the application at the cost of stability=Programlari hizlandirir ancak stabilitelerini düsürür
-Gamma (default: 0)=Gamma (Standart: 0)
-Gamma value to set when launching this link=Bu linki çalistirirken kullanilacak gamma degeri
-ON=Açik
-OFF=Kapali
-File Browser=Dosya seçici
-Directory Browser=Klasör seçici
diff --git a/src/filelister.cpp b/src/filelister.cpp
index 7fd4343..cc3b3b4 100644
--- a/src/filelister.cpp
+++ b/src/filelister.cpp
@@ -65,10 +65,12 @@ void FileLister::setFilter(const string &filter)
 	this->filter = filter;
 }
 
-void FileLister::browse()
+void FileLister::browse(bool clean)
 {
-	directories.clear();
-	files.clear();
+	if (clean) {
+		directories.clear();
+		files.clear();
+	}
 
 	if (showDirectories || showFiles) {
 		DIR *dirp;
@@ -86,8 +88,8 @@ void FileLister::browse()
 
 		while ((dptr = readdir(dirp))) {
 			file = dptr->d_name;
-                        file_lowercase = file;
-                        std::transform(file_lowercase.begin(), file_lowercase.end(), file_lowercase.begin(), ::tolower);
+			file_lowercase = file;
+			std::transform(file_lowercase.begin(), file_lowercase.end(), file_lowercase.begin(), ::tolower);
 
 			if (file[0] == '.' && file != "..")
 				continue;
@@ -104,10 +106,18 @@ void FileLister::browse()
 			if (S_ISDIR(st.st_mode)) {
 				if (!showDirectories)
 					continue;
+
+				if (std::find(directories.begin(), directories.end(), file) != directories.end())
+				  continue;
+
 				directories.push_back(file);
 			} else {
 				if (!showFiles)
 					continue;
+
+				if (std::find(files.begin(), files.end(), file) != files.end())
+				  continue;
+
 				for (vector<string>::iterator it = vfilter.begin(); it != vfilter.end(); ++it) {
 					if (it->length() <= file.length()) {
 						if (file_lowercase.compare(file.length() - it->length(), it->length(), *it) == 0) {
diff --git a/src/filelister.h b/src/filelister.h
index 4634e04..0c971eb 100644
--- a/src/filelister.h
+++ b/src/filelister.h
@@ -36,7 +36,7 @@ private:
 
 public:
 	FileLister(const string &startPath = "/boot/local", bool showDirectories = true, bool showFiles = true);
-	void browse();
+	void browse(bool clean = true);
 
 	unsigned int size();
 	unsigned int dirCount();
diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp
index d4cf41f..7c58b32 100644
--- a/src/gmenu2x.cpp
+++ b/src/gmenu2x.cpp
@@ -86,6 +86,7 @@ const char *CARD_ROOT = "/card/"; //Note: Add a trailing /!
 const int CARD_ROOT_LEN = 5;
 
 static GMenu2X *app;
+static string gmenu2x_home;
 
 using namespace std;
 using namespace fastdelegate;
@@ -120,6 +121,11 @@ static void quit_all(int err) {
     exit(err);
 }
 
+const string GMenu2X::getHome(void)
+{
+	return gmenu2x_home;
+}
+
 int main(int /*argc*/, char * /*argv*/[]) {
 	INFO("----\nGMenu2X starting: If you read this message in the logs, check http://gmenu2x.sourceforge.net/page/Troubleshooting for a solution\n----\n");
 
@@ -127,6 +133,20 @@ int main(int /*argc*/, char * /*argv*/[]) {
 	signal(SIGSEGV,&quit_all);
 	signal(SIGTERM,&quit_all);
 
+	char *home = getenv("HOME");
+	if (home == NULL) {
+		ERROR("Unable to find gmenu2x home directory. The $HOME variable is not defined.\n");
+		return 1;
+	}
+
+	gmenu2x_home = (string)home + (string)"/.gmenu2x";
+	if (!fileExists(gmenu2x_home) && mkdir(gmenu2x_home.c_str(), 0770) < 0) {
+		ERROR("Unable to create gmenu2x home directory.\n");
+		return 1;
+	}
+
+	DEBUG("Home path: %s.\n", gmenu2x_home.c_str());
+
 	app = new GMenu2X();
 	DEBUG("Starting main()\n");
 	app->main();
@@ -286,19 +306,23 @@ GMenu2X::GMenu2X() {
 	initMenu();
 
 	if (!fileExists(confStr["wallpaper"])) {
-		DEBUG("Searching wallpaper\n");
-
-		FileLister fl("skins/"+confStr["skin"]+"/wallpapers",false,true);
-		fl.setFilter(".png,.jpg,.jpeg,.bmp");
-		fl.browse();
-		if (fl.getFiles().size()<=0 && confStr["skin"] != "Default")
-			fl.setPath("skins/Default/wallpapers",true);
-		if (fl.getFiles().size()>0)
-			confStr["wallpaper"] = fl.getPath()+fl.getFiles()[0];
+		DEBUG("No wallpaper defined; we will take the default one.\n");
+		confStr["wallpaper"] = DEFAULT_WALLPAPER_PATH;
 	}
 
 	initBG();
-	input.init(path+"input.conf");
+
+	/* If a user-specified input.conf file exists, we load it;
+	 * otherwise, we load the default one. */
+	const char *input_file = (getHome() + "/input.conf").c_str();
+	if (fileExists(input_file)) {
+		DEBUG("Loading user-specific input.conf file: %s.\n", input_file);
+	} else {
+		input_file = GMENU2X_SYSTEM_DIR "/input.conf";
+		DEBUG("Loading system input.conf file: %s.\n", input_file);
+	}
+
+	input.init(input_file);
     PowerSaver::getInstance()->setScreenTimeout( confInt["backlightTimeout"] );
 	setInputSpeed();
 	initServices();
@@ -441,7 +465,7 @@ void GMenu2X::initMenu() {
 				menu->addActionLink(i,"USB Nand",MakeDelegate(this,&GMenu2X::activateNandUsb),tr["Activate Usb on Nand"],"skin:icons/usb.png");
 			//menu->addActionLink(i,"USB Root",MakeDelegate(this,&GMenu2X::activateRootUsb),tr["Activate Usb on the root of the Gp2x Filesystem"],"skin:icons/usb.png");*/
 #endif
-			if (fileExists(path+"log.txt"))
+			if (fileExists(getHome()+"/log.txt"))
 				menu->addActionLink(i,tr["Log Viewer"],MakeDelegate(this,&GMenu2X::viewLog),tr["Displays last launched program's output"],"skin:icons/ebook.png");
 			menu->addActionLink(i,tr["About"],MakeDelegate(this,&GMenu2X::about),tr["Info about GMenu2X"],"skin:icons/about.png");
 		}
@@ -507,7 +531,7 @@ and all the anonymous donors...\n\
 }
 
 void GMenu2X::viewLog() {
-	string logfile = path+"log.txt";
+	string logfile = getHome()+"/log.txt";
 	if (fileExists(logfile)) {
 		ifstream inf(logfile.c_str(), ios_base::in);
 		if (inf.is_open()) {
@@ -536,7 +560,7 @@ void GMenu2X::viewLog() {
 }
 
 void GMenu2X::readConfig() {
-	string conffile = path+"gmenu2x.conf";
+	string conffile = getHome() + "/gmenu2x.conf";
 	if (fileExists(conffile)) {
 		ifstream inf(conffile.c_str(), ios_base::in);
 		if (inf.is_open()) {
@@ -573,7 +597,7 @@ void GMenu2X::readConfig() {
 
 void GMenu2X::writeConfig() {
 	ledOn();
-	string conffile = path+"gmenu2x.conf";
+	string conffile = getHome() + "/gmenu2x.conf";
 	ofstream inf(conffile.c_str());
 	if (inf.is_open()) {
 		ConfStrHash::iterator endS = confStr.end();
@@ -642,7 +666,15 @@ void GMenu2X::writeConfigOpen2x() {
 
 void GMenu2X::writeSkinConfig() {
 	ledOn();
-	string conffile = path+"skins/"+confStr["skin"]+"/skin.conf";
+
+	string conffile = getHome() + "/skins/";
+	if (!fileExists(conffile))
+	  mkdir(conffile.c_str(), 0770);
+	conffile = conffile + confStr["skin"];
+	if (!fileExists(conffile))
+	  mkdir(conffile.c_str(), 0770);
+	conffile = conffile + "/skin.conf";
+
 	ofstream inf(conffile.c_str());
 	if (inf.is_open()) {
 		ConfStrHash::iterator endS = skinConfStr.end();
@@ -1104,8 +1136,11 @@ void GMenu2X::options() {
 	int prevbacklight = confInt["backlight"];
 	bool showRootFolder = fileExists(CARD_ROOT);
 
-	FileLister fl_tr("translations");
+	FileLister fl_tr(getHome() + "/translations");
 	fl_tr.browse();
+	fl_tr.setPath(GMENU2X_SYSTEM_DIR "/translations", false);
+	fl_tr.browse(false);
+
 	fl_tr.insertFile("English");
 	string lang = tr.lang();
 
@@ -1172,9 +1207,12 @@ void GMenu2X::settingsOpen2x() {
 }
 
 void GMenu2X::skinMenu() {
-	FileLister fl_sk("skins",true,false);
+	FileLister fl_sk(getHome() + "/skins", true, false);
 	fl_sk.addExclude("..");
 	fl_sk.browse();
+	fl_sk.setPath(GMENU2X_SYSTEM_DIR "/skins", false);
+	fl_sk.browse(false);
+
 	string curSkin = confStr["skin"];
 
 	SettingsDialog sd(this, input, ts, tr["Skin"]);
@@ -1224,8 +1262,12 @@ void GMenu2X::setSkin(const string &skin, bool setWallpaper) {
 	skinConfColors[COLOR_MESSAGE_BOX_BORDER] = (RGBAColor){80,80,80,255};
 	skinConfColors[COLOR_MESSAGE_BOX_SELECTION] = (RGBAColor){160,160,160,255};
 
-	//load skin settings
-	string skinconfname = "skins/"+skin+"/skin.conf";
+	/* Load skin settings from user directory if present,
+	 * or from the system directory. */
+	string skinconfname = getHome() + "/skins/" + skin + "/skin.conf";
+	if (!fileExists(skinconfname))
+	  skinconfname = GMENU2X_SYSTEM_DIR "/skins/" + skin + "/skin.conf";
+
 	if (fileExists(skinconfname)) {
 		ifstream skinconf(skinconfname.c_str(), ios_base::in);
 		if (skinconf.is_open()) {
@@ -1597,19 +1639,22 @@ void GMenu2X::renameSection() {
 		 && find(menu->getSections().begin(),menu->getSections().end(), id.getInput())
 				== menu->getSections().end()) {
 			//section directory doesn't exists
-			string newsectiondir = "sections/" + id.getInput();
-			string sectiondir = "sections/" + menu->selSection();
+			string newsectiondir = getHome() + "/sections/" + id.getInput();
+			string sectiondir = getHome() + "/sections/" + menu->selSection();
 			ledOn();
-			if (rename(sectiondir.c_str(), "tmpsection")==0 && rename("tmpsection", newsectiondir.c_str())==0) {
-				string oldpng = sectiondir+".png", newpng = newsectiondir+".png";
-				string oldicon = sc.getSkinFilePath(oldpng), newicon = sc.getSkinFilePath(newpng);
+
+			if (!rename(sectiondir.c_str(), newsectiondir.c_str())) {
+				string oldpng = menu->selSection() + ".png";
+				string newpng = id.getInput() + ".png";
+				string oldicon = sc.getSkinFilePath(oldpng);
+				string newicon = sc.getSkinFilePath(newpng);
+
 				if (!oldicon.empty() && newicon.empty()) {
 					newicon = oldicon;
 					newicon.replace(newicon.find(oldpng), oldpng.length(), newpng);
 
 					if (!fileExists(newicon)) {
-						rename(oldicon.c_str(), "tmpsectionicon");
-						rename("tmpsectionicon", newicon.c_str());
+						rename(oldicon.c_str(), newicon.c_str());
 						sc.move("skin:"+oldpng, "skin:"+newpng);
 					}
 				}
@@ -1627,7 +1672,7 @@ void GMenu2X::deleteSection() {
 	mb.setButton(CLEAR, tr["No"]);
 	if (mb.exec() == ACCEPT) {
 		ledOn();
-		if (rmtree(path+"sections/"+menu->selSection())) {
+		if (rmtree(getHome() + "/sections/" + menu->selSection())) {
 			menu->deleteSelectedSection();
 			sync();
 		}
diff --git a/src/gmenu2x.h b/src/gmenu2x.h
index ac8f7c0..9cd838b 100644
--- a/src/gmenu2x.h
+++ b/src/gmenu2x.h
@@ -37,6 +37,15 @@
 #include <vector>
 #include <tr1/unordered_map>
 
+#ifndef GMENU2X_SYSTEM_DIR
+#define GMENU2X_SYSTEM_DIR "/usr/share/gmenu2x"
+#endif
+
+#ifndef DEFAULT_WALLPAPER_PATH
+#define DEFAULT_WALLPAPER_PATH \
+  GMENU2X_SYSTEM_DIR "/skins/Default/wallpapers/default.png"
+#endif
+
 const int MAX_VOLUME_SCALE_FACTOR = 200;
 // Default values - going to add settings adjustment, saving, loading and such
 const int VOLUME_SCALER_MUTE = 0;
@@ -153,6 +162,10 @@ public:
 	~GMenu2X();
 	void quit();
 
+	/* Returns the home directory of gmenu2x, usually
+	 * ~/.gmenu2x */
+	static const string getHome(void);
+
 	/*
 	 * Variables needed for elements disposition
 	 */
diff --git a/src/linkapp.cpp b/src/linkapp.cpp
index c12179e..6fa1f5c 100644
--- a/src/linkapp.cpp
+++ b/src/linkapp.cpp
@@ -484,7 +484,7 @@ void LinkApp::launch(const string &selectedFile, const string &selectedDir) {
 	} // else, well.. we are no worse off :)
 
 	if (params!="") command += " " + params;
-	if (gmenu2x->confInt["outputLogs"]) command += " &> " + cmdclean(gmenu2x->getExePath()) + "/log.txt";
+	if (gmenu2x->confInt["outputLogs"]) command += " &> " + cmdclean(gmenu2x->getHome()) + "/log.txt";
 	if (wrapper) command += "; sync & cd "+cmdclean(gmenu2x->getExePath())+"; exec ./gmenu2x";
 	if (dontleave) {
 		system(command.c_str());
diff --git a/src/menu.cpp b/src/menu.cpp
index 6678427..c93ad61 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -39,26 +39,9 @@ Menu::Menu(GMenu2X *gmenu2x) {
 	this->gmenu2x = gmenu2x;
 	iFirstDispSection = 0;
 
-	DIR *dirp;
-	struct stat st;
-	struct dirent *dptr;
-	string filepath;
+	readSections(GMENU2X_SYSTEM_DIR "/sections");
+	readSections(GMenu2X::getHome() + "/sections");
 
-	if ((dirp = opendir("sections")) == NULL) return;
-
-	while ((dptr = readdir(dirp))) {
-		if (dptr->d_name[0]=='.') continue;
-		filepath = (string)"sections/"+dptr->d_name;
-		int statRet = stat(filepath.c_str(), &st);
-		if (!S_ISDIR(st.st_mode)) continue;
-		if (statRet != -1) {
-			sections.push_back((string)dptr->d_name);
-			linklist ll;
-			links.push_back(ll);
-		}
-	}
-
-	closedir(dirp);
 	sort(sections.begin(),sections.end(),case_less());
 	setSectionIndex(0);
 	readLinks();
@@ -72,6 +55,34 @@ uint Menu::firstDispRow() {
 	return iFirstDispRow;
 }
 
+void Menu::readSections(std::string parentDir)
+{
+	DIR *dirp;
+	struct stat st;
+	struct dirent *dptr;
+
+	dirp = opendir(parentDir.c_str());
+	if (!dirp) return;
+
+	while ((dptr = readdir(dirp))) {
+		int statret;
+		if (dptr->d_name[0]=='.') continue;
+
+		string filepath = parentDir + "/" + dptr->d_name;
+		statret = stat(filepath.c_str(), &st);
+		if (!S_ISDIR(st.st_mode)) continue;
+		if (statret != -1) {
+			if (find(sections.begin(), sections.end(), (string)dptr->d_name) == sections.end()) {
+				sections.push_back((string)dptr->d_name);
+				linklist ll;
+				links.push_back(ll);
+			}
+		}
+	}
+
+	closedir(dirp);
+}
+
 void Menu::loadIcons() {
 	//reload section icons
 	for (uint i=0; i<sections.size(); i++) {
@@ -154,11 +165,6 @@ void Menu::setSectionIndex(int i) {
 	iFirstDispRow = 0;
 }
 
-string Menu::sectionPath(int section) {
-	if (section<0 || section>(int)sections.size()) section = iSection;
-	return "sections/"+sections[section]+"/";
-}
-
 /*====================================
    LINKS MANAGEMENT
   ====================================*/
@@ -198,14 +204,18 @@ bool Menu::addLink(string path, string file, string section) {
 		title = title.substr(0, pos);
 	}
 
-	string linkpath = "sections/"+section+"/"+title;
+	string linkpath = GMenu2X::getHome()+"/sections/"+section;
+	if (!fileExists(linkpath))
+		mkdir(linkpath.c_str(), 0755);
+
+	linkpath += "/" + title;
 	int x=2;
 	while (fileExists(linkpath)) {
 		stringstream ss;
 		linkpath = "";
 		ss << x;
 		ss >> linkpath;
-		linkpath = "sections/"+section+"/"+title+linkpath;
+		linkpath = GMenu2X::getHome()+"/sections/"+section+"/"+title+linkpath;
 		x++;
 	}
 
@@ -284,8 +294,12 @@ bool Menu::addLink(string path, string file, string section) {
 }
 
 bool Menu::addSection(const string &sectionName) {
-	string sectiondir = "sections/"+sectionName;
-	if (mkdir(sectiondir.c_str(),0777)==0) {
+	string sectiondir = GMenu2X::getHome() + "/sections";
+	if (!fileExists(sectiondir))
+		mkdir(sectiondir.c_str(), 0755);
+
+	sectiondir = sectiondir + "/" + sectionName;
+	if (mkdir(sectiondir.c_str(), 0755) == 0) {
 		sections.push_back(sectionName);
 		linklist ll;
 		links.push_back(ll);
@@ -394,32 +408,44 @@ void Menu::setLinkIndex(int i) {
 	iLink = i;
 }
 
+void Menu::readLinksOfSection(std::string path, std::vector<std::string> &linkfiles)
+{
+	DIR *dirp;
+	struct stat st;
+	struct dirent *dptr;
+
+	if ((dirp = opendir(path.c_str())) == NULL) return;
+
+	while ((dptr = readdir(dirp))) {
+		if (dptr->d_name[0] == '.') continue;
+		string filepath = path + "/" + dptr->d_name;
+		int statret = stat(filepath.c_str(), &st);
+		if (S_ISDIR(st.st_mode)) continue;
+		if (statret != -1)
+			linkfiles.push_back(filepath);
+	}
+
+	closedir(dirp);
+}
+
 void Menu::readLinks() {
 	vector<string> linkfiles;
 
 	iLink = 0;
 	iFirstDispRow = 0;
-
-	DIR *dirp;
-	struct stat st;
-	struct dirent *dptr;
 	string filepath;
 
 	for (uint i=0; i<links.size(); i++) {
 		links[i].clear();
 		linkfiles.clear();
 
-		if ((dirp = opendir(sectionPath(i).c_str())) == NULL) continue;
+		int correct = (i>sections.size() ? iSection : i);
 
-		while ((dptr = readdir(dirp))) {
-			if (dptr->d_name[0]=='.') continue;
-			filepath = sectionPath(i)+dptr->d_name;
-			int statRet = stat(filepath.c_str(), &st);
-			if (S_ISDIR(st.st_mode)) continue;
-			if (statRet != -1) {
-				linkfiles.push_back(filepath);
-			}
-		}
+		readLinksOfSection(GMENU2X_SYSTEM_DIR "/sections/"
+		  + sections[correct], linkfiles);
+
+		readLinksOfSection(GMenu2X::getHome() + "/sections/"
+		  + sections[correct], linkfiles);
 
 		sort(linkfiles.begin(), linkfiles.end(),case_less());
 		for (uint x=0; x<linkfiles.size(); x++) {
@@ -430,8 +456,6 @@ void Menu::readLinks() {
 			else
 				free(link);
 		}
-
-		closedir(dirp);
 	}
 }
 
diff --git a/src/menu.h b/src/menu.h
index 46ea4f0..e41997b 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -48,6 +48,12 @@ private:
 	void readLinks();
 	void freeLinks();
 
+	// Load all the sections of the given "sections" directory.
+	void readSections(std::string parentDir);
+
+	// Load all the links on the given section directory.
+	void readLinksOfSection(std::string path, std::vector<std::string> &linkfiles);
+
 public:
 	Menu(GMenu2X *gmenu2x);
 	~Menu();
@@ -80,8 +86,6 @@ public:
 	void linkDown();
 	void setLinkIndex(int i);
 
-	string sectionPath(int section = -1);
-
 	const vector<string> &getSections() { return sections; }
 	void renameSection(int index, const string &name);
 };
diff --git a/src/surface.cpp b/src/surface.cpp
index 6348a76..9de8010 100644
--- a/src/surface.cpp
+++ b/src/surface.cpp
@@ -22,6 +22,7 @@
 #include "imageio.h"
 #include "utilities.h"
 #include "debug.h"
+#include "surfacecollection.h"
 
 #include <SDL_gfxPrimitives.h>
 
@@ -54,13 +55,10 @@ Surface *Surface::emptySurface(int width, int height) {
 
 Surface *Surface::loadImage(const string &img, const string &skin) {
 	string skinpath;
-	if (!skin.empty() && !img.empty() && img[0]!='/') {
-		skinpath = "skins/"+skin+"/"+img;
-		if (!fileExists(skinpath))
-			skinpath = "skins/Default/"+img;
-	} else {
-		skinpath = img;
-	}
+	if (!skin.empty() && !img.empty() && img[0]!='/')
+	  skinpath = SurfaceCollection::getSkinFilePath(skin, img);
+	else
+	  skinpath = img;
 
 	SDL_Surface *raw = loadPNG(skinpath);
 	if (!raw) {
diff --git a/src/surfacecollection.cpp b/src/surfacecollection.cpp
index 1bc35f6..3ebc61b 100644
--- a/src/surfacecollection.cpp
+++ b/src/surfacecollection.cpp
@@ -22,6 +22,7 @@
 #include "surface.h"
 #include "utilities.h"
 #include "debug.h"
+#include "gmenu2x.h"
 
 #include <iostream>
 
@@ -39,16 +40,39 @@ void SurfaceCollection::setSkin(const string &skin) {
 	this->skin = skin;
 }
 
-string SurfaceCollection::getSkinFilePath(const string &file) {
-	string prefix = "/usr/share/gmenu2x/";
-	if (fileExists("skins/"+skin+"/"+file))
-		return "skins/"+skin+"/"+file;
-	else if (fileExists("skins/Default/"+file))
-		return "skins/Default/"+file;
-	else if (fileExists(prefix+"skins/Default/"+file))
-		return prefix+"skins/Default/"+file;
-	else
-		return "";
+/* Returns the location of a skin directory,
+ * from its name given as a parameter. */
+string SurfaceCollection::getSkinPath(const string &skin)
+{
+	string path = GMenu2X::getHome() + "/skins/" + skin;
+	if (fileExists(path))
+	  return path;
+
+	path = GMENU2X_SYSTEM_DIR "/skins/" + skin;
+	if (fileExists(path))
+	  return path;
+
+	return "";
+}
+
+string SurfaceCollection::getSkinFilePath(const string &file)
+{
+	return SurfaceCollection::getSkinFilePath(skin, file);
+}
+
+string SurfaceCollection::getSkinFilePath(const string &skin, const string &file)
+{
+	/* We first search the skin file on the user-specific directory. */
+	string path = GMenu2X::getHome() + "/skins/" + skin + "/" + file;
+	if (fileExists(path))
+	  return path;
+
+	/* If not found, we search that skin file on the system directory. */
+	path = GMENU2X_SYSTEM_DIR "/skins/" + skin + "/" + file;
+	if (fileExists(path))
+	  return path;
+
+	return "";
 }
 
 void SurfaceCollection::debug() {
diff --git a/src/surfacecollection.h b/src/surfacecollection.h
index c7b0766..2c63acd 100644
--- a/src/surfacecollection.h
+++ b/src/surfacecollection.h
@@ -39,6 +39,8 @@ public:
 
 	void setSkin(const std::string &skin);
 	std::string getSkinFilePath(const std::string &file);
+	static std::string getSkinFilePath(const std::string &skin, const std::string &file);
+	static std::string getSkinPath(const std::string &skin);
 
 	bool defaultAlpha;
 	void debug();
diff --git a/src/translator.cpp b/src/translator.cpp
index d1c5553..56f3c5c 100644
--- a/src/translator.cpp
+++ b/src/translator.cpp
@@ -25,6 +25,7 @@
 
 #include "translator.h"
 #include "debug.h"
+#include "gmenu2x.h"
 
 using namespace std;
 
@@ -44,7 +45,10 @@ void Translator::setLang(const string &lang) {
 	translations.clear();
 
 	string line;
-	ifstream infile (string("translations/"+lang).c_str(), ios_base::in);
+	ifstream infile ((GMenu2X::getHome() + "/translations/" + lang).c_str(), ios_base::in);
+	if (!infile.is_open())
+	  infile.open((string(GMENU2X_SYSTEM_DIR "/translations/") + lang).c_str(), ios_base::in);
+
 	if (infile.is_open()) {
 		while (getline(infile, line, '\n')) {
 			line = trim(line);
diff --git a/src/wallpaperdialog.cpp b/src/wallpaperdialog.cpp
index 27cb6e6..ea4b5dc 100644
--- a/src/wallpaperdialog.cpp
+++ b/src/wallpaperdialog.cpp
@@ -35,19 +35,37 @@ bool WallpaperDialog::exec()
 {
 	bool close = false, result = true;
 
-	FileLister fl("skins/"+gmenu2x->confStr["skin"]+"/wallpapers");
+	FileLister fl;
 	fl.setFilter(".png,.jpg,.jpeg,.bmp");
-	vector<string> wallpapers;
-	if (fileExists("skins/"+gmenu2x->confStr["skin"]+"/wallpapers")) {
-		fl.browse();
-		wallpapers = fl.getFiles();
+
+	string filepath = GMenu2X::getHome() + "/skins/"
+	  	+ gmenu2x->confStr["skin"] + "/wallpapers";
+	if (fileExists(filepath))
+	  fl.setPath(filepath, true);
+
+	filepath = GMENU2X_SYSTEM_DIR "/skins/"
+	  	+ gmenu2x->confStr["skin"] + "/wallpapers";
+	if (fileExists(filepath)) {
+		fl.setPath(filepath, false);
+		fl.browse(false);
 	}
+
 	if (gmenu2x->confStr["skin"] != "Default") {
-		fl.setPath("skins/Default/wallpapers",true);
-		for (uint i=0; i<fl.getFiles().size(); i++)
-			wallpapers.push_back(fl.getFiles()[i]);
+		filepath = GMenu2X::getHome() + "/skins/Default/wallpapers";
+		if (fileExists(filepath)) {
+			fl.setPath(filepath, false);
+			fl.browse(false);
+		}
+
+		filepath = GMENU2X_SYSTEM_DIR "/skins/Default/wallpapers";
+		if (fileExists(filepath)) {
+			fl.setPath(filepath, false);
+			fl.browse(false);
+		}
 	}
 
+	vector<string> wallpapers = fl.getFiles();
+
 	DEBUG("Wallpapers: %i\n", wallpapers.size());
 
 	uint i, selected = 0, firstElement = 0, iY;
@@ -57,10 +75,7 @@ bool WallpaperDialog::exec()
 		if (selected<firstElement) firstElement=selected;
 
 		//Wallpaper
-		if (selected<wallpapers.size()-fl.getFiles().size())
-			gmenu2x->sc["skins/"+gmenu2x->confStr["skin"]+"/wallpapers/"+wallpapers[selected]]->blit(gmenu2x->s,0,0);
-		else
-			gmenu2x->sc["skins/Default/wallpapers/"+wallpapers[selected]]->blit(gmenu2x->s,0,0);
+		gmenu2x->sc[((string)"skin:wallpapers/" + wallpapers[selected]).c_str()]->blit(gmenu2x->s, 0, 0);
 
 		gmenu2x->drawTopBar(gmenu2x->s);
 		gmenu2x->drawBottomBar(gmenu2x->s);
@@ -111,22 +126,16 @@ bool WallpaperDialog::exec()
                 break;
             case ACCEPT:
                 close = true;
-                if (wallpapers.size() > 0) {
-                    if (selected < wallpapers.size() - fl.getFiles().size())
-                      wallpaper = "skins/" + gmenu2x->confStr["skin"] + "/wallpapers/" + wallpapers[selected];
-                    else
-                      wallpaper = "skins/Default/wallpapers/" + wallpapers[selected];
-                } else result = false;
+                if (wallpapers.size() > 0)
+					wallpaper = gmenu2x->sc.getSkinFilePath("wallpapers/" + wallpapers[selected]);
+                else result = false;
             default:
                 break;
         }
 	}
 
 	for (uint i=0; i<wallpapers.size(); i++)
-		if (i<wallpapers.size()-fl.getFiles().size())
-			gmenu2x->sc.del("skins/"+gmenu2x->confStr["skin"]+"/wallpapers/"+wallpapers[i]);
-		else
-			gmenu2x->sc.del("skins/Default/wallpapers/"+wallpapers[i]);
+	  gmenu2x->sc.del("skin:wallpapers/" + wallpapers[i]);
 
 	return result;
 }