diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index e06014f..a0b8322 100644
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -115,23 +115,6 @@ ENDFOREACH(flag)
 #Create resources location file
 CONFIGURE_FILE( resources-location.in ${DEMO_SHARED}/resources-location.cpp )
 
-#Replace @DEMO_STYLE_IMAGE_DIR@ in following files
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/base-theme.json.in ${LOCAL_STYLE_DIR}/base-theme.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/demo-theme.json.in ${LOCAL_STYLE_DIR}/demo-theme.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/examples-theme.json.in ${LOCAL_STYLE_DIR}/examples-theme.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/tests-theme.json.in ${LOCAL_STYLE_DIR}/tests-theme.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/animated-gradient-call-active-style.json.in ${LOCAL_STYLE_DIR}/animated-gradient-call-active-style.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/contact-cards-example-theme.json.in ${LOCAL_STYLE_DIR}/contact-cards-example-theme.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/progress-bar-example-theme.json.in ${LOCAL_STYLE_DIR}/progress-bar-example-theme.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/simple-example-theme.json.in ${LOCAL_STYLE_DIR}/simple-example-theme.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/style-example-theme-one.json.in ${LOCAL_STYLE_DIR}/style-example-theme-one.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/style-example-theme-two.json.in ${LOCAL_STYLE_DIR}/style-example-theme-two.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/style-example-theme-three.json.in ${LOCAL_STYLE_DIR}/style-example-theme-three.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/tooltip-example-theme.json.in ${LOCAL_STYLE_DIR}/tooltip-example-theme.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/basic-light-theme.json.in ${LOCAL_STYLE_DIR}/basic-light-theme.json )
-CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/text-editor-example-theme.json.in ${LOCAL_STYLE_DIR}/text-editor-example-theme.json )
-MESSAGE("Configured ${LOCAL_STYLE_DIR}/style-example-theme<>.json files")
-
 FILE(GLOB LOCAL_STYLES_LIST "${LOCAL_STYLE_DIR}/*.json")
 FOREACH(flag ${LOCAL_STYLES_LIST})
   INSTALL(FILES ${flag} DESTINATION ${STYLE_DIR})
diff --git a/resources/style/.gitignore b/resources/style/.gitignore
deleted file mode 100644
index 5582fe8..0000000
--- a/resources/style/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-base-theme.json
-demo-theme.json
-examples-theme.json
-tests-theme.json
-animated-gradient-call-active-style.json
-contact-cards-example-theme.json
-progress-bar-example-theme.json
-simple-example-theme.json
-style-example-theme-three.json
-style-example-theme-two.json
-style-example-theme-one.json
-tooltip-example-theme.json
-basic-light-theme.json
-text-editor-example-theme.json
diff --git a/resources/style/animated-gradient-call-active-style.json.in b/resources/style/animated-gradient-call-active-style.json
index d73dc38..d73dc38 100644
--- a/resources/style/animated-gradient-call-active-style.json.in
+++ b/resources/style/animated-gradient-call-active-style.json
diff --git a/resources/style/base-theme.json.in b/resources/style/base-theme.json
index 12404e9..12404e9 100644
--- a/resources/style/base-theme.json.in
+++ b/resources/style/base-theme.json
diff --git a/resources/style/basic-light-theme.json.in b/resources/style/basic-light-theme.json
index ae863f2..ae863f2 100644
--- a/resources/style/basic-light-theme.json.in
+++ b/resources/style/basic-light-theme.json
diff --git a/resources/style/contact-cards-example-theme.json.in b/resources/style/contact-cards-example-theme.json
index 3a1448f..3a1448f 100644
--- a/resources/style/contact-cards-example-theme.json.in
+++ b/resources/style/contact-cards-example-theme.json
diff --git a/resources/style/demo-theme.json.in b/resources/style/demo-theme.json
index 1203c52..1203c52 100644
--- a/resources/style/demo-theme.json.in
+++ b/resources/style/demo-theme.json
diff --git a/resources/style/examples-theme.json.in b/resources/style/examples-theme.json
index 4dd7a86..4dd7a86 100644
--- a/resources/style/examples-theme.json.in
+++ b/resources/style/examples-theme.json
diff --git a/resources/style/mobile/animated-gradient-call-active-style.json.in b/resources/style/mobile/animated-gradient-call-active-style.json
index d73dc38..d73dc38 100644
--- a/resources/style/mobile/animated-gradient-call-active-style.json.in
+++ b/resources/style/mobile/animated-gradient-call-active-style.json
diff --git a/resources/style/mobile/base-theme.json.in b/resources/style/mobile/base-theme.json
index 3a817c5..3a817c5 100644
--- a/resources/style/mobile/base-theme.json.in
+++ b/resources/style/mobile/base-theme.json
diff --git a/resources/style/mobile/basic-light-theme.json.in b/resources/style/mobile/basic-light-theme.json
index ae863f2..ae863f2 100644
--- a/resources/style/mobile/basic-light-theme.json.in
+++ b/resources/style/mobile/basic-light-theme.json
diff --git a/resources/style/mobile/contact-cards-example-theme.json.in b/resources/style/mobile/contact-cards-example-theme.json
index 03ece78..03ece78 100644
--- a/resources/style/mobile/contact-cards-example-theme.json.in
+++ b/resources/style/mobile/contact-cards-example-theme.json
diff --git a/resources/style/mobile/demo-theme.json.in b/resources/style/mobile/demo-theme.json
index 05578b7..05578b7 100644
--- a/resources/style/mobile/demo-theme.json.in
+++ b/resources/style/mobile/demo-theme.json
diff --git a/resources/style/mobile/examples-theme.json.in b/resources/style/mobile/examples-theme.json
index f6e1c6b..f6e1c6b 100644
--- a/resources/style/mobile/examples-theme.json.in
+++ b/resources/style/mobile/examples-theme.json
diff --git a/resources/style/mobile/progress-bar-example-theme.json.in b/resources/style/mobile/progress-bar-example-theme.json
index d9a47ee..d9a47ee 100644
--- a/resources/style/mobile/progress-bar-example-theme.json.in
+++ b/resources/style/mobile/progress-bar-example-theme.json
diff --git a/resources/style/mobile/simple-example-theme.json.in b/resources/style/mobile/simple-example-theme.json
index d2b68e5..d2b68e5 100644
--- a/resources/style/mobile/simple-example-theme.json.in
+++ b/resources/style/mobile/simple-example-theme.json
diff --git a/resources/style/mobile/style-example-theme-one.json.in b/resources/style/mobile/style-example-theme-one.json
index 74025d2..74025d2 100644
--- a/resources/style/mobile/style-example-theme-one.json.in
+++ b/resources/style/mobile/style-example-theme-one.json
diff --git a/resources/style/mobile/style-example-theme-three.json.in b/resources/style/mobile/style-example-theme-three.json
index f77d957..f77d957 100644
--- a/resources/style/mobile/style-example-theme-three.json.in
+++ b/resources/style/mobile/style-example-theme-three.json
diff --git a/resources/style/mobile/style-example-theme-two.json.in b/resources/style/mobile/style-example-theme-two.json
index fa8ed33..fa8ed33 100644
--- a/resources/style/mobile/style-example-theme-two.json.in
+++ b/resources/style/mobile/style-example-theme-two.json
diff --git a/resources/style/mobile/tests-theme.json.in b/resources/style/mobile/tests-theme.json
index 90d8049..90d8049 100644
--- a/resources/style/mobile/tests-theme.json.in
+++ b/resources/style/mobile/tests-theme.json
diff --git a/resources/style/mobile/text-editor-example-theme.json.in b/resources/style/mobile/text-editor-example-theme.json
index 48470b4..48470b4 100644
--- a/resources/style/mobile/text-editor-example-theme.json.in
+++ b/resources/style/mobile/text-editor-example-theme.json
diff --git a/resources/style/mobile/tooltip-example-theme.json.in b/resources/style/mobile/tooltip-example-theme.json
index aa2cfb5..aa2cfb5 100644
--- a/resources/style/mobile/tooltip-example-theme.json.in
+++ b/resources/style/mobile/tooltip-example-theme.json
diff --git a/resources/style/progress-bar-example-theme.json.in b/resources/style/progress-bar-example-theme.json
index 971ee7d..971ee7d 100644
--- a/resources/style/progress-bar-example-theme.json.in
+++ b/resources/style/progress-bar-example-theme.json
diff --git a/resources/style/simple-example-theme.json.in b/resources/style/simple-example-theme.json
index d2b68e5..d2b68e5 100644
--- a/resources/style/simple-example-theme.json.in
+++ b/resources/style/simple-example-theme.json
diff --git a/resources/style/style-example-theme-one.json.in b/resources/style/style-example-theme-one.json
index 51ddc8b..51ddc8b 100644
--- a/resources/style/style-example-theme-one.json.in
+++ b/resources/style/style-example-theme-one.json
diff --git a/resources/style/style-example-theme-three.json.in b/resources/style/style-example-theme-three.json
index f77d957..f77d957 100644
--- a/resources/style/style-example-theme-three.json.in
+++ b/resources/style/style-example-theme-three.json
diff --git a/resources/style/style-example-theme-two.json.in b/resources/style/style-example-theme-two.json
index d689bff..d689bff 100644
--- a/resources/style/style-example-theme-two.json.in
+++ b/resources/style/style-example-theme-two.json
diff --git a/resources/style/tests-theme.json.in b/resources/style/tests-theme.json
index c25d961..c25d961 100644
--- a/resources/style/tests-theme.json.in
+++ b/resources/style/tests-theme.json
diff --git a/resources/style/text-editor-example-theme.json.in b/resources/style/text-editor-example-theme.json
index 48470b4..48470b4 100644
--- a/resources/style/text-editor-example-theme.json.in
+++ b/resources/style/text-editor-example-theme.json
diff --git a/resources/style/tooltip-example-theme.json.in b/resources/style/tooltip-example-theme.json
index aa2cfb5..aa2cfb5 100644
--- a/resources/style/tooltip-example-theme.json.in
+++ b/resources/style/tooltip-example-theme.json