diff --git a/NVTCapacitivePen.idc b/NVTCapacitivePen.idc
new file mode 100644
index 0000000..39f5158
--- /dev/null
+++ b/NVTCapacitivePen.idc
@@ -0,0 +1,2 @@
+touch.orientationAware = 1
+touch.orientation = ORIENTATION_270
diff --git a/NVTCapacitiveTouchScreen.idc b/NVTCapacitiveTouchScreen.idc
new file mode 100644
index 0000000..bcfcb54
--- /dev/null
+++ b/NVTCapacitiveTouchScreen.idc
@@ -0,0 +1 @@
+touch.orientation = ORIENTATION_270
diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc
index 47f813a..6534386 100644
--- a/conf/init.tangorpro.rc
+++ b/conf/init.tangorpro.rc
@@ -37,6 +37,25 @@ on property:vendor.mfgapi.touchpanel.permission=1
     chmod 0600 /sys/devices/virtual/sec/tsp/cmd
     chown system system /sys/devices/virtual/sec/tsp/cmd
 
+# Touch
+on property:vendor.device.modules.ready=1
+    chown system system /sys/devices/platform/10d10000.spi/spi_master/spi0/spi0.0/input/nvt_touch/force_touch_active
+    chown system system /sys/devices/platform/10d10000.spi/spi_master/spi0/spi0.0/input/nvt_touch/nvt_dttw_mode
+    chown system system /sys/devices/platform/10d10000.spi/spi_master/spi0/spi0.0/input/nvt_touch/nvt_fw_history
+    chown system system /sys/devices/platform/10d10000.spi/spi_master/spi0/spi0.0/input/nvt_touch/nvt_high_sensi_mode
+
+on property:vendor.all.modules.ready=1 && property:persist.sys.tap_gesture=
+    write /sys/devices/platform/10d10000.spi/spi_master/spi0/spi0.0/input/nvt_touch/nvt_dttw_mode 1
+    write /sys/devices/platform/exynos-drm/primary-panel/force_power_on 1
+
+on property:vendor.all.modules.ready=1 && property:persist.sys.tap_gesture=1
+    write /sys/devices/platform/10d10000.spi/spi_master/spi0/spi0.0/input/nvt_touch/nvt_dttw_mode 1
+    write /sys/devices/platform/exynos-drm/primary-panel/force_power_on 1
+
+on property:vendor.all.modules.ready=1 && property:persist.sys.tap_gesture=0
+    write /sys/devices/platform/10d10000.spi/spi_master/spi0/spi0.0/input/nvt_touch/nvt_dttw_mode 0
+    write /sys/devices/platform/exynos-drm/primary-panel/force_power_on 0
+
 # Fingerprint
 on post-fs-data
     chown system system /dev/goodix_fp
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index dde0741..cc46041 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -33,6 +33,11 @@ DEVICE_PACKAGE_OVERLAYS += device/google/tangorpro/tangorpro/overlay
 PRODUCT_SOONG_NAMESPACES += device/google/tangorpro
 PRODUCT_PACKAGES += WifiOverlayT6pro
 
+# Touch files
+PRODUCT_COPY_FILES += \
+        device/google/tangorpro/NVTCapacitiveTouchScreen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitiveTouchScreen.idc \
+        device/google/tangorpro/NVTCapacitivePen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitivePen.idc
+
 # Init files
 PRODUCT_COPY_FILES += \
 	device/google/tangorpro/conf/init.tangorpro.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.tangorpro.rc