diff --git a/mabox-en/Packages-Desktop b/mabox-en/Packages-Desktop
index 21c0c71..dcce4ba 100644
--- a/mabox-en/Packages-Desktop
+++ b/mabox-en/Packages-Desktop
@@ -248,6 +248,7 @@ numlockx
#ob-autostart
obconf
#obkey-gtk3
+obsuite
obmenu-generator
obbrowser
openbox
@@ -273,7 +274,6 @@ mabox-keyring
mabox-pipemenus
mabox-utilities
mabox-artwork
-cornora
gkrellm
gkrellm-themes
gkrellmlaunch
diff --git a/mabox-en/desktop-overlay/etc/UPower/UPower.conf b/mabox-en/desktop-overlay/etc/UPower/UPower.conf
deleted file mode 100644
index c7c7012..0000000
--- a/mabox-en/desktop-overlay/etc/UPower/UPower.conf
+++ /dev/null
@@ -1,94 +0,0 @@
-# Only the system vendor should modify this file, ordinary users
-# should not have to change anything.
-
-[UPower]
-
-# Enable the Watts Up Pro device.
-#
-# The Watts Up Pro contains a generic FTDI USB device without a specific
-# vendor and product ID. When we probe for WUP devices, we can cause
-# the user to get a perplexing "Device or resource busy" error when
-# attempting to use their non-WUP device.
-#
-# The generic FTDI device is known to also be used on:
-#
-# - Sparkfun FT232 breakout board
-# - Parallax Propeller
-#
-# default=false
-EnableWattsUpPro=false
-
-# Don't poll the kernel for battery level changes.
-#
-# Some hardware will send us battery level changes through
-# events, rather than us having to poll for it. This option
-# allows disabling polling for hardware that sends out events.
-#
-# default=false
-NoPollBatteries=false
-
-# Do we ignore the lid state
-#
-# Some laptops are broken. The lid state is either inverted, or stuck
-# on or off. We can't do much to fix these problems, but this is a way
-# for users to make the laptop panel vanish, a state that might be used
-# by a couple of user-space daemons. On Linux systems, see also
-# logind.conf(5).
-#
-# default=false
-IgnoreLid=true
-
-# Policy for warnings and action based on battery levels
-#
-# Whether battery percentage based policy should be used. The default
-# is to use the time left, change to true to use the percentage, which
-# should work around broken firmwares. It is also more reliable than
-# the time left (frantically saving all your files is going to use more
-# battery than letting it rest for example).
-# default=true
-UsePercentageForPolicy=true
-
-# When UsePercentageForPolicy is true, the levels at which UPower will
-# consider the battery low, critical, or take action for the critical
-# battery level.
-#
-# This will also be used for batteries which don't have time information
-# such as that of peripherals.
-#
-# If any value is invalid, or not in descending order, the defaults
-# will be used.
-#
-# Defaults:
-# PercentageLow=10
-# PercentageCritical=3
-# PercentageAction=2
-PercentageLow=10
-PercentageCritical=3
-PercentageAction=2
-
-# When UsePercentageForPolicy is false, the time remaining at which UPower
-# will consider the battery low, critical, or take action for the critical
-# battery level.
-#
-# If any value is invalid, or not in descending order, the defaults
-# will be used.
-#
-# Defaults:
-# TimeLow=1200
-# TimeCritical=300
-# TimeAction=120
-TimeLow=1200
-TimeCritical=300
-TimeAction=120
-
-# The action to take when "TimeAction" or "PercentageAction" above has been
-# reached for the batteries (UPS or laptop batteries) supplying the computer
-#
-# Possible values are:
-# PowerOff
-# Hibernate
-# HybridSleep
-#
-# If HybridSleep isn't available, Hibernate will be used
-# If Hibernate isn't available, PowerOff will be used
-CriticalPowerAction=HybridSleep
diff --git a/mabox-pl/Packages-Desktop b/mabox-pl/Packages-Desktop
index 6868c94..551e545 100644
--- a/mabox-pl/Packages-Desktop
+++ b/mabox-pl/Packages-Desktop
@@ -138,7 +138,7 @@ pavucontrol
playerctl
pulseaudio
pulseaudio-alsa
-#volumeicon
+volumeicon
xfce4-volumed-pulse
#---------=> CLI internet apps
@@ -170,6 +170,7 @@ inxi
jp2a
lsof
mesa-demos
+moreutils
neofetch
pastebinit
ps_mem
@@ -288,11 +289,12 @@ mabox-pipemenus
mabox-utilities
mabox-wallpapers-2020
mb-jgtools
-cornora
+#cornora
gkrellm
gkrellm-themes
gkrellmlaunch
+#gkrellm-volume
bunsen-themes-git
lx-colors-themes
#numix-gtk-theme
diff --git a/mabox-pl/desktop-overlay/etc/UPower/UPower.conf b/mabox-pl/desktop-overlay/etc/UPower/UPower.conf
deleted file mode 100644
index c7c7012..0000000
--- a/mabox-pl/desktop-overlay/etc/UPower/UPower.conf
+++ /dev/null
@@ -1,94 +0,0 @@
-# Only the system vendor should modify this file, ordinary users
-# should not have to change anything.
-
-[UPower]
-
-# Enable the Watts Up Pro device.
-#
-# The Watts Up Pro contains a generic FTDI USB device without a specific
-# vendor and product ID. When we probe for WUP devices, we can cause
-# the user to get a perplexing "Device or resource busy" error when
-# attempting to use their non-WUP device.
-#
-# The generic FTDI device is known to also be used on:
-#
-# - Sparkfun FT232 breakout board
-# - Parallax Propeller
-#
-# default=false
-EnableWattsUpPro=false
-
-# Don't poll the kernel for battery level changes.
-#
-# Some hardware will send us battery level changes through
-# events, rather than us having to poll for it. This option
-# allows disabling polling for hardware that sends out events.
-#
-# default=false
-NoPollBatteries=false
-
-# Do we ignore the lid state
-#
-# Some laptops are broken. The lid state is either inverted, or stuck
-# on or off. We can't do much to fix these problems, but this is a way
-# for users to make the laptop panel vanish, a state that might be used
-# by a couple of user-space daemons. On Linux systems, see also
-# logind.conf(5).
-#
-# default=false
-IgnoreLid=true
-
-# Policy for warnings and action based on battery levels
-#
-# Whether battery percentage based policy should be used. The default
-# is to use the time left, change to true to use the percentage, which
-# should work around broken firmwares. It is also more reliable than
-# the time left (frantically saving all your files is going to use more
-# battery than letting it rest for example).
-# default=true
-UsePercentageForPolicy=true
-
-# When UsePercentageForPolicy is true, the levels at which UPower will
-# consider the battery low, critical, or take action for the critical
-# battery level.
-#
-# This will also be used for batteries which don't have time information
-# such as that of peripherals.
-#
-# If any value is invalid, or not in descending order, the defaults
-# will be used.
-#
-# Defaults:
-# PercentageLow=10
-# PercentageCritical=3
-# PercentageAction=2
-PercentageLow=10
-PercentageCritical=3
-PercentageAction=2
-
-# When UsePercentageForPolicy is false, the time remaining at which UPower
-# will consider the battery low, critical, or take action for the critical
-# battery level.
-#
-# If any value is invalid, or not in descending order, the defaults
-# will be used.
-#
-# Defaults:
-# TimeLow=1200
-# TimeCritical=300
-# TimeAction=120
-TimeLow=1200
-TimeCritical=300
-TimeAction=120
-
-# The action to take when "TimeAction" or "PercentageAction" above has been
-# reached for the batteries (UPS or laptop batteries) supplying the computer
-#
-# Possible values are:
-# PowerOff
-# Hibernate
-# HybridSleep
-#
-# If HybridSleep isn't available, Hibernate will be used
-# If Hibernate isn't available, PowerOff will be used
-CriticalPowerAction=HybridSleep
diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/autostart/blueman.desktop b/mabox-pl/desktop-overlay/etc/skel/.config/autostart/blueman.desktop
new file mode 100644
index 0000000..c6382d2
--- /dev/null
+++ b/mabox-pl/desktop-overlay/etc/skel/.config/autostart/blueman.desktop
@@ -0,0 +1,100 @@
+[Desktop Entry]
+Name=Blueman Applet
+Name[am]=Blueman Applet
+Name[ar]=بريمج بلومان
+Name[ast]=Applet Blueman
+Name[be]=Аплет Blueman
+Name[bg]=Аплет Blueman
+Name[bs]=Blueman Aplet
+Name[ca]=Miniaplicació de Blueman
+Name[cs]=Blueman Applet
+Name[da]=Blueman-panelprogram
+Name[de]=Blueman-Applet
+Name[el]=Μικροεφαρμογή Blueman
+Name[en_AU]=Blueman Applet
+Name[en_GB]=Blueman Applet
+Name[es]=Miniaplicación de Blueman
+Name[et]=Blueman rakend
+Name[eu]=Blueman applet-a
+Name[fi]=Blueman-sovelma
+Name[fr]=Applet Blueman
+Name[gl]=Miniaplicativo Blueman
+Name[hi]=ब्लूटूथ एप्पलेट
+Name[hr]=Blueman programčić
+Name[hu]=Blueman kisalkalmazás
+Name[id]=Applet Blueman
+Name[it]=Blueman Applet
+Name[ja]=Blueman アプレット
+Name[ko]=블루맨 애플릿
+Name[lt]=Blueman programėlė
+Name[lv]=Blueman Sīkrīks
+Name[mk]=Blueman аплет
+Name[mr]=ब्लुटूथ एप्लेट
+Name[ms]=Aplet Blueman
+Name[nb]=Blueman-panelprogram
+Name[nl]=Blueman-applet
+Name[pl]=Aplet Blueman
+Name[pt]=Applet Blueman
+Name[pt_BR]=Miniaplicativo Blueman
+Name[ro]=Miniaplicația Blueman
+Name[ru]=Апплет Blueman
+Name[sk]=Aplet bluetooth
+Name[sl]=Aplet Blueman
+Name[sr]=Блуменово програмче
+Name[sv]=Panelprogrammet Blueman
+Name[tr]=Blueman Programcığı
+Name[uk]=Аплет Blueman
+Name[zh_CN]=Blueman Applet
+Name[zh_TW]=Blueman 小程式
+Comment=Blueman Bluetooth Manager
+Comment[am]=Blueman የ ብሉቱዝ አስተዳዳሪ
+Comment[ar]=مدير البلوتوث بلومان
+Comment[ast]=Alministrador Bluetooth Blueman
+Comment[be]=Blueman, Bluetooth-кіраўнік
+Comment[bg]=Мениджър на блутут „Blueman“
+Comment[ca]=Gestor de Bluetooth Blueman
+Comment[cs]=Správce Bluetooth Blueman
+Comment[da]=Blueman Bluetooth-håndtering
+Comment[de]=Blueman-Bluetooth-Verwaltung
+Comment[el]=Διαχειριστής Bluetooth Blueman
+Comment[en_AU]=Blueman Bluetooth Manager
+Comment[en_GB]=Blueman Bluetooth Manager
+Comment[es]=Gestor de Bluetooth Blueman
+Comment[et]=Blueman Bluetoothi haldur
+Comment[eu]=Blueman Bluetooth-kudeatzailea
+Comment[fi]=Blueman bluetooth-hallinta
+Comment[fr]=Gestionnaire Bluetooth Blueman
+Comment[gl]=Xestor de Bluetooth Blueman
+Comment[hr]=Blueman Bluetooth upravitelj
+Comment[hu]=Blueman Bluetooth-kezelő
+Comment[id]=Blueman Manager Bluetooth
+Comment[it]=Blueman Gestore Bluetooth
+Comment[ja]=Blueman Bluetooth マネージャー
+Comment[ko]=블루맨 블루투스 관리자
+Comment[lt]=Blueman „Bluetooth“ tvarkytuvė
+Comment[lv]=Blueman Bluetooth Pārvaldnieks
+Comment[mk]=Blueman управувач со блутут
+Comment[mr]=ब्लुमॅन ब्लुटूथ व्यवस्थापक
+Comment[ms]=Pengurus Bluetooth Blueman
+Comment[nb]=Blueman Blåtannsbehandler
+Comment[nl]=Blueman Bluetooth-beheer
+Comment[pl]=Menedżer Bluetooth Blueman
+Comment[pt]=Gestor de Bluetooth Blueman
+Comment[pt_BR]=Gerenciador de Bluetooth Blueman
+Comment[ro]=Gestionarul Bluetooth Blueman
+Comment[ru]=Менеджер Bluetooth Blueman
+Comment[sk]=Správca Bluetooth Blueman
+Comment[sl]=Upravljalnik Blueman Bluetootha
+Comment[sr]=Блутутов управник Блумен
+Comment[sv]=Blåtandshanteraren Blueman
+Comment[tr]=Blueman Bluetooth Yöneticisi
+Comment[uk]=Керівник bluetooth Blueman
+Comment[vi]=Blueman - Trình quản lý Bluetooth
+Comment[zh_CN]=Blueman蓝牙管理器
+Comment[zh_TW]=Blueman 藍牙管理員
+Icon=blueman
+Exec=blueman-applet
+Terminal=false
+Type=Application
+Categories=
+Hidden=true
diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/jgmenu/prepend.csv b/mabox-pl/desktop-overlay/etc/skel/.config/jgmenu/prepend.csv
index cb5392f..4510a69 100644
--- a/mabox-pl/desktop-overlay/etc/skel/.config/jgmenu/prepend.csv
+++ b/mabox-pl/desktop-overlay/etc/skel/.config/jgmenu/prepend.csv
@@ -1,5 +1,5 @@
-@text,,6,6,150,20,0,left,top,auto,#000000,
-@search,,24,6,150,20,2,left,top,auto,#000000 0,Pisz aby wyszukać
+@text,,26,6,150,20,0,left,top,auto,#000000,
+@search,,44,6,150,20,2,left,top,auto,#000000 0,Pisz aby wyszukać
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
@@ -11,13 +11,12 @@ Zrzut ekranu,mb-jgtools screenshot,emblem-photos
^sep()
Ustawienia,^checkout(ustawienia),applications-utilities
^sep()
-Zablokuj ekran,blurlock,system-lock-screen
+Zablokuj ekran,betterlockscreen -l,system-lock-screen
Wyjście,mb-jgtools mblogout,system-shutdown
^tag(ustawienia)
-Centrum Sterowania Mabox,mbcc,mbcc
-Mabox Styler,mbstyler,/usr/share/icons/mbs_trans_32.png
+Centrum Sterowania Mabox,mcc,mbcc
^sep(Pulpit)
Wystrój i ikony,lxappearance,preferences-desktop-theme
Tapeta,nitrogen,nitrogen
diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/mabox/mabox.conf b/mabox-pl/desktop-overlay/etc/skel/.config/mabox/mabox.conf
new file mode 100644
index 0000000..7ad335f
--- /dev/null
+++ b/mabox-pl/desktop-overlay/etc/skel/.config/mabox/mabox.conf
@@ -0,0 +1,2 @@
+show_welcome=true
+jgmenu_use_icons=true
diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/mabox/places-append.csv b/mabox-pl/desktop-overlay/etc/skel/.config/mabox/places-append.csv
new file mode 100644
index 0000000..e69de29
diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/mabox/places-prepend.csv b/mabox-pl/desktop-overlay/etc/skel/.config/mabox/places-prepend.csv
new file mode 100644
index 0000000..e69de29
diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/obmenu-generator/schema.pl b/mabox-pl/desktop-overlay/etc/skel/.config/obmenu-generator/schema.pl
index d1c63ae..59cc554 100644
--- a/mabox-pl/desktop-overlay/etc/skel/.config/obmenu-generator/schema.pl
+++ b/mabox-pl/desktop-overlay/etc/skel/.config/obmenu-generator/schema.pl
@@ -99,8 +99,7 @@ our $SCHEMA = [
{end => undef},
{sep => undef},
{beg => ['Ustawienia', 'gnome-settings']},
- {item => ['mbcc', 'Centrum Sterowania Mabox', 'mbcc']},
- {item => ['mbstyler', 'Mabox Styler', '/usr/share/icons/mbs_trans_32.png']},
+ {item => ['mcc', 'Centrum Sterowania Mabox', 'mbcc']},
{sep => 'Pulpit'},
{item => ['lxappearance', 'Wystrój i ikony', 'preferences-desktop-theme']},
{item => ['nitrogen', 'Tapeta', 'nitrogen']},
diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/openbox/autostart b/mabox-pl/desktop-overlay/etc/skel/.config/openbox/autostart
index b63fa5c..f92052d 100755
--- a/mabox-pl/desktop-overlay/etc/skel/.config/openbox/autostart
+++ b/mabox-pl/desktop-overlay/etc/skel/.config/openbox/autostart
@@ -31,9 +31,8 @@ xcape -e 'Super_L=Super_L|space'
(sleep 1s && mb-tint2-session) &
## Startup
-#(sleep 1s && volumeicon) &
+(sleep 1s && volumeicon) &
(sleep 1s && xfce4-volumed-pulse) &
-(sleep 1s && clipit) &
(sleep 1s && gkrellm -w) &
## Optionally enable file manager in daemon mode for automounting
@@ -43,12 +42,6 @@ xcape -e 'Super_L=Super_L|space'
## Optionally disable touchpad
#/usr/bin/synclient TouchpadOff=1 &
-## Regeneracja menu
-(sleep 1s && mb-regenerate-menu) &
-
-## Mabox-welcome screen
-(sleep 1s && mb-welcome --autostart) &
-
## Conky
(sleep 2s && mb-conky-session --autostart) &
@@ -58,5 +51,7 @@ xcape -e 'Super_L=Super_L|space'
## Betterlockscreen setup
betterlockscreen_setup &
-## Hot Corners
-#cornora -tl "mb-jgtools places" -tr "mb-jgtools right" -br "mb-jgtools mblogout" -iof
+(sleep 1 && obsuite) &
+
+## Mabox scripts - DO NOT DISABLE
+(sleep 1s && mabox-obstart) &
diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/openbox/rc.xml b/mabox-pl/desktop-overlay/etc/skel/.config/openbox/rc.xml
index 9d59157..a175414 100644
--- a/mabox-pl/desktop-overlay/etc/skel/.config/openbox/rc.xml
+++ b/mabox-pl/desktop-overlay/etc/skel/.config/openbox/rc.xml
@@ -351,7 +351,7 @@
- jgmenu_run
+ mb-jgtools main ipc
@@ -360,9 +360,12 @@
-
-
+
+ mb-jgtools main
+
@@ -394,7 +397,7 @@
mb-jgtools places
-
+
pamixer -i 2
@@ -439,7 +442,7 @@
playerctl next
-
+
@@ -989,6 +992,19 @@
yes
+
+ all
+ above
+ no
+
+ -10
+ -10
+
+
+ 20%
+ 20%
+
+