update
diff --git a/config/common.mk b/config/common.mk
index 278adb7..ba855c7 100755
--- a/config/common.mk
+++ b/config/common.mk
@@ -18,15 +18,6 @@
 PRODUCT_PACKAGES := \
     Stk
 
-# T-Mobile theme engine
-PRODUCT_PACKAGES += \
-       ThemeManager \
-       ThemeChooser \
-       com.tmobile.themes
-
-PRODUCT_COPY_FILES += \
-       vendor/purity/proprietary/common/etc/permissions/com.tmobile.software.themes.xml:system/etc/permissions/com.tmobile.software.themes.xml
-
 # Common Keyboard w/ Gestures
 PRODUCT_COPY_FILES += \
     vendor/purity/proprietary/common/app/LatinImeGoogle.apk:system/app/LatinImeGoogle.apk \
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 67c01ec..c08dad1 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -1,7 +1,6 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/maguro.mk \
     $(LOCAL_DIR)/toro.mk \
-    $(LOCAL_DIR)/toroplus.mk \
     $(LOCAL_DIR)/mako.mk \
     $(LOCAL_DIR)/grouper.mk \
     $(LOCAL_DIR)/manta.mk
diff --git a/products/maguro.mk b/products/maguro.mk
index 8d61068..672a11e 100644
--- a/products/maguro.mk
+++ b/products/maguro.mk
@@ -16,6 +16,10 @@
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.com.google.mcc_fallback=262
 
+# Applications
+PRODUCT_COPY_FILES += \
+    vendor/purity/proprietary/common/app/Torch.apk:system/app/Torch.apk
+
 # Inherit media effect blobs
 -include vendor/purity/config/common_media_effects.mk
 
diff --git a/products/mako.mk b/products/mako.mk
index 53e9aef..0ef1734 100644
--- a/products/mako.mk
+++ b/products/mako.mk
@@ -11,7 +11,7 @@
 PRODUCT_MODEL := Nexus 4
 PRODUCT_MANUFACTURER := LGE
 
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=occam BUILD_FINGERPRINT=google/occam/mako:4.2.2/JDQ39/573038:user/release-keys PRIVATE_BUILD_DESC="occam-user 4.2.2 JDQ39 573038 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=occam BUILD_FINGERPRINT=google/occam/mako:4.3/JWR66V/737497:user/release-keys PRIVATE_BUILD_DESC="occam-user 4.3 JWR66V 737497 release-keys"
 
 # Inherit common build.prop overrides
 -include vendor/purity/config/common_versions.mk
diff --git a/proprietary/common/app/Torch.apk b/proprietary/common/app/Torch.apk
new file mode 100644
index 0000000..147eb37
--- /dev/null
+++ b/proprietary/common/app/Torch.apk
Binary files differ
diff --git a/proprietary/common/etc/apns-conf-cdma.xml b/proprietary/common/etc/apns-conf-cdma.xml
index 42a0d77..84aa2f8 100644
--- a/proprietary/common/etc/apns-conf-cdma.xml
+++ b/proprietary/common/etc/apns-conf-cdma.xml
@@ -19,7 +19,7 @@
 
 <!-- use empty string to specify no proxy or port -->
 <!-- This version must agree with that in apps/common/res/apns.xml -->
-<apns version="7">
+<apns version="8">
   <apn carrier="MobiPCS" mcc="310" mnc="00" apn="MobiPCS" user="@mobipcs.com" password="mobipcs" mmsc="http://mms.mobipcs.com" authtype="3" type="*" />
   <apn carrier="Cricket" mcc="310" mnc="16" apn="wap.mycricket.com" user="@mycricket.com" password="cricket" mmsc="http://mms.mycricket.com/servlets/mms" mmsproxy="" mmsport="" proxy="wap.mycricket.com" port="8080" authtype="2" type="*" />
   <apn carrier="Cellular South" mcc="310" mnc="023" apn="internet" mmsc="http://pix.cellularsouth.com/servlets/mms" authtype="3" port="" mmsport="" type="mms" />
diff --git a/proprietary/common/etc/apns-conf.xml b/proprietary/common/etc/apns-conf.xml
index 2cd843c..6487427 100644
--- a/proprietary/common/etc/apns-conf.xml
+++ b/proprietary/common/etc/apns-conf.xml
@@ -19,7 +19,7 @@
 
 <!-- use empty string to specify no proxy or port -->
 <!-- This version must agree with that in apps/common/res/apns.xml -->
-<apns version="7">
+<apns version="8">
   <apn carrier="Cosmote GR" mcc="202" mnc="01" apn="Internet" type="default,supl" />
   <apn carrier="Cosmote GR MMS" mcc="202" mnc="01" apn="Mms" mmsc="195.167.65.220:8002" mmsproxy="10.10.10.20" mmsport="8080" type="mms" />
   <apn carrier="Cosmote Wireless Internet" mcc="202" mnc="01" apn="internet" type="default,supl" />