diff --git a/resources/style/demo-theme.json b/resources/style/demo-theme.json
index 79acc25..5b35adc 100644
--- a/resources/style/demo-theme.json
+++ b/resources/style/demo-theme.json
@@ -43,14 +43,33 @@ distributing this software or its derivatives.
     {
       "point-size":13
     },
-
+    "textselectionpopuplabel":
+    {
+      "point-size":18
+    },
+    "textselectionpopup":
+    {
+      "popup-max-size":[400,100],
+      "option-divider-size":[2,0],
+      "popup-divider-color":[0.23,0.72,0.8,0.11],
+      "popup-icon-color":[1.0,1.0,1.0,1.0],
+      "popup-pressed-color":[0.24,0.72,0.8,0.11],
+      "background-image": {
+        "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
+        }
+    },
     "textfield":
     {
       "font-family":"HelveticaNeue",
       "font-style":"Regular",
-      "point-size":18
+      "point-size":18,
+      "primary-cursor-color":[0.75,0.96,1.0,1.0],
+      "secondary-cursor-color":[1.0,0.71,0.9,1.0],
+      "selection-highlight-color":[0.75,0.96,1.0,1.0],
+      "grab-handle-image":"{DALI_IMAGE_DIR}cursor_handler_center.png",
+      "selection-handle-image-left":"{DALI_IMAGE_DIR}selection_handle_left.png",
+      "selection-handle-image-right":"{DALI_IMAGE_DIR}selection_handle_right.png"
     },
-
     "scrollview":
     {
       "overshoot-effect-color":"B018"
diff --git a/resources/style/mobile/demo-theme.json b/resources/style/mobile/demo-theme.json
index 4328b32..579bb81 100644
--- a/resources/style/mobile/demo-theme.json
+++ b/resources/style/mobile/demo-theme.json
@@ -25,7 +25,8 @@ distributing this software or its derivatives.
     "textlabel":
     {
       "font-family":"SamsungSans",
-      "font-style":"Regular"
+      "font-style":"Regular",
+      "point-size":18
     },
 
     "textlabel-font-size-0":
@@ -63,11 +64,31 @@ distributing this software or its derivatives.
     {
       "point-size":10
     },
-
+    "textselectionpopuplabel":
+    {
+      "point-size":8
+    },
+    "textselectionpopup":
+    {
+      "popup-max-size":[400,100],
+      "option-divider-size":[2,0],
+      "popup-divider-color":[0.23,0.72,0.8,0.11],
+      "popup-icon-color":[1.0,1.0,1.0,1.0],
+      "popup-pressed-color":[0.24,0.72,0.8,0.11],
+      "background-image": {
+        "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
+        }
+    },
     "textfield":
     {
       "font-family":"SamsungSans",
-      "font-style":"Regular"
+      "font-style":"Regular",
+      "primary-cursor-color":[0.0,0.71,0.9,1.0],
+      "secondary-cursor-color":[0.0,0.71,0.9,1.0],
+      "selection-highlight-color":[0.75,0.96,1.0,1.0],
+      "grab-handle-image":"{DALI_IMAGE_DIR}cursor_handler_center.png",
+      "selection-handle-image-left":"{DALI_IMAGE_DIR}selection_handle_left.png",
+      "selection-handle-image-right":"{DALI_IMAGE_DIR}selection_handle_right.png"
     },
 
     "textfield-font-size-0":