diff --git a/clone_projects.sh b/clone_projects.sh
index 1caa404..4f2cc71 100644
--- a/clone_projects.sh
+++ b/clone_projects.sh
@@ -3,62 +3,65 @@
 ## This script clones all the different repos
 
 
-RED=$(tput setaf 1)
-GREEN=$(tput setaf 2)
-ORANGE=$(tput setaf 3)
-NC=$(tput sgr0)
-
-
 ##################
 # REPOS ON LIME2 #
 ##################
 
 echo "Setting up Keepass..."
 if [ -e ~/Keepass ]; then
-  echo "Keepass is already there, updating..."
+  echo "${GREEN}Keepass is already there, updating...${NC}"
   cd ~/Keepass && git pull
 else
-  echo "Cloning new Keepass..."
+  echo "${ORANGE}Cloning new Keepass...${NC}"
   cd && git clone ssh://flyingscorpio@2px.info.tm/~/repos/Keepass.git
 fi
 
-echo "Setting up VimConf..."
-if [ -e ~/VimConf ]; then
-  echo "VimConf is already there, updating..."
-  cd ~/VimConf && git pull
-else
-  echo "Cloning new VimConf..."
-  cd && git clone ssh://flyingscorpio@2px.info.tm/~/repos/VimConf.git
-fi
-cd ~/VimConf && /bin/bash ~/VimConf/update.sh "$OS"
-
 echo "Setting up Lessons..."
 if [ -e ~/Lessons ]; then
-  echo "Lessons is already there, updating..."
+  echo "${GREEN}Lessons is already there, updating...${NC}"
   cd ~/Lessons && git pull
 else
-  echo "Cloning new Lessons..."
+  echo "${ORANGE}Cloning new Lessons...${NC}"
   cd && git clone ssh://flyingscorpio@2px.info.tm/~/repos/Lessons.git
 fi
 
-echo "Setting up RootMe..."
-if [ -e ~/RootMe ]; then
-  echo "RootMe is already there, updating..."
-  cd ~/RootMe && git pull
-else
-  echo "Cloning new RootMe..."
-  cd && git clone ssh://flyingscorpio@2px.info.tm/~/repos/RootMe.git
-fi
-
 echo "Setting up PersonnalScripts..."
 if [ -e ~/PersonnalScripts ]; then
-  echo "PersonnalScripts is already there, updating..."
+  echo "${GREEN}PersonnalScripts is already there, updating...${NC}"
   cd ~/PersonnalScripts && git pull
 else
-  echo "Cloning new PersonnalScripts..."
+  echo "${ORANGE}Cloning new PersonnalScripts...${NC}"
   cd && git clone ssh://flyingscorpio@2px.info.tm/~/repos/PersonnalScripts.git
 fi
 
+echo "Setting up RootMe..."
+if [ -e ~/RootMe ]; then
+  echo "${GREEN}RootMe is already there, updating...${NC}"
+  cd ~/RootMe && git pull
+else
+  echo "${ORANGE}Cloning new RootMe...${NC}"
+  cd && git clone ssh://flyingscorpio@2px.info.tm/~/repos/RootMe.git
+fi
+
+echo "Setting up SetupCockpit..."
+if [ -e ~/SetupCockpit ]; then
+  echo "${GREEN}SetupCockpit is already there, updating...${NC}"
+  cd ~/SetupCockpit && git pull
+else
+  echo "${ORANGE}Cloning new SetupCockpit...${NC}"
+  cd && git clone ssh://flyingscorpio@2px.info.tm/~/repos/SetupCockpit.git
+fi
+
+echo "Setting up VimConf..."
+if [ -e ~/VimConf ]; then
+  echo "${GREEN}VimConf is already there, updating...${NC}"
+  cd ~/VimConf && git pull
+else
+  echo "${ORANGE}Cloning new VimConf...${NC}"
+  cd && git clone ssh://flyingscorpio@2px.info.tm/~/repos/VimConf.git
+fi
+cd ~/VimConf && /bin/bash ~/VimConf/update.sh "$OS"
+
 
 ###################
 # REPOS ON GITLAB #
@@ -66,24 +69,24 @@ fi
 
 if [ ! -e ~/SRC ]; then
   mkdir ~/SRC
-  echo "Created ~/SRC"
+  echo "${ORANGE}Created ~/SRC${NC}"
 fi
 
 echo "Setting up e2li/depydoc..."
 if [ -e ~/SRC/depydoc ]; then
-  echo "depydoc is already there, updating..."
+  echo "${GREEN}depydoc is already there, updating..${NC}."
   cd ~/SRC/depydoc && git pull
 else
-  echo "Cloning new depydoc..."
+  echo "${ORANGE}Cloning new depydoc...${NC}"
   cd ~/SRC && git clone https://gitlab.com/e2li/depydoc.git
 fi
 
 echo "Setting up 2px..."
 if [ -e ~/SRC/2px ]; then
-  echo "2px is already there, updating..."
+  echo "${GREEN}2px is already there, updating...${NC}"
   cd ~/SRC/2px && git pull
 else
-  echo "Cloning new 2px..."
+  echo "${ORANGE}Cloning new 2px...${NC}"
   cd ~/SRC && git clone https://gitlab.com/flyingscorpio/2px.git
   cd ~/SRC/2px && python3 -m venv env
   echo "
@@ -98,28 +101,28 @@ fi
 
 echo "Setting up BlurMySearches..."
 if [ -e ~/SRC/BlurMySearches ]; then
-  echo "BlurMySearches is already there, updating..."
+  echo "${GREEN}BlurMySearches is already there, updating...${NC}"
   cd ~/SRC/BlurMySearches && git pull
 else
-  echo "Cloning new BlurMySearches..."
+  echo "${ORANGE}Cloning new BlurMySearches...${NC}"
   cd ~/SRC && git clone https://gitlab.com/flyingscorpio/BlurMySearches.git
 fi
 
-echo "Setting up JsonToPython..."
+echo "Setting up JsonToPython...${NC}"
 if [ -e ~/SRC/JsonToPython ]; then
-  echo "JsonToPython is already there, updating..."
+  echo "${GREEN}JsonToPython is already there, updating...${NC}"
   cd ~/SRC/JsonToPython && git pull
 else
-  echo "Cloning new JsonToPython..."
+  echo "${ORANGE}Cloning new JsonToPython...${NC}"
   cd ~/SRC && git clone https://gitlab.com/flyingscorpio/JsonToPython.git
 fi
 
 echo "Setting up LVEL-website..."
 if [ -e ~/SRC/LVEL-website ]; then
-  echo "LVEL-website is already there, updating..."
+  echo "${GREEN}LVEL-website is already there, updating...${NC}"
   cd ~/SRC/LVEL-website && git pull
 else
-  echo "Cloning new LVEL-website..."
+  echo "${ORANGE}Cloning new LVEL-website...${NC}"
   cd ~/SRC && git clone https://gitlab.com/flyingscorpio/LVEL-website.git
   cd ~/SRC/LVEL-website && python3 -m venv env
   echo "
@@ -134,72 +137,72 @@ fi
 
 echo "Setting up MarioSokoban..."
 if [ -e ~/SRC/MarioSokoban ]; then
-  echo "MarioSokoban is already there, updating..."
+  echo "${GREEN}MarioSokoban is already there, updating...${NC}"
   cd ~/SRC/MarioSokoban && git pull
 else
-  echo "Cloning new MarioSokoban..."
+  echo "${ORANGE}Cloning new MarioSokoban...${NC}"
   cd ~/SRC && git clone https://gitlab.com/flyingscorpio/MarioSokoban.git
 fi
 
 echo "Setting up PythonLocalBlockchain..."
 if [ -e ~/SRC/PythonLocalBlockchain ]; then
-  echo "PythonLocalBlockchain is already there, updating..."
+  echo "${GREEN}PythonLocalBlockchain is already there, updating...${NC}"
   cd ~/SRC/PythonLocalBlockchain && git pull
 else
-  echo "Cloning new PythonLocalBlockchain..."
+  echo "${ORANGE}Cloning new PythonLocalBlockchain...${NC}"
   cd ~/SRC && git clone https://gitlab.com/flyingscorpio/PythonLocalBlockchain.git
 fi
 
 echo "Setting up Roboc-GUI..."
 if [ -e ~/SRC/Roboc-GUI ]; then
-  echo "Roboc-GUI is already there, updating..."
+  echo "${GREEN}Roboc-GUI is already there, updating...${NC}"
   cd ~/SRC/Roboc-GUI && git pull
 else
-  echo "Cloning new Roboc-GUI..."
+  echo "${ORANGE}Cloning new Roboc-GUI...${NC}"
   cd ~/SRC && git clone https://gitlab.com/flyingscorpio/Roboc-GUI.git
 fi
 
 echo "Setting up Roboc-console..."
 if [ -e ~/SRC/Roboc-console ]; then
-  echo "Roboc-console is already there, updating..."
+  echo "${GREEN}Roboc-console is already there, updating...${NC}"
   cd ~/SRC/Roboc-console && git pull
 else
-  echo "Cloning new Roboc-console..."
+  echo "${ORANGE}Cloning new Roboc-console...${NC}"
   cd ~/SRC && git clone https://gitlab.com/flyingscorpio/Roboc-console
 fi
 
 echo "Setting up SudokuSolver..."
 if [ -e ~/SRC/SudokuSolver ]; then
-  echo "SudokuSolver is already there, updating..."
+  echo "${GREEN}SudokuSolver is already there, updating...${NC}"
   cd ~/SRC/SudokuSolver && git pull
 else
-  echo "Cloning new SudokuSolver..."
+  echo "${ORANGE}Cloning new SudokuSolver...${NC}"
   cd ~/SRC && git clone https://gitlab.com/flyingscorpio/SudokuSolver.git
 fi
 
 echo "Setting up TicTacToe..."
 if [ -e ~/SRC/TicTacToe ]; then
-  echo "TicTacToe is already there, updating..."
+  echo "${GREEN}TicTacToe is already there, updating...${NC}"
   cd ~/SRC/TicTacToe && git pull
 else
-  echo "Cloning new TicTacToe..."
+  echo "${ORANGE}Cloning new TicTacToe...${NC}"
   cd ~/SRC && git clone https://gitlab.com/flyingscorpio/TicTacToe.git
 fi
 
 echo "Setting up WhitespaceInterpreter..."
 if [ -e ~/SRC/WhitespaceInterpreter ]; then
-  echo "WhitespaceInterpreter is already there, updating..."
+  echo "${GREEN}WhitespaceInterpreter is already there, updating...${NC}"
   cd ~/SRC/WhitespaceInterpreter && git pull
 else
-  echo "Cloning new WhitespaceInterpreter..."
+  echo "${ORANGE}Cloning new WhitespaceInterpreter...${NC}"
   cd ~/SRC && git clone https://gitlab.com/flyingscorpio/WhitespaceInterpreter.git
 fi
 
 echo "Setting up WikipediaAcronymScraper..."
 if [ -e ~/SRC/WikipediaAcronymScraper ]; then
-  echo "WikipediaAcronymScraper is already there, updating..."
+  echo "${GREEN}WikipediaAcronymScraper is already there, updating...${NC}"
   cd ~/SRC/WikipediaAcronymScraper && git pull
 else
-  echo "Cloning new WikipediaAcronymScraper..."
+  echo "${ORANGE}Cloning new WikipediaAcronymScraper...${NC}"
   cd ~/SRC && git clone https://gitlab.com/flyingscorpio/WikipediaAcronymScraper.git
 fi
diff --git a/setup_cockpit.sh b/setup_cockpit.sh
index 7a8bb1e..5169c93 100755
--- a/setup_cockpit.sh
+++ b/setup_cockpit.sh
@@ -45,7 +45,7 @@ fi
 echo "Using $OS"
 export OS
 
-/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
+/bin/bash ~/SetupCockpit/separator.sh
 
 
 ###################
@@ -55,15 +55,15 @@ export OS
 echo "Installing scripts..."
 
 if [ "$OS" = 'debian' ]; then
-  /bin/bash ~/PersonnalScripts/SetupCockpit/debian_based_installs.sh
+  /bin/bash ~/SetupCockpit/debian_based_installs.sh
 elif [ "$OS" = 'arch' ]; then
-  /bin/bash ~/PersonnalScripts/SetupCockpit/arch_based_installs.sh
+  /bin/bash ~/SetupCockpit/arch_based_installs.sh
 else
   echo "${RED} Didn't receive correct OS information, quitting...${NC}"
   exit 1
 fi
 
-/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
+/bin/bash ~/SetupCockpit/separator.sh
 
 
 ########################
@@ -71,13 +71,13 @@ fi
 ########################
 
 echo "Updating .bash_aliases..."
-if cp ~/PersonnalScripts/SetupCockpit/.bash_aliases ~/.bash_aliases; then
+if cp ~/SetupCockpit/bash_aliases ~/.bash_aliases; then
   echo "${GREEN}Successfully updated .bash_aliases${NC}"
 else
   echo "${ORANGE}There was a problem while updating .bash_aliases${NC}"
 fi
 
-/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
+/bin/bash ~/SetupCockpit/separator.sh
 
 
 #################
@@ -93,7 +93,7 @@ git config --global alias.co "checkout"
 git config --global alias.st "status"
 git config --global alias.br "branch"
 
-/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
+/bin/bash ~/SetupCockpit/separator.sh
 
 
 ##############################################################################
@@ -111,10 +111,10 @@ echo "<?xml version=\"1.0\"?>
       <glob pattern=\"*.mkd\"/>
       <glob pattern=\"*.markdown\"/>
     </mime-type>
-  </mime-info>" >> ~/.local/share/mime/packages/text-markdown.xml
+  </mime-info>" > ~/.local/share/mime/packages/text-markdown.xml
 fi
 
-/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
+/bin/bash ~/SetupCockpit/separator.sh
 
 
 ##################
@@ -125,7 +125,7 @@ echo "Cloning projects..."
 
 /bin/bash clone_projects.sh
 
-/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
+/bin/bash ~/SetupCockpit/separator.sh
 
 
 #######################
@@ -136,4 +136,4 @@ echo "Configuring ProtonVPN..."
 
 sudo protonvpn init && sudo protonvpn c --cc NL
 
-/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
+/bin/bash ~/SetupCockpit/separator.sh