diff --git a/click.mk b/click.mk
index 9ceba1a..920ebaa 100644
--- a/click.mk
+++ b/click.mk
@@ -89,78 +89,6 @@ PRODUCT_COPY_FILES += \
     device/htc/click/custom/handle_compcache:system/bin/handle_compcache \
     device/htc/click/custom/rzscontrol:system/bin/rzscontrol
 
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.media.dec.jpeg.memcap=20000000
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    rild.libpath=/system/lib/libhtc_ril.so \
-    ro.ril.ecc.HTC-ELL=92,93,94 \
-    ro.ril.ecc.HTC-WWE=999 \
-    ro.ril.enable.a52.HTC-ITA=1 \
-    ro.ril.enable.a53.HTC-ITA=1 \
-    ro.ril.enable.a52=0 \
-    ro.ril.enable.a53=1 \
-    ro.ril.enable.dtm = 1 \
-    ro.ril.gprsclass = 12 \
-    ro.ril.hsdpa.category=8 \
-    ro.ril.hsupa.category=5 \
-    ro.ril.hsxpa=2 \
-    ro.ril.def.agps.mode = 2
-
-# Time between scans in seconds. Keep it high to minimize battery drain.
-# This only affects the case in which there are remembered access points,
-# but none are in range.
-PRODUCT_PROPERTY_OVERRIDES += \
-    wifi.interface = tiwlan0 \
-    wifi.supplicant_scan_interval=45 \
-    ro.tether.denied=true
-
-# density in DPI of the LCD of this board. This is used to scale the UI
-# appropriately. If this property is not defined, the default value is 120 dpi. 
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.sf.lcd_density=120
-
-# View configuration for QVGA
-PRODUCT_PROPERTY_OVERRIDES += \
-    view.fading_edge_length=8 \
-    view.touch_slop=15 \
-    view.minimum_fling_velocity=25 \
-    view.scroll_friction=0.008
-
-# Default network type
-# 0 => WCDMA Preferred.
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.telephony.default_network=0 \
-    ro.com.google.locationfeatures=1
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.opengles.version=65536 \
-    persist.sys.use_dithering=0
-
-# Disable fs check on boot by default
-PRODUCT_PROPERTY_OVERRIDES += \
-    sys.checkfs.fat=false
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.config.notification_sound=tweeters.ogg \
-    ro.config.alarm_alert=Alarm_Classic.ogg
-
-# Enable JIT by default
-PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.execution-mode=int:fast
-
-# VM heap size
-PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.heapsize=24m
-
-# Enable compcache
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.compcache.default=18
-
-# Makes HOME ADW / OTHERS to be always in memoory
-PRODUCT_PROPERTY_OVERRIDES += \
-    pref_lock_home=1
-
 # media configuration xml file
 PRODUCT_COPY_FILES += \
     device/htc/click/media_profiles.xml:/system/etc/media_profiles.xml
diff --git a/system.prop b/system.prop
new file mode 100644
index 0000000..9c446f5
--- /dev/null
+++ b/system.prop
@@ -0,0 +1,69 @@
+#
+# system.prop for tattoo
+#
+
+# Increase SKIA decode memory capability for progressive jpg file
+ro.media.dec.jpeg.memcap=20000000
+
+# RIL specific configuration
+rild.libpath=/system/lib/libhtc_ril.so
+ro.ril.ecc.HTC-ELL=92,93,94
+ro.ril.ecc.HTC-WWE=999
+ro.ril.enable.a52.HTC-ITA=1
+ro.ril.enable.a53.HTC-ITA=1
+ro.ril.enable.a52=0
+ro.ril.enable.a53=1
+ro.ril.enable.dtm = 1
+ro.ril.gprsclass = 12
+ro.ril.hsdpa.category=8
+ro.ril.hsupa.category=5
+ro.ril.hsxpa=2
+ro.ril.def.agps.mode = 2
+
+# Modify MMS APN retry timer from 5s to 2s.
+ro.gsm.2nd_data_retry_config = max_retries=3, 2000, 2000, 2000
+
+# Time between scans in seconds. Keep it high to minimize battery drain.
+# This only affects the case in which there are remembered access points,
+# but none are in range.
+wifi.interface = tiwlan0
+wifi.supplicant_scan_interval=45
+
+# density in DPI of the LCD of this board. This is used to scale the UI
+# appropriately. If this property is not defined, the default value is 120 dpi. 
+ro.sf.lcd_density=120
+
+# View configuration for QVGA
+view.fading_edge_length=8
+view.touch_slop=15
+view.minimum_fling_velocity=25
+view.scroll_friction=0.008
+
+# Default network type
+# 0 => WCDMA Preferred.
+ro.telephony.default_network=0
+ro.com.google.locationfeatures=1
+
+ro.opengles.version=65536
+
+# Disable fs check on boot by default
+sys.checkfs.fat=false
+
+ro.config.notification_sound=tweeters.ogg
+ro.config.alarm_alert=Alarm_Classic.ogg
+
+# Enable JIT by default
+dalvik.vm.execution-mode=int:jit
+
+# Persist default parameters
+persist.sys.use_dithering=0
+persist.sys.purgeable_assets=1
+
+# VM heap size
+dalvik.vm.heapsize=24m
+
+# Enable compcache
+ro.compcache.default=18
+
+# Makes HOME ADW / OTHERS to be always in memoory
+pref_lock_home=1