diff --git a/lang/en/.config/jgmenu/prepend.csv b/lang/en/.config/jgmenu/prepend.csv
index 44e6eb4..271f17c 100644
--- a/lang/en/.config/jgmenu/prepend.csv
+++ b/lang/en/.config/jgmenu/prepend.csv
@@ -1,5 +1,5 @@
@text,,10,6,150,20,0,left,top,auto,#000000,
-@search,,24,6,150,20,2,left,top,auto,#000000 0,Type to search
+@search,,44,6,150,20,2,left,top,auto,#000000 0,Type to search
^sep()
Terminal,exo-open --launch TerminalEmulator,utilities-terminal
WWW Browser,exo-open --launch WebBrowser,firefox
@@ -10,52 +10,28 @@ Applications,^checkout(lx-apps),applications-other
^sep()
Screenshot,mb-jgtools screenshot,emblem-photos
+
+^sep()
+Lock screen,betterlockscreen -l dim -t "Type password to unlock...",system-lock-screen
^sep()
Settings,^checkout(settings),applications-utilities
^sep()
-Lock screen,betterlockscreen -l dim -t "Type password to unlock...",system-lock-screen
Exit,mb-jgtools mblogout,system-shutdown
^tag(settings)
-Mabox Control Center,mcc,distributor-logo-mabox
-^sep(Desktop)
-Look and Feel,lxappearance,preferences-desktop-theme
-Wallpaper,nitrogen,nitrogen
-Notifications,xfce4-notifyd-config,xfce4-notifyd
-Conkies,^pipe(jgmenu_run ob --cmd=mabox-conky-pipemenu),desktop-effects
-Tint2 panels,^pipe(jgmenu_run ob --cmd=mabox-tint2-pipemenu),tint2conf
-Composer,^pipe(jgmenu_run ob --cmd=mabox-compositor),compton
-Menu,^checkout(menu),menu-editor
-^sep(Settings)
-Preferred applications,exo-preferred-applications,preferences-desktop-default-applications
-Power Manager,xfce4-power-manager-settings,xfce4-power-manager-settings
-Login Manager settings,lightdm-gtk-greeter-settings-pkexec,lightdm-gtk-greeter-settings
-^sep(Openbox)
-Openbox Configuration Manager,obconf,obconf
-Autostart,^checkout(autostart),geany
-RC - configuration file,geany ~/.config/openbox/rc.xml,geany
-Reconfigure Openbox,openbox --reconfigure,openbox
-^sep(Mabox Themes)
-Theme manager,mb-obthemes,preferences-desktop-theme
+. ~/.config/mabox/settings.csv
+
+
^sep(Help)
User Guide (online),^checkout(userguide),distributor-logo-mabox
MaboxForum,exo-open --launch WebBrowser https://forum.maboxlinux.org/,distributor-logo-mabox
-^tag(menu)
-Edit Schema,geany ~/.config/jgmenu/prepend.csv,geany
-Edit Settings,geany ~/.config/mabox/mabox.conf,geany
-Menu Font Size,^checkout(size)
-Sync jgmenu with OB theme,obtheme2jgmenu,system-reboot
+
+
^tag(userguide)
. /usr/share/mb-jgtools/userguide.csv
-^tag(size)
-tiny,cat /usr/share/mb-jgtools/tiny > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-small,cat /usr/share/mb-jgtools/small > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-normal,cat /usr/share/mb-jgtools/normal > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-big,cat /usr/share/mb-jgtools/big > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-huge,cat /usr/share/mb-jgtools/huge > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-^tag(autostart)
-Choose apps/services (GUI Editor),yautostart
-Edit autostart file (advanced),geany ~/.config/openbox/autostart,geany
+
+. ~/.config/mabox/settings_tags.csv
+
^tag(lx-apps)
diff --git a/lang/en/.config/mabox/settings.csv b/lang/en/.config/mabox/settings.csv
new file mode 100644
index 0000000..75aa068
--- /dev/null
+++ b/lang/en/.config/mabox/settings.csv
@@ -0,0 +1,21 @@
+^sep(Preferences)
+Mabox Control Center,mcc,distributor-logo-mabox
+^sep(Desktop)
+Look and Feel,lxappearance,preferences-desktop-theme
+Wallpaper,nitrogen,nitrogen
+Notifications,xfce4-notifyd-config,xfce4-notifyd
+Conkies,^pipe(jgmenu_run ob --cmd=mabox-conky-pipemenu),desktop-effects
+Tint2 panels,^pipe(jgmenu_run ob --cmd=mabox-tint2-pipemenu),tint2conf
+Composer,^pipe(jgmenu_run ob --cmd=mabox-compositor),compton
+Menu,^checkout(menu),menu-editor
+^sep(Settings)
+Preferred applications,exo-preferred-applications,preferences-desktop-default-applications
+Power Manager,xfce4-power-manager-settings,xfce4-power-manager-settings
+Login Manager settings,lightdm-gtk-greeter-settings-pkexec,lightdm-gtk-greeter-settings
+^sep(Openbox)
+Openbox Configuration Manager,obconf,obconf
+Autostart,^checkout(autostart),geany
+RC - configuration file,geany ~/.config/openbox/rc.xml,geany
+Reconfigure Openbox,openbox --reconfigure,openbox
+^sep(Mabox Themes)
+Theme manager,mb-obthemes,preferences-desktop-theme
diff --git a/lang/en/.config/mabox/settings_tags.csv b/lang/en/.config/mabox/settings_tags.csv
new file mode 100644
index 0000000..504d837
--- /dev/null
+++ b/lang/en/.config/mabox/settings_tags.csv
@@ -0,0 +1,17 @@
+^tag(menu)
+^sep(Menu)
+Edit Schema,geany ~/.config/jgmenu/prepend.csv,geany
+Edit Settings,geany ~/.config/mabox/mabox.conf,geany
+Menu Font Size,^checkout(size)
+Sync jgmenu with OB theme,obtheme2jgmenu,system-reboot
+^tag(size)
+^sep(Menu/panel size)
+tiny,cat /usr/share/mb-jgtools/tiny > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+small,cat /usr/share/mb-jgtools/small > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+normal,cat /usr/share/mb-jgtools/normal > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+big,cat /usr/share/mb-jgtools/big > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+huge,cat /usr/share/mb-jgtools/huge > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+^tag(autostart)
+^sep(Autostart)
+Choose apps/services (GUI Editor),yautostart,gtk-execute
+Edit autostart file (advanced),geany ~/.config/openbox/autostart,geany
diff --git a/lang/es/.config/jgmenu/prepend.csv b/lang/es/.config/jgmenu/prepend.csv
index c8153de..f5a65cd 100644
--- a/lang/es/.config/jgmenu/prepend.csv
+++ b/lang/es/.config/jgmenu/prepend.csv
@@ -1,5 +1,5 @@
@text,,10,6,150,20,0,left,top,auto,#000000,
-@search,,24,6,150,20,2,left,top,auto,#000000 0,Buscar
+@search,,44,6,150,20,2,left,top,auto,#000000 0,Buscar
^sep()
Terminal,exo-open --launch TerminalEmulator,utilities-terminal
Navegador Internet,exo-open --launch WebBrowser,firefox
@@ -10,49 +10,25 @@ Aplicaciones,^checkout(lx-apps),applications-other
^sep()
Capturar Pantalla,mb-jgtools screenshot,emblem-photos
+
+^sep()
+Bloquear pantalla,betterlockscreen -l dim,system-lock-screen
^sep()
Ajustes,^checkout(settings),applications-utilities
^sep()
-Bloquear pantalla,betterlockscreen -l dim,system-lock-screen
Salir,mb-jgtools mblogout,system-shutdown
^tag(settings)
-Centro de Control Mabox,mcc,distributor-logo-mabox
-^sep(Escritorio)
-Apariencia,lxappearance,preferences-desktop-theme
-Fondos de pantalla,nitrogen,nitrogen
-Notificaciones,xfce4-notifyd-config,xfce4-notifyd
-Recuadros Conky,^pipe(jgmenu_run ob --cmd=mabox-conky-pipemenu),desktop-effects
-Paneles Tint2,^pipe(jgmenu_run ob --cmd=mabox-tint2-pipemenu),tint2conf
-Compositor gráfico,^pipe(jgmenu_run ob --cmd=mabox-compositor),compton
-Menu,^checkout(menu),menu-editor
-^sep(Configuración)
-Aplicaciones preferidas,exo-preferred-applications,preferences-desktop-default-applications
-Ajustes de energía,xfce4-power-manager-settings,xfce4-power-manager-settings
-Gestor Inicio de sesión,lightdm-gtk-greeter-settings-pkexec,lightdm-gtk-greeter-settings
-^sep(Openbox)
-Ajustes de Openbox,obconf,obconf
-Reinicio,^checkout(autostart),geany
-RC - ajustes de archivo,geany ~/.config/openbox/rc.xml,geany
-Reconfigurar Openbox,openbox --reconfigure,openbox
-^sep(Temas de Mabox)
-Gestor de Temas,mb-obthemes,preferences-desktop-theme
-^tag(menu)
-Editar Menu Schema,geany ~/.config/jgmenu/prepend.csv,geany
-Editar ajustes en Mabox,geany ~/.config/mabox/mabox.conf,geany
-Tamaño de Menu/Panel lateral,^checkout(size)
-Sincronizar jgmenu con tema OB ,obtheme2jgmenu,system-reboot
+. ~/.config/mabox/settings.csv
+
+^sep(Ayuda)
+Mabox User Guide (online),^checkout(userguide),distributor-logo-mabox
+Mabox Forum,exo-open --launch WebBrowser https://forum.maboxlinux.org/,distributor-logo-mabox
+
^tag(userguide)
. /usr/share/mb-jgtools/userguide.csv
-^tag(size)
-Diminuto,cat /usr/share/mb-jgtools/tiny > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-Pequeño,cat /usr/share/mb-jgtools/small > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-Normal,cat /usr/share/mb-jgtools/normal > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-Grande,cat /usr/share/mb-jgtools/big > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-Muy Grande,cat /usr/share/mb-jgtools/huge > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-^tag(autostart)
-Elegir apps/servicios del editor gráfico,yautostart
-Editar el archivo de reinicio (avanzado),geany ~/.config/openbox/autostart,geany
+
+. ~/.config/mabox/settings_tags.csv
^tag(lx-apps)
diff --git a/lang/es/.config/mabox/settings.csv b/lang/es/.config/mabox/settings.csv
new file mode 100644
index 0000000..ac0ce3d
--- /dev/null
+++ b/lang/es/.config/mabox/settings.csv
@@ -0,0 +1,21 @@
+^sep(Configuración)
+Centro de Control Mabox,mcc,distributor-logo-mabox
+^sep(Escritorio)
+Apariencia,lxappearance,preferences-desktop-theme
+Fondos de pantalla,nitrogen,nitrogen
+Notificaciones,xfce4-notifyd-config,xfce4-notifyd
+Recuadros Conky,^pipe(jgmenu_run ob --cmd=mabox-conky-pipemenu),desktop-effects
+Paneles Tint2,^pipe(jgmenu_run ob --cmd=mabox-tint2-pipemenu),tint2conf
+Compositor gráfico,^pipe(jgmenu_run ob --cmd=mabox-compositor),compton
+Menu,^checkout(menu),menu-editor
+^sep(Configuración)
+Aplicaciones preferidas,exo-preferred-applications,preferences-desktop-default-applications
+Ajustes de energía,xfce4-power-manager-settings,xfce4-power-manager-settings
+Gestor Inicio de sesión,lightdm-gtk-greeter-settings-pkexec,lightdm-gtk-greeter-settings
+^sep(Openbox)
+Ajustes de Openbox,obconf,obconf
+Reinicio,^checkout(autostart),geany
+RC - ajustes de archivo,geany ~/.config/openbox/rc.xml,geany
+Reconfigurar Openbox,openbox --reconfigure,openbox
+^sep(Temas de Mabox)
+Gestor de Temas,mb-obthemes,preferences-desktop-theme
diff --git a/lang/es/.config/mabox/settings_tags.csv b/lang/es/.config/mabox/settings_tags.csv
new file mode 100644
index 0000000..b14dc4a
--- /dev/null
+++ b/lang/es/.config/mabox/settings_tags.csv
@@ -0,0 +1,17 @@
+^tag(menu)
+^sep(Menu)
+Editar Menu Schema,geany ~/.config/jgmenu/prepend.csv,geany
+Editar ajustes en Mabox,geany ~/.config/mabox/mabox.conf,geany
+^sep()
+Tamaño de Menu/Panel lateral,^checkout(size)
+Sincronizar jgmenu con tema OB ,obtheme2jgmenu,system-reboot
+
+^tag(size)
+Diminuto,cat /usr/share/mb-jgtools/tiny > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+Pequeño,cat /usr/share/mb-jgtools/small > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+Normal,cat /usr/share/mb-jgtools/normal > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+Grande,cat /usr/share/mb-jgtools/big > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+Muy Grande,cat /usr/share/mb-jgtools/huge > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+^tag(autostart)
+Elegir apps/servicios del editor gráfico,yautostart,gtk-execute
+Editar el archivo de reinicio (avanzado),geany ~/.config/openbox/autostart,geany
diff --git a/lang/pl/.config/jgmenu/prepend.csv b/lang/pl/.config/jgmenu/prepend.csv
index 77a22f6..4f8040a 100644
--- a/lang/pl/.config/jgmenu/prepend.csv
+++ b/lang/pl/.config/jgmenu/prepend.csv
@@ -1,60 +1,34 @@
@text,,10,6,150,20,0,left,top,auto,#000000,
@search,,44,6,150,20,2,left,top,auto,#000000 0,Pisz aby wyszukać
-^sep()
Terminal,exo-open --launch TerminalEmulator,utilities-terminal
Przeglądarka WWW,exo-open --launch WebBrowser,firefox
Menedżer plików,exo-open --launch FileManager,system-file-manager
+Dodaj/Usuń programy,pamac-manager,pamac
^sep()
Aplikacje,^checkout(lx-apps),applications-other
^sep()
Zrzut ekranu,mb-jgtools screenshot,emblem-photos
^sep()
+
+Zablokuj ekran,betterlockscreen -l dim,system-lock-screen
+^sep()
Ustawienia,^checkout(ustawienia),applications-utilities
^sep()
-Zablokuj ekran,betterlockscreen -l,system-lock-screen
Wyjście,mb-jgtools mblogout,system-shutdown
^tag(ustawienia)
+. ~/.config/mabox/settings.csv
-Centrum Sterowania Mabox,mcc,distributor-logo-mabox
-^sep(Pulpit)
-Wystrój i ikony,lxappearance,preferences-desktop-theme
-Tapeta,nitrogen,nitrogen
-Powiadomienia,xfce4-notifyd-config,xfce4-notifyd
-Zarządzaj Conky,^pipe(jgmenu_run ob --cmd=mabox-conky-pipemenu),desktop-effects
-Zarządzaj panelami tint2,^pipe(jgmenu_run ob --cmd=mabox-tint2-pipemenu),tint2conf
-Kompozytor,^pipe(jgmenu_run ob --cmd=mabox-compositor),compton
-Menu,^checkout(menu),menu-editor
-^sep(Ustawienia)
-Preferowane aplikacje,exo-preferred-applications,preferences-desktop-default-applications
-Menedżer logowania,lightdm-gtk-greeter-settings-pkexec,lightdm-gtk-greeter-settings
-Ustawienia zasilania,xfce4-power-manager-settings,xfce4-power-manager-settings
-^sep(Openbox)
-Autostart,^checkout(autostart),geany
-RC - plik konfiguracyjny,geany ~/.config/openbox/rc.xml,geany
-
-Rekonfiguruj Openbox,openbox --reconfigure,openbox
-^sep(Motywy Maboxa)
-Zarządzaj motywami,mb-obthemes,preferences-desktop-theme
^sep(Pomoc)
Przewodnik Użytkownika (online),^checkout(userguide),distributor-logo-mabox
Forum dyskusyjne Mabox,exo-open --launch WebBrowser https://forum.maboxlinux.org/,distributor-logo-mabox
-^tag(autostart)
-Wybierz programy/usługi (GUI Edytor),yautostart
-Edycja pliku (zaawansowane),geany ~/.config/openbox/autostart,geany
+
^tag(userguide)
. /usr/share/mb-jgtools/userguide_PL.csv
-^tag(menu)
-Edytuj pozycje menu,geany ~/.config/jgmenu/prepend.csv,geany
-Edytuj ustawienia,geany ~/.config/mabox/mabox.conf,geany
-Rozmiar,^checkout(rozmiar)
-^tag(rozmiar)
-malutki,cat ~/.config/mabox/tiny > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-mały,cat ~/.config/mabox/small > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-normalny,cat ~/.config/mabox/normal > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-duży,cat ~/.config/mabox/big > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
-wielki,cat ~/.config/mabox/huge > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+
+. ~/.config/mabox/settings_tags.csv
+
^tag(lx-apps)
diff --git a/lang/pl/.config/mabox/settings.csv b/lang/pl/.config/mabox/settings.csv
new file mode 100644
index 0000000..d975d9c
--- /dev/null
+++ b/lang/pl/.config/mabox/settings.csv
@@ -0,0 +1,22 @@
+^sep(Ustawienia)
+Centrum Sterowania Mabox,mcc,distributor-logo-mabox
+^sep(Pulpit)
+Wystrój i ikony,lxappearance,preferences-desktop-theme
+Tapeta,nitrogen,nitrogen
+Powiadomienia,xfce4-notifyd-config,xfce4-notifyd
+Zarządzaj Conky,^pipe(jgmenu_run ob --cmd=mabox-conky-pipemenu),desktop-effects
+Zarządzaj panelami tint2,^pipe(jgmenu_run ob --cmd=mabox-tint2-pipemenu),tint2conf
+Kompozytor,^pipe(jgmenu_run ob --cmd=mabox-compositor),compton
+Menu,^checkout(menu),menu-editor
+^sep(Ustawienia)
+Preferowane aplikacje,exo-preferred-applications,preferences-desktop-default-applications
+Menedżer logowania,lightdm-gtk-greeter-settings-pkexec,lightdm-gtk-greeter-settings
+Ustawienia zasilania,xfce4-power-manager-settings,xfce4-power-manager-settings
+^sep(Openbox)
+Menadżer konfiguracji Openbox,obconf,obconf
+Autostart,^checkout(autostart),geany
+RC - plik konfiguracyjny,geany ~/.config/openbox/rc.xml,geany
+
+Rekonfiguruj Openbox,openbox --reconfigure,openbox
+^sep(Motywy Maboxa)
+Zarządzaj motywami,mb-obthemes,preferences-desktop-theme
diff --git a/lang/pl/.config/mabox/settings_tags.csv b/lang/pl/.config/mabox/settings_tags.csv
new file mode 100644
index 0000000..e08f63a
--- /dev/null
+++ b/lang/pl/.config/mabox/settings_tags.csv
@@ -0,0 +1,18 @@
+^tag(menu)
+^sep(Menu)
+Rozmiar,^checkout(rozmiar)
+^sep()
+Edytuj pozycje menu,geany ~/.config/jgmenu/prepend.csv,geany
+Edytuj ustawienia,geany ~/.config/mabox/mabox.conf,geany
+
+^tag(rozmiar)
+^sep(Rozmiar menu)
+malutki,cat /usr/share/mb-jgtools/tiny > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+mały,cat /usr/share/mb-jgtools/small > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+normalny,cat /usr/share/mb-jgtools/normal > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+duży,cat /usr/share/mb-jgtools/big > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+wielki,cat /usr/share/mb-jgtools/huge > ~/.config/mabox/jgmenusize.conf && mb-jgtools main
+^tag(autostart)
+^sep(Autostart)
+Wybierz programy/usługi (GUI Edytor),yautostart,gtk-execute
+Edycja pliku (zaawansowane),geany ~/.config/openbox/autostart,geany