diff --git a/desktop-base-openmamba.spec b/desktop-base-openmamba.spec
index 00f0de2..08328b8 100644
--- a/desktop-base-openmamba.spec
+++ b/desktop-base-openmamba.spec
@@ -6,18 +6,12 @@
 # autospec -u desktop-base-openmamba -a5 \
 #    --define distroID=OpenMamba,distroid=openmamba,distroicon=openmamba.png
 
-%ifnarch arm aarch64
-%define with_kde3tools 1
-%else
-%define with_kde3tools 0
-%endif
-
 %define distroID   openmamba
 %define distroid   openmamba
 %define distroicon openmamba
 
 Name:          desktop-base-openmamba
-Version:       2022.06.16
+Version:       2022.06.18.1
 Release:       1mamba
 Summary:       openmamba default desktop theme and menu entries
 Group:         System/Tools
@@ -25,14 +19,10 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://gitlab.mambasoft.it/openmamba/desktop-base-openmamba
-Source:        http://gitlab.mambasoft.it/openmamba/desktop-base-openmamba.git/v%{version}/desktop-base-openmamba-%{version}.tar.bz2
+Source:        https://gitlab.mambasoft.it/openmamba/desktop-base-openmamba.git/v%{version}/desktop-base-openmamba-%{version}.tar.bz2
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 ## AUTOBUILDREQ-END
-%if "%{with_kde3tools}" == "1"
-# For rpm macros used below:
-BuildRequires: kdelibs3-devel
-%endif
 Requires:      liberation-fonts-ttf
 Requires:      ttf-symbola
 Requires:      ttf-khmer
@@ -48,9 +38,6 @@ Requires:      system-base-openmamba = %{?epoch:%epoch:}%{version}-%{release}
 Requires:      /usr/bin/notify-send
 Requires:      license-dialog
 Requires:      udisks2
-%if "%{with_kde3tools}" == "1"
-Requires:      kommander
-%endif
 %ifnarch arm
 Requires:      postplug-xorg
 Requires:      postplug-sound
@@ -66,12 +53,11 @@ Requires:      pulseaudio
 Requires:      libalsa-plugins
 Requires:      pulseaudio-module-x11
 Requires:      surface-tools
-Requires:      PyQt5-py3
-Requires:      python-sip-py3
-Requires:      pygobject-py3
 Requires:      libqt5-plugins
 Requires:      desktop-file-utils
 Requires:      remote-support-mambasoft
+Requires:      mambabase
+Requires:      mambareport
 
 %description
 openmamba default desktop theme and menu entries providing with various desktop related scripts and configuration files.
@@ -131,20 +117,16 @@ openmamba base tools for non graphical system.
 %make \
    ARCH=%{_target_cpu} \
    DISTROID=%{distroID} DISTROid=%{distroid} \
-   DISTROICON=%{distroicon} \
-   WITHKDE3TOOLS=%{with_kde3tools}
+   DISTROICON=%{distroicon}
 
 %install
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 %makeinstall \
    ARCH=%{_target_cpu} \
    DISTROID=%{distroID} DISTROid=%{distroid} \
-   DISTROICON=%{distroicon} \
-   WITHKDE3TOOLS=%{with_kde3tools}
+   DISTROICON=%{distroicon}
 
-%find_lang mambabase
-
-%find_lang openmamba-update
+%find_lang %{name} --all-name
 
 install -d -m0755 %{buildroot}%{_sysconfdir}/udev/rules.d
 ln -s /dev/null %{buildroot}%{_sysconfdir}/udev/rules.d/80-net-setup-link.rules
@@ -163,7 +145,7 @@ _EOF
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
-%files -n system-base-openmamba -f openmamba-update.lang
+%files -n system-base-openmamba -f %{name}.lang
 %defattr(-,root,root)
 %{_sysconfdir}/dnf/protected.d/system-base-openmamba.conf
 %{_sysconfdir}/udev/rules.d/80-net-setup-link.rules
@@ -179,7 +161,7 @@ _EOF
 %{_datadir}/%{distroid}/SRPMS/*
 %{_datadir}/pixmaps/system-logo-white.png
 
-%files -f mambabase.lang
+%files
 %defattr(-,root,root)
 %{_sysconfdir}/dnf/protected.d/desktop-base-openmamba.conf
 %{_sysconfdir}/xdg/menus/applications-merged/%{distroid}.menu
@@ -195,50 +177,18 @@ _EOF
 %{_datadir}/icons/hicolor/*/apps/distromenu-skype.png
 %{_datadir}/icons/hicolor/*/apps/distromenu-spotify.png
 %{_datadir}/icons/hicolor/*/apps/%{distroicon}.png
-%{_datadir}/icons/hicolor/*/apps/mamba.png
 %{_datadir}/icons/hicolor/scalable/apps/openmamba.svg
-#%{_kde4_bindir}/konsole-nofork
-%if "%{with_kde3}" == "1"
-%{_kdedatadir}/apps/konqueror/profiles/resourcesbrowsing
-%{_kdedatadir}/apps/kdisplay/color-schemes/openmamba_green.kcsrc
-%{_kdedatadir}/apps/kthememanager/themes/openmamba-green/openmamba-green.xml
-%{_kdedatadir}/apps/kthememanager/themes/openmamba-green/openmamba-green.preview.png
-%{_kdedatadir}/autostart/kmix.desktop
-%{_kdedatadir}/config/kcmartsrc
-%{_kdedatadir}/config/kcmfonts
-%{_kdedatadir}/config/kdeglobals
-%{_kdedatadir}/config/kmilodrc
-%{_kdedatadir}/config/kmixrc
-%{_kdedatadir}/config/knotifyrc
-%{_kdedatadir}/config/kwinrc
-%{_kdedatadir}/config/kickerrc
-%{_kdedatadir}/config/kdesktoprc
-%{_kdedatadir}/config/kcmthememanagerrc
-%{_kdedatadir}/config/konsolerc
-%{_kdedatadir}/config/kpagerrc
-%{_kdedatadir}/config/compizrc
-%{_kdedatadir}/wallpapers/*
-%endif
-# mambabase stuff
-%{_bindir}/mambabase
-%dir %{_datadir}/%{distroid}/mambabase
-%{_datadir}/%{distroid}/mambabase/mambabase.py
-%{_datadir}/%{distroid}/mambabase/mambabase-pkggroups-parser.sh
-%{_datadir}/%{distroid}/mambabase/*.ui
-%{_datadir}/%{distroid}/mambabase/mambabase-autostart.desktop
-%{_datadir}/%{distroid}/mambabase/openmamba.png
-%{_datadir}/%{distroid}/mambabase/mambabase.png
-%{_datadir}/%{distroid}/mambabase/nvidia-autoselect-driver
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/mambabase.qm
-%if "%{with_kde3tools}" == "1"
-%dir %{_datadir}/%{distroid}/mambareport
-%{_datadir}/%{distroid}/mambareport/mambareport.kmdr
-%endif
 # desktop stuff
 %{_sysconfdir}/profile.d/desktop-firsttime.sh
 %{_datadir}/openmamba/desktop/desktop-*.tar.bz2
 
 %changelog
+* Sat Jun 18 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 2022.06.18.1-1mamba
+- update to 2022.06.18.1
+
+* Sat Jun 18 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 2022.06.18-1mamba
+- update to 2022.06.18
+
 * Thu Jun 16 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 2022.06.16-1mamba
 - update to 2022.06.16