diff --git a/Makefile b/Makefile
index d9a7d143..018f05d7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,46 +1,41 @@
-PLATFORM := retrofw
+PLATFORM := linux
 
 BUILDTIME := $(shell date +%s)
 
-CHAINPREFIX := /opt/mipsel-RetroFW-linux-uclibc
-CROSS_COMPILE := $(CHAINPREFIX)/usr/bin/mipsel-linux-
-export CROSS_COMPILE
-
-CC			:= $(CROSS_COMPILE)gcc
-CXX			:= $(CROSS_COMPILE)g++
-STRIP		:= $(CROSS_COMPILE)strip
+CC			:= gcc
+CXX			:= g++
+STRIP		:= strip
 
 SYSROOT     := $(shell $(CC) --print-sysroot)
 SDL_CFLAGS  := $(shell $(SYSROOT)/usr/bin/sdl-config --cflags)
 SDL_LIBS    := $(shell $(SYSROOT)/usr/bin/sdl-config --libs)
 
-CFLAGS = -DPLATFORM=\"$(PLATFORM)\" -D__BUILDTIME__="$(BUILDTIME)" -DLOG_LEVEL=3
-CFLAGS += -Os -ggdb -g3 $(SDL_CFLAGS)
-CFLAGS += -mhard-float -mips32 -mno-mips16
-CFLAGS += -std=c++11 -fdata-sections -ffunction-sections -fno-exceptions -fno-math-errno -fno-threadsafe-statics -Wno-narrowing
+CFLAGS = -DPLATFORM=\"$(PLATFORM)\" -D__BUILDTIME__="$(BUILDTIME)" -DLOG_LEVEL=4
+CFLAGS += -O0 -ggdb -g -pg $(SDL_CFLAGS)
+CFLAGS += -Wundef -Wno-deprecated -Wno-unknown-pragmas -Wno-format -Wno-narrowing
 CFLAGS += -Isrc -Isrc/libopk
-CFLAGS += -DTARGET_RETROFW -DHW_TVOUT -DHW_UDC -DHW_EXT_SD -DHW_SCALER -DOPK_SUPPORT -DIPK_SUPPORT
-CFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
+CFLAGS += -DTARGET_LINUX -DHW_TVOUT -DHW_UDC -DHW_EXT_SD -DHW_SCALER -DOPK_SUPPORT -DIPK_SUPPORT
 
 LDFLAGS = -Wl,-Bstatic -Lsrc/libopk -l:libopk.a
 LDFLAGS += -Wl,-Bdynamic -lz $(SDL_LIBS) -lSDL_image -lSDL_ttf
-LDFLAGS += -Wl,--as-needed -Wl,--gc-sections
 
 OBJDIR = /tmp/gmenu2x/$(PLATFORM)
 DISTDIR = dist/$(PLATFORM)
-TARGET = $(DISTDIR)/gmenu2x
+TARGET = dist/$(PLATFORM)/gmenu2x
 
 SOURCES := $(wildcard src/*.cpp)
-OBJS := $(patsubst src/%.cpp, $(OBJDIR)/%.o, $(SOURCES))
+OBJS := $(patsubst src/%.cpp, $(OBJDIR)/src/%.o, $(SOURCES))
 
 # File types rules
-$(OBJDIR)/%.o: src/%.cpp src/%.h src/platform/$(PLATFORM).h
+$(OBJDIR)/src/%.o: src/%.cpp src/%.h src/platform/linux.h
 	$(CXX) $(CFLAGS) -o $@ -c $<
 
+-include $(patsubst src/%.cpp, $(OBJDIR)/src/%.d, $(SOURCES))
+
 all: dir libopk shared
 
 dir:
-	@mkdir -p $(OBJDIR) $(DISTDIR)
+	@mkdir -p $(OBJDIR)/src dist/$(PLATFORM)
 
 libopk:
 	make -C src/libopk clean
@@ -55,29 +50,15 @@ shared: debug
 
 clean:
 	make -C src/libopk clean
-	rm -rf $(OBJDIR) *.gcda *.gcno $(TARGET) $(TARGET)-debug /tmp/.gmenu-ipk/ $(DISTDIR) dist/gmenunx-$(PLATFORM).zip dist/gmenunx-$(PLATFORM).ipk
-
-ipk: dist
-	rm -rf /tmp/.gmenu-ipk/; mkdir -p /tmp/.gmenu-ipk/
-	sed "s/^Version:.*/Version: $$(date +%Y%m%d)/" assets/control > /tmp/.gmenu-ipk/control
-	cp assets/conffiles /tmp/.gmenu-ipk/
-	echo -e "#!/bin/sh\nsync; echo -e 'Installing gmenunx..'; mount -o remount,rw /; rm /var/lib/opkg/info/gmenunx.list; exit 0" > /tmp/.gmenu-ipk/preinst
-	echo -e "#!/bin/sh\nsync; mount -o remount,ro /; echo -e 'Installation finished.\nRestarting gmenunx..'; sleep 1; killall gmenu2x; exit 0" > /tmp/.gmenu-ipk/postinst
-	chmod +x /tmp/.gmenu-ipk/postinst /tmp/.gmenu-ipk/preinst
-	tar --owner=0 --group=0 -czvf /tmp/.gmenu-ipk/control.tar.gz -C /tmp/.gmenu-ipk/ control conffiles postinst preinst
-	tar --owner=0 --group=0 -czvf /tmp/.gmenu-ipk/data.tar.gz -C $(DISTDIR) about.txt COPYING gmenu2x gmenu2x.conf input.conf skins translations
-	echo 2.0 > /tmp/.gmenu-ipk/debian-binary
-	ar r dist/gmenunx-$(PLATFORM).ipk /tmp/.gmenu-ipk/control.tar.gz /tmp/.gmenu-ipk/data.tar.gz /tmp/.gmenu-ipk/debian-binary
+	rm -rf $(OBJDIR) $(DISTDIR) *.gcda *.gcno $(TARGET) $(TARGET)-debug
 
 dist: dir libopk shared
-	mkdir -p $(DISTDIR)/skins/Default
-	install -m644 -D about.txt $(DISTDIR)/about.txt
+	install -m644 -D README.md $(DISTDIR)/README.txt
 	install -m644 -D COPYING $(DISTDIR)/COPYING
+	install -m644 -D ChangeLog.md $(DISTDIR)/ChangeLog
 	cp -RH assets/translations $(DISTDIR)
-	cp -RH assets/skins/RetroFW/* $(DISTDIR)/skins/Default
-	cp -RH assets/skins/Default/font.ttf $(DISTDIR)/skins/Default
+	cp -RH assets/skins $(DISTDIR)
 	cp -RH assets/$(PLATFORM)/input.conf $(DISTDIR)
-	echo "wallpaper=\"skins/Default/wallpapers/RetroFW.png\"" > $(DISTDIR)/gmenu2x.conf
 
 zip: dist
-	cd $(DISTDIR)/ && rm -f ../gmenunx-$(PLATFORM).zip && zip -r ../gmenunx-$(PLATFORM).zip skins translations COPYING gmenu2x input.conf gmenu2x.conf about.txt
+	cd $(DISTDIR)/ && zip -r ../gmenu2x.$(PLATFORM).zip skins translations ChangeLog COPYING gmenu2x input.conf README.txt
diff --git a/Makefile.linux b/Makefile.linux
deleted file mode 100644
index f8101416..00000000
--- a/Makefile.linux
+++ /dev/null
@@ -1,64 +0,0 @@
-PLATFORM := linux
-
-BUILDTIME := $(shell date +%s)
-
-CC			:= gcc
-CXX			:= g++
-STRIP		:= strip
-
-SYSROOT     := $(shell $(CC) --print-sysroot)
-SDL_CFLAGS  := $(shell $(SYSROOT)/usr/bin/sdl-config --cflags)
-SDL_LIBS    := $(shell $(SYSROOT)/usr/bin/sdl-config --libs)
-
-CFLAGS = -DPLATFORM=\"$(PLATFORM)\" -D__BUILDTIME__="$(BUILDTIME)" -DLOG_LEVEL=4
-CFLAGS += -O0 -ggdb -g -pg $(SDL_CFLAGS)
-CFLAGS += -Wundef -Wno-deprecated -Wno-unknown-pragmas -Wno-format -Wno-narrowing
-CFLAGS += -Isrc -Isrc/libopk
-CFLAGS += -DTARGET_LINUX -DHW_TVOUT -DHW_UDC -DHW_EXT_SD -DHW_SCALER -DOPK_SUPPORT -DIPK_SUPPORT
-
-LDFLAGS = -Wl,-Bstatic -Lsrc/libopk -l:libopk.a
-LDFLAGS += -Wl,-Bdynamic -lz $(SDL_LIBS) -lSDL_image -lSDL_ttf
-
-OBJDIR = /tmp/gmenu2x/$(PLATFORM)
-DISTDIR = dist/$(PLATFORM)
-TARGET = dist/$(PLATFORM)/gmenu2x
-
-SOURCES := $(wildcard src/*.cpp)
-OBJS := $(patsubst src/%.cpp, $(OBJDIR)/src/%.o, $(SOURCES))
-
-# File types rules
-$(OBJDIR)/src/%.o: src/%.cpp src/%.h src/platform/linux.h
-	$(CXX) $(CFLAGS) -o $@ -c $<
-
--include $(patsubst src/%.cpp, $(OBJDIR)/src/%.d, $(SOURCES))
-
-all: dir libopk shared
-
-dir:
-	@mkdir -p $(OBJDIR)/src dist/$(PLATFORM)
-
-libopk:
-	make -C src/libopk clean
-	make -C src/libopk
-
-debug: $(OBJS)
-	@echo "Linking gmenu2x-debug..."
-	$(CXX) -o $(TARGET)-debug $(OBJS) $(LDFLAGS)
-
-shared: debug
-	$(STRIP) $(TARGET)-debug -o $(TARGET)
-
-clean:
-	make -C src/libopk clean
-	rm -rf $(OBJDIR) $(DISTDIR) *.gcda *.gcno $(TARGET) $(TARGET)-debug
-
-dist: dir libopk shared
-	install -m644 -D README.md $(DISTDIR)/README.txt
-	install -m644 -D COPYING $(DISTDIR)/COPYING
-	install -m644 -D ChangeLog.md $(DISTDIR)/ChangeLog
-	cp -RH assets/translations $(DISTDIR)
-	cp -RH assets/skins $(DISTDIR)
-	cp -RH assets/$(PLATFORM)/input.conf $(DISTDIR)
-
-zip: dist
-	cd $(DISTDIR)/ && zip -r ../gmenunx.$(PLATFORM).zip skins translations ChangeLog COPYING gmenu2x input.conf README.txt
diff --git a/Makefile.retrofw b/Makefile.retrofw
new file mode 100644
index 00000000..cd23129b
--- /dev/null
+++ b/Makefile.retrofw
@@ -0,0 +1,83 @@
+PLATFORM := retrofw
+
+BUILDTIME := $(shell date +%s)
+
+CHAINPREFIX := /opt/mipsel-RetroFW-linux-uclibc
+CROSS_COMPILE := $(CHAINPREFIX)/usr/bin/mipsel-linux-
+export CROSS_COMPILE
+
+CC			:= $(CROSS_COMPILE)gcc
+CXX			:= $(CROSS_COMPILE)g++
+STRIP		:= $(CROSS_COMPILE)strip
+
+SYSROOT     := $(shell $(CC) --print-sysroot)
+SDL_CFLAGS  := $(shell $(SYSROOT)/usr/bin/sdl-config --cflags)
+SDL_LIBS    := $(shell $(SYSROOT)/usr/bin/sdl-config --libs)
+
+CFLAGS = -DPLATFORM=\"$(PLATFORM)\" -D__BUILDTIME__="$(BUILDTIME)" -DLOG_LEVEL=3
+CFLAGS += -Os -ggdb -g3 $(SDL_CFLAGS)
+CFLAGS += -mhard-float -mips32 -mno-mips16
+CFLAGS += -std=c++11 -fdata-sections -ffunction-sections -fno-exceptions -fno-math-errno -fno-threadsafe-statics -Wno-narrowing
+CFLAGS += -Isrc -Isrc/libopk
+CFLAGS += -DTARGET_RETROFW -DHW_TVOUT -DHW_UDC -DHW_EXT_SD -DHW_SCALER -DOPK_SUPPORT -DIPK_SUPPORT
+CFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
+
+LDFLAGS = -Wl,-Bstatic -Lsrc/libopk -l:libopk.a
+LDFLAGS += -Wl,-Bdynamic -lz $(SDL_LIBS) -lSDL_image -lSDL_ttf
+LDFLAGS += -Wl,--as-needed -Wl,--gc-sections
+
+OBJDIR = /tmp/gmenu2x/$(PLATFORM)
+DISTDIR = dist/$(PLATFORM)
+TARGET = $(DISTDIR)/gmenu2x
+
+SOURCES := $(wildcard src/*.cpp)
+OBJS := $(patsubst src/%.cpp, $(OBJDIR)/%.o, $(SOURCES))
+
+# File types rules
+$(OBJDIR)/%.o: src/%.cpp src/%.h src/platform/$(PLATFORM).h
+	$(CXX) $(CFLAGS) -o $@ -c $<
+
+all: dir libopk shared
+
+dir:
+	@mkdir -p $(OBJDIR) $(DISTDIR)
+
+libopk:
+	make -C src/libopk clean
+	make -C src/libopk
+
+debug: $(OBJS)
+	@echo "Linking gmenu2x-debug..."
+	$(CXX) -o $(TARGET)-debug $(OBJS) $(LDFLAGS)
+
+shared: debug
+	$(STRIP) $(TARGET)-debug -o $(TARGET)
+
+clean:
+	make -C src/libopk clean
+	rm -rf $(OBJDIR) *.gcda *.gcno $(TARGET) $(TARGET)-debug /tmp/.gmenu-ipk/ $(DISTDIR) dist/gmenu2x-$(PLATFORM).zip dist/gmenu2x-$(PLATFORM).ipk
+
+ipk: dist
+	rm -rf /tmp/.gmenu-ipk/; mkdir -p /tmp/.gmenu-ipk/
+	sed "s/^Version:.*/Version: $$(date +%Y%m%d)/" assets/control > /tmp/.gmenu-ipk/control
+	cp assets/conffiles /tmp/.gmenu-ipk/
+	echo -e "#!/bin/sh\nsync; echo -e 'Installing gmenu2x..'; mount -o remount,rw /; rm /var/lib/opkg/info/gmenu2x.list; exit 0" > /tmp/.gmenu-ipk/preinst
+	echo -e "#!/bin/sh\nsync; mount -o remount,ro /; echo -e 'Installation finished.\nRestarting gmenu2x..'; sleep 1; killall gmenu2x; exit 0" > /tmp/.gmenu-ipk/postinst
+	chmod +x /tmp/.gmenu-ipk/postinst /tmp/.gmenu-ipk/preinst
+	tar --owner=0 --group=0 -czvf /tmp/.gmenu-ipk/control.tar.gz -C /tmp/.gmenu-ipk/ control conffiles postinst preinst
+	tar --owner=0 --group=0 -czvf /tmp/.gmenu-ipk/data.tar.gz -C $(DISTDIR) about.txt COPYING gmenu2x gmenu2x.conf input.conf skins translations
+	echo 2.0 > /tmp/.gmenu-ipk/debian-binary
+	ar r dist/gmenu2x-$(PLATFORM).ipk /tmp/.gmenu-ipk/control.tar.gz /tmp/.gmenu-ipk/data.tar.gz /tmp/.gmenu-ipk/debian-binary
+
+dist: dir libopk shared
+	mkdir -p $(DISTDIR)/skins/Default
+	install -m644 -D about.txt $(DISTDIR)/about.txt
+	install -m644 -D COPYING $(DISTDIR)/COPYING
+	cp -RH assets/translations $(DISTDIR)
+	cp -RH assets/skins/RetroFW/* $(DISTDIR)/skins/Default
+	cp -RH assets/skins/Default/font.ttf $(DISTDIR)/skins/Default
+	cp -RH assets/$(PLATFORM)/input.conf $(DISTDIR)
+	echo "wallpaper=\"skins/Default/wallpapers/RetroFW.png\"" > $(DISTDIR)/gmenu2x.conf
+
+zip: dist
+	cd $(DISTDIR)/ && rm -f ../gmenu2x-$(PLATFORM).zip && zip -r ../gmenu2x-$(PLATFORM).zip skins translations COPYING gmenu2x input.conf gmenu2x.conf about.txt
diff --git a/Makefile.rg350 b/Makefile.rg350
index cd1b9bb9..36081a4f 100644
--- a/Makefile.rg350
+++ b/Makefile.rg350
@@ -56,7 +56,7 @@ shared: debug
 
 clean:
 	make -C src/libopk clean
-	rm -rf $(OBJDIR) *.gcda *.gcno $(TARGET) $(TARGET)-debug $(DISTDIR) dist/gmenunx-$(PLATFORM).zip
+	rm -rf $(OBJDIR) *.gcda *.gcno $(TARGET) $(TARGET)-debug $(DISTDIR) dist/gmenu2x-$(PLATFORM).zip
 
 dist: dir libopk shared
 	mkdir -p $(DISTDIR)/skins/Default
@@ -67,4 +67,4 @@ dist: dir libopk shared
 	cp -RH assets/$(PLATFORM)/input.conf $(DISTDIR)
 
 zip: dist
-	cd $(DISTDIR)/ && rm -f ../gmenunx-$(PLATFORM).zip && zip -r ../gmenunx-$(PLATFORM).zip skins translations COPYING gmenu2x input.conf about.txt
+	cd $(DISTDIR)/ && rm -f ../gmenu2x-$(PLATFORM).zip && zip -r ../gmenu2x-$(PLATFORM).zip skins translations COPYING gmenu2x input.conf about.txt
diff --git a/README.md b/README.md
index a54d3812..80805d74 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ sudo apt-get install -y build-essential libsdl-dev libsdl-image1.2-dev libsdl-mi
 ```
 Compile with:
 ```sh
-make -f Makefile.linux dist
+make dist
 ```
 Then run it from the `dist/linux/` directory:
 ```sh
diff --git a/assets/translations/Chinese(CN) b/assets/translations/Chinese(CN)
index c70ba3d0..652b1681 100644
--- a/assets/translations/Chinese(CN)
+++ b/assets/translations/Chinese(CN)
@@ -7,7 +7,7 @@ Allow the selector to change directory=允许选择程序浏览器改变目录
 Alt Font Outline=备选字轮廓色彩
 Alt Font=备选文字
 Appearance & skin settings=外观设置
-apps and GMenuNX. Are you sure?=程序和GMenuNX,是否确定?
+apps and GMenu2X. Are you sure?=程序和GMenu2X,是否确定?
 apps=软件
 Are you sure?=是否确定?
 Audio volume=全局音量
@@ -83,7 +83,7 @@ Font Outline=文字轮廓
 Font size=字体大小
 Font=文字色彩
 games=游戏
-GMenuNX=系统
+GMenu2X=系统
 Go to=跳转
 Height of bottom bar=设置底部栏的高度值
 Hint: Hold 'SELECT' to disable TV-output=提示：长按SELECT停止电视输出
@@ -99,7 +99,7 @@ How to show image preview and game art=设置预览图显示方式
 Icon=图标
 Icons=图标
 Image viewer=
-Info about GMenuNX=关于GMenuNX
+Info about GMenu2X=关于GMenu2X
 Insert a name for the new section=为新分组输入名称
 Insert a new name for this section=为此分组输入新名称
 Installing skin=
@@ -154,7 +154,7 @@ Remember the last selected section, link and file=记住最后选择的分组，
 Remove this dialog!=
 Rename section=重命名分组
 Reset Default skin settings back to default=恢复默认主题为默认设置
-Reset GMenuNX settings=恢复系统默认设置
+Reset GMenu2X settings=恢复系统默认设置
 Reset link's custom CPU speed back to default=将模拟器自定义的CPU频率恢复为默认值
 Reset link's icon back to default=恢复图标为默认设置
 Reset settings=恢复默认设置
@@ -190,9 +190,9 @@ Set the default A/B/X/Y layout=设置默认A/B/X/Y布局
 Set the default audio volume=设置系统音量
 Set the default tearing FIX method=设置默认屏幕撕裂修正方式
 Set the default working CPU frequency=设置默认工作CPU频率
-Set the language used by GMenuNX=设置语言
+Set the language used by GMenu2X=设置语言
 Set the layout and position of the Section Bar=设置标题栏在首页的位置和布局
-Set the skin used by GMenuNX=设置皮肤
+Set the skin used by GMenu2X=设置皮肤
 settings=设置
 Settings=设置
 Shift=切换
diff --git a/assets/translations/Chinese(TW) b/assets/translations/Chinese(TW)
index 15494374..185e048b 100644
--- a/assets/translations/Chinese(TW)
+++ b/assets/translations/Chinese(TW)
@@ -7,7 +7,7 @@ Allow the selector to change directory=允許選擇程式瀏覽器改變目錄
 Alt Font Outline=備選字輪廓色彩
 Alt Font=備選文字
 Appearance & skin settings=
-apps and GMenuNX. Are you sure?=
+apps and GMenu2X. Are you sure?=
 apps=
 Are you sure?=是否確定?
 Audio volume=全局音量
@@ -83,7 +83,7 @@ Font Outline=文字輪廓色彩
 Font size=文字大小
 Font=文字顏色
 games=遊戲
-GMenuNX=系統
+GMenu2X=系統
 Go to=
 Height of bottom bar=設置底部欄的高度值
 Hint: Hold 'SELECT' to disable TV-output=
@@ -99,7 +99,7 @@ How to show image preview and game art=
 Icon=圖標
 Icons=圖標
 Image viewer=
-Info about GMenuNX=
+Info about GMenu2X=
 Insert a name for the new section=為新分組輸入名稱
 Insert a new name for this section=為此分組輸入新名稱
 Installing skin=
@@ -154,7 +154,7 @@ Remember the last selected section, link and file=記住最後選擇的分組，
 Remove this dialog!=
 Rename section=重命名分組
 Reset Default skin settings back to default=恢復默認主題為默認設置
-Reset GMenuNX settings=恢復系統默認設置
+Reset GMenu2X settings=恢復系統默認設置
 Reset link's custom CPU speed back to default=將模擬器自定義的CPU頻率恢復為默認值
 Reset link's icon back to default=恢復圖標為默認設置
 Reset settings=恢復默認設置
@@ -190,9 +190,9 @@ Set the default A/B/X/Y layout=
 Set the default audio volume=設置系統音量
 Set the default tearing FIX method=
 Set the default working CPU frequency=設置默認工作CPU頻率
-Set the language used by GMenuNX=
+Set the language used by GMenu2X=
 Set the layout and position of the Section Bar=設置標題欄在首頁的位置和布局
-Set the skin used by GMenuNX=
+Set the skin used by GMenu2X=
 settings=
 Settings=設置
 Shift=
diff --git a/assets/translations/Polish b/assets/translations/Polish
index 005a0e61..5ce68683 100644
--- a/assets/translations/Polish
+++ b/assets/translations/Polish
@@ -7,7 +7,7 @@ Allow the selector to change directory=Pozwól selektorowi na zmianę ścieżki
 Alt Font Outline=Granica czcionki alter.
 Alt Font=Czcionka alter.
 Appearance & skin settings=Wygląd i ustawienie skórki
-apps and GMenuNX. Are you sure?=aplikacje i GMenuNX. Jesteś pewien?
+apps and GMenu2X. Are you sure?=aplikacje i GMenu2X. Jesteś pewien?
 apps=apki
 Are you sure?=Jesteś pewien?
 Audio volume=Głośność
@@ -83,7 +83,7 @@ Font Outline=Kontur czcionki
 Font size=Wielkość czcionki
 Font=Czcionka
 games=gry
-GMenuNX=GMenuNX
+GMenu2X=GMenu2X
 Go to=Idź do
 Height of bottom bar=Wysokość dolnego paska
 Hint: Hold 'SELECT' to disable TV-output=Tip: Przytrzymaj 'SELECT' aby wyłączyć wyjście TV
@@ -99,7 +99,7 @@ How to show image preview and game art=Jak pokazywać podgląd obrazów i okład
 Icon=Ikona
 Icons=Ikony
 Image viewer=Przeglądarka obrazów
-Info about GMenuNX=Informacje o GMenuNX
+Info about GMenu2X=Informacje o GMenu2X
 Insert a name for the new section=Wprowadź nazwę dla nowej sekcji
 Insert a new name for this section=Wprowadź nazwę dla tej sekcji
 Installing skin=Instaluję skórkę
@@ -154,7 +154,7 @@ Remember the last selected section, link and file=Zapamiętaj ostatnią wybraną
 Remove this dialog!=Usuń tę wiadomość!
 Rename section=Zmień nazwę sekcji
 Reset Default skin settings back to default=Zresetuj Domyślne ustawienia skórki z powrotem
-Reset GMenuNX settings=Zresetuj ustawienia GMenuNX
+Reset GMenu2X settings=Zresetuj ustawienia GMenu2X
 Reset link's custom CPU speed back to default=Zresetuj częst. CPU skrótów do domyślnych
 Reset link's icon back to default=Zresetuj ikony skrótów do domyślnych
 Reset settings=Zresetuj ustawienia
@@ -190,9 +190,9 @@ Set the default A/B/X/Y layout=Ustaw domyślny A/B/X/Y układ
 Set the default audio volume=Ustaw domyślną głośność
 Set the default tearing FIX method=Ustaw domyślną metodę "tearing FIX"
 Set the default working CPU frequency=Ustaw domyślną roboczą częstotliwość CPU
-Set the language used by GMenuNX=Ustaw język używany przez GMenuNX
+Set the language used by GMenu2X=Ustaw język używany przez GMenu2X
 Set the layout and position of the Section Bar=Ustaw układ i pozycję paska Paska Sekcji
-Set the skin used by GMenuNX=Ustaw skórkę używaną przez GMenuNX
+Set the skin used by GMenu2X=Ustaw skórkę używaną przez GMenu2X
 settings=ustawienia
 Settings=Ustawienia
 Shift=Shift
diff --git a/assets/translations/Portuguese(Brazil) b/assets/translations/Portuguese(Brazil)
index 3895838f..254e862d 100644
--- a/assets/translations/Portuguese(Brazil)
+++ b/assets/translations/Portuguese(Brazil)
@@ -7,7 +7,7 @@ Allow the selector to change directory=Permitir ao seletor que mude de diretóri
 Alt Font Outline=Contorno da fonte alternativa
 Alt Font=Fonte alternativa
 Appearance & skin settings=Configurações de aparência e configurações de skins
-apps and GMenuNX. Are you sure?=aplicativos e o GMenu2X. Tem certeza?
+apps and GMenu2X. Are you sure?=aplicativos e o GMenu2X. Tem certeza?
 apps=aplicativos
 Are you sure?=Tem certeza?
 Audio volume=Volume do Áudio
@@ -83,7 +83,7 @@ Font Outline=Contorno da fonte
 Font size=Tamanho da fonte
 Font=Fonte
 games=jogos
-GMenuNX=GMenu2X
+GMenu2X=GMenu2X
 Go to=Vá para
 Height of bottom bar=Altura da barra inferior
 Hint: Hold 'SELECT' to disable TV-output=Dica: segure 'SELECT' para desativar a saída para TV
@@ -99,7 +99,7 @@ How to show image preview and game art=Como mostrar a visualização da imagem e
 Icon=Ícone
 Icons=Ícones
 Image viewer=Visualizador de imagens
-Info about GMenuNX=Informação sobre o  GMenu2X
+Info about GMenu2X=Informação sobre o  GMenu2X
 Insert a name for the new section=Insira o nome da nova seção
 Insert a new name for this section=Insira um novo nome para esta seção
 Installing skin=Instalando skin
@@ -154,7 +154,7 @@ Remember the last selected section, link and file=Lembre-se da última seção,
 Remove this dialog!=Remover esta mensagem!
 Rename section=Renomear Seção
 Reset Default skin settings back to default=Redefinir as configurações de skin padrão de volta ao padrão
-Reset GMenuNX settings=Redefinir as configurações do GMenu2X
+Reset GMenu2X settings=Redefinir as configurações do GMenu2X
 Reset link's custom CPU speed back to default=Redefinir a velocidade da CPU personalizada do link de volta ao padrão
 Reset link's icon back to default=Redefinir o ícone do link de volta ao padrão
 Reset settings=Redefinir configurações
@@ -190,9 +190,9 @@ Set the default A/B/X/Y layout=Defina o layout padrão A/B/X/Y
 Set the default audio volume=Defina o volume de áudio padrão
 Set the default tearing FIX method=Defina o método FIX padrão
 Set the default working CPU frequency=Defina a frequência de trabalho padrão da CPU
-Set the language used by GMenuNX=Define o idioma usado no GMenu2X
+Set the language used by GMenu2X=Define o idioma usado no GMenu2X
 Set the layout and position of the Section Bar=Defina o layout e a posição da barra de seção
-Set the skin used by GMenuNX=Selecionar Skin ao usar pelo GMenu2X
+Set the skin used by GMenu2X=Selecionar Skin ao usar pelo GMenu2X
 settings=configurações
 Settings=Configurações
 Shift=Shift
diff --git a/assets/translations/Russian b/assets/translations/Russian
index bcb2b43c..f62d03a7 100644
--- a/assets/translations/Russian
+++ b/assets/translations/Russian
@@ -7,7 +7,7 @@ Allow the selector to change directory=Разрешить селектору в
 Alt Font Outline=Контур альт. шрифта
 Alt Font=Альтернативный шрифт
 Appearance & skin settings=Настройка темы и внешнего вида
-apps and GMenuNX. Are you sure?=приложениям и GMenu2X. Уверены?
+apps and GMenu2X. Are you sure?=приложениям и GMenu2X. Уверены?
 apps=приложения
 Are you sure?=Уверены?
 Audio volume=Громкость звука
@@ -83,7 +83,7 @@ Font Outline=Контур шрифта
 Font size=Размер шрифта
 Font=Шрифт
 games=игры
-GMenuNX=GMenu2X
+GMenu2X=GMenu2X
 Go to=Перейти в
 Height of bottom bar=Высота нижней панели
 Hint: Hold 'SELECT' to disable TV-output=Совет: Для отключения ТВ-выхода держите «SELECT»
@@ -99,7 +99,7 @@ How to show image preview and game art=Как отображать миниат
 Icon=Значёк
 Icons=Значки
 Image viewer=Просмотрщик изображений
-Info about GMenuNX=Информация о GMenu2X
+Info about GMenu2X=Информация о GMenu2X
 Insert a name for the new section=Задайте имя для нового раздела
 Insert a new name for this section=Задайте новое имя для этого раздела
 Installing skin=Установка темы
@@ -154,7 +154,7 @@ Remember the last selected section, link and file=Запоминать посл
 Remove this dialog!=Более не сообщать!
 Rename section=Переименовать раздел
 Reset Default skin settings back to default=Сбросить настройки темы «Default»
-Reset GMenuNX settings=Сбросить настройки GMenu2X
+Reset GMenu2X settings=Сбросить настройки GMenu2X
 Reset link's custom CPU speed back to default=Сбросить назначенную ярлыкам частоту ЦП
 Reset link's icon back to default=Сбросить назначенные значки ярлыков
 Reset settings=Сброс настроек
@@ -190,9 +190,9 @@ Set the default A/B/X/Y layout=Установка раскладки A/B/X/Y п
 Set the default audio volume=Установка громкости звука по умолчанию
 Set the default tearing FIX method=Метод коррекции разрыва кадра по умолчанию
 Set the default working CPU frequency=Рабочая частота ЦП по умолчанию
-Set the language used by GMenuNX=Установка языка интерфейса GMenu2X
+Set the language used by GMenu2X=Установка языка интерфейса GMenu2X
 Set the layout and position of the Section Bar=Схема расположения панели разделов
-Set the skin used by GMenuNX=Выбор темы GMenu2X
+Set the skin used by GMenu2X=Выбор темы GMenu2X
 settings=настройки
 Settings=Настройки
 Shift=Шифт
diff --git a/dictionary.txt b/dictionary.txt
index 49987653..63bdb5ca 100644
--- a/dictionary.txt
+++ b/dictionary.txt
@@ -16,7 +16,7 @@ Alt Font=
 Alt Font Outline=
 Appearance & skin settings=
 Application this link points to=
-apps and GMenuNX. Are you sure?=
+apps and GMenu2X. Are you sure?=
 Are you sure?=
 A: Select=
 Audio volume=
@@ -107,8 +107,8 @@ Font size=
 FTP on boot=
 Gamma=
 Gamma value to set when launching this link=
-GMenuNX=
-GMenuNX will restart to apply=
+GMenu2X=
+GMenu2X will restart to apply=
 Go to=
 GP2XJOY on boot=
 Hardware scaling mode=
@@ -129,7 +129,7 @@ How to show image preview and game art=
 Icon=
 Icons=
 Image viewer=
-Info about GMenuNX=
+Info about GMenu2X=
 Info about system=
 Insert a name for the new section=
 Insert a new name for this section=
@@ -198,7 +198,7 @@ Remove this dialog!=
 Rename section=
 Reset=
 Reset Default skin settings back to default=
-Reset GMenuNX settings=
+Reset GMenu2X settings=
 Reset link's custom CPU speed back to default=
 Reset link's icon back to default=
 Reset settings=
@@ -247,9 +247,9 @@ Set the default audio volume=
 Set the default tearing FIX method=
 Set the default working CPU frequency=
 Set the Headphones Mode scaling 0-100% (default is 65%)=
-Set the language used by GMenuNX=
+Set the language used by GMenu2X=
 Set the layout and position of the Section Bar=
-Set the skin used by GMenuNX=
+Set the skin used by GMenu2X=
 Set the Speaker Mode scaling 0-150% (default is 100%)=
 Settings=
 Shift=
diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp
index 99e3e13b..ed9c71a0 100644
--- a/src/gmenu2x.cpp
+++ b/src/gmenu2x.cpp
@@ -157,7 +157,7 @@ static void quit_all(int err) {
 }
 
 int main(int argc, char * argv[]) {
-	INFO("Starting GMenuNX...");
+	INFO("Starting GMenu2X...");
 
 	signal(SIGINT,  &quit_all);
 	signal(SIGSEGV, &quit_all);
@@ -180,7 +180,7 @@ int main(int argc, char * argv[]) {
 
 	usleep(1000);
 
-	GMenu2X::instance = new GMenuNX();
+	GMenu2X::instance = new GMenu2X_platform();
 	GMenu2X::instance->main(autoStart);
 
 	return 0;
@@ -663,7 +663,7 @@ void GMenu2X::initMenu() {
 				menu->addActionLink(i, tr["Log Viewer"], MakeDelegate(this, &GMenu2X::viewLog), tr["Displays last launched program's output"], "ebook.png");
 			}
 
-			menu->addActionLink(i, tr["About"], MakeDelegate(this, &GMenu2X::about), tr["Info about GMenuNX"], "about.png");
+			menu->addActionLink(i, tr["About"], MakeDelegate(this, &GMenu2X::about), tr["Info about GMenu2X"], "about.png");
 			menu->addActionLink(i, tr["Power"], MakeDelegate(this, &GMenu2X::poweroffDialog), tr["Power menu"], "exit.png");
 			menu->addActionLink(i, tr["CPU Settings"], MakeDelegate(this, &GMenu2X::cpuSettings), tr["Config CPU clock"], "cpu.png");
 		}
@@ -719,7 +719,7 @@ void GMenu2X::settings() {
 	SettingsDialog sd(this, ts, tr["Settings"], "skin:icons/configure.png");
 	sd.allowCancel = true;
 
-	sd.addSetting(new MenuSettingMultiString(this, tr["Language"], tr["Set the language used by GMenuNX"], &lang, &fl_tr.getFiles()));
+	sd.addSetting(new MenuSettingMultiString(this, tr["Language"], tr["Set the language used by GMenu2X"], &lang, &fl_tr.getFiles()));
 
 	string prevDateTime = confStr["datetime"] = get_date_time();
 	sd.addSetting(new MenuSettingDateTime(this, tr["Date & Time"], tr["Set system's date & time"], &confStr["datetime"]));
@@ -801,7 +801,7 @@ void GMenu2X::resetSettings() {
 
 	SettingsDialog sd(this, ts, tr["Reset settings"], "skin:icons/configure.png");
 	sd.allowCancel_link_nomb = true;
-	sd.addSetting(new MenuSettingBool(this, tr["GMenuNX"], tr["Reset GMenuNX settings"], &reset_gmenu));
+	sd.addSetting(new MenuSettingBool(this, tr["GMenu2X"], tr["Reset GMenu2X settings"], &reset_gmenu));
 	sd.addSetting(new MenuSettingBool(this, tr["Default skin"], tr["Reset Default skin settings back to default"], &reset_skin));
 	sd.addSetting(new MenuSettingBool(this, tr["Icons"], tr["Reset link's icon back to default"], &reset_icon));
 	sd.addSetting(new MenuSettingBool(this, tr["Manuals"], tr["Unset link's manual"], &reset_manual));
@@ -817,7 +817,7 @@ void GMenu2X::resetSettings() {
 	  }
 
 	if (sd.exec() && sd.edited() && sd.save) {
-		MessageBox mb(this, tr["Changes will be applied to ALL"]+"\n"+tr["apps and GMenuNX. Are you sure?"], "skin:icons/exit.png");
+		MessageBox mb(this, tr["Changes will be applied to ALL"]+"\n"+tr["apps and GMenu2X. Are you sure?"], "skin:icons/exit.png");
 		mb.setButton(CANCEL, tr["Cancel"]);
 		mb.setButton(MANUAL,  tr["Yes"]);
 		if (mb.exec() != MANUAL) return;
@@ -1315,7 +1315,7 @@ void GMenu2X::skinMenu() {
 		SettingsDialog sd(this, ts, tr["Skin"], "skin:icons/skin.png");
 		sd.selected = selected;
 		sd.allowCancel_nomb = true;
-		sd.addSetting(new MenuSettingMultiString(this, tr["Skin"], tr["Set the skin used by GMenuNX"], &confStr["skin"], &fl_sk.getDirectories(), MakeDelegate(this, &GMenu2X::onChangeSkin)));
+		sd.addSetting(new MenuSettingMultiString(this, tr["Skin"], tr["Set the skin used by GMenu2X"], &confStr["skin"], &fl_sk.getDirectories(), MakeDelegate(this, &GMenu2X::onChangeSkin)));
 		sd.addSetting(new MenuSettingMultiString(this, tr["Wallpaper"], tr["Select an image to use as a wallpaper"], &confStr["tmp_wallpaper"], &wallpapers, MakeDelegate(this, &GMenu2X::onChangeSkin), MakeDelegate(this, &GMenu2X::changeWallpaper)));
 		sd.addSetting(new MenuSettingMultiString(this, tr["Background"], tr["How to scale wallpaper, backdrops and game art"], &confStr["bgscale"], &bgScale));
 		sd.addSetting(new MenuSettingMultiString(this, tr["Preview mode"], tr["How to show image preview and game art"], &confStr["previewMode"], &previewMode));
@@ -1630,7 +1630,7 @@ bool GMenu2X::saveScreenshot(string path) {
 
 void GMenu2X::reinit(bool showDialog) {
 	if (showDialog) {
-		MessageBox mb(this, tr["GMenuNX will restart to apply"]+"\n"+tr["the settings. Continue?"], "skin:icons/exit.png");
+		MessageBox mb(this, tr["GMenu2X will restart to apply"]+"\n"+tr["the settings. Continue?"], "skin:icons/exit.png");
 		mb.setButton(CONFIRM, tr["Restart"]);
 		mb.setButton(CANCEL,  tr["Cancel"]);
 		if (mb.exec() == CANCEL) return;
diff --git a/src/platform/gp2x.h b/src/platform/gp2x.h
index 8c95dc78..2b2f18ae 100644
--- a/src/platform/gp2x.h
+++ b/src/platform/gp2x.h
@@ -37,7 +37,7 @@ int32_t getBatteryStatus() {
 	return -1;
 }
 
-class GMenuNX : public GMenu2X {
+class GMenu2X_platform : public GMenu2X {
 private:
 	typedef struct {
 		uint16_t batt;
@@ -528,7 +528,7 @@ class GMenuNX : public GMenu2X {
 // 	// temp += "\n    " + tr["External: "] + getDiskFree("/mnt/ext_sd");
 // 	temp += "----\n";
 
-// 	TextDialog td(this, "GMenuNX", tr["Info about system"], "skin:icons/about.png");
+// 	TextDialog td(this, "GMenu2X", tr["Info about system"], "skin:icons/about.png");
 
 // // #if defined(TARGET_CAANOO)
 // // 	string versionFile = "";
diff --git a/src/platform/linux.h b/src/platform/linux.h
index f5ddb7f2..528ce4bf 100644
--- a/src/platform/linux.h
+++ b/src/platform/linux.h
@@ -59,7 +59,7 @@ uint8_t getVolumeMode(uint8_t vol) {
 	return VOLUME_MODE_NORMAL;
 }
 
-class GMenuNX : public GMenu2X {
+class GMenu2X_platform : public GMenu2X {
 private:
 	void hwInit() {
 		CPU_MENU = 528;
diff --git a/src/platform/miyoo.h b/src/platform/miyoo.h
index d64236ab..cc26d435 100644
--- a/src/platform/miyoo.h
+++ b/src/platform/miyoo.h
@@ -191,7 +191,7 @@ uint8_t getVolumeMode(uint8_t vol) {
 	return VOLUME_MODE_NORMAL;
 }
 
-class GMenuNX : public GMenu2X {
+class GMenu2X_platform : public GMenu2X {
 private:
 	void hwDeinit() {
 	}
diff --git a/src/platform/retrofw.h b/src/platform/retrofw.h
index 21a7b2a9..8ee6db90 100644
--- a/src/platform/retrofw.h
+++ b/src/platform/retrofw.h
@@ -165,7 +165,7 @@ uint32_t hwCheck(unsigned int interval = 0, void *param = NULL) {
 	return interval;
 }
 
-class GMenuNX : public GMenu2X {
+class GMenu2X_platform : public GMenu2X {
 private:
 	void hwDeinit() {
 		if (memdev > 0) {
diff --git a/src/platform/rg350.h b/src/platform/rg350.h
index 0d55cfea..e3f6c536 100644
--- a/src/platform/rg350.h
+++ b/src/platform/rg350.h
@@ -87,7 +87,7 @@ uint32_t hwCheck(unsigned int interval = 0, void *param = NULL) {
 	return interval;
 }
 
-class GMenuNX : public GMenu2X {
+class GMenu2X_platform : public GMenu2X {
 private:
 	void hwInit() {
 		CPU_MENU = 0;
diff --git a/translate.txt b/translate.txt
index 12f8b9e8..f25a9ae8 100644
--- a/translate.txt
+++ b/translate.txt
@@ -7,7 +7,7 @@ Allow the selector to change directory=
 Alt Font Outline=
 Alt Font=
 Appearance & skin settings=
-apps and GMenuNX. Are you sure?=
+apps and GMenu2X. Are you sure?=
 apps=
 Are you sure?=
 Audio volume=
@@ -83,7 +83,7 @@ Font Outline=
 Font size=
 Font=
 games=
-GMenuNX=
+GMenu2X=
 Go to=
 Height of bottom bar=
 Hint: Hold 'SELECT' to disable TV-output=
@@ -99,7 +99,7 @@ How to show image preview and game art=
 Icon=
 Icons=
 Image viewer=
-Info about GMenuNX=
+Info about GMenu2X=
 Insert a name for the new section=
 Insert a new name for this section=
 Installing skin=
@@ -154,7 +154,7 @@ Remember the last selected section, link and file=
 Remove this dialog!=
 Rename section=
 Reset Default skin settings back to default=
-Reset GMenuNX settings=
+Reset GMenu2X settings=
 Reset link's custom CPU speed back to default=
 Reset link's icon back to default=
 Reset settings=
@@ -190,9 +190,9 @@ Set the default A/B/X/Y layout=
 Set the default audio volume=
 Set the default tearing FIX method=
 Set the default working CPU frequency=
-Set the language used by GMenuNX=
+Set the language used by GMenu2X=
 Set the layout and position of the Section Bar=
-Set the skin used by GMenuNX=
+Set the skin used by GMenu2X=
 settings=
 Settings=
 Shift=