diff --git a/apt-extend-mx b/apt-extend-mx
index c161d6f..0ff5295 100755
--- a/apt-extend-mx
+++ b/apt-extend-mx
@@ -3,48 +3,21 @@
 
 #
 # Additional Packages
-COMMON="joe keepass2 xdotool powerline fonts-powerline powerline-gitstatus curlftpfs libstdc++6"
+COMMON="keepass2 xdotool systemd-sysv openssh-server vim-nox tree"
+# COMMON="$COMMON curlftpfs"
+COMMON="$COMMON tlp tlp-rdw"
+COMMON="$COMMON fonts-powerline"
+COMMON="$COMMON nextcloud-desktop dolphin-nextcloud"
+# COMMON="$COMMON fonts-powerline powerline powerline-gitstatus"
 
-_COMMON="
-joe git tmux
-keepass2 xdotool
-brasero
-sshfs curlftpfs openssh-server
-fonts-powerline powerline python3-powerline python3-powerline-gitstatus
-lib32stdc++6
-"
+MULTIMEDIA="rhythmbox ario kodi kodi-pvr-hts"
+MULTIMEDIA="$MULTIMEDIA lame"
+MULTIMEDIA="$MULTIMEDIA qjackctl ardour calf-plugins eq10q fluid-soundfont-gm fluid-soundfont-gs lame"
 
-MULTIMEDIA="qjackctl ardour calf-plugins eq10q fluid-soundfont-gm fluid-soundfont-gs lame kodi"
+TOOLS="wavemon evolution retext gnuplot latexmk texlive-latex-recommended texlive-latex-extra texlive-lang-german texlive-fonts-recommended"
 
-_MULTIMEDIA="
-ffmpeg
-kodi kodi-pvr-hts
-spotify-client
-"
+PROGRAMMING="python-is-python3 python3-venv pkgconf libgtk2.0-dev jq meld"
 
-TOOLS="evolution latexmk texlive-generic-recommended texlive-latex-extra texlive-lang-german texlive-fonts-recommended"
-
-_TOOLS="
-evolution
-gnuplot
-gnome-boxes
-gvncviewer
-texlive-binaries texlive-latex-extra texlive-lang-german texlive-fonts-recommended texstudio
-gimp
-"
-
-PROGRAMMING="virtualenv python3-wxgtk4.0 qt5dxcb-plugin"
-
-_PROGRAMMING="
-pycodestyle
-virtualenv
-python-coverage python3-coverage python-jinja2 python3-jinja2
-python-wxtools python3-wxgtk4.0
-python3-evdev python3-serial
-python3-sphinx python3-sphinx-rtd-theme
-meld
-retext
-"
 
 ALL=$COMMON\ $MULTIMEDIA\ $TOOLS\ $PROGRAMMING