diff --git a/Scripts/LineageOS-14.1/00init.sh b/Scripts/LineageOS-14.1/00init.sh
index b04b48dc..f76470cc 100644
--- a/Scripts/LineageOS-14.1/00init.sh
+++ b/Scripts/LineageOS-14.1/00init.sh
@@ -2,20 +2,21 @@
 
 #Sets settings used by all other scripts
 
-base="/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/";
-export base;
+export androidWorkspace="/mnt/Drive-1/Development/Other/Android_ROMs/";
+export base=$androidWorkspace"Build/LineageOS-14.1/";
 
-patches="/mnt/Drive-1/Development/Other/Android_ROMs/Patches/LineageOS-14.1/";
-export patches;
+export patches=$androidWorkspace"Patches/LineageOS-14.1/";
+export cvePatches=$androidWorkspace"Patches/Linux_CVEs/";
 
-cvePatches="/mnt/Drive-1/Development/Other/Android_ROMs/Patches/Linux_CVEs/";
-export cvePatches;
+export scripts=$androidWorkspace"Scripts/LineageOS-14.1/";
+export cveScripts=$scripts"CVE_Patchers/";
 
-scripts="/mnt/Drive-1/Development/Other/Android_ROMs/Scripts/LineageOS-14.1/";
-export scripts;
+export ANDROID_HOME="/home/$USER/Android/Sdk";
 
-cveScripts=$scripts"CVE_Patchers/";
-export cveScripts;
+export KBUILD_BUILD_USER=emy
+export KBUILD_BUILD_HOST=dosbm
 
-ANDROID_HOME="/home/$USER/Android/Sdk";
-export ANDROID_HOME;
+export ANDROID_JACK_VM_ARGS="-Xmx6144m -Xms512m -Dfile.encoding=UTF-8 -XX:+TieredCompilation"
+export JACK_SERVER_VM_ARGUMENTS="${ANDROID_JACK_VM_ARGS}"
+
+export GRADLE_OPTS=-Xmx2048m
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 20d05d4f..05cef6f7 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -4,11 +4,8 @@
 #Delete Everything and Sync
 #repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore,Silence} out && repo sync -j20 --force-sync
 
-#Initialize some variables
-#source ../../Scripts/LineageOS-14.1/00init.sh
-
 #Apply all of our changes
-#source $scripts/Patch.sh && source $scripts/Optimize.sh && source $scripts/Rebrand.sh && source $scripts/Theme.sh && source $scripts/Deblob.sh && source $scripts/Patch_CVE.sh && source build/envsetup.sh && export ANDROID_HOME="/home/$USER/Android/Sdk" && export ANDROID_JACK_VM_ARGS="-Xmx6144m -Xms512m -Dfile.encoding=UTF-8 -XX:+TieredCompilation" && export JACK_SERVER_VM_ARGUMENTS="${ANDROID_JACK_VM_ARGS}" && GRADLE_OPTS=-Xmx2048m && export KBUILD_BUILD_USER=emy && export KBUILD_BUILD_HOST=dosbm
+#source ../../Scripts/LineageOS-14.1/00init.sh && source $scripts/Patch.sh && source $scripts/Optimize.sh && source $scripts/Rebrand.sh && source $scripts/Theme.sh && source $scripts/Deblob.sh && source $scripts/Patch_CVE.sh && source build/envsetup.sh
 
 #Build!
 #brunch lineage_mako-user && export OTA_PACKAGE_SIGNING_KEY=../../Signing_Keys/releasekey && export SIGNING_KEY_DIR=../../Signing_Keys && brunch lineage_clark-user && brunch lineage_bacon-user && brunch lineage_thor-userdebug && brunch lineage_angler-user && brunch lineage_bullhead-user && brunch lineage_ether-user && brunch lineage_flounder-user && brunch lineage_flo-user && brunch lineage_FP2-user && brunch lineage_hammerhead-user && brunch lineage_marlin-user && brunch lineage_sailfish-user && brunch lineage_n5110-user && brunch lineage_osprey-user && brunch lineage_shamu-user && brunch lineage_Z00T-user