diff --git a/aroma/META-INF/com/google/android/aroma-config b/aroma/META-INF/com/google/android/aroma-config
index bc19cae..91580a4 100755
--- a/aroma/META-INF/com/google/android/aroma-config
+++ b/aroma/META-INF/com/google/android/aroma-config
@@ -10,7 +10,7 @@ loadlang("langs/en.lang");
 ini_set("rom_name", "Bootloader Changer");
 ini_set("rom_version", "2.3.2");
 ini_set("rom_author", "Nevax - xda@NevaX1");
-#Set by script
+#SetByScript
 ini_set("rom_date", "29th September 2015");
 
 #Font
diff --git a/aroma/META-INF/com/google/android/updater-script b/aroma/META-INF/com/google/android/updater-script
index 4c7e98c..94d8a16 100755
--- a/aroma/META-INF/com/google/android/updater-script
+++ b/aroma/META-INF/com/google/android/updater-script
@@ -14,8 +14,8 @@ ui_print(" ");
 if
 	(file_getprop("/tmp/aroma/bootloader.prop", "selected.2")=="1")
 then
-## 17 : Added by ./tools/variant/*.sh
-## 18 : Added by ./tools/variant/*.sh
+#17:AddedByScript
+#18:AddedByScript
 endif;
 ui_print(" ");
 ui_print(" ");
diff --git a/tools/variant/assert-F320x.sh b/tools/variant/assert-F320x.sh
index b7082a3..c33d77f 100644
--- a/tools/variant/assert-F320x.sh
+++ b/tools/variant/assert-F320x.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 #updater-script
-perl -i -pe 's/.*/ ui_print(" assert f320k/l/s : OK"); / if $.==18' updater-script
-perl -i -pe 's/.*/ assert(getprop("ro.product.device") == "f320s" || getprop("ro.build.product") == "f320s" || getprop("ro.product.device") == "f320l" || getprop("ro.build.product") == "f320l" || getprop("ro.product.device") == "f320k" || getprop("ro.build.product") == "f320k" || getprop("ro.product.device") == "g2" || getprop("ro.build.product") == "g2" || getprop("ro.product.device") == "galbi" || getprop("ro.build.product") == "galbi"  || abort("This package is for device: f320k,f320l,f320s,g2,galbi; this device is " + getprop("ro.product.device") + ".");); / if $.==17' updater-script
+perl -i -pe 's/.*/ ui_print(" assert F320x : OK"); / if $.==18' updater-script
+perl -i -pe 's/.*/ assert(getprop("ro.product.device") == "f320k" || getprop("ro.build.product") == "f320k" || getprop("ro.product.device") == "f320l" || getprop("ro.build.product") == "f320l" || getprop("ro.product.device") == "f320s" || getprop("ro.build.product") == "f320s" || getprop("ro.product.device") == "g2" || getprop("ro.build.product") == "g2" || getprop("ro.product.device") == "galbi" || getprop("ro.build.product") == "galbi"  || abort("This package is for device: f320x,g2,galbi; this device is " + getprop("ro.product.device") + ".");); / if $.==17' updater-script
 
 #aroma config
-perl -i -pe 's/.*/ ini_set("rom_device", "G2 F320K/S/L"); / if $.==13' aroma-config
+perl -i -pe 's/.*/ ini_set("rom_device", "G2 F320x"); / if $.==13' aroma-config
diff --git a/tools/variant/assert-F320x.sh.old b/tools/variant/assert-F320x.sh.old
new file mode 100644
index 0000000..b7082a3
--- /dev/null
+++ b/tools/variant/assert-F320x.sh.old
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+#updater-script
+perl -i -pe 's/.*/ ui_print(" assert f320k/l/s : OK"); / if $.==18' updater-script
+perl -i -pe 's/.*/ assert(getprop("ro.product.device") == "f320s" || getprop("ro.build.product") == "f320s" || getprop("ro.product.device") == "f320l" || getprop("ro.build.product") == "f320l" || getprop("ro.product.device") == "f320k" || getprop("ro.build.product") == "f320k" || getprop("ro.product.device") == "g2" || getprop("ro.build.product") == "g2" || getprop("ro.product.device") == "galbi" || getprop("ro.build.product") == "galbi"  || abort("This package is for device: f320k,f320l,f320s,g2,galbi; this device is " + getprop("ro.product.device") + ".");); / if $.==17' updater-script
+
+#aroma config
+perl -i -pe 's/.*/ ini_set("rom_device", "G2 F320K/S/L"); / if $.==13' aroma-config
diff --git a/tools/variant/assert-d802_5_6.sh b/tools/variant/assert-d802_5_6.sh
index da8312d..c6acb37 100644
--- a/tools/variant/assert-d802_5_6.sh
+++ b/tools/variant/assert-d802_5_6.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
 
 #updater-script
-#perl -i -pe 's/.*/ ui_print(" assert D802/5/6 : OK"); / if $.==18' updater-script
-#perl -i -pe 's/.*/ assert(getprop("ro.product.device") == "d802" || getprop("ro.build.product") == "d802" || getprop("ro.product.device") == "d806" || getprop("ro.build.product") == "d806" || getprop("ro.product.device") == "d805" || getprop("ro.build.product") == "d805" || getprop("ro.product.device") == "g2" || getprop("ro.build.product") == "g2" || getprop("ro.product.device") == "galbi" || getprop("ro.build.product") == "galbi"  || abort("This package is for device: d802,d805,d806,g2,galbi; this device is " + getprop("ro.product.device") + "."););  / if $.==17' updater-script
-sed -i -e 's/## 18 : Added by ./tools/variant/*.sh/ui_print(" assert D802/5/6 : OK");/' updater-script
-sed -i -e 's/## 17 : Added by ./tools/variant/*.sh/assert(getprop("ro.product.device") == "d802" || getprop("ro.build.product") == "d802" || getprop("ro.product.device") == "d806" || getprop("ro.build.product") == "d806" || getprop("ro.product.device") == "d805" || getprop("ro.build.product") == "d805" || getprop("ro.product.device") == "g2" || getprop("ro.build.product") == "g2" || getprop("ro.product.device") == "galbi" || getprop("ro.build.product") == "galbi"  || abort("This package is for device: d802,d805,d806,g2,galbi; this device is " + getprop("ro.product.device") + "."););/' updater-script
+perl -i -pe 's/.*/ ui_print(" assert d802_5_6 : OK"); / if $.==18' updater-script
+perl -i -pe 's/.*/ assert(getprop("ro.product.device") == "d802" || getprop("ro.build.product") == "d802" || getprop("ro.build.product") == "d805" || getprop("ro.product.device") == "d805" || getprop("ro.build.product") == "d806" || getprop("ro.product.device") == "d806" || getprop("ro.product.device") == "g2" || getprop("ro.build.product") == "g2" || getprop("ro.product.device") == "galbi" || getprop("ro.build.product") == "galbi"  || abort("This package is for device: d802_5_6,g2,galbi; this device is " + getprop("ro.product.device") + ".");); / if $.==17' updater-script
+
 #aroma config
-#perl -i -pe 's/.*/ ini_set("rom_device", "G2 D802/5/6"); / if $.==13' aroma-config
-sed -i -e 's/#Set by script/ui_print(" assert D802/5/6 : OK");/' aroma-config
+perl -i -pe 's/.*/ ini_set("rom_device", "G2 D802_5_6"); / if $.==13' aroma-config
diff --git a/tools/variant/assert-d802_5_6.sh.old b/tools/variant/assert-d802_5_6.sh.old
new file mode 100644
index 0000000..da8312d
--- /dev/null
+++ b/tools/variant/assert-d802_5_6.sh.old
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#updater-script
+#perl -i -pe 's/.*/ ui_print(" assert D802/5/6 : OK"); / if $.==18' updater-script
+#perl -i -pe 's/.*/ assert(getprop("ro.product.device") == "d802" || getprop("ro.build.product") == "d802" || getprop("ro.product.device") == "d806" || getprop("ro.build.product") == "d806" || getprop("ro.product.device") == "d805" || getprop("ro.build.product") == "d805" || getprop("ro.product.device") == "g2" || getprop("ro.build.product") == "g2" || getprop("ro.product.device") == "galbi" || getprop("ro.build.product") == "galbi"  || abort("This package is for device: d802,d805,d806,g2,galbi; this device is " + getprop("ro.product.device") + "."););  / if $.==17' updater-script
+sed -i -e 's/## 18 : Added by ./tools/variant/*.sh/ui_print(" assert D802/5/6 : OK");/' updater-script
+sed -i -e 's/## 17 : Added by ./tools/variant/*.sh/assert(getprop("ro.product.device") == "d802" || getprop("ro.build.product") == "d802" || getprop("ro.product.device") == "d806" || getprop("ro.build.product") == "d806" || getprop("ro.product.device") == "d805" || getprop("ro.build.product") == "d805" || getprop("ro.product.device") == "g2" || getprop("ro.build.product") == "g2" || getprop("ro.product.device") == "galbi" || getprop("ro.build.product") == "galbi"  || abort("This package is for device: d802,d805,d806,g2,galbi; this device is " + getprop("ro.product.device") + "."););/' updater-script
+#aroma config
+#perl -i -pe 's/.*/ ini_set("rom_device", "G2 D802/5/6"); / if $.==13' aroma-config
+sed -i -e 's/#Set by script/ui_print(" assert D802/5/6 : OK");/' aroma-config