diff --git a/README.md b/README.md
index 6f333c9..d0a2786 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,15 @@
 ## Overview
 ### Helium_Helper.sh
 - Interactive installer and updater script
-- Installs to `/home/<USER>/.apps/Helium`  |  changeable in line 15 `INSTALL_PATH` 
+- Installs to `/home/<USER>/.apps/Helium`  |  changeable in line 27 `INSTALL_PATH` 
 - Assumes: 
-    - Presence of `/home/<USER>/.apps/Helium` when updating  |  changeable in line 15 `INSTALL_PATH`
-    - Executable named `helium-browser.AppImage`  |  for convenience so launchers don't have to be edited at each update
-- Keeps prior AppImage as `helium-browser.OldAppImage` which will be replaced at every update
+    - Presence of `/home/<USER>/.apps/Helium` when updating  |  changeable in line 27 `INSTALL_PATH`
+    - Executable named `Helium.AppImage`  |  for convenience so launchers don't have to be edited at each update
+- Keeps prior AppImage as `Helium.old` which will be replaced at every update
+- Adds desktop launcher to `/home/<USER>/.local/share/applications`
 
 ### Helium_Auto_Update.sh
-- Automatic updater script for e.g. `cron`
+- Automatic updater script
 - Installs to `/home/<USER>/.apps/Helium`  |  changeable in line 8 `INSTALL_PATH` 
 - Assumes: 
     - Presence of `/home/<USER>/.apps/Helium` when updating  |  changeable in line 8 `INSTALL_PATH`
diff --git a/assets/icon/helium.png b/assets/icon/helium.png
new file mode 100644
index 0000000..238d157
Binary files /dev/null and b/assets/icon/helium.png differ
diff --git a/assets/launcher/helium.desktop.template b/assets/launcher/helium.desktop.template
new file mode 100644
index 0000000..22ea353
--- /dev/null
+++ b/assets/launcher/helium.desktop.template
@@ -0,0 +1,24 @@
+[Desktop Entry]
+Version=1.0
+Name=Helium Web Browser
+GenericName=Web Browser
+Comment=Access the Internet
+Exec=%APP_LOCATION% %U
+StartupNotify=true
+StartupWMClass=helium
+Terminal=false
+Icon=%ICON_LOCATION%
+Type=Application
+Categories=Network;WebBrowser;
+MimeType=application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;
+Actions=new-window;new-private-window;
+X-AppImage-Version=%APP_VERSION%
+
+[Desktop Action new-window]
+Name=New Window
+Exec=%APP_LOCATION%
+
+[Desktop Action new-private-window]
+Name=New Incognito Window
+Exec=%APP_LOCATION% --incognito
+
diff --git a/assets/launcher/helium.desktop.txt b/assets/launcher/helium.desktop.txt
new file mode 100644
index 0000000..22ea353
--- /dev/null
+++ b/assets/launcher/helium.desktop.txt
@@ -0,0 +1,24 @@
+[Desktop Entry]
+Version=1.0
+Name=Helium Web Browser
+GenericName=Web Browser
+Comment=Access the Internet
+Exec=%APP_LOCATION% %U
+StartupNotify=true
+StartupWMClass=helium
+Terminal=false
+Icon=%ICON_LOCATION%
+Type=Application
+Categories=Network;WebBrowser;
+MimeType=application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;
+Actions=new-window;new-private-window;
+X-AppImage-Version=%APP_VERSION%
+
+[Desktop Action new-window]
+Name=New Window
+Exec=%APP_LOCATION%
+
+[Desktop Action new-private-window]
+Name=New Incognito Window
+Exec=%APP_LOCATION% --incognito
+
diff --git a/helium_helper.sh b/helium_helper.sh
index bfe1f44..9e9d41f 100755
--- a/helium_helper.sh
+++ b/helium_helper.sh
@@ -1,57 +1,95 @@
 #!/bin/bash
 
-# HELIUM BOWSER INSTALL & UPDATE SCRIPT ---> INTERACTIVE
+# Helium BOWSER INSTALL & UPDATE SCRIPT ---> INTERACTIVE
+
+########## PREREQUISITES ###########
+set -e
 
 ## SOME COLOR
 CYN="\e[0;36m"
 YEL="\e[0;33m"
 RED="\e[0;31m"
 GRN="\e[0;32m"
+LCY="\e[1;36m"
 CRS="\e[0m"
 
-## FOLDER & GLOBAL VARIABLES
-SCRIPT_VERSION="0.4"
-mkdir -p /tmp/Helium
-TMP=/tmp/Helium
-INSTALL_PATH=$HOME/.apps/Helium
-PROFILE=$HOME/.profile
-MISSING=$(cat $TMP/missingDeps 2>/dev/null)
-DEPENDENCIES=("curl" "wget")
-GIT_VERSION=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "tag_name" | tr -d \", | awk '{print $2}')
+## GLOBAL VARIABLES
+APP_NAME="Helium"
+APP_NAME_LONG="Helium Web Browser"
+SOURCE="GitHub"
+SCRIPT_NAME="$APP_NAME Helper Script"
+SCRIPT_FILE_NAME="helium_helper.sh"
+SCRIPT_VERSION="0.5.1"
+DATE=$(date)
 
-### SCRIPT DEPENDENCIES
-dependency_check() { 
+## LOCATIONS
+TMP=/tmp/$APP_NAME
+INSTALL_PATH=$HOME/.apps/$APP_NAME
+CONFIG_PATH=$INSTALL_PATH/assets
+BACKUP_PATH=$INSTALL_PATH/assets/backup
+LOG_PATH=$INSTALL_PATH/assets/logs
+LOG=$LOG_PATH/log
+LAUNCHER_PATH=$HOME/.local/share/applications
+SCRIPT_PATH=$HOME/.local/bin
+#PROFILE=$HOME/.profile     ### for AUTO UPDATE
+
+########## FUNCTIONS ###########
+
+### DEPENDENCIES
+cmd_query() { 
     local PACKAGE="$1"
 
-    if command -v "$PACKAGE" >/dev/null 2>&1 ; then
-        :
-
-    else
-        echo "$PACKAGE" >> $TMP/missingDeps
+    if ! command -v "$PACKAGE" >/dev/null 2>&1 ; then
+        echo "    - $PACKAGE" >> $TMP/missingDeps
 
     fi
 }
 
-for PACKAGE in "${DEPENDENCIES[@]}" ; do
-    dependency_check "$PACKAGE"
+dependency_check () {
+    DEPENDENCIES=("curl" "wget")
+    mkdir -p $TMP
+    
+    for PACKAGE in "${DEPENDENCIES[@]}" ; do
+        cmd_query "$PACKAGE"
 
-done
+    done
 
-if ! [ "$MISSING" ] ; then
-    :
+    if [ -f "$TMP/missingDeps" ] ; then
+        MISSING=$(cat $TMP/missingDeps)
+        echo -e "\n  ${RED}Following dependencies are missing :\n\n${CRS}$MISSING\n\n  ${CYN}Please install and re-run script !${CRS}"
+        exit_clean
+        exit
+        
+    fi
+}
 
-else
-    echo -e "\n  ${RED}Following dependencies are missing :\n\n${YEL}$MISSING\n\n  ${CYN}Please install and re-run script !${CRS}"
-    rm $TMP/missingDeps
-    exit 1
+### CHECK LOCAL INSTALL
+local_check() {
+    if ! [ -d "$INSTALL_PATH" ] ; then
+        echo -e "\n  ${RED}$APP_NAME_LONG directory not found!${CRS}"
+        install_helium
+        exit
+        
+    elif ! [ -f "$INSTALL_PATH/$APP_NAME.AppImage" ] ; then
+        echo -e "\n  ${RED}$APP_NAME_LONG directory found but no executable named ${CYN}$APP_NAME.AppImage${RED}!${CRS}"
+        install_helium
+        exit
 
-fi
+    fi
+}
 
-## CHECK LOCAL INSTALL
+### INSTALL
 install_helium() {
+    if [ -f "$INSTALL_PATH/$APP_NAME.AppImage" ] ; then
+        echo -e "\n  ${CYN}$APP_NAME_LONG AppImage found! Trying to update...${CRS}"
+        update_helium
+        exit
+
+    fi
 
     while true ; do
-        read -p "  Download and install Helium from GitHub? (Y/n) : " CONFIRM_INSTALL
+        read -p "  Download and install $APP_NAME_LONG from $SOURCE? (Y/n) : " CONFIRM_INSTALL
+        echo
 
         if [[ "$CONFIRM_INSTALL" == "" || "$CONFIRM_INSTALL" == "y" || "$CONFIRM_INSTALL" == "Y" ]] ; then
             GIT_URL=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "browser_download_url" | grep "x86_64.AppImage" | grep -v "zsync" | tr -d \" | awk '{print $2}')
@@ -59,92 +97,357 @@ install_helium() {
             wget -P $TMP $GIT_URL -q --show-progress
             chmod +x $TMP/$GIT_FILENAME
             mkdir -p $INSTALL_PATH
-            mv $TMP/$GIT_FILENAME $INSTALL_PATH/helium-browser.AppImage
-            echo -e "\n  ${GRN}Helium is installed !${CRS}\n"
-            rm -rf $TMP
-            exit 0
+            mv $TMP/$GIT_FILENAME $INSTALL_PATH/$APP_NAME.AppImage
+            echo -e "\n  ${GRN}$APP_NAME_LONG is installed!${CRS}\n"
+            add_launcher
+            exit_clean
 
         elif [[ "$CONFIRM_INSTALL" == "n" || "$CONFIRM_INSTALL" == "N" ]] ; then
-            echo -e "\n  ${RED}Installation cancelled !${CRS}\n"
-            exit 1
+            echo -e "\n  ${RED}Installation cancelled!${CRS}\n"
+            exit
 
         else
-            echo -e "  ${YEL}Invalid response !${CRS}\n"
+            echo -e "  ${YEL}Invalid response!${CRS}\n"
             
         fi
 
     done
 }
 
-if ! [ -d "$INSTALL_PATH" ] ; then
-    echo -e "\n  ${RED}Helium directory not found !${CRS}"
-    install_helium
+### LAUNCHER --> TO DO
+add_launcher() {
+    if [ -f "$LAUNCHER_PATH/$APP_NAME.desktop" ] ; then
+        echo -e "\n  ${RED}${APP_NAME}.desktop already exists!${CRS}"
+        exit
+    
+    elif [ -f "$INSTALL_PATH/$APP_NAME.AppImage" ] ; then
+        while true ; do
+        read -p "  Add $APP_NAME_LONG launcher to $LAUNCHER_PATH? (Y/n) : " CONFIRM_LAUNCHER
+        echo
 
-elif ! [ -f "$INSTALL_PATH/helium-browser.AppImage" ] ; then
-    echo -e "\n  ${RED}Helium directory found but no executable named ${CYN}helium-browser.AppImage ${RED}!${CRS}"
-    install_helium
+        if [[ "$CONFIRM_LAUNCHER" == "" || "$CONFIRM_LAUNCHER" == "y" || "$CONFIRM_LAUNCHER" == "Y" ]] ; then
+            LAUNCHER_URL=https://lab.c95.org/fr4nz/helium-helper/raw/branch/main/assets/launcher/helium.desktop.template
+            ICON_URL=https://lab.c95.org/fr4nz/helium-helper/raw/branch/main/assets/icon/helium.png
+            LOCAL_VERSION=$($INSTALL_PATH/$APP_NAME.AppImage --version | awk '{print $2}')
+            wget -P $TMP $LAUNCHER_URL -q --show-progress
+            wget -P $TMP $ICON_URL -q --show-progress
+            sed -i "s|%APP_LOCATION%|$INSTALL_PATH/$APP_NAME.AppImage|" $TMP/helium.desktop.template
+            sed -i "s|%ICON_LOCATION%|$CONFIG_PATH/icon/helium.png|" $TMP/helium.desktop.template
+            sed -i "s|%APP_VERSION%|$LOCAL_VERSION|" $TMP/helium.desktop.template
+            mkdir -p $LAUNCHER_PATH $BACKUP_PATH $CONFIG_PATH/icon
+            cp $TMP/helium.desktop.template $LAUNCHER_PATH/$APP_NAME.desktop
+            mv $TMP/helium.desktop.template $BACKUP_PATH/$APP_NAME.desktop.backup
+            mv $TMP/helium.png $CONFIG_PATH/icon
+            echo -e "\n  ${GRN}$APP_NAME_LONG launcher is set up!${CRS}\n"
+            exit_clean
 
-else 
-    :
+        elif [[ "$CONFIRM_LAUNCHER" == "n" || "$CONFIRM_LAUNCHER" == "N" ]] ; then
+            echo -e "\n  ${RED}Launcher creation cancelled!${CRS}\n"
+            exit
 
-fi
+        else
+            echo -e "  ${YEL}Invalid response!${CRS}\n"
+            
+        fi
 
-## COMPARE 
+    done
+
+    else
+        echo -e "\n  ${RED}$APP_NAME_LONG AppImage not found! Can't add launcher...${CRS}"
+        install_helium
+        exit
+    
+    fi
+}
+
+### UPDATE
 update_helium() {
+    LOCAL_VERSION=$($INSTALL_PATH/$APP_NAME.AppImage --version | awk '{print $2}')
+    GIT_VERSION=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "tag_name" | tr -d \", | awk '{print $2}')
 
-    while true ; do
-        read -p "  Download and update Helium from GitHub? (Y/n) : " CONFIRM
+    ### CHECK FOR EMPTY VERSION TAGS
+    if [ -z "$GIT_VERSION" ] ; then
+        echo -e "\n  ${RED}Empty version tag from ${CYN}$SOURCE${RED}! Can't compare, exiting...${CRS}"
+        exit
 
-        if [[ "$CONFIRM" == "" || "$CONFIRM" == "y" || "$CONFIRM" == "Y" ]] ; then
-            GIT_URL=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "browser_download_url" | grep "x86_64.AppImage" | grep -v "zsync" | tr -d \" | awk '{print $2}')
-            GIT_FILENAME=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "browser_download_url" | grep "x86_64.AppImage" | grep -v "zsync" | tr -d \" | awk '{print $2}' | awk -F'/' '{print $9}')
-            wget -P $TMP $GIT_URL -q --show-progress
-            chmod +x $TMP/$GIT_FILENAME
-            rm $INSTALL_PATH/helium-browser.OldAppImage >/dev/null 2>&1
-            mv $INSTALL_PATH/helium-browser.AppImage $INSTALL_PATH/helium-browser.OldAppImage >/dev/null 2>&1
-            mv $TMP/$GIT_FILENAME $INSTALL_PATH/helium-browser.AppImage
-            echo -e "\n  ${GRN}Helium is up-to-date !${CRS}\n"
-            break
+    elif [ -z "$LOCAL_VERSION" ] ; then
+        echo -e "\n  ${RED}Empty version tag from ${CYN}local AppImage${RED}! Can't compare, exiting...${CRS}"
+        exit
 
-        elif [[ "$CONFIRM" == "n" || "$CONFIRM" == "N" ]] ; then
-            echo -e "\n  ${RED}Update cancelled !${CRS}\n"
-            exit 1
+    fi
+
+    ### COMPARE LOCAL & REMOTE VERSION
+    LOCAL_VERSION_NUM=$(echo $LOCAL_VERSION | tr -d .)
+    GIT_VERSION_NUM=$(echo $GIT_VERSION | tr -d .)
+
+    if [ "$GIT_VERSION" == "$LOCAL_VERSION" ] ; then
+        echo -e "\n  ${GRN}$APP_NAME_LONG is already up-to-date!${CRS}\n"
+
+    elif [ "$GIT_VERSION_NUM" -gt "$LOCAL_VERSION_NUM" ] ; then
+        echo -e "\n  ${RED}$APP_NAME_LONG is updatable!${CRS}\n"
+        echo -e "  ${CYN}Local Version :\t${CRS}${LOCAL_VERSION}"
+        echo -e "  ${CYN}$SOURCE Version :\t${CRS}${GIT_VERSION}\n"
+
+        while true ; do
+            read -p "  Download and update $APP_NAME_LONG from $SOURCE? (Y/n) : " CONFIRM
+            echo
+
+            if [[ "$CONFIRM" == "" || "$CONFIRM" == "y" || "$CONFIRM" == "Y" ]] ; then
+                GIT_URL=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "browser_download_url" | grep "x86_64.AppImage" | grep -v "zsync" | tr -d \" | awk '{print $2}')
+                GIT_FILENAME=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "browser_download_url" | grep "x86_64.AppImage" | grep -v "zsync" | tr -d \" | awk '{print $2}' | awk -F'/' '{print $9}')
+                mkdir -p $TMP
+                wget -P $TMP $GIT_URL -q --show-progress
+                chmod +x $TMP/$GIT_FILENAME
+                if [ -f "$INSTALL_PATH/$APP_NAME.old" ] ; then
+                    rm $INSTALL_PATH/$APP_NAME.old
+                fi
+                mv $INSTALL_PATH/$APP_NAME.AppImage $INSTALL_PATH/$APP_NAME.old
+                mv $TMP/$GIT_FILENAME $INSTALL_PATH/$APP_NAME.AppImage
+                echo -e "\n  ${GRN}$APP_NAME_LONG is up-to-date !${CRS}\n"
+                break
+
+            elif [[ "$CONFIRM" == "n" || "$CONFIRM" == "N" ]] ; then
+                echo -e "\n  ${RED}Update cancelled!${CRS}\n"
+                exit
+
+            else
+                echo -e "  ${YEL}Invalid response!${CRS}\n"
+                
+            fi
+
+        done
+
+    else
+        echo -e "\n  ${RED}Version tags malformed or you are using a Beta version!${CRS}\n"
+        echo -e "  ${CYN}Local Version :\t${CRS}${LOCAL_VERSION}"
+        echo -e "  ${CYN}$SOURCE Version :\t${CRS}${GIT_VERSION}\n"
+        echo -e "  ${RED}Update failed... Exiting...${CRS}\n"
+        exit
+        
+    fi
+
+}
+
+### AUTOMATIC UPDATE --> TO DO
+auto_update() {
+    if ! [ -f "$INSTALL_PATH/$APP_NAME.AppImage" ] ; then
+        echo -e "\n  ${RED}$APP_NAME AppImage not found! Can't add auto update script...${CRS}"
+        exit
+        
+    else
+        echo -e "\n  ${RED}Not implemented yet...${CRS}"
+        exit
+
+    fi
+}
+
+### REMOVE
+remove_helium() {
+    if [ -d "$INSTALL_PATH" ] ; then
+
+        while true ; do
+        read -p "  Remove $APP_NAME_LONG folder $INSTALL_PATH? (Y/n) : " CONFIRM_REMOVE
+
+        if [[ "$CONFIRM_REMOVE" == "" || "$CONFIRM_REMOVE" == "y" || "$CONFIRM_REMOVE" == "Y" ]] ; then
+            rm -rf $INSTALL_PATH
+            rm $LAUNCHER_PATH/$APP_NAME.desktop
+            echo -e "\n  ${RED}$APP_NAME_LONG removed!${CRS}\n"
+            exit
+
+        elif [[ "$CONFIRM_REMOVE" == "n" || "$CONFIRM_REMOVE" == "N" ]] ; then
+            echo -e "\n  ${RED}Removal cancelled!${CRS}\n"
+            exit
 
         else
-            echo -e "  ${YEL}Invalid response !${CRS}\n"
+            echo -e "  ${YEL}Invalid response!${CRS}\n"
             
         fi
 
     done
+
+    else
+        echo -e "\n  ${RED}Can't remove $APP_NAME_LONG! ${YEL}$INSTALL_PATH ${RED}directory not found...${CRS}\n"
+        exit
+
+    fi
 }
 
-LOCAL_VERSION=$($INSTALL_PATH/helium-browser.AppImage --version | awk '{print $2}')
+### SCRIPT VERSION
+script_version() {
+    echo -e "\n  ${CYN}$APP_NAME_LONG Helper Script Version :   ${GRN}${SCRIPT_VERSION}${CRS}\n"
+    exit
+    
+}
 
-### CHECK FROM EMPTY VERSION TAGS
-if [ -z "$GIT_VERSION" ] ; then
-    echo -e "\n  ${RED}Empty version tag from ${CYN}GitHub ${RED}! Can't compare, exiting ...${CRS}"
-    exit 1
+### UPDATE SCRIPT --> TO DO
+update_script() {
+    if ! [ -f "$INSTALL_PATH/$APP_NAME.AppImage" ] ; then
+        echo -e "\n  ${RED}$APP_NAME_LONG AppImage not found! Can't update script...${CRS}"
+        exit
+        
+    else
+        echo -e "\n  ${RED}Not implemented yet...${CRS}"
+        exit
 
-elif [ -z "$LOCAL_VERSION" ] ; then
-    echo -e "\n  ${RED}Empty version tag from ${CYN}local AppImage ${RED}! Can't compare, exiting ...${CRS}"
-    exit 1
+    fi
+}
 
-else
-    :
+### COMPARE APPIMAGE VERSION
+compare_version() {
+    LOCAL_VERSION=$($INSTALL_PATH/$APP_NAME.AppImage --version | awk '{print $2}')
+    GIT_VERSION=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "tag_name" | tr -d \", | awk '{print $2}')
 
-fi
+    ### CHECK FOR EMPTY VERSION TAGS
+    if [ -z "$GIT_VERSION" ] ; then
+        echo -e "\n  ${RED}Empty version tag from ${CYN}$SOURCE${RED}! Can't compare, exiting...${CRS}"
+        exit
 
-if [ "$GIT_VERSION" == "$LOCAL_VERSION" ] ; then
-    echo -e "\n  ${GRN}Helium is up-to-date !${CRS}\n"
+    elif [ -z "$LOCAL_VERSION" ] ; then
+        echo -e "\n  ${RED}Empty version tag from ${CYN}local AppImage${RED}! Can't compare, exiting...${CRS}"
+        exit
 
-else
-    echo -e "\n  ${RED}Helium is updatable !${CRS}\n"
-    echo -e "  ${CYN}Local Version :    ${CRS}${LOCAL_VERSION}"
-    echo -e "  ${CYN}GitHub Version :   ${CRS}${GIT_VERSION}\n"
-    update_helium
+    fi
 
-fi
+    ### COMPARE LOCAL & REMOTE VERSION
+    LOCAL_VERSION_NUM=$(echo $LOCAL_VERSION | tr -d .)
+    GIT_VERSION_NUM=$(echo $GIT_VERSION | tr -d .)
 
-rm -rf $TMP
+    if [ "$GIT_VERSION" == "$LOCAL_VERSION" ] ; then
+        echo -e "\n  ${GRN}$APP_NAME_LONG is up-to-date!${CRS}\n"
+        echo -e "  ${CYN}Local Version :\t${CRS}${LOCAL_VERSION}"
+        echo -e "  ${CYN}$SOURCE Version :\t${CRS}${GIT_VERSION}\n"
+        exit
+        
+    elif [ "$GIT_VERSION_NUM" -gt "$LOCAL_VERSION_NUM" ] ; then
+        echo -e "\n  ${YEL}$APP_NAME_LONG is updatable!${CRS}\n"
+        echo -e "  ${CYN}Local Version :\t${CRS}${LOCAL_VERSION}"
+        echo -e "  ${CYN}$SOURCE Version :\t${CRS}${GIT_VERSION}\n"
+        exit
+        
+    else
+        echo -e "\n  ${RED}Version tags malformed or you are using a Beta version!${CRS}\n"
+        echo -e "  ${CYN}Local Version :\t${CRS}${LOCAL_VERSION}"
+        echo -e "  ${CYN}$SOURCE Version :\t${CRS}${GIT_VERSION}\n"
+        echo -e "  ${RED}Update failed ... Exiting ...${CRS}\n"
+        exit
+        
+    fi
+}
 
-exit 0
+### HELP
+help() {
+    echo -e "\n${LCY}${SCRIPT_NAME}${CRS}\n"
+    echo -e "$APP_NAME_LONG installer & updater script\n"
+    echo -e "Syntax: $SCRIPT_FILE_NAME [ -i | -L | -u | -r | -c | -s | -h ]\n" # | -U | -S 
+    echo -e "Options:\n"
+    echo -e "\t-i\tDownload & install $APP_NAME_LONG from $SOURCE"
+    echo -e "\t-L\tCreate desktop launcher"
+    echo -e "\t-u\tDownload & update $APP_NAME_LONG from $SOURCE"
+    #echo -e "\t-U\tEnable automatic updates on login ${RED}--> Not yet working${CRS}"
+    echo -e "\t-r\tRemove $APP_NAME_LONG"
+    echo -e "\t-c\tCompare local to remote version"
+    echo -e "\t-s\tShow script version"
+    #echo -e "\t-S\tUpdate script ${RED}--> Not yet working${CRS}"
+    echo -e "\t-h\tPrint this help page.\n"
+    echo -e "Configured locations:\n"
+    echo -e "\t${CYN}${INSTALL_PATH}${CRS}\t\tInstall location"
+    echo -e "\t${CYN}${LAUNCHER_PATH}${CRS}\tLauncher location"
+    echo -e "\t${CYN}${SCRIPT_PATH}${CRS}\t\t\tScript location\n"
+}
+
+### EXIT CLEAN
+exit_clean() {
+    if [ -d "$TMP" ] ; then
+        rm -rf $TMP
+
+    fi
+
+    exit
+}
+
+########## MAIN ##########
+
+## GET OPTIONS
+while getopts ":i,:L,:u,:U,:r,:c,:s,:S,:h" OPTION ; do
+    case $OPTION in
+        i)
+            echo -e "\n  ${YEL}Installing $APP_NAME_LONG...${CRS}"
+            dependency_check
+            local_check
+            install_helium
+            exit_clean
+            exit ;;
+
+        L)
+            echo -e "\n  ${YEL}Adding $APP_NAME_LONG launcher...${CRS}"
+            dependency_check
+            local_check
+            add_launcher
+            exit_clean
+            exit ;;
+
+        u)
+            echo -e "\n  ${YEL}Updating $APP_NAME_LONG...${CRS}"
+            dependency_check
+            local_check
+            update_helium
+            exit_clean
+            exit ;;
+
+        U)
+            echo -e "\n  ${YEL}Enabling automatic updates...${CRS}"
+            dependency_check
+            local_check
+            auto_update
+            exit_clean
+            exit ;;
+
+        r)
+            echo -e "\n  ${YEL}Removing $APP_NAME_LONG...${CRS}"
+            remove_helium
+            exit ;;
+
+        c)
+            echo -e "\n  ${YEL}Comparing remote to local version...${CRS}"
+            dependency_check
+            local_check
+            compare_version
+            exit_clean
+            exit ;;
+
+        s)
+            script_version
+            exit ;;
+
+        S)
+            echo -e "\n  ${YEL}Updating script...${CRS}"
+            dependency_check
+            local_check
+            update_script
+            exit_clean
+            exit ;;
+
+        h)
+            help
+            exit;;
+
+        *)
+            echo -e "\n${YEL}Option ${RED}-t${YEL} not recognized... Refer to help below!${CRS}"
+            help
+            exit;;
+
+    esac
+
+done
+
+## DEPENDENCY CHECK
+dependency_check
+
+## CHECK FOR LOCAL INSTALL
+local_check
+
+## UPDATE 
+update_helium
+
+## CLEAN
+exit_clean
diff --git a/icon/helium-icon.png b/icon/helium-icon.png
deleted file mode 100644
index a0e28c1..0000000
Binary files a/icon/helium-icon.png and /dev/null differ
diff --git a/test.sh b/test.sh
new file mode 100755
index 0000000..7d3f504
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+TMP=/tmp/Helium
+add_launcher() {
+    if [ -f "$INSTALL_PATH/helium-browser.AppImage" ] ; then
+        
+        
+    else
+        echo -e "\n  ${RED}Helium AppImage not found! Can't add launcher...${CRS}"
+        exit
+
+    fi
+}
\ No newline at end of file
diff --git a/todo.md b/todo.md
index 5c05233..a4fb1dc 100644
--- a/todo.md
+++ b/todo.md
@@ -1,13 +1,27 @@
 # To Do List Helium installer
 
-## Fix
-- Auto Update implementation
+## Last Jobs
+- Improved Version comparasing
+- Clean up function added
+- Remover function added
+- Dummy functions added for:
+    - Auto Update
+    - Script update
+- Dependency check fixed
+- Launcher function works
+- Remover extended
+- Readme updated
+
 
 ## Add
-- Internet connectivity check in [Auto Update Script](https://lab.c95.org/fr4nz/shell-scripts/src/branch/main/helium-browser/helium_auto_update.sh)
-- Desktop entry [Helper Script](https://lab.c95.org/fr4nz/shell-scripts/src/branch/main/helium-browser/helium_helper.sh)
-- Desktop entry updater [Helper Script](https://lab.c95.org/fr4nz/shell-scripts/src/branch/main/helium-browser/helium_helper.sh)
-- create help function
+- Internet connectivity check in [Auto Update Script](https://lab.c95.org/fr4nz/helium-helper/src/branch/main/helium_auto_update.sh)
+- Desktop entry updater [Helper Script](https://lab.c95.org/fr4nz/helium-helper/src/branch/main/helium_helper.sh) & [Auto Update Script](https://lab.c95.org/fr4nz/helium-helper/src/branch/main/helium_auto_update.sh)
+- Auto update setup
+    - shell recognition
+- Script updater
+- Architecture detection
+- Uninstaller --> Partially done
+- Set alias
 
 ## Repo
 - Merge workflow
@@ -15,6 +29,8 @@
     - Remove to do list
     - Remove comment from script
 
+## Fix
+
 ## Notes
 
 ```sh