diff --git a/common.sh b/common.sh
index 7e1d7b6..b825310 100644
--- a/common.sh
+++ b/common.sh
@@ -1,15 +1,16 @@
 #!/usr/bin/bash
 
 ALL=0
-WORKSTATION=0
-EXTRA=0
+CORE=0
 DEV=0
+EXTRA=0
+WORKSTATION=0
 
 if [[ "$#" -eq 0 ]]; then
     ALL=1
 fi
 
-options=$(getopt -o awed -l all,workstation,extra,dev -- "$@")
+options=$(getopt -o acdew -l all,core,dev,extra,workstation -- "$@")
 [ $? -eq 0 ] || {
     echo "Incorrect options provided"
     exit 1
@@ -21,14 +22,17 @@ while true; do
     -a | --all)
         ALL=1
         ;;
-    -w | --workstation)
-        WORKSTATION=1
+    -c | --core)
+        CORE=1
+        ;;
+    -d | --dev)
+        DEV=1
         ;;
     -e | --extra)
         EXTRA=1
         ;;
-    -d | --dev)
-        DEV=1
+    -w | --workstation)
+        WORKSTATION=1
         ;;
     --)
         shift
diff --git a/install_dotfiles.sh b/install_dotfiles.sh
index 9e93d6f..9d85be5 100755
--- a/install_dotfiles.sh
+++ b/install_dotfiles.sh
@@ -120,15 +120,14 @@ function install() {
 }
 
 
-mode="${1-terminal}"
-
-echo $mode
 install -d "${HOME}/.dotfiles" "./"
 
-install .oh-my-zsh/themes/oke.zsh-theme
-install .zshrc
-install .vimrc
-install .winfo.sh
+if [ "${CORE}" -eq 1 ]; then
+    install .oh-my-zsh/themes/oke.zsh-theme
+    install .zshrc
+    install .vimrc
+    install .winfo.sh
+fi
 
 if [ "${WORKSTATION}" -eq 1 ]; then
     install .Xmodmap
diff --git a/install_packages_arch.sh b/install_packages_arch.sh
index 98c075d..bb07ad6 100755
--- a/install_packages_arch.sh
+++ b/install_packages_arch.sh
@@ -120,7 +120,9 @@ function add_pkg_list() {
     packages_to_install+=("${list_packages[@]}")
 }
 
-add_pkg_list pkgs_system_base
+if [ "${CORE}" -eq 1 ]; then
+    add_pkg_list pkgs_system_base
+fi
 
 if [ "${WORKSTATION}" -eq 1 ]; then
     add_pkg_list pkgs_system_workstation