diff --git a/icewm-menu.patch b/icewm-menu.patch
new file mode 100644
index 0000000..96cf16c
--- /dev/null
+++ b/icewm-menu.patch
@@ -0,0 +1,18 @@
+--- a/lib/menu.in	2019-09-18 19:52:15.000000000 +0300
++++ b/lib/menu.in	2019-10-12 14:42:00.292835720 +0300
+@@ -3,13 +3,8 @@
+ # Place your variants in @CFGDIR@ or in $HOME/.icewm since
+ # modifications to this file will be overwritten when you reinstall icewm.
+ #
+-prog "@XTERMCMD@" xterm @XTERMCMD@
+-prog urxvt xterm urxvt -bg black -cr green -fg white -C -sl 500
+-prog gedit fte gedit
+-prog NEdit nedit nedit
+-prog Firefox mozilla firefox
+-prog Hexchat xchat hexchat
+-prog Gimp gimp gimp
++prog Firefox	web-browser	firefox
++prog Chromium	web-browser	chromium-browser
+ includeprog icewm-menu-fdo --sep-before --no-sep-others
+ menufile Programs folder programs
+ menufile Tool_bar folder toolbar
diff --git a/icewm-toolbar.patch b/icewm-toolbar.patch
index 1a482d3..1f552e8 100644
--- a/icewm-toolbar.patch
+++ b/icewm-toolbar.patch
@@ -7,6 +7,6 @@
 -prog "@XTERMCMD@" utilities-terminal @XTERMCMD@
 -prog "Web browser" web-browser xdg-open about:blank
 -
-+prog "Web browser"  web-browser xdg-open    about:blank
-+prog "File manager" system-file-manager     xdg-open /home
-+prog "@XTERMCMD@"   utilities-terminal      @XTERMCMD@
++prog "Web browser"     web-browser         xdg-open about:blank
++prog "File manager"    system-file-manager xdg-open /home
++prog "Terminal"        utilities-terminal  @XTERMCMD@
diff --git a/icewm.spec b/icewm.spec
index 29b23bf..90d263f 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -6,7 +6,7 @@
 
 Name:           icewm
 Version:        1.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Window manager designed for speed, usability, and consistency
 
 License:        LGPLv2+
@@ -43,6 +43,7 @@ Source51:       conky.conf
 
 Patch0:         %{name}-keys.patch
 Patch1:         %{name}-toolbar.patch
+Patch2:         %{name}-menu.patch
 
 # Fallback build tool
 #BuildRequires: automake
@@ -208,13 +209,15 @@ Various config files for 3rd-party apps to play nicely with %{name}.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %setup -q -D -T -a10
 %setup -q -D -T -a11
 
 # Tweak default theme
-sed -i 's!sans-serif:size=10!Cantarell:size=11!'                                    IceClearlooks2*/*.theme
-sed -i 's!xmirs!xmis!'                                                              IceClearlooks2*/*.theme
-sed -i 's!#DesktopBackgroundScaled=1 # 0 / 1!DesktopBackgroundScaled=1 # 0 / 1!'    IceClearlooks2*/*.theme
+sed -i 's!sans-serif:size=10!Cantarell:size=11!'                                                            IceClearlooks2*/*.theme
+sed -i 's!MenuFontNameXft            = Cantarell:size=11!MenuFontNameXft            = Cantarell:size=10!'   IceClearlooks2*/*.theme
+sed -i 's!xmirs!xmis!'                                                                                      IceClearlooks2*/*.theme
+sed -i 's!#DesktopBackgroundScaled=1 # 0 / 1!DesktopBackgroundScaled=1 # 0 / 1!'                            IceClearlooks2*/*.theme
 sed -i 's!#DesktopBackgroundImage = "/home/ren/Imágenes/cafe70.jpg"!DesktopBackgroundImage = "%{_datadir}/backgrounds/%{name}-wallpaper.png"!' IceClearlooks2*/*.theme
 
 %setup -q -D -T -a12
@@ -224,11 +227,11 @@ find Windows7ice1/. -type f -executable -exec chmod -x "{}" \;
 %setup -q -D -T -a15
 
 # Tweak Araita theme
-sed -i 's!carlito:size=12!Cantarell:size=11!' Araita*/*.theme
-sed -i 's!carlito:size=13!Cantarell:size=11!' Araita*/*.theme
+sed -i 's!carlito:size=12!Cantarell:size=11!'   Araita*/*.theme
+sed -i 's!carlito:size=13!Cantarell:size=11!'   Araita*/*.theme
+sed -i 's!22!16!'                               Araita*/*.theme
 sed -i 's!#DesktopBackgroundImage=                   "/usr/share/wallpapers/default.jpg"!DesktopBackgroundImage=                   "%{_datadir}/backgrounds/%{name}-wallpaper.png"!' Araita*/*.theme
 
-
 # Remove in next version
 # https://github.com/bbidulock/icewm/issues/387
 sed -i 's/ IceWM.jpg//' lib/CMakeLists.txt
@@ -265,7 +268,8 @@ popd
 
 # Themes
 cp -a IceClearlooks2-*          %{buildroot}%{_datadir}/%{name}/themes/
-cp -rfa icewm-fedora/themes     %{buildroot}%{_datadir}/%{name}/
+cp -rfa icewm-fedora/*          %{buildroot}%{_datadir}/%{name}/
+rm -r                           %{buildroot}%{_datadir}/%{name}/themes/IceClearlooks2-Magi/icons
 cp -a KDE-Core                  %{buildroot}%{_datadir}/%{name}/themes/
 cp -a Windows7ice1              %{buildroot}%{_datadir}/%{name}/themes/
 cp -a Araita+                   %{buildroot}%{_datadir}/%{name}/themes/
@@ -368,6 +372,9 @@ install -pm0644 %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conky.c
 
 
 %changelog
+* Sat Oct 12 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 1.6.2-3
+- Theming improving and better defaults (work still in progress)
+
 * Thu Oct 10 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 1.6.2-2
 - Fixes and new features
 
diff --git a/sources b/sources
index e0839d0..48e02d1 100644
--- a/sources
+++ b/sources
@@ -4,4 +4,4 @@ SHA512 (IceClearlooks2-ColorsMas_theme_pack-0.8.tar.bz2) = 3c79f2914135ea9074876
 SHA512 (KDE-Core-20181026134422.tar.bz2) = a946637167385893fefc01a0725fab2262a9a74d686070f68125dd0c297abf7dfda0808c0a48f0d53acb9a6ef0650927c778e46708b267975708909e118a27ab
 SHA512 (Windows7ice1.tar.xz) = c02ccf8a74c54488571654a319247311abde1db906ba65882d43144b376f6700d107be2af2475e54d2b6078ef3bd1fdafa2b42808e467a5eeb8f074a211e44b9
 SHA512 (icewm-1.6.2.tar.gz) = d7db40f6a6d47b03be44d32cb3fa204c93e4bff022908b7b50ba911e265ca0877ac62556f539e2e656faa2238a4af4f0eeb4b4f569171daef347236fbd90b093
-SHA512 (icewm-fedora.tar.xz) = 8e594756e094fe14cde510e4a0c2d71f0d40949c2a3ce3a68e65aa321c944e7904e6f45c30cd269152eeaf75389db346ab93bee6e4316f307f4f2e58efa28102
+SHA512 (icewm-fedora.tar.xz) = e7e9460842bfe8c9147219da6a04af64a1afc8c4a0a1418a24e98ea858f36803cf259927f8276745bb3ea2e0604cdbd8bb8504fdf1c11992d60c241ca56971a1