diff --git a/README.md b/README.md
index a457267..870a8e9 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
 </p>
 
 <p align="center">
+    <a href="https://gitter.im/librewolf-community/librewolf?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge" target="_blank"><img src="https://badges.gitter.im/librewolf-community/librewolf.svg"></a>
     <a href="https://gitlab.com/librewolf-community/librewolf/releases" target="_blank"><img src="https://img.shields.io/badge/Download-%20LibreWolf-green.svg"> </a>
     <a href="https://gitlab.com/librewolf-community/librewolf/releases"><img src="https://img.shields.io/badge/Version-0.0.1-green.svg"></a>
     <a href="https://gitlab.com/librewolf-community/librewolf/commits/master"><img src="https://img.shields.io/badge/Maintained-Yes-green.svg"></a>
diff --git a/browser/build.sh b/browser/build.sh
index 38ce831..ea3ca00 100755
--- a/browser/build.sh
+++ b/browser/build.sh
@@ -22,7 +22,11 @@ printf "APPIMAGE_RESOURCE_FOLDER: $APPIMAGE_RESOURCE_FOLDER\n";
 # Installs some needed dependencies
 printf "\nInstalling script dependencies\n";
 apt update;
-apt install sudo python python3 inkscape icnsutils wget fuse libfuse-dev -y;
+apt install sudo python python3 inkscape icnsutils wget fuse libfuse-dev kmod -y;
+
+# Loads the FUSE kernel module
+sudo depmod;
+sudo modprobe fuse;
 
 printf "\n\n---------------------------------- ICON GENERATION ------------------------------------------\n";
 
diff --git a/browser/resources/appimage/AppRun b/browser/resources/appimage/AppRun
index 3d4fb44..756f291 100755
--- a/browser/resources/appimage/AppRun
+++ b/browser/resources/appimage/AppRun
@@ -8,6 +8,6 @@ export XDG_DATA_DIRS="${HERE}/usr/share/${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
 export PERLLIB="${HERE}/usr/share/perl5/:${HERE}/usr/lib/perl5/${PERLLIB:+:$PERLLIB}"
 export GSETTINGS_SCHEMA_DIR="${HERE}/usr/share/glib-2.0/schemas/${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}"
 export QT_PLUGIN_PATH="${HERE}/usr/lib/qt4/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt4/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt4/plugins/:${HERE}/usr/lib32/qt4/plugins/:${HERE}/usr/lib64/qt4/plugins/:${HERE}/usr/lib/qt5/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt5/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt5/plugins/:${HERE}/usr/lib32/qt5/plugins/:${HERE}/usr/lib64/qt5/plugins/${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}"
-export SNAP_NAME="firefox"
+export MOZ_LEGACY_PROFILES=1
 EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2 | cut -d " " -f 1)
 exec "${EXEC}" "$@"
diff --git a/browser/resources/source_files/browser/components/moz.build b/browser/resources/source_files/browser/components/moz.build
new file mode 100644
index 0000000..cb016ca
--- /dev/null
+++ b/browser/resources/source_files/browser/components/moz.build
@@ -0,0 +1,101 @@
+
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+with Files("**"):
+    BUG_COMPONENT = ("Firefox", "General")
+
+with Files("distribution.js"):
+    BUG_COMPONENT = ("Firefox", "Distributions")
+
+with Files("tests/**"):
+    BUG_COMPONENT = ("Firefox", "General")
+
+with Files("tests/browser/browser_bug538331.js"):
+    BUG_COMPONENT = ("Toolkit", "Application Update")
+
+with Files("tests/browser/browser_contentpermissionprompt.js"):
+    BUG_COMPONENT = ("Firefox", "Site Identity and Permission Panels")
+
+with Files("tests/unit/test_distribution.js"):
+    BUG_COMPONENT = ("Firefox", "Distributions")
+
+with Files("safebrowsing/**"):
+    BUG_COMPONENT = ("Toolkit", "Safe Browsing")
+
+with Files('controlcenter/**'):
+    BUG_COMPONENT = ('Firefox', 'General')
+
+
+DIRS += [
+    'about',
+    'attribution',
+    'contextualidentity',
+    'customizableui',
+    'dirprovider',
+    'downloads',
+    'enterprisepolicies',
+    'extensions',
+    'library',
+    'migration',
+    'newtab',
+    'originattributes',
+    'places',
+    #'pocket',
+    'preferences',
+    'privatebrowsing',
+    'protocolhandler',
+    'resistfingerprinting',
+    'search',
+    'sessionstore',
+    'shell',
+    'syncedtabs',
+    'uitour',
+    'urlbar',
+    'translation',
+]
+
+DIRS += ['build']
+
+if CONFIG['NIGHTLY_BUILD']:
+    DIRS += [
+        'aboutconfig',
+        'payments',
+    ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    DIRS += ['touchbar']
+
+XPIDL_SOURCES += [
+    'nsIBrowserHandler.idl',
+]
+
+XPIDL_MODULE = 'browsercompsbase'
+
+XPCOM_MANIFESTS += [
+    'components.conf',
+]
+
+EXTRA_COMPONENTS += [
+    'BrowserComponents.manifest',
+    'tests/startupRecorder.js',
+    'tests/testComponents.manifest',
+]
+
+EXTRA_JS_MODULES += [
+    'BrowserContentHandler.jsm',
+    'BrowserGlue.jsm',
+    'distribution.js',
+]
+
+BROWSER_CHROME_MANIFESTS += [
+    'safebrowsing/content/test/browser.ini',
+    'tests/browser/browser.ini'
+]
+
+XPCSHELL_TESTS_MANIFESTS += [
+    'tests/unit/xpcshell.ini'
+]
diff --git a/browser/resources/source_files/mozconfig b/browser/resources/source_files/mozconfig
index de55258..99b0103 100644
--- a/browser/resources/source_files/mozconfig
+++ b/browser/resources/source_files/mozconfig
@@ -6,7 +6,20 @@ mk_add_options MOZ_OBJDIR=./obj_BUILD_OUTPUT
 
 # Setting the branding options
 ac_add_options --with-branding=browser/branding/librewolf
-ac_add_options --with-distribution-id=io.github.librewolf
+ac_add_options --with-distribution-id=io.gitlab.librewolf
 
 # enables ALSA
 ac_add_options --enable-alsa
+
+
+mk_add_options MOZ_CRASHREPORTER=0
+mk_add_options MOZ_DATA_REPORTING=0
+mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+mk_add_options MOZ_TELEMETRY_REPORTING=0
+
+mk_add_options MOZ_REQUIRE_SIGNING=0
+
+mk_add_options MOZ_ADOBE_EME=0
+
+
+