diff --git a/A-Team.mk b/A-Team.mk
index d894639..d2040e3 100644
--- a/A-Team.mk
+++ b/A-Team.mk
@@ -1,9 +1,8 @@
 #
 # Copyright 2019-Present A-Team Digital Solutions
 #
-
 ############
-## A-Team ##
+## A-Team ROM Build Addon mk File
 ##################################################################
 
 LOCAL_PATH := $(call my-dir)
@@ -16,19 +15,31 @@ TARGET_BOOT_ANIMATION_RES := 1080
 # Device Maintainer
 DEVICE_MAINTAINER := PizzaG
 
-# A-Team KSU & Mods
-PRODUCT_SOONG_NAMESPACES += \
-    [A-Team_Mods] \
-
-# A-Team KSU & Magisk Root
-ifeq ($(INSTALLER_VARIANT), Custom)
+# A-Team KSU - Magisk Root - Mods - Custom Installer
+ifeq ($(INSTALLER_VARIANT), custom)
 PRODUCT_SOONG_NAMESPACES += \
+    [A-Team_Custom_ROM_Installer] \
     [A-Team_KSU] \
-    [A-Team_Magisk]
+    [A-Team_Magisk] \
+    [A-Team_Mods] 
+# Copy A-Team Custom Script Files - /product/bin 
+PRODUCT_COPY_FILES += \
+    $(A_TEAM_PATH)/scripts/A-Team-PostBoot.sh:$(TARGET_COPY_OUT_PRODUCT)/bin/A-Team-PostBoot.sh \
+    $(A_TEAM_PATH)/scripts/A-Team-Setup.sh:$(TARGET_COPY_OUT_PRODUCT)/bin/A-Team-Setup.sh \
+    $(A_TEAM_PATH)/scripts/A-Team-Magisk.sh:$(TARGET_COPY_OUT_PRODUCT)/bin/A-Team-Magisk.sh 
+# Copy A-Team Custom rc Files - /system/etc/init
+PRODUCT_COPY_FILES += \
+    $(A_TEAM_PATH)/init/a-team.boot.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/a-team.boot.rc
+endif
+
+# A-Team Default Installer
+ifeq ($(INSTALLER_VARIANT), default)
+PRODUCT_SOONG_NAMESPACES += \
+    [A-Team_Default_ROM_Installer]
 endif
 
 # A-Team Custom APN
-ifeq ($(APN_VARIABLE), Custom)
+ifeq ($(CUSTOM_APN), True)
 PRODUCT_SOONG_NAMESPACES += \
     [A-Team_Custom_APN] 
 else
@@ -46,16 +57,15 @@ TARGET_KERNEL_SOURCE := kernel/motorola/$(DEVICE_KERNEL)
 PRODUCT_SOONG_NAMESPACES += \
   [$(DEVICE_NAME)_$(TARGET_KERNEL)_Kernel]
 ##################################################################
-
-
 ###########################
-## A-Team Gapps Variants ##
+## A-Team Gapps ##
 ##################################################################
 
-# A-Team MindTheGapps
+# A-Team Gapps
 ifeq ($(GAPPS_VARIANT), Gapps)
 PRODUCT_SOONG_NAMESPACES += \
      [A-Team_G-Apps]
+# MindTheGapps
 $(call inherit-product, vendor/gapps/arm64/arm64-vendor.mk)
 #$(call inherit-product, vendor/gms/products/gms.mk)
 endif
@@ -67,8 +77,6 @@ PRODUCT_SOONG_NAMESPACES += \
 #$(call inherit-product, vendor/microg/products/gms.mk)
 endif
 ##################################################################
-
-
 ####################
 ## A-Team Moto Product Add-Ons ##
 ##################################################################
@@ -85,23 +93,11 @@ PRODUCT_COPY_FILES += $(call find-copy-subdir-files,*,$(A_TEAM_PATH)/wallpapers,
 
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.config.wallpaper=product/media/wallpapers/default_moto_wallpaper.jpg 
-
-# Copy A-Team Custom Script Files - /product/bin 
-PRODUCT_COPY_FILES += \
-    $(A_TEAM_PATH)/scripts/A-Team-PostBoot.sh:$(TARGET_COPY_OUT_PRODUCT)/bin/A-Team-PostBoot.sh \
-    $(A_TEAM_PATH)/scripts/A-Team-Setup.sh:$(TARGET_COPY_OUT_PRODUCT)/bin/A-Team-Setup.sh \
-    $(A_TEAM_PATH)/scripts/A-Team-Magisk.sh:$(TARGET_COPY_OUT_PRODUCT)/bin/A-Team-Magisk.sh
 ##################################################################
-
-
 ####################
 ## A-Team Moto System Add-Ons ##
 ##################################################################
 
-# Copy A-Team Custom rc Files - /system/etc/init
-PRODUCT_COPY_FILES += \
-    $(A_TEAM_PATH)/init/a-team.boot.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/a-team.boot.rc
-
 # Copy Busybox - /system/bin
 PRODUCT_COPY_FILES += \
     $(A_TEAM_PATH)/Busybox/arm64/busybox:$(TARGET_COPY_OUT_SYSTEM)/bin/busybox \
@@ -121,15 +117,7 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     persist.sys.disable_rescue=true \
     ro.a-team.rom_version=$(INTERNAL_VERSION)
 ##################################################################
-
-
 #############################
 ## Disabled / Old / Unused ##
 ##################################################################
-
-# A-Team Custom APN
-#ifeq ($(CUSTOM_APN), true)
-#PRODUCT_COPY_FILES += \
-#    $(A_TEAM_PATH)/Custom_APN/apns-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml
-#endif
 ##################################################################