diff --git a/binary_tarball/build_tarball.sh b/binary_tarball/build_tarball.sh
index adf9ad3..bddc276 100755
--- a/binary_tarball/build_tarball.sh
+++ b/binary_tarball/build_tarball.sh
@@ -7,17 +7,15 @@ set -e;
 # Sets up script variables
 BINARY_TARBALL=$1;
 _SCRIPT_FOLDER=$(realpath $(dirname $0));
-_REPOSITORY_FOLDER=$(realpath $_SCRIPT_FOLDER/../../../);
-
-_BINARY_TARBALL_SOURCE_FOLDER=$_SCRIPT_FOLDER/compile;
-_BINARY_TARBALL_SOURCE_CONTENT_FOLDER=$_REPOSITORY_FOLDER/browser/common/source_files/;
-_BINARY_TARBALL_TOGGLE_SETTINGS_SCRIPT=$_SCRIPT_FOLDER/content/toggle-settings.sh;
-_BINARY_TARBALL_LAUNCH_SCRIPT=$_SCRIPT_FOLDER/content/launch_librewolf.sh;
+_REPOSITORY_FOLDER=$(realpath $_SCRIPT_FOLDER/../);
+_SOURCE_FOLDER=$_SCRIPT_FOLDER/compile;
+_TOGGLE_SETTINGS_SCRIPT=$_SCRIPT_FOLDER/content/toggle-settings.sh;
+_LAUNCH_SCRIPT=$_SCRIPT_FOLDER/content/launch_librewolf.sh;
 
 # Executes the build
 $_SCRIPT_FOLDER/scripts/1_Install_Dependencies.sh;
-$_SCRIPT_FOLDER/scripts/2_Download_Source_Code.sh $_BINARY_TARBALL_SOURCE_FOLDER;
-$_SCRIPT_FOLDER/scripts/3_Configure_Source_Code.sh $_BINARY_TARBALL_SOURCE_FOLDER $_BINARY_TARBALL_SOURCE_CONTENT_FOLDER;
-$_SCRIPT_FOLDER/scripts/4_Build_Binary_Tarball.sh $_BINARY_TARBALL_SOURCE_FOLDER $BINARY_TARBALL;
-$_SCRIPT_FOLDER/scripts/5_Configure_Binary_Tarball.sh $BINARY_TARBALL $_BINARY_TARBALL_TOGGLE_SETTINGS_SCRIPT  $_BINARY_TARBALL_LAUNCH_SCRIPT;
+$_SCRIPT_FOLDER/scripts/2_Download_Source_Code.sh $_SOURCE_FOLDER;
+$_SCRIPT_FOLDER/scripts/3_Configure_Source_Code.sh $_SOURCE_FOLDER;
+$_SCRIPT_FOLDER/scripts/4_Build_Binary_Tarball.sh $_SOURCE_FOLDER $BINARY_TARBALL;
+$_SCRIPT_FOLDER/scripts/5_Configure_Binary_Tarball.sh $BINARY_TARBALL $_TOGGLE_SETTINGS_SCRIPT  $_LAUNCH_SCRIPT;
 
diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh
index 9adc430..befaf7e 100755
--- a/binary_tarball/scripts/3_Configure_Source_Code.sh
+++ b/binary_tarball/scripts/3_Configure_Source_Code.sh
@@ -3,13 +3,15 @@ printf "\n\n------------------------------ FINAL PREBUILD CONFIGURATION --------
 
 # Setup Script Variables
 SOURCE_CODE_FOLDER=$1;
-SOURCE_CODE_CUSTOMIZATION_FOLDER=$2;
+_COMMON_REPO='git@gitlab.com:librewolf-community/browser/common.git';
 _POCKET_SED_STRING="s/'pocket'/#'pocket'/g";
 _POCKET_FILE=$SOURCE_CODE_FOLDER/browser/components/moz.build;
 
 # Copy Source Code Changes to Source Code
 printf "\nCopying branding and source code changes to firefox source code\n";
-cp -r $SOURCE_CODE_CUSTOMIZATION_FOLDER/* $SOURCE_CODE_FOLDER/;
+git clone $_COMMON_REPO common;
+cp -r common/source_files/* $SOURCE_CODE_FOLDER/;
+rm -rf common;
 
 # Disables Pocket
 printf "\nDisabling Pocket\n";
diff --git a/build.sh b/build.sh
index 850e8ad..8f756f8 100755
--- a/build.sh
+++ b/build.sh
@@ -6,15 +6,11 @@ set -e;
 
 # Sets up script variables
 SCRIPT_FOLDER=$(realpath $(dirname $0));
-REPOSITORY_FOLDER=$(realpath $SCRIPT_FOLDER/../../);
-BINARY_TARBALL=$REPOSITORY_FOLDER/LibreWolf.tar.bz2;
-APPIMAGE_FILE=$REPOSITORY_FOLDER/LibreWolf.AppImage;
-FLATPAK_REPO=$REPOSITORY_FOLDER/librewolf-flatpak-repo;
-FLATPAK_BUNDLE=$REPOSITORY_FOLDER/LibreWolf.flatpak;
+BINARY_TARBALL=$SCRIPT_FOLDER/LibreWolf.tar.bz2;
+APPIMAGE_FILE=$SCRIPT_FOLDER/LibreWolf.AppImage;
+FLATPAK_REPO=$SCRIPT_FOLDER/librewolf-flatpak-repo;
+FLATPAK_BUNDLE=$SCRIPT_FOLDER/LibreWolf.flatpak;
 
 $SCRIPT_FOLDER/binary_tarball/build_tarball.sh $BINARY_TARBALL;
 $SCRIPT_FOLDER/appimage/build_appimage.sh $BINARY_TARBALL $APPIMAGE_FILE;
 $SCRIPT_FOLDER/flatpak/build_flatpak.sh $BINARY_TARBALL $FLATPAK_REPO $FLATPAK_BUNDLE;
-
-
-