diff --git a/openmamba-groups.db b/openmamba-groups.db
index 206879b..4caf7f4 100644
--- a/openmamba-groups.db
+++ b/openmamba-groups.db
@@ -7,14 +7,14 @@ ARCH=`uname -m`
 
 PKG_GROUPS=("KERNEL_MAMBA_PKGS" "KERNEL_MAMBA_64GB_PKGS" "BASE_PKGS" "OFFICE_PKGS" "OFFICE_EXTRA_PKGS" "MULTIMEDIA_PLAYERS_PKGS"
             "MULTIMEDIA_EDITING_PKGS" "INTERNET_PKGS" "INTERNET_EXTRA_PKGS" "GRAPHICS_PKGS" "SCIENTIFIC_PKGS" "GAMES_PKGS"
-            "GAMES_EXTRA_PKGS" "VIRTUALIZATION_PKGS" "SERVER_PKGS" "DEVEL_PKGS" "SUN_JAVA_PKGS" "SUN_JAVA_RUNTIME_PKGS")
+            "GAMES_EXTRA_PKGS" "VIRTUALIZATION_PKGS" "SERVER_PKGS" "DEVEL_PKGS")
 PKG_NAMES=("kernel" "kernel-64GB" "base" "office" "office-extras" "multimedia-players" "multimedia-editing" "internet"
            "internet-extras" "graphics" "scientific" "games" "games-extras" "virtualization"
-           "server" "devel" "sun-java" "sun-java-runtime")
+           "server" "devel")
 PKG_DESC=("Standard kernel" "64GB kernel for computers with 4GB or more" "Base packages" "Office suite" "Office extra packages"
           "Audio and Video players" "Multimedia editing and production applications" "Internet applications"
           "Internet extra applications" "Graphics applications" "Scientific applications" "Games" "Games extras"
-          "Virtualization applications" "Server packages" "Development packages" "Sun Java" "Sun Java Runtime")
+          "Virtualization applications" "Server packages" "Development packages")
 
 KERNEL_MAMBA_PKGS="kernel-mamba"
 KERNEL_MAMBA_64GB_PKGS="kernel-mamba-64GB"
@@ -23,11 +23,11 @@ KERNEL_MAMBA_ARM_PKGS="kernel-mamba-arm"
 KERNEL_MAMBA_AARCH64_PKGS="kernel-mamba-aarch64"
 
 BASE_PKGS="\
-desktop-base-openmamba logrotate systemd-cron openssh-server \
+desktop-base-openmamba systemd-cron openssh-server \
 samba-server foomatic nfs-utils openmamba-lsb sane cups \
 mambatray r5u87x-firmware zd1211-firmware \
 alsa-firmware alsa-tools-firmware midisport-firmware \
-bluez-firmware ipw2100-firmware ipw2200-firmware xterm desktop-file-utils \
+bluez-firmware ipw2100-firmware ipw2200-firmware desktop-file-utils \
 cjkuni-uming-fonts-ttf un-core-fonts-ttf inetutils"
 
 if [ "$ARCH" != "arm" ]; then
@@ -46,27 +46,21 @@ if [ "$GNOME_IS_INSTALLED" ]; then
 fi
 
 BASE_PKGS_EXTRAS="\
-gnupg apt-file xorg-apps-extra hsfmodem \
-compiz-fusion-plugins-extra compiz-fusion-plugins-main \
-compizconfig-settings-manager syslog-ng"
+gnupg2 xorg-apps-extra hsfmodem syslog-ng"
 
 OFFICE_PKGS="\
 libreoffice-base libreoffice-math libreoffice-writer libreoffice-impress \
 libreoffice-calc libreoffice-filters libreoffice-pyuno libreoffice-draw"
 
+OFFICE_EXTRA_PKGS="abiword"
+
 if [ "$KDE_IS_INSTALLED" ]; then
-   OFFICE_PKGS="$OFFICE_PKGS kmymoney"
+   OFFICE_EXTRA_PKGS="$OFFICE_EXTRA_PKGS kmymoney"
 fi
 if [ "$GNOME_IS_INSTALLED" ]; then
-   OFFICE_PKGS="$OFFICE_PKGS gnucash"
+   OFFICE_EXTRA_PKGS="$OFFICE_EXTRA_PKGS gnucash"
 fi
 
-# sync-engine synce-kpm libopensync-plugin-python \
-#libopensync-plugin-syncml libopensync-plugin-palm \
-# libopensync-plugin-moto libopensync-plugin-google-calendar"
-
-OFFICE_EXTRA_PKGS="abiword"
-
 if [ "$KDE_IS_INSTALLED" ]; then
    OFFICE_EXTRA_PKGS="$OFFICE_EXTRA_PKGS koffice kmymoney2"
 fi
@@ -77,18 +71,14 @@ fi
 
 MULTIMEDIA_PLAYERS_PKGS="vlc"
 
-if [ "$KDE_IS_INSTALLED" ]; then
-   MULTIMEDIA_PLAYERS_PKGS="$MULTIMEDIA_PLAYERS_PKGS amarok kaffeine juk"
-fi
+MULTIMEDIA_PLAYERS_EXTRA_PKGS="xmms clementine \
+miro dragonplayer freetuxtv amarok kaffeine juk"
 
-MULTIMEDIA_PLAYERS_EXTRA_PKGS="xmms alsaplayer-output-alsa alsaplayer-output-oss clementine \
-miro dragonplayer freetuxtv"
-
-MULTIMEDIA_EDITING_PKGS="lmms MuseScore qjackctl \
-qsynth hydrogen mixxx audacity muse DVDStyler"
+MULTIMEDIA_EDITING_PKGS="audacity"
 
 MULTIMEDIA_EDITING_EXTRA_PKGS="puredata timidity ardour qtractor rosegarden ZynAddSubFX DVDAuthorWizard \
-DVDRipOMatic reKordmydesktop lives"
+DVDRipOMatic reKordmydesktop lives lmms MuseScore qjackctl \
+qsynth hydrogen mixxx muse DVDStyler"
 
 if [ "$KDE_IS_INSTALLED" ]; then
    MULTIMEDIA_EDITING_PKGS="$MULTIMEDIA_EDITING_PKGS \
@@ -102,7 +92,7 @@ AUDIO_PKGS="$MULTIMEDIA_PLAYERS_PKGS"
 AUDIO_PROF_PKGS="$MULTIMEDIA_EDITING_PKGS"
 VIDEO_PKGS="$MULTIMEDIA_EDITING_PKGS"
 
-INTERNET_PKGS="firefox FileZilla"
+INTERNET_PKGS="firefox FileZilla telegram-desktop"
 
 if [ "$KDE_IS_INSTALLED" ]; then
    INTERNET_PKGS="$INTERNET_PKGS ktorrent kontact kopete kpartsplugin kdeconnect"
@@ -118,16 +108,16 @@ if [ "$ARCH" == "x86_64" ]; then
    INTERNET_EXTRA_PKGS="chromium $INTERNET_EXTRA_PKGS"
 fi
 
-GRAPHICS_PKGS="xsane"
+GRAPHICS_PKGS="krita"
 
 if [ "$KDE_IS_INSTALLED" ]; then
-   GRAPHICS_PKGS="$GRAPHICS_PKGS krita digikam gwenview kgamma5 kruler \
+   GRAPHICS_PKGS="$GRAPHICS_PKGS skanlite krita digikam gwenview kgamma5 kruler \
 spectacle kamera kcolorchooser kolourpaint kamoso"
 else
    GRAPHICS_PKGS="$GRAPHICS_PKGS gimp cheese"
 fi
 
-GRAPHICS_EXTRA_PKGS="blender inkscape cinepaint xscreensaver xscreensaver-gl"
+GRAPHICS_EXTRA_PKGS="xsane blender inkscape cinepaint xscreensaver xscreensaver-gl"
 
 SCIENTIFIC_PKGS="stellarium"
 
@@ -190,15 +180,11 @@ if [ "$KDE_IS_INSTALLED" ]; then
    DEVEL_PKGS="$DEVEL_PKGS"
 fi
 
-SUN_JAVA_PKGS="sun-java"
-SUN_JAVA_RUNTIME_PKGS="sun-java-runtime"
-
 # default client installation
 ALL_PKGS="\
 $KERNEL $BASE_PKGS $OFFICE_PKGS $MULTIMEDIA_PLAYERS_PKGS $MULTIMEDIA_EDITING_PKGS \
 $INTERNET_PKGS $GRAPHICS_PKGS \
-$GAMES_PKGS $VIRTUALIZATION_PKGS $DEVEL_PKGS \
-$SUN_JAVA_PKGS $SUN_JAVA_RUNTIME_PKGS"
+$GAMES_PKGS $VIRTUALIZATION_PKGS"
 
 EXTRA_PKGS="\
 $OFFICE_EXTRA_PKGS $INTERNET_EXTRA_PKGS $GAMES_EXTRA_PKGS $SERVER_PKGS"