diff --git a/install/brew.sh b/install/brew.sh
deleted file mode 100755
index c967937a..00000000
--- a/install/brew.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-brew tap homebrew/dupes
-brew tap homebrew/php
-brew tap homebrew/versions
-brew tap caskroom/versions
-
-# install additional brew packages -- see _install.sh too
-brew install composer
-brew install curl --with-ssl --with-libssh2
-brew install ffmpeg --with-libvpx --with-libvorbis --with-fdk-aac
-brew install git-extras
-brew install git-flow
-brew install git-ftp
-brew install imagemagick
-brew install mariadb
-brew install mozjpeg
-brew install nginx --with-http2
-brew install openssl
-brew install php70 --with-homebrew-curl --with-homebrew-openssl
-brew install php70-intl
-brew install php70-mcrypt
-brew install rsync
-brew install rbenv
-brew install the_silver_searcher
-brew install wget
-brew install youtube-dl
-
-# brew cask and install software
-brew cask install alfred
-brew cask install carbon-copy-cloner
-brew cask install cleanmymac
-brew cask install dash
-brew cask install doxie
-brew cask install firefox
-brew cask install flux
-brew cask install google-chrome
-brew cask install harvest
-brew cask install imagealpha
-brew cask install imageoptim
-brew cask install libreoffice
-brew cask install qlcolorcode
-brew cask install qlstephen
-brew cask install sequel-pro
-brew cask install skype
-brew cask install slack
-brew cask install telegram
-brew cask install toggldesktop
-brew cask install transmission
-brew cask install virtualbox
-brew cask install vlc
-brew cask install xld
-
-# set some options for qlcolorcode
-defaults write org.n8gray.QLColorCode font Hack
-defaults write org.n8gray.QLColorCode fontSizePoints 9
-# maybe you have to copy solarized-dark into the caskroom to use it
-# have a look a the most current github repo for qlcolorcode
-defaults write org.n8gray.QLColorCode hlTheme solarized-dark
-defaults write org.n8gray.QLColorCode extraHLFlags '--replace-tabs=2'
-qlmanage -r
-
-# the rest -> appstore or adobe or others, such as gpg have to be installed manually
diff --git a/install/cli-tools.sh b/install/cli-tools.sh
new file mode 100755
index 00000000..5a14d4c7
--- /dev/null
+++ b/install/cli-tools.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+brew tap homebrew/dupes
+brew tap homebrew/php
+brew tap homebrew/versions
+
+# install additional brew packages -- see _install.sh too
+brew install composer
+brew install curl --with-ssl --with-libssh2
+brew install ffmpeg --with-libvpx --with-libvorbis --with-fdk-aac
+brew install git-extras
+brew install git-flow
+brew install git-ftp
+brew install imagemagick
+brew install mariadb
+brew install mas
+brew install mozjpeg
+brew install nginx --with-http2
+brew install openssl
+brew install php70 --with-homebrew-curl --with-homebrew-openssl
+brew install php70-intl
+brew install php70-mcrypt
+brew install rsync
+brew install rbenv
+brew install the_silver_searcher
+brew install wget
+brew install youtube-dl
diff --git a/install/software.sh b/install/software.sh
new file mode 100755
index 00000000..fe3d635e
--- /dev/null
+++ b/install/software.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+brew tap caskroom/versions
+
+# brew cask and install software
+brew cask install alfred
+brew cask install carbon-copy-cloner
+brew cask install cleanmymac
+brew cask install dash
+brew cask install doxie
+brew cask install firefox
+brew cask install flux
+brew cask install google-chrome
+brew cask install harvest
+brew cask install imagealpha
+brew cask install imageoptim
+brew cask install libreoffice
+brew cask install qlcolorcode
+brew cask install qlstephen
+brew cask install sequel-pro
+brew cask install skype
+brew cask install slack
+brew cask install telegram
+brew cask install toggldesktop
+brew cask install transmission
+brew cask install virtualbox
+brew cask install vlc
+brew cask install xld
+
+# set some options for qlcolorcode
+defaults write org.n8gray.QLColorCode font Hack
+defaults write org.n8gray.QLColorCode fontSizePoints 9
+defaults write org.n8gray.QLColorCode hlTheme blacknblue
+defaults write org.n8gray.QLColorCode extraHLFlags '--replace-tabs=2'
+qlmanage -r
+
+# mac app store installs using mas (brew install mas)
+mas install 411246225 # Caffeine
+mas install 430798174 # HazeOver
+mas install 443987910 # 1Password
+mas install 824171161 # Affinity Designer
+mas install 824183456 # Affinity Photo
+mas install 890031187 # Marked 2
+
+# the rest such as gpg and drivers have to be installed manually