diff --git a/build/tizen/.gitignore b/build/tizen/.gitignore
index bc56788..9425618 100644
--- a/build/tizen/.gitignore
+++ b/build/tizen/.gitignore
@@ -10,3 +10,4 @@ install_manifest.txt
 /docs/dali.doxy
 /builder/dali-builder
 /examples/*.demo
+/mo
diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 11b2fec..75b8a55 100644
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -101,11 +101,45 @@ ENDFOREACH(flag)
 
 SET(DALI_DEMO_CFLAGS "-DDEMO_IMAGE_DIR=${DEMO_IMAGE_DIR} -DDEMO_VIDEO_DIR=${DEMO_VIDEO_DIR} -DDEMO_MODEL_DIR=${DEMO_MODEL_DIR} -DDEMO_SCRIPT_DIR=${DEMO_SCRIPT_DIR} -DDEMO_THEME_PATH=${DEMO_THEME_PATH} -DDEMO_EXAMPLE_BIN=${DEMO_EXAMPLE_BIN} -DDEMO_LOCALE_DIR=${DEMO_LOCALE_DIR} -fvisibility=hidden -DHIDE_DALI_INTERNALS -DDEMO_LANG=${DEMO_LANG}")
 
+###########################################################################
+# Internationalization
+
+SET(PO_DIR ${RESOURCE_DIR}/po)
+
+FILE(GLOB PO_FILES RELATIVE "${PO_DIR}" "${PO_DIR}/*.po")
+
+SET(MSGFMT "/usr/bin/msgfmt")
+SET(MO_FILES_DIR ${CMAKE_BINARY_DIR}/mo)
+FILE(MAKE_DIRECTORY ${MO_FILES_DIR})
+
+FOREACH(PO_FILE ${PO_FILES})
+        SET(PO_FILE ${PO_DIR}/${PO_FILE})
+        MESSAGE("PO: ${PO_FILE}")
+        GET_FILENAME_COMPONENT(ABS_PO_FILE ${PO_FILE} ABSOLUTE)
+        GET_FILENAME_COMPONENT(lang ${ABS_PO_FILE} NAME_WE)
+        SET(MO_FILE ${MO_FILES_DIR}/${lang}.mo)
+        ADD_CUSTOM_COMMAND(OUTPUT ${MO_FILE}
+                           COMMAND ${MSGFMT} -o ${MO_FILE} ${ABS_PO_FILE}
+                           DEPENDS ${ABS_PO_FILE})
+        INSTALL(FILES ${MO_FILE} DESTINATION ${LOCALE_DIR}/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
+        SET(MO_FILES ${MO_FILES} ${MO_FILE})
+ENDFOREACH(PO_FILE)
+
+MESSAGE(".mo files: ${MO_FILES}")
+ADD_CUSTOM_TARGET(po ALL DEPENDS ${MO_FILES})
+
+OPTION(INTERNATIONALIZATION "Internationalization demo string names" ON)
+IF (INTERNATIONALIZATION)
+        SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DINTERNATIONALIZATION_ENABLED")
+ENDIF(INTERNATIONALIZATION)
+
+###########################################################################
+
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werror -Wall -fPIE")
 SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
 
 INCLUDE_DIRECTORIES(${ROOT_SRC_DIR})
-INCLUDE_DIRECTORIES(${DEMO_SRC_DIR})
+#INCLUDE_DIRECTORIES(${DEMO_SRC_DIR})
 
 ADD_SUBDIRECTORY(demo)
 ADD_SUBDIRECTORY(examples)
diff --git a/build/tizen/demo/CMakeLists.txt b/build/tizen/demo/CMakeLists.txt
index 227bc50..affd620 100644
--- a/build/tizen/demo/CMakeLists.txt
+++ b/build/tizen/demo/CMakeLists.txt
@@ -7,26 +7,3 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${REQUIRED_PKGS_LDFLAGS} -pie)
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
-# Internationalization
-
-SET(PO_DIR ${DEMO_SRC_DIR}/po)
-
-FILE(GLOB PO_FILES RELATIVE "${PO_DIR}" "${PO_DIR}/*.po")
-
-SET(MSGFMT "/usr/bin/msgfmt")
-
-FOREACH(PO_FILE ${PO_FILES})
-        SET(PO_FILE ${PO_DIR}/${PO_FILE})
-        MESSAGE("PO: ${PO_FILE}")
-        GET_FILENAME_COMPONENT(ABS_PO_FILE ${PO_FILE} ABSOLUTE)
-        GET_FILENAME_COMPONENT(lang ${ABS_PO_FILE} NAME_WE)
-        SET(MO_FILE ${PO_DIR}/${lang}.mo)
-        ADD_CUSTOM_COMMAND(OUTPUT ${MO_FILE}
-                           COMMAND ${MSGFMT} -o ${MO_FILE} ${ABS_PO_FILE}
-                           DEPENDS ${ABS_PO_FILE})
-        INSTALL(FILES ${MO_FILE} DESTINATION ${LOCALE_DIR}/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
-        SET(MO_FILES ${MO_FILES} ${MO_FILE})
-ENDFOREACH(PO_FILE)
-
-MESSAGE(".mo files: ${MO_FILES}")
-ADD_CUSTOM_TARGET(po ALL DEPENDS ${MO_FILES})
diff --git a/demo/file.list b/demo/file.list
deleted file mode 100644
index c64143a..0000000
--- a/demo/file.list
+++ /dev/null
@@ -1,25 +0,0 @@
-# Add files to build with demo here
-
-common_src_files = \
-    $(demo_src_dir)/dali-table-view.cpp
-
-demo_src_files = \
-    $(common_src_files) \
-    $(demo_src_dir)/dali-demo.cpp
-
-# Add files to install here
-
-demo_image_files = \
-    $(demo_src_dir)/images/*.png \
-    $(demo_src_dir)/images/*.jpg \
-    $(demo_src_dir)/images/*.gif \
-    $(demo_src_dir)/images/*.bmp \
-    $(demo_src_dir)/images/*.ico \
-    $(demo_src_dir)/images/*.wbmp \
-    $(demo_src_dir)/images/*.svg
-
-demo_model_files = \
-    $(demo_src_dir)/models/*
-
-demo_script_files = \
-    $(demo_src_dir)/scripts/*
diff --git a/demo/po/en.po b/demo/po/en.po
deleted file mode 100755
index a2ec3fa..0000000
--- a/demo/po/en.po
+++ /dev/null
@@ -1,50 +0,0 @@
-msgid "DALI_DEMO_STR_TITLE_BUBBLES"
-msgstr "Bubbles"
-
-msgid "DALI_DEMO_STR_TITLE_BLOCKS"
-msgstr "Blocks"
-
-msgid "DALI_DEMO_STR_TITLE_CLUSTER"
-msgstr "Cluster"
-
-msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
-msgstr "Cube Transition"
-
-msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
-msgstr "Dissolve Transition"
-
-msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
-msgstr "Item View"
-
-msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
-msgstr "Magnifier"
-
-msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
-msgstr "Motion Blur"
-
-msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
-msgstr "Motion Stretch"
-
-msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
-msgstr "Page Turn View"
-
-msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
-msgstr "Radial Menu"
-
-msgid "DALI_DEMO_STR_TITLE_REFRACTION"
-msgstr "Refraction"
-
-msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
-msgstr "Scroll View"
-
-msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
-msgstr "Lights and shadows"
-
-msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
-msgstr "Script Based UI"
-
-msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
-msgstr "Image Scaling Modes"
-
-msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
-msgstr "Text Label"
diff --git a/demo/po/en_GB.po b/demo/po/en_GB.po
deleted file mode 100755
index a2ec3fa..0000000
--- a/demo/po/en_GB.po
+++ /dev/null
@@ -1,50 +0,0 @@
-msgid "DALI_DEMO_STR_TITLE_BUBBLES"
-msgstr "Bubbles"
-
-msgid "DALI_DEMO_STR_TITLE_BLOCKS"
-msgstr "Blocks"
-
-msgid "DALI_DEMO_STR_TITLE_CLUSTER"
-msgstr "Cluster"
-
-msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
-msgstr "Cube Transition"
-
-msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
-msgstr "Dissolve Transition"
-
-msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
-msgstr "Item View"
-
-msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
-msgstr "Magnifier"
-
-msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
-msgstr "Motion Blur"
-
-msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
-msgstr "Motion Stretch"
-
-msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
-msgstr "Page Turn View"
-
-msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
-msgstr "Radial Menu"
-
-msgid "DALI_DEMO_STR_TITLE_REFRACTION"
-msgstr "Refraction"
-
-msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
-msgstr "Scroll View"
-
-msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
-msgstr "Lights and shadows"
-
-msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
-msgstr "Script Based UI"
-
-msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
-msgstr "Image Scaling Modes"
-
-msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
-msgstr "Text Label"
diff --git a/demo/po/en_US.po b/demo/po/en_US.po
deleted file mode 100755
index a2ec3fa..0000000
--- a/demo/po/en_US.po
+++ /dev/null
@@ -1,50 +0,0 @@
-msgid "DALI_DEMO_STR_TITLE_BUBBLES"
-msgstr "Bubbles"
-
-msgid "DALI_DEMO_STR_TITLE_BLOCKS"
-msgstr "Blocks"
-
-msgid "DALI_DEMO_STR_TITLE_CLUSTER"
-msgstr "Cluster"
-
-msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
-msgstr "Cube Transition"
-
-msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
-msgstr "Dissolve Transition"
-
-msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
-msgstr "Item View"
-
-msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
-msgstr "Magnifier"
-
-msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
-msgstr "Motion Blur"
-
-msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
-msgstr "Motion Stretch"
-
-msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
-msgstr "Page Turn View"
-
-msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
-msgstr "Radial Menu"
-
-msgid "DALI_DEMO_STR_TITLE_REFRACTION"
-msgstr "Refraction"
-
-msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
-msgstr "Scroll View"
-
-msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
-msgstr "Lights and shadows"
-
-msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
-msgstr "Script Based UI"
-
-msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
-msgstr "Image Scaling Modes"
-
-msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
-msgstr "Text Label"
diff --git a/demo/po/zn_CH.po b/demo/po/zn_CH.po
deleted file mode 100755
index f136c4b..0000000
--- a/demo/po/zn_CH.po
+++ /dev/null
@@ -1,50 +0,0 @@
-msgid "DALI_DEMO_STR_TITLE_BUBBLES"
-msgstr "气泡"
-
-msgid "DALI_DEMO_STR_TITLE_BLOCKS"
-msgstr "块体"
-
-msgid "DALI_DEMO_STR_TITLE_CLUSTER"
-msgstr "叢集"
-
-msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
-msgstr "方块 切换效果"
-
-msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
-msgstr "冰消瓦解 切换效果"
-
-msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
-msgstr "項目 檢視"
-
-msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
-msgstr "放大鏡"
-
-msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
-msgstr "动作 模糊"
-
-msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
-msgstr "动作 拉伸"
-
-msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
-msgstr "页面"
-
-msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
-msgstr "射线图"
-
-msgid "DALI_DEMO_STR_TITLE_REFRACTION"
-msgstr "折光"
-
-msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
-msgstr "捲動"
-
-msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
-msgstr "阴影"
-
-msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
-msgstr "指令檔"
-
-msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
-msgstr "图像 制定級數"
-
-msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
-msgstr "标签"
diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp
index 28eb286..03a99e6 100644
--- a/examples/blocks/blocks-example.cpp
+++ b/examples/blocks/blocks-example.cpp
@@ -228,6 +228,9 @@ public:
   {
     Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
 
+    // Hide the indicator bar
+    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+
     // Creates a default view with a default tool bar.
     // The view is added to the stage.
     Toolkit::ToolBar toolBar;
diff --git a/examples/homescreen-benchmark/homescreen-benchmark.cpp b/examples/homescreen-benchmark/homescreen-benchmark.cpp
index da33200..8e04e44 100644
--- a/examples/homescreen-benchmark/homescreen-benchmark.cpp
+++ b/examples/homescreen-benchmark/homescreen-benchmark.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
-
+#include <sstream>
 #include <iostream>
 
 using namespace Dali;
@@ -24,319 +25,54 @@ using Dali::Toolkit::TextLabel;
 
 namespace
 {
-const char* IMAGE_PATH[] = {
-  DEMO_IMAGE_DIR "application-icon-0.png",
-  DEMO_IMAGE_DIR "application-icon-100.png",
-  DEMO_IMAGE_DIR "application-icon-101.png",
-  DEMO_IMAGE_DIR "application-icon-102.png",
-  DEMO_IMAGE_DIR "application-icon-103.png",
-  DEMO_IMAGE_DIR "application-icon-104.png",
-  DEMO_IMAGE_DIR "application-icon-105.png",
-  DEMO_IMAGE_DIR "application-icon-106.png",
-  DEMO_IMAGE_DIR "application-icon-107.png",
-  DEMO_IMAGE_DIR "application-icon-108.png",
-  DEMO_IMAGE_DIR "application-icon-109.png",
-  DEMO_IMAGE_DIR "application-icon-10.png",
-  DEMO_IMAGE_DIR "application-icon-110.png",
-  DEMO_IMAGE_DIR "application-icon-111.png",
-  DEMO_IMAGE_DIR "application-icon-112.png",
-  DEMO_IMAGE_DIR "application-icon-113.png",
-  DEMO_IMAGE_DIR "application-icon-114.png",
-  DEMO_IMAGE_DIR "application-icon-115.png",
-  DEMO_IMAGE_DIR "application-icon-116.png",
-  DEMO_IMAGE_DIR "application-icon-117.png",
-  DEMO_IMAGE_DIR "application-icon-118.png",
-  DEMO_IMAGE_DIR "application-icon-119.png",
-  DEMO_IMAGE_DIR "application-icon-11.png",
-  DEMO_IMAGE_DIR "application-icon-120.png",
-  DEMO_IMAGE_DIR "application-icon-121.png",
-  DEMO_IMAGE_DIR "application-icon-122.png",
-  DEMO_IMAGE_DIR "application-icon-123.png",
-  DEMO_IMAGE_DIR "application-icon-124.png",
-  DEMO_IMAGE_DIR "application-icon-125.png",
-  DEMO_IMAGE_DIR "application-icon-126.png",
-  DEMO_IMAGE_DIR "application-icon-127.png",
-  DEMO_IMAGE_DIR "application-icon-128.png",
-  DEMO_IMAGE_DIR "application-icon-129.png",
-  DEMO_IMAGE_DIR "application-icon-12.png",
-  DEMO_IMAGE_DIR "application-icon-130.png",
-  DEMO_IMAGE_DIR "application-icon-131.png",
-  DEMO_IMAGE_DIR "application-icon-132.png",
-  DEMO_IMAGE_DIR "application-icon-133.png",
-  DEMO_IMAGE_DIR "application-icon-134.png",
-  DEMO_IMAGE_DIR "application-icon-135.png",
-  DEMO_IMAGE_DIR "application-icon-136.png",
-  DEMO_IMAGE_DIR "application-icon-137.png",
-  DEMO_IMAGE_DIR "application-icon-138.png",
-  DEMO_IMAGE_DIR "application-icon-139.png",
-  DEMO_IMAGE_DIR "application-icon-13.png",
-  DEMO_IMAGE_DIR "application-icon-140.png",
-  DEMO_IMAGE_DIR "application-icon-141.png",
-  DEMO_IMAGE_DIR "application-icon-142.png",
-  DEMO_IMAGE_DIR "application-icon-143.png",
-  DEMO_IMAGE_DIR "application-icon-144.png",
-  DEMO_IMAGE_DIR "application-icon-145.png",
-  DEMO_IMAGE_DIR "application-icon-146.png",
-  DEMO_IMAGE_DIR "application-icon-147.png",
-  DEMO_IMAGE_DIR "application-icon-14.png",
-  DEMO_IMAGE_DIR "application-icon-15.png",
-  DEMO_IMAGE_DIR "application-icon-16.png",
-  DEMO_IMAGE_DIR "application-icon-17.png",
-  DEMO_IMAGE_DIR "application-icon-18.png",
-  DEMO_IMAGE_DIR "application-icon-19.png",
-  DEMO_IMAGE_DIR "application-icon-1.png",
-  DEMO_IMAGE_DIR "application-icon-20.png",
-  DEMO_IMAGE_DIR "application-icon-21.png",
-  DEMO_IMAGE_DIR "application-icon-22.png",
-  DEMO_IMAGE_DIR "application-icon-23.png",
-  DEMO_IMAGE_DIR "application-icon-24.png",
-  DEMO_IMAGE_DIR "application-icon-25.png",
-  DEMO_IMAGE_DIR "application-icon-26.png",
-  DEMO_IMAGE_DIR "application-icon-27.png",
-  DEMO_IMAGE_DIR "application-icon-28.png",
-  DEMO_IMAGE_DIR "application-icon-29.png",
-  DEMO_IMAGE_DIR "application-icon-2.png",
-  DEMO_IMAGE_DIR "application-icon-30.png",
-  DEMO_IMAGE_DIR "application-icon-31.png",
-  DEMO_IMAGE_DIR "application-icon-32.png",
-  DEMO_IMAGE_DIR "application-icon-33.png",
-  DEMO_IMAGE_DIR "application-icon-34.png",
-  DEMO_IMAGE_DIR "application-icon-35.png",
-  DEMO_IMAGE_DIR "application-icon-36.png",
-  DEMO_IMAGE_DIR "application-icon-37.png",
-  DEMO_IMAGE_DIR "application-icon-38.png",
-  DEMO_IMAGE_DIR "application-icon-39.png",
-  DEMO_IMAGE_DIR "application-icon-3.png",
-  DEMO_IMAGE_DIR "application-icon-40.png",
-  DEMO_IMAGE_DIR "application-icon-41.png",
-  DEMO_IMAGE_DIR "application-icon-42.png",
-  DEMO_IMAGE_DIR "application-icon-43.png",
-  DEMO_IMAGE_DIR "application-icon-44.png",
-  DEMO_IMAGE_DIR "application-icon-45.png",
-  DEMO_IMAGE_DIR "application-icon-46.png",
-  DEMO_IMAGE_DIR "application-icon-47.png",
-  DEMO_IMAGE_DIR "application-icon-48.png",
-  DEMO_IMAGE_DIR "application-icon-49.png",
-  DEMO_IMAGE_DIR "application-icon-4.png",
-  DEMO_IMAGE_DIR "application-icon-50.png",
-  DEMO_IMAGE_DIR "application-icon-51.png",
-  DEMO_IMAGE_DIR "application-icon-52.png",
-  DEMO_IMAGE_DIR "application-icon-53.png",
-  DEMO_IMAGE_DIR "application-icon-54.png",
-  DEMO_IMAGE_DIR "application-icon-55.png",
-  DEMO_IMAGE_DIR "application-icon-56.png",
-  DEMO_IMAGE_DIR "application-icon-57.png",
-  DEMO_IMAGE_DIR "application-icon-58.png",
-  DEMO_IMAGE_DIR "application-icon-59.png",
-  DEMO_IMAGE_DIR "application-icon-5.png",
-  DEMO_IMAGE_DIR "application-icon-60.png",
-  DEMO_IMAGE_DIR "application-icon-61.png",
-  DEMO_IMAGE_DIR "application-icon-62.png",
-  DEMO_IMAGE_DIR "application-icon-63.png",
-  DEMO_IMAGE_DIR "application-icon-64.png",
-  DEMO_IMAGE_DIR "application-icon-65.png",
-  DEMO_IMAGE_DIR "application-icon-66.png",
-  DEMO_IMAGE_DIR "application-icon-67.png",
-  DEMO_IMAGE_DIR "application-icon-68.png",
-  DEMO_IMAGE_DIR "application-icon-69.png",
-  DEMO_IMAGE_DIR "application-icon-6.png",
-  DEMO_IMAGE_DIR "application-icon-70.png",
-  DEMO_IMAGE_DIR "application-icon-71.png",
-  DEMO_IMAGE_DIR "application-icon-72.png",
-  DEMO_IMAGE_DIR "application-icon-73.png",
-  DEMO_IMAGE_DIR "application-icon-74.png",
-  DEMO_IMAGE_DIR "application-icon-75.png",
-  DEMO_IMAGE_DIR "application-icon-76.png",
-  DEMO_IMAGE_DIR "application-icon-77.png",
-  DEMO_IMAGE_DIR "application-icon-78.png",
-  DEMO_IMAGE_DIR "application-icon-79.png",
-  DEMO_IMAGE_DIR "application-icon-7.png",
-  DEMO_IMAGE_DIR "application-icon-80.png",
-  DEMO_IMAGE_DIR "application-icon-81.png",
-  DEMO_IMAGE_DIR "application-icon-82.png",
-  DEMO_IMAGE_DIR "application-icon-83.png",
-  DEMO_IMAGE_DIR "application-icon-84.png",
-  DEMO_IMAGE_DIR "application-icon-85.png",
-  DEMO_IMAGE_DIR "application-icon-86.png",
-  DEMO_IMAGE_DIR "application-icon-87.png",
-  DEMO_IMAGE_DIR "application-icon-88.png",
-  DEMO_IMAGE_DIR "application-icon-89.png",
-  DEMO_IMAGE_DIR "application-icon-8.png",
-  DEMO_IMAGE_DIR "application-icon-90.png",
-  DEMO_IMAGE_DIR "application-icon-91.png",
-  DEMO_IMAGE_DIR "application-icon-92.png",
-  DEMO_IMAGE_DIR "application-icon-93.png",
-  DEMO_IMAGE_DIR "application-icon-94.png",
-  DEMO_IMAGE_DIR "application-icon-95.png",
-  DEMO_IMAGE_DIR "application-icon-96.png",
-  DEMO_IMAGE_DIR "application-icon-97.png",
-  DEMO_IMAGE_DIR "application-icon-98.png",
-  DEMO_IMAGE_DIR "application-icon-99.png",
-  DEMO_IMAGE_DIR "application-icon-9.png",
-  NULL
-};
+
+const char* IMAGE_PATH_PREFIX               ( DEMO_IMAGE_DIR "application-icon-" );
+const char* IMAGE_PATH_POSTFIX              ( ".png" );
+const int   TOTAL_ICON_DEFINITIONS          ( 147 );
+
+const char* BACKGROUND_IMAGE                ( DEMO_IMAGE_DIR "background-3.jpg" );
+const float PAGE_SCALE_FACTOR_X             ( 0.95f );
+const float PAGE_SCALE_FACTOR_Y             ( 0.95f );
+const float PAGE_DURATION_SCALE_FACTOR      ( 10.0f ); ///< Time-scale factor, larger = animation is slower
+
+const float DEFAULT_OPT_ROW_COUNT           ( 5 );
+const float DEFAULT_OPT_COL_COUNT           ( 4 );
+const float DEFAULT_OPT_PAGE_COUNT          ( 10 );
+const bool  DEFAULT_OPT_USE_TABLEVIEW       ( true );
+const bool  DEFAULT_OPT_BATCHING_ENABLED    ( true );
+const bool  DEFAULT_OPT_ICON_LABELS         ( true );
+
+// The image/label area tries to make sure the positioning will be relative to previous sibling
+const float IMAGE_AREA                      ( 0.60f );
+const float LABEL_AREA                      ( 0.50f );
 
 /**
- * Random words used as unique application names
+ * Random words used as unique application names.
+ * The number matches the value of TOTAL_ICON_DEFINITIONS.
  */
 const char* DEMO_APPS_NAMES[] =
 {
-  "Achdyer",
-  "Achtortor",
-  "Ackirlor",
-  "Ackptin",
-  "Aighte",
-  "Akala",
-  "Alealdny",
-  "Angash",
-  "Anglor",
-  "Anveraugh",
-  "Ardangas",
-  "Ardug",
-  "Ardworu",
-  "Ascerald",
-  "Ash'ach",
-  "Athiund",
-  "Aughm",
-  "Aughtheryer",
-  "Awitad",
-  "Banengon",
-  "Banhinat",
-  "Belrisash",
-  "Bilorm",
-  "Bleustcer",
-  "Bliagelor",
-  "Blorynton",
-  "Booten",
-  "Bripolqua",
-  "Bryray",
-  "Burust",
-  "Cataikel",
-  "Cerilwar",
-  "Cerl",
-  "Certin",
-  "Checerper",
-  "Chegit",
-  "Cheirat",
-  "Che'rak",
-  "Cheves",
-  "Chiperath",
-  "Chralerack",
-  "Chram",
-  "Clyimen",
-  "Coqueang",
-  "Craennther",
-  "Cykage",
-  "Dalek",
-  "Darhkel",
-  "Daril",
-  "Darpban",
-  "Dasrad",
-  "Deeqskel",
-  "Delurnther",
-  "Denalda",
-  "Derynkel",
-  "Deurnos",
-  "Doyaryke",
-  "Draithon",
-  "Drantess",
-  "Druardny",
-  "Dynsaytor",
-  "Dytinris",
-  "Eeni",
-  "Elmryn",
-  "Emgha",
-  "Emiton",
-  "Emworeng",
-  "Endnys",
-  "Enessray",
-  "Engyer",
-  "En'rady",
-  "Enthount",
-  "Enundem",
-  "Essina",
-  "Faughald",
-  "Fiummos",
-  "Garash",
-  "Garight",
-  "Garrynath",
-  "Ghalora",
-  "Ghatan",
-  "Gibanis",
-  "Hatdyn",
-  "Heesban",
-  "Hesub",
-  "Hinkelenth",
-  "Hirryer",
-  "Ideinta",
-  "Im'eld",
-  "Ina'ir",
-  "Ing'moro",
-  "Ingormess",
-  "Ingshy",
-  "Issath",
-  "Issendris",
-  "Issey",
-  "Issum",
-  "Itenthbel",
-  "K'ackves",
-  "Kagdra",
-  "Kalbankim",
-  "Kal'enda",
-  "Kimest",
-  "Kimundeng",
-  "Koachlor",
-  "Kuren",
-  "Kygver",
-  "Kyning",
-  "Laiyach",
-  "Lasuzu",
-  "Lekew",
-  "Lerengom",
-  "Lertan",
-  "Liadem",
-  "Liathar",
-  "Liephden",
-  "Likellor",
-  "Loightmos",
-  "Loromum",
-  "Lorr",
-  "Lortas",
-  "Lyerr",
-  "Maustbur",
-  "Menvor",
-  "Meusten",
-  "Mirodskel",
-  "Morhatrod",
-  "Moserbel",
-  "Mosorrad",
-  "Mosraye",
-  "Mosth",
-  "Neabar",
-  "Neerdem",
-  "Nichqua",
-  "Nudraough",
-  "Nuyim",
-  "Nycha",
-  "Nyia",
-  "Nyjac",
-  "Nystondar",
-  "Okine",
-  "Oldit",
-  "Om'mose",
-  "Onye",
-  "Ososrak",
-  "Pecertin",
-  "Perrd",
-  "Phutorny",
-  "Puizlye",
-  "Quirantai",
-  NULL
+  "Achdyer",   "Aughm",       "Cerl",       "Daril",      "Emgha",     "Ghatan",     "Issum",     "Lertan",    "Mosorrad",
+  "Achtortor", "Aughtheryer", "Certin",     "Darpban",    "Emiton",    "Gibanis",    "Itenthbel", "Liadem",    "Mosraye",
+  "Ackirlor",  "Awitad",      "Checerper",  "Dasrad",     "Emworeng",  "Hatdyn",     "K'ackves",  "Liathar",   "Mosth",
+  "Ackptin",   "Banengon",    "Chegit",     "Deeqskel",   "Endnys",    "Heesban",    "Kagdra",    "Liephden",  "Neabar",
+  "Aighte",    "Banhinat",    "Cheirat",    "Delurnther", "Enessray",  "Hesub",      "Kalbankim", "Likellor",  "Neerdem",
+  "Akala",     "Belrisash",   "Che'rak",    "Denalda",    "Engyer",    "Hinkelenth", "Kal'enda",  "Loightmos", "Nichqua",
+  "Alealdny",  "Bilorm",      "Cheves",     "Derynkel",   "En'rady",   "Hirryer",    "Kimest",    "Loromum",   "Nudraough",
+  "Angash",    "Bleustcer",   "Chiperath",  "Deurnos",    "Enthount",  "Ideinta",    "Kimundeng", "Lorr",      "Nuyim",
+  "Anglor",    "Bliagelor",   "Chralerack", "Doyaryke",   "Enundem",   "Im'eld",     "Koachlor",  "Lortas",    "Nycha",
+  "Anveraugh", "Blorynton",   "Chram",      "Draithon",   "Essina",    "Ina'ir",     "Kuren",     "Lyerr",     "Nyia",
+  "Ardangas",  "Booten",      "Clyimen",    "Drantess",   "Faughald",  "Ing'moro",   "Kygver",    "Maustbur",  "Nyjac",
+  "Ardug",     "Bripolqua",   "Coqueang",   "Druardny",   "Fiummos",   "Ingormess",  "Kyning",    "Menvor",    "Nystondar",
+  "Ardworu",   "Bryray",      "Craennther", "Dynsaytor",  "Garash",    "Ingshy",     "Laiyach",   "Meusten",   "Okine",
+  "Ascerald",  "Burust",      "Cykage",     "Dytinris",   "Garight",   "Issath",     "Lasuzu",    "Mirodskel", "Oldit",
+  "Ash'ach",   "Cataikel",    "Dalek",      "Eeni",       "Garrynath", "Issendris",  "Lekew",     "Morhatrod", "Om'mose",
+  "Athiund",   "Cerilwar",    "Darhkel",    "Elmryn",     "Ghalora",   "Issey",      "Lerengom",  "Moserbel",  "Onye",
+  "Ososrak",   "Pecertin",    "Perrd"
 };
 
-// this code comes from command-line-options.cpp. the reason it's here is to
-// keep consistent the extra-help formatting when '--help' used
-
+// This code comes from command-line-options.cpp. the reason it's here is to
+// keep consistent the extra-help formatting when '--help' used.
 void PrintHelp( const char * const opt, const char * const optDescription)
 {
   const std::ios_base::fmtflags flags = std::cout.flags();
@@ -348,74 +84,70 @@ void PrintHelp( const char * const opt, const char * const optDescription)
   std::cout.flags( flags );
 }
 
-const float PAGE_SCALE_FACTOR_X             ( 0.95f );
-const float PAGE_SCALE_FACTOR_Y             ( 0.95f );
-const float PAGE_DURATION_SCALE_FACTOR      ( 2.0f ); // time-scale factor, larger = animation is slower
-
-const float DEFAULT_OPT_ROW_COUNT           ( 5 );
-const float DEFAULT_OPT_COL_COUNT           ( 4 );
-const float DEFAULT_OPT_PAGE_COUNT          ( 10 );
-const bool  DEFAULT_OPT_USETABLEVIEW        ( false );
-
 }
 
-// This example is a benchmark that mimics the paged applications list of the homescreen app
-//
+/**
+ * @brief This example is a benchmark that mimics the paged applications list of the homescreen application.
+ */
 class HomescreenBenchmark : public ConnectionTracker
 {
 public:
 
   // Config structure passed to the constructor. It makes easier to increase number
-  // of setup parameters if needed
+  // of setup parameters if needed.
   struct Config
   {
     Config() :
       mRows( DEFAULT_OPT_ROW_COUNT ),
       mCols( DEFAULT_OPT_COL_COUNT ),
       mPageCount( DEFAULT_OPT_PAGE_COUNT ),
-      mUseTableView( DEFAULT_OPT_USETABLEVIEW )
+      mTableViewEnabled( DEFAULT_OPT_USE_TABLEVIEW ),
+      mBatchingEnabled( DEFAULT_OPT_BATCHING_ENABLED ),
+      mIconLabelsEnabled( DEFAULT_OPT_ICON_LABELS )
     {
     }
 
-    int   mRows;
-    int   mCols;
-    int   mPageCount;
-    bool  mUseTableView;
+    int  mRows;
+    int  mCols;
+    int  mPageCount;
+    bool mTableViewEnabled;
+    bool mBatchingEnabled;
+    bool mIconLabelsEnabled;
   };
 
   // animation script data
   struct ScriptData
   {
     ScriptData( int pages, float duration, bool flick )
+    : mPages( pages ),
+      mDuration( duration ),
+      mFlick( flick )
     {
-      mPages = pages;
-      mDuration = duration;
-      mFlick = flick;
     }
 
-    int     mPages; // number of pages to scroll
-    float   mDuration; // duration
-    bool    mFlick; // use flick or 'one-by-one' scroll
+    int   mPages;    ///< Number of pages to scroll
+    float mDuration; ///< Duration
+    bool  mFlick;    ///< Use flick or 'one-by-one' scroll
   };
 
   HomescreenBenchmark( Application& application, const Config& config )
   : mApplication( application ),
     mConfig( config ),
+    mScriptFrame( 0 ),
     mCurrentPage( 0 )
   {
-    // Connect to the Application's Init signal
+    // Connect to the Application's Init signal.
     mApplication.InitSignal().Connect( this, &HomescreenBenchmark::Create );
   }
 
   ~HomescreenBenchmark()
   {
-    // Nothing to do here;
   }
 
-  // The Init signal is received once (only) during the Application lifetime
+  // The Init signal is received once (only) during the Application lifetime.
   void Create( Application& application )
   {
-    // create benchmark script
+    // Create benchmark script
     CreateScript();
 
     // Get a handle to the stage
@@ -427,35 +159,37 @@ public:
     mScrollParent.SetParentOrigin( ParentOrigin::CENTER );
 
     // create background
-    Toolkit::ImageView background = Toolkit::ImageView::New( DEMO_IMAGE_DIR "background-3.jpg");
-    Stage::GetCurrent().Add(background);
+    Toolkit::ImageView background = Toolkit::ImageView::New( BACKGROUND_IMAGE );
+    Stage::GetCurrent().Add( background );
     background.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
     background.SetAnchorPoint( AnchorPoint::CENTER );
     background.SetParentOrigin( ParentOrigin::CENTER );
 
     PopulatePages();
 
-    stage.Add(mScrollParent);
+    stage.Add( mScrollParent );
 
-    // Respond to a click anywhere on the stage
+    // Respond to a click anywhere on the stage.
     stage.GetRootLayer().TouchSignal().Connect( this, &HomescreenBenchmark::OnTouch );
   }
 
   bool OnTouch( Actor actor, const TouchData& touch )
   {
-    // quit the application
+    // Quit the application.
     mApplication.Quit();
     return true;
   }
 
   Actor AddPage()
   {
-    // create root page actor
+    // Create root page actor.
     Actor pageActor;
 
-    if( mConfig.mUseTableView )
+    if( mConfig.mTableViewEnabled )
     {
       Toolkit::TableView tableView = Toolkit::TableView::New( mConfig.mRows, mConfig.mCols );
+
+      // Create geometry batcher for table view.
       tableView.SetBackgroundColor( Vector4( 0.0f, 0.0f, 0.0f, 0.5f ) );
       pageActor = tableView;
     }
@@ -468,38 +202,33 @@ public:
     pageActor.SetParentOrigin( ParentOrigin::CENTER );
     pageActor.SetAnchorPoint( AnchorPoint::CENTER );
     pageActor.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    pageActor.SetSizeModeFactor(Vector3( PAGE_SCALE_FACTOR_X, PAGE_SCALE_FACTOR_Y, 1.0f ) );
+    pageActor.SetSizeModeFactor( Vector3( PAGE_SCALE_FACTOR_X, PAGE_SCALE_FACTOR_Y, 1.0f ) );
     return pageActor;
   }
 
-  void AddIconsToPage(Actor page)
+  void AddIconsToPage( Actor page )
   {
     Size stageSize( Stage::GetCurrent().GetSize() );
     const float scaledHeight = stageSize.y * PAGE_SCALE_FACTOR_Y;
     const float scaledWidth = stageSize.x * PAGE_SCALE_FACTOR_X;
-
     const float PADDING = stageSize.y / 64.0f;
-    const float ROW_HEIGHT = ( scaledHeight - (PADDING*2.0f) ) / (float)mConfig.mRows;
-    const float COL_WIDTH = ( scaledWidth - (PADDING*2.0f) ) / (float)mConfig.mCols;
+    const float ROW_HEIGHT = ( scaledHeight - (PADDING*2.0f) ) / static_cast<float>( mConfig.mRows );
+    const float COL_WIDTH = ( scaledWidth - (PADDING*2.0f) ) / static_cast<float>( mConfig.mCols );
 
-    // the image/label area tries to make sure the positioning will be relative to previous sibling
-    const float IMAGE_AREA = 0.60f;
-    const float LABEL_AREA = 0.50f;
+    Vector2 dpi = Stage::GetCurrent().GetDpi();
 
     static int currentIconIndex = 0;
 
-    Vector2 dpi = Stage::GetCurrent().GetDpi();
-
     for( int y = 0; y < mConfig.mRows; ++y )
     {
       for( int x = 0; x < mConfig.mCols; ++x )
       {
-        // create parent icon view
+        // Create parent icon view
         Toolkit::Control iconView = Toolkit::Control::New();
         iconView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
         iconView.SetParentOrigin( ParentOrigin::TOP_LEFT );
 
-        if( !mConfig.mUseTableView )
+        if( !mConfig.mTableViewEnabled )
         {
           float rowX = x * COL_WIDTH + PADDING;
           float rowY = y * ROW_HEIGHT + PADDING;
@@ -512,31 +241,45 @@ public:
           iconView.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
         }
 
-        // create image view
-        Toolkit::ImageView imageView = Toolkit::ImageView::New( IMAGE_PATH[currentIconIndex] );
+        // Create empty image to avoid early renderer creation
+        Toolkit::ImageView imageView = Toolkit::ImageView::New();
+
+        // Auto-generate the Icons image URL.
+        Property::Map map;
+        std::stringstream imagePath;
+        imagePath << IMAGE_PATH_PREFIX << currentIconIndex << IMAGE_PATH_POSTFIX;
+        map[ Dali::Toolkit::ImageVisual::Property::URL ] = imagePath.str();
+
+        // Enable/disable batching
+        map[ Toolkit::ImageVisual::Property::BATCHING_ENABLED ] = mConfig.mBatchingEnabled;
+
+        imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map );
         imageView.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
         imageView.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
         imageView.SetAnchorPoint( AnchorPoint::CENTER );
         imageView.SetParentOrigin( ParentOrigin::CENTER );
-        imageView.SetSizeModeFactor( Vector3(IMAGE_AREA, IMAGE_AREA, 1.0f) );
+        imageView.SetSizeModeFactor( Vector3( IMAGE_AREA, IMAGE_AREA, 1.0f ) );
 
-        // create label
-        Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( DEMO_APPS_NAMES[currentIconIndex] );
-        textLabel.SetAnchorPoint( AnchorPoint::TOP_CENTER );
-        textLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
-
-        textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-        textLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
-        textLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, (((float)( ROW_HEIGHT * LABEL_AREA ) * 72.0f)  / (dpi.y))*0.25f );
-        textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
-        textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "TOP" );
+        if( mConfig.mIconLabelsEnabled )
+        {
+          // create label
+          Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( DEMO_APPS_NAMES[currentIconIndex] );
+          textLabel.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+          textLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
+          textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+          textLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White.
+          textLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, ( ( static_cast<float>( ROW_HEIGHT * LABEL_AREA ) * 72.0f )  / dpi.y ) * 0.25f );
+          textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
+          textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "TOP" );
+          imageView.Add( textLabel );
+        }
 
         iconView.Add( imageView );
-        imageView.Add( textLabel );
+        page.Add( iconView );
 
-        page.Add(iconView);
-
-        if( !IMAGE_PATH[ ++currentIconIndex ] )
+        // We only have images and names for a certain number of icons.
+        // Wrap around if we have used them all.
+        if( ++currentIconIndex == TOTAL_ICON_DEFINITIONS )
         {
           currentIconIndex = 0;
         }
@@ -546,58 +289,62 @@ public:
 
   void CreateScript()
   {
-    const int lastPage = mConfig.mPageCount-1;
-    const int halfA = lastPage/2;
-    const int halfB = lastPage/2 + lastPage%2;
-    mScriptFrameData.push_back( ScriptData( lastPage,                1.5f,     true));
-    mScriptFrameData.push_back( ScriptData( -lastPage,               1.5f,     true ));
-    mScriptFrameData.push_back( ScriptData( halfA,                   1.0f,     true ));
-    mScriptFrameData.push_back( ScriptData( halfB,                   1.0f,     true ));
-    mScriptFrameData.push_back( ScriptData( -lastPage,               0.5f,     false ));
-    mScriptFrameData.push_back( ScriptData( halfA,                   0.5f,     false ));
-    mScriptFrameData.push_back( ScriptData( halfB,                   1.0f,     true ));
-    mScriptFrameData.push_back( ScriptData( -halfA,                  1.0f,     true ));
-    mScriptFrameData.push_back( ScriptData( 1,                       0.1f,     true ));
-    mScriptFrameData.push_back( ScriptData( -1,                      0.1f,     true ));
-    mScriptFrameData.push_back( ScriptData( 1,                       0.1f,     true ));
-    mScriptFrameData.push_back( ScriptData( -1,                      0.1f,     true ));
-    mScriptFrameData.push_back( ScriptData( 1,                       0.1f,     true ));
-    mScriptFrameData.push_back( ScriptData( -1,                      0.1f,     true ));
-    mScriptFrameData.push_back( ScriptData( halfA,                   1.0f,     true ));
+    const int lastPage = mConfig.mPageCount - 1;
+    const int halfA = lastPage / 2;
+    const int halfB = lastPage / 2 + lastPage % 2;
+    mScriptFrameData.push_back( ScriptData( lastPage,  1.5f, true  ) );
+    mScriptFrameData.push_back( ScriptData( -lastPage, 1.5f, true  ) );
+    mScriptFrameData.push_back( ScriptData( halfA,     1.0f, true  ) );
+    mScriptFrameData.push_back( ScriptData( halfB,     1.0f, true  ) );
+    mScriptFrameData.push_back( ScriptData( -lastPage, 0.5f, false ) );
+    mScriptFrameData.push_back( ScriptData( halfA,     0.5f, false ) );
+    mScriptFrameData.push_back( ScriptData( halfB,     1.0f, true  ) );
+    mScriptFrameData.push_back( ScriptData( -halfA,    1.0f, true  ) );
+    mScriptFrameData.push_back( ScriptData( 1,         0.1f, true  ) );
+    mScriptFrameData.push_back( ScriptData( -1,        0.1f, true  ) );
+    mScriptFrameData.push_back( ScriptData( 1,         0.1f, true  ) );
+    mScriptFrameData.push_back( ScriptData( -1,        0.1f, true  ) );
+    mScriptFrameData.push_back( ScriptData( 1,         0.1f, true  ) );
+    mScriptFrameData.push_back( ScriptData( -1,        0.1f, true  ) );
+    mScriptFrameData.push_back( ScriptData( halfA,     1.0f, true  ) );
   }
 
   void PopulatePages()
   {
     Vector3 stageSize( Stage::GetCurrent().GetSize() );
-    const float SCALED_HEIGHT = stageSize.y * PAGE_SCALE_FACTOR_Y;
 
     for( int i = 0; i < mConfig.mPageCount; ++i )
     {
-      // create page
+      // Create page.
       Actor page = AddPage();
 
-      // populate icons
-      AddIconsToPage(page);
+      // Populate icons.
+      AddIconsToPage( page );
 
-      // move page 'a little bit up'
+      // Move page 'a little bit up'.
       page.SetParentOrigin( ParentOrigin::CENTER );
       page.SetAnchorPoint( AnchorPoint::CENTER );
-      page.SetPosition( Vector3(stageSize.x*i, -0.30f*( stageSize.y-SCALED_HEIGHT ), 0.0f) );
+      page.SetPosition( Vector3( stageSize.x * i, 0.0f, 0.0f ) );
       mScrollParent.Add( page );
+
+      if( mConfig.mTableViewEnabled && mConfig.mBatchingEnabled )
+      {
+        page.SetProperty( Actor::Property::BATCH_PARENT, true );
+      }
     }
 
-    mScrollParent.SetOpacity( 0.0f );
-    mScrollParent.SetScale( Vector3(0.0f, 0.0f, 0.0f) );
+    mScrollParent.SetOpacity( 1.0f );
+    mScrollParent.SetScale( Vector3::ONE );
 
-    // fade in
+    // Fade in.
     ShowAnimation();
   }
 
   void ShowAnimation()
   {
-    mShowAnimation = Animation::New(1.0f);
-    mShowAnimation.AnimateTo( Property(mScrollParent, Actor::Property::COLOR_ALPHA), 1.0f, AlphaFunction::EASE_IN_OUT );
-    mShowAnimation.AnimateTo( Property(mScrollParent, Actor::Property::SCALE), Vector3(1.0f, 1.0f, 1.0f), AlphaFunction::EASE_IN_OUT );
+    mShowAnimation = Animation::New( 1.0f );
+    mShowAnimation.AnimateTo( Property( mScrollParent, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::EASE_IN_OUT );
+    mShowAnimation.AnimateTo( Property( mScrollParent, Actor::Property::SCALE ), Vector3::ONE, AlphaFunction::EASE_IN_OUT );
     mShowAnimation.FinishedSignal().Connect( this, &HomescreenBenchmark::OnAnimationEnd );
     mShowAnimation.Play();
   }
@@ -606,16 +353,17 @@ public:
   {
     duration *= PAGE_DURATION_SCALE_FACTOR;
     Vector3 stageSize( Stage::GetCurrent().GetSize() );
-    mScrollAnimation = Animation::New(duration);
+    mScrollAnimation = Animation::New( duration );
     if( flick )
     {
-      mScrollAnimation.AnimateBy( Property(mScrollParent, Actor::Property::POSITION), Vector3(-stageSize.x*pages, 0.0f, 0.0f), AlphaFunction::EASE_IN_OUT );
+      mScrollAnimation.AnimateBy( Property( mScrollParent, Actor::Property::POSITION ), Vector3( -stageSize.x * pages, 0.0f, 0.0f ), AlphaFunction::EASE_IN_OUT );
     }
     else
     {
-      for(  int i = 0; i < abs(pages); ++i )
+      int totalPages = abs( pages );
+      for( int i = 0; i < totalPages; ++i )
       {
-        mScrollAnimation.AnimateBy( Property(mScrollParent, Actor::Property::POSITION), Vector3(pages < 0 ? stageSize.x : -stageSize.x, 0.0f, 0.0f), AlphaFunction::EASE_IN_OUT, TimePeriod(duration*i, duration) );
+        mScrollAnimation.AnimateBy( Property( mScrollParent, Actor::Property::POSITION ), Vector3( pages < 0 ? stageSize.x : -stageSize.x, 0.0f, 0.0f ), AlphaFunction::EASE_IN_OUT, TimePeriod( duration * i, duration ) );
       }
     }
     mScrollAnimation.FinishedSignal().Connect( this, &HomescreenBenchmark::OnAnimationEnd );
@@ -625,13 +373,7 @@ public:
 
   void OnAnimationEnd( Animation& source )
   {
-    if( source == mShowAnimation )
-    {
-      ScriptData& frame = mScriptFrameData[0];
-      ScrollPages( frame.mPages, frame.mDuration, frame.mFlick );
-      mScriptFrame = 1;
-    }
-    else if( mScriptFrame < mScriptFrameData.size() && source == mScrollAnimation )
+    if( mScriptFrame < mScriptFrameData.size() )
     {
       ScriptData& frame = mScriptFrameData[mScriptFrame];
       ScrollPages( frame.mPages, frame.mDuration, frame.mFlick );
@@ -644,18 +386,14 @@ public:
   }
 
 private:
-  Application&                mApplication;
 
+  Application&                mApplication;
   Actor                       mScrollParent;
-
   Animation                   mShowAnimation;
   Animation                   mScrollAnimation;
-
   Config                      mConfig;
-
   std::vector<ScriptData>     mScriptFrameData;
   size_t                      mScriptFrame;
-
   int                         mCurrentPage;
 };
 
@@ -665,26 +403,27 @@ void RunTest( Application& application, const HomescreenBenchmark::Config& confi
 
   if( printHelpAndExit )
   {
-    PrintHelp( "c<num>", " Number of columns");
-    PrintHelp( "r<num>", " Number of rows");
-    PrintHelp( "p<num>", " Number of pages ( must be greater than 1 )");
-    PrintHelp( "-use-tableview", " Uses TableView for layouting");
+    PrintHelp( "c<num>",               " Number of columns" );
+    PrintHelp( "r<num>",               " Number of rows" );
+    PrintHelp( "p<num>",               " Number of pages ( must be greater than 1 )" );
+    PrintHelp( "-disable-tableview",   " Disables the use of TableView for layouting (must be enabled for batching)" );
+    PrintHelp( "-disable-batching",    " Disables geometry batching" );
+    PrintHelp( "-disable-icon-labels", " Disables labels for each icon" );
     return;
   }
 
   application.MainLoop();
 }
 
-// Entry point for Linux & Tizen applications
-//
+// Entry point for Linux & Tizen applications.
 int DALI_EXPORT_API main( int argc, char **argv )
 {
-  // default settings
+  // Default settings.
   HomescreenBenchmark::Config config;
 
   bool printHelpAndExit = false;
 
-  for( int i(1) ; i < argc; ++i )
+  for( int i = 1 ; i < argc; ++i )
   {
     std::string arg( argv[i] );
     if( arg.compare( 0, 2, "-r" ) == 0 )
@@ -699,15 +438,22 @@ int DALI_EXPORT_API main( int argc, char **argv )
     {
       config.mPageCount = atoi( arg.substr( 2 ).c_str() );
     }
-    else if( arg.compare( "--use-tableview" ) == 0 )
+    else if( arg.compare( "--disable-tableview" ) == 0 )
+    {
+      config.mTableViewEnabled = false;
+    }
+    else if( arg.compare( "--disable-batching" ) == 0 )
     {
-      config.mUseTableView = true;
+      config.mBatchingEnabled = false;
+    }
+    else if( arg.compare( "--disable-icon-labels" ) == 0 )
+    {
+      config.mIconLabelsEnabled = false;
     }
     else if( arg.compare( "--help" ) == 0 )
     {
       printHelpAndExit = true;
     }
-
   }
 
   Application application = Application::New( &argc, &argv );
diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
index 3af560d..7cdc4a6 100644
--- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
+++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
@@ -175,6 +175,9 @@ public:
     // Get a handle to the stage
     Stage stage = Stage::GetCurrent();
 
+    // Hide the indicator bar
+    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+
     // Background image:
     Dali::Property::Map backgroundImage;
     backgroundImage.Insert( Toolkit::Visual::Property::TYPE,  Toolkit::Visual::IMAGE );
diff --git a/examples/image-view-svg/image-view-svg-example.cpp b/examples/image-view-svg/image-view-svg-example.cpp
index 7c08b44..12180f2 100644
--- a/examples/image-view-svg/image-view-svg-example.cpp
+++ b/examples/image-view-svg/image-view-svg-example.cpp
@@ -66,6 +66,9 @@ public:
     Vector2 stageSize = stage.GetSize();
     mActorSize = stageSize/2.f;
 
+    // Hide the indicator bar
+    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+
     stage.KeyEventSignal().Connect(this, &ImageSvgController::OnKeyEvent);
 
     // Background, for receiving gestures
diff --git a/examples/mesh-visual/mesh-visual-example.cpp b/examples/mesh-visual/mesh-visual-example.cpp
index b157f63..3340838 100644
--- a/examples/mesh-visual/mesh-visual-example.cpp
+++ b/examples/mesh-visual/mesh-visual-example.cpp
@@ -15,14 +15,14 @@ namespace
   };
 
   //Files for meshes
-  const char * const MODEL_FILE[] =
+  const char * const MODEL_FILE_TABLE[] =
   {
       DEMO_MODEL_DIR "Dino.obj",
       DEMO_MODEL_DIR "ToyRobot-Metal.obj",
       DEMO_MODEL_DIR "Toyrobot-Plastic.obj"
   };
 
-  const char * const MATERIAL_FILE[] =
+  const char * const MATERIAL_FILE_TABLE[] =
   {
       DEMO_MODEL_DIR "Dino.mtl",
       DEMO_MODEL_DIR "ToyRobot-Metal.mtl",
@@ -39,13 +39,12 @@ namespace
     MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING
   };
 
-  //Files for background and toolbar
-  const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-1.jpg");
-
   const float X_ROTATION_DISPLACEMENT_FACTOR = 60.0f;
   const float Y_ROTATION_DISPLACEMENT_FACTOR = 60.0f;
-  const float MODEL_SCALE = 0.75f;
-  const int NUM_MESHES = 3;
+  const float MODEL_SCALE =                    0.75f;
+  const float LIGHT_SCALE =                    0.15f;
+  const float BUTTONS_OFFSET_BOTTOM =          0.9f;
+  const int   NUM_MESHES =                     2;
 
   //Used to identify actors.
   const int MODEL_TAG = 0;
@@ -64,7 +63,8 @@ public:
     mShadingModeIndex( 0 ),        //Start with textured with detailed specular lighting.
     mTag( -1 ),                    //Non-valid default, which will get set to a correct value when used.
     mSelectedModelIndex( -1 ),     //Non-valid default, which will get set to a correct value when used.
-    mPaused( false )               //Animations play by default.
+    mPaused( false ),              //Animations play by default.
+    mLightFixed( true )            //The light is fixed by default.
   {
     // Connect to the Application's Init signal
     mApplication.InitSignal().Connect( this, &MeshVisualController::Create );
@@ -79,23 +79,7 @@ public:
   {
     // Get a handle to the stage
     Stage stage = Stage::GetCurrent();
-
-    //Add background
-    ImageView backView = ImageView::New( BACKGROUND_IMAGE );
-    backView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-    stage.Add( backView );
-
-    //Setup and load the 3D models and buttons
-    LoadScene();
-
-    //Allow for exiting of the application via key presses.
-    stage.KeyEventSignal().Connect( this, &MeshVisualController::OnKeyEvent );
-  }
-
-  //Sets up the on-screen elements.
-  void LoadScene()
-  {
-    Stage stage = Stage::GetCurrent();
+    stage.SetBackgroundColor( Vector4( 0.0, 0.5, 1.0, 1.0 ) );
 
     //Set up layer to place objects on.
     Layer baseLayer = Layer::New();
@@ -108,41 +92,45 @@ public:
     baseLayer.TouchedSignal().Connect( this, &MeshVisualController::OnTouch );
     stage.Add( baseLayer );
 
-    //Add containers to house each visual-holding-actor.
+    //Place models on the scene.
+    SetupModels( baseLayer );
+
+    //Place buttons on the scene.
+    SetupButtons( baseLayer );
+
+    //Add a light to the scene.
+    SetupLight( baseLayer );
+
+    //Allow for exiting of the application via key presses.
+    stage.KeyEventSignal().Connect( this, &MeshVisualController::OnKeyEvent );
+  }
+
+  //Loads and adds the models to the scene, inside containers for hit detection.
+  void SetupModels( Layer layer )
+  {
+    //Add containers to house each renderer-holding-actor.
     for( int i = 0; i < NUM_MESHES; i++ )
     {
       mContainers[i] = Actor::New();
       mContainers[i].SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
       mContainers[i].RegisterProperty( "Tag", MODEL_TAG ); //Used to differentiate between different kinds of actor.
       mContainers[i].RegisterProperty( "Model", Property::Value( i ) ); //Used to index into the model.
-
-      //Position each container on screen
-      if( i == 0 )
-      {
-        //Main, central model
-        mContainers[i].SetSizeModeFactor( Vector3( MODEL_SCALE, MODEL_SCALE, 0.0f ) );
-        mContainers[i].SetParentOrigin( ParentOrigin::CENTER );
-        mContainers[i].SetAnchorPoint( AnchorPoint::CENTER );
-      }
-      else if( i == 1 )
-      {
-        //Top left model
-        mContainers[i].SetSizeModeFactor( Vector3( MODEL_SCALE / 3.0f, MODEL_SCALE / 3.0f, 0.0f ) );
-        mContainers[i].SetParentOrigin( Vector3( 0.05, 0.03, 0.5 ) ); //Offset from top left
-        mContainers[i].SetAnchorPoint( AnchorPoint::TOP_LEFT );
-      }
-      else if( i == 2 )
-      {
-        //Top right model
-        mContainers[i].SetSizeModeFactor( Vector3( MODEL_SCALE / 3.0f, MODEL_SCALE / 3.0f, 0.0f ) );
-        mContainers[i].SetParentOrigin( Vector3( 0.95, 0.03, 0.5 ) ); //Offset from top right
-        mContainers[i].SetAnchorPoint( AnchorPoint::TOP_RIGHT );
-      }
-
       mContainers[i].TouchedSignal().Connect( this, &MeshVisualController::OnTouch );
-      baseLayer.Add( mContainers[i] );
+      layer.Add( mContainers[i] );
     }
 
+    //Position each container individually on screen
+
+    //Main, central model
+    mContainers[0].SetSizeModeFactor( Vector3( MODEL_SCALE, MODEL_SCALE, 0.0f ) );
+    mContainers[0].SetParentOrigin( ParentOrigin::CENTER );
+    mContainers[0].SetAnchorPoint( AnchorPoint::CENTER );
+
+    //Top left model
+    mContainers[1].SetSizeModeFactor( Vector3( MODEL_SCALE / 3.0f, MODEL_SCALE / 3.0f, 0.0f ) );
+    mContainers[1].SetParentOrigin( Vector3( 0.05, 0.03, 0.5 ) ); //Offset from top left
+    mContainers[1].SetAnchorPoint( AnchorPoint::TOP_LEFT );
+
     //Set up models
     for( int i = 0; i < NUM_MESHES; i++ )
     {
@@ -170,70 +158,120 @@ public:
 
     //Calling this sets the model in the controls.
     ReloadModel();
+  }
+
+  //Place the various buttons on the bottom of the screen, with title labels where necessary.
+  void SetupButtons( Layer layer )
+  {
+    //Text label title for changing model or shader.
+    TextLabel changeTitleLabel = TextLabel::New( "Switch" );
+    changeTitleLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+    changeTitleLabel.SetProperty( TextLabel::Property::UNDERLINE, "{\"thickness\":\"2.0\"}" );
+    changeTitleLabel.SetParentOrigin( Vector3( 0.2, BUTTONS_OFFSET_BOTTOM, 0.5 ) );
+    changeTitleLabel.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
+    layer.Add( changeTitleLabel );
 
     //Create button for model changing
-    Toolkit::PushButton modelButton = Toolkit::PushButton::New();
+    PushButton modelButton = Toolkit::PushButton::New();
     modelButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
     modelButton.ClickedSignal().Connect( this, &MeshVisualController::OnChangeModelClicked );
-    modelButton.SetParentOrigin( Vector3( 0.05, 0.95, 0.5 ) ); //Offset from bottom left
-    modelButton.SetAnchorPoint( AnchorPoint::BOTTOM_LEFT );
-    modelButton.SetLabelText( "Change Model" );
-    baseLayer.Add( modelButton );
+    modelButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
+    modelButton.SetAnchorPoint( AnchorPoint::TOP_RIGHT );
+    modelButton.SetLabelText( "Model" );
+    changeTitleLabel.Add( modelButton );
 
     //Create button for shader changing
-    Toolkit::PushButton shaderButton = Toolkit::PushButton::New();
+    PushButton shaderButton = Toolkit::PushButton::New();
     shaderButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
     shaderButton.ClickedSignal().Connect( this, &MeshVisualController::OnChangeShaderClicked );
-    shaderButton.SetParentOrigin( Vector3( 0.95, 0.95, 0.5 ) ); //Offset from bottom right
-    shaderButton.SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT );
-    shaderButton.SetLabelText( "Change Shader" );
-    baseLayer.Add( shaderButton );
+    shaderButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
+    shaderButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+    shaderButton.SetLabelText( "Shader" );
+    changeTitleLabel.Add( shaderButton );
 
     //Create button for pausing animations
-    Toolkit::PushButton pauseButton = Toolkit::PushButton::New();
+    PushButton pauseButton = Toolkit::PushButton::New();
     pauseButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
     pauseButton.ClickedSignal().Connect( this, &MeshVisualController::OnPauseClicked );
-    pauseButton.SetParentOrigin( Vector3( 0.5, 0.95, 0.5 ) ); //Offset from bottom center
-    pauseButton.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
+    pauseButton.SetParentOrigin( Vector3( 0.5, BUTTONS_OFFSET_BOTTOM, 0.5 ) );
+    pauseButton.SetAnchorPoint( AnchorPoint::TOP_CENTER );
     pauseButton.SetLabelText( " || " );
-    baseLayer.Add( pauseButton );
+    layer.Add( pauseButton );
+
+    //Text label title for light position mode.
+    TextLabel lightTitleLabel = TextLabel::New( "Light Position" );
+    lightTitleLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+    lightTitleLabel.SetProperty( TextLabel::Property::UNDERLINE, "{\"thickness\":\"2.0\"}" );
+    lightTitleLabel.SetParentOrigin( Vector3( 0.8, BUTTONS_OFFSET_BOTTOM, 0.5 ) );
+    lightTitleLabel.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
+    layer.Add( lightTitleLabel );
+
+    //Create button for switching between manual and fixed light position.
+    PushButton lightButton = Toolkit::PushButton::New();
+    lightButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+    lightButton.ClickedSignal().Connect( this, &MeshVisualController::OnChangeLightModeClicked );
+    lightButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
+    lightButton.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+    lightButton.SetLabelText( "FIXED" );
+    lightTitleLabel.Add( lightButton );
+  }
 
+  //Add a point light source the the scene, on a layer above the first.
+  void SetupLight( Layer baseLayer )
+  {
     //Create control to act as light source of scene.
     mLightSource = Control::New();
-    mLightSource.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH );
-    mLightSource.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT );
     mLightSource.RegisterProperty( "Tag", LIGHT_TAG );
 
+    //Set size of control based on screen dimensions.
+    Stage stage = Stage::GetCurrent();
+    if( stage.GetSize().width < stage.GetSize().height )
+    {
+      //Scale to width.
+      mLightSource.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::WIDTH );
+      mLightSource.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT );
+      mLightSource.SetSizeModeFactor( Vector3( LIGHT_SCALE, 0.0f, 0.0f ) );
+    }
+    else
+    {
+      //Scale to height.
+      mLightSource.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::HEIGHT );
+      mLightSource.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::WIDTH );
+      mLightSource.SetSizeModeFactor( Vector3( 0.0f, LIGHT_SCALE, 0.0f ) );
+    }
+
     //Set position relative to top left, as the light source property is also relative to the top left.
     mLightSource.SetParentOrigin( ParentOrigin::TOP_LEFT );
     mLightSource.SetAnchorPoint( AnchorPoint::CENTER );
-    mLightSource.SetPosition( Stage::GetCurrent().GetSize().x * 0.5f, Stage::GetCurrent().GetSize().y * 0.1f );
+    mLightSource.SetPosition( Stage::GetCurrent().GetSize().x * 0.85f, Stage::GetCurrent().GetSize().y * 0.125 );
 
-    //Make white background.
+    //Supply an image to represent the light.
     Property::Map lightMap;
-    lightMap.Insert( Visual::Property::TYPE,  Visual::COLOR );
-    lightMap.Insert( ColorVisual::Property::MIX_COLOR, Color::WHITE );
+    lightMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
+    lightMap.Insert( ImageVisual::Property::URL, DEMO_IMAGE_DIR "light-icon.png" );
     mLightSource.SetProperty( Control::Property::BACKGROUND, Property::Value( lightMap ) );
 
-    //Label to show what this actor is for the user.
-    TextLabel lightLabel = TextLabel::New( "Light" );
-    lightLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-    lightLabel.SetParentOrigin( ParentOrigin::CENTER );
-    lightLabel.SetAnchorPoint( AnchorPoint::CENTER );
-    float padding = 5.0f;
-    lightLabel.SetPadding( Padding( padding, padding, padding, padding ) );
-    mLightSource.Add( lightLabel );
-
     //Connect to touch signal for dragging.
     mLightSource.TouchedSignal().Connect( this, &MeshVisualController::OnTouch );
 
     //Place the light source on a layer above the base, so that it is rendered above everything else.
     Layer upperLayer = Layer::New();
+    upperLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+    upperLayer.SetParentOrigin( ParentOrigin::CENTER );
+    upperLayer.SetAnchorPoint( AnchorPoint::CENTER );
+
     baseLayer.Add( upperLayer );
     upperLayer.Add( mLightSource );
 
-    //Calling this sets the light position of each model to that of the light source control.
-    UpdateLight();
+    //Decide which light to use to begin with.
+    if( mLightFixed )
+    {
+      UseFixedLight();
+    }
+    else
+    {
+      UseManualLight();
+    }
   }
 
   //Updates the displayed models to account for parameter changes.
@@ -242,11 +280,10 @@ public:
     //Create mesh property map
     Property::Map map;
     map.Insert( Visual::Property::TYPE,  Visual::MESH );
-    map.Insert( MeshVisual::Property::OBJECT_URL, MODEL_FILE[mModelIndex] );
-    map.Insert( MeshVisual::Property::MATERIAL_URL, MATERIAL_FILE[mModelIndex] );
+    map.Insert( MeshVisual::Property::OBJECT_URL, MODEL_FILE_TABLE[mModelIndex] );
+    map.Insert( MeshVisual::Property::MATERIAL_URL, MATERIAL_FILE_TABLE[mModelIndex] );
     map.Insert( MeshVisual::Property::TEXTURES_PATH, TEXTURES_PATH );
     map.Insert( MeshVisual::Property::SHADING_MODE, SHADING_MODE_TABLE[mShadingModeIndex] );
-    map.Insert( MeshVisual::Property::USE_SOFT_NORMALS, false );
 
     //Set the two controls to use the mesh
     for( int i = 0; i < NUM_MESHES; i++ )
@@ -255,12 +292,39 @@ public:
     }
   }
 
+  void UseFixedLight()
+  {
+    //Hide draggable source
+    mLightSource.SetVisible( false );
+
+    //Use stage dimensions to place light at center, offset outwards in z axis.
+    Stage stage = Stage::GetCurrent();
+    float width = stage.GetSize().width;
+    float height = stage.GetSize().height;
+    Vector3 lightPosition = Vector3( width / 2.0f, height / 2.0f, std::max( width, height ) * 5.0f );
+
+    //Set global light position
+    for( int i = 0; i < NUM_MESHES; ++i )
+    {
+      mModels[i].control.RegisterProperty( "lightPosition", lightPosition, Property::ANIMATABLE );
+    }
+  }
+
+  void UseManualLight()
+  {
+    //Show draggable source
+    mLightSource.SetVisible( true );
+
+    //Update to switch light position to that off the source.
+    UpdateLight();
+  }
+
   //Updates the light position for each model to account for changes in the source on screen.
   void UpdateLight()
   {
     //Set light position to the x and y of the light control, offset out of the screen.
     Vector3 controlPosition = mLightSource.GetCurrentPosition();
-    Vector3 lightPosition = Vector3( controlPosition.x, controlPosition.y, Stage::GetCurrent().GetSize().x * 2.0f );
+    Vector3 lightPosition = Vector3( controlPosition.x, controlPosition.y, Stage::GetCurrent().GetSize().x / 2.0f );
 
     for( int i = 0; i < NUM_MESHES; ++i )
     {
@@ -402,6 +466,29 @@ public:
     return true;
   }
 
+
+  //Switch between a fixed light source in front of the screen, and a light source the user can drag around.
+  bool OnChangeLightModeClicked( Toolkit::Button button )
+  {
+    //Toggle state.
+    mLightFixed = !mLightFixed;
+
+    if( mLightFixed )
+    {
+      UseFixedLight();
+
+      button.SetLabelText( "FIXED" );
+    }
+    else
+    {
+      UseManualLight();
+
+      button.SetLabelText( "MANUAL" );
+    }
+
+    return true;
+  }
+
   //If escape or the back button is pressed, quit the application (and return to the launcher)
   void OnKeyEvent( const KeyEvent& event )
   {
@@ -433,6 +520,7 @@ private:
   int mTag; //Identifies what kind of actor has been selected in OnTouch.
   int mSelectedModelIndex; //Index of model selected on screen.
   bool mPaused; //If true, all animations are paused and should stay so.
+  bool mLightFixed; //If false, the light is in manual.
 };
 
 // Entry point for Linux & Tizen applications
diff --git a/examples/native-image-source/native-image-source-example.cpp b/examples/native-image-source/native-image-source-example.cpp
index fe676dc..cf9304b 100644
--- a/examples/native-image-source/native-image-source-example.cpp
+++ b/examples/native-image-source/native-image-source-example.cpp
@@ -146,6 +146,10 @@ public:
     // Get a handle to the stage
     Stage stage = Stage::GetCurrent();
     stage.SetBackgroundColor( Color::WHITE );
+
+    // Hide the indicator bar
+    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+
     stage.KeyEventSignal().Connect(this, &NativeImageSourceController::OnKeyEvent);
 
     mButtonRefreshAlways = PushButton::New();
diff --git a/examples/page-turn-view/page-turn-view-example.cpp b/examples/page-turn-view/page-turn-view-example.cpp
index b1b71ab..3d037eb 100644
--- a/examples/page-turn-view/page-turn-view-example.cpp
+++ b/examples/page-turn-view/page-turn-view-example.cpp
@@ -242,6 +242,9 @@ void PageTurnController::OnInit( Application& app )
 
   Stage::GetCurrent().KeyEventSignal().Connect(this, &PageTurnController::OnKeyEvent);
 
+  // Hide the indicator bar
+  app.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+
   Stage stage = Stage::GetCurrent();
   Vector2 stageSize =  stage.GetSize();
 
diff --git a/examples/primitive-shapes/primitive-shapes-example.cpp b/examples/primitive-shapes/primitive-shapes-example.cpp
index bf8478d..9329371 100644
--- a/examples/primitive-shapes/primitive-shapes-example.cpp
+++ b/examples/primitive-shapes/primitive-shapes-example.cpp
@@ -68,6 +68,9 @@ public:
     Stage stage = Stage::GetCurrent();
     stage.SetBackgroundColor( Color::WHITE );
 
+    // Hide the indicator bar
+    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+
     //Set up layer to place UI on.
     Layer layer = Layer::New();
     layer.SetParentOrigin( ParentOrigin::CENTER );
diff --git a/examples/renderer-stencil/renderer-stencil-example.cpp b/examples/renderer-stencil/renderer-stencil-example.cpp
index 994f551..27385f0 100644
--- a/examples/renderer-stencil/renderer-stencil-example.cpp
+++ b/examples/renderer-stencil/renderer-stencil-example.cpp
@@ -33,7 +33,6 @@ namespace
 
 // Application constants:
 const char * const APPLICATION_TITLE( "Renderer Stencil API Demo" );
-const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
 const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" );
 
 // Texture filenames:
@@ -52,6 +51,7 @@ const float ANIMATION_BOUNCE_DEFORMATION_PERCENT( 20.0f ); ///< Percentage (of t
 const float ANIMATION_BOUNCE_HEIGHT_PERCENT( 40.0f );      ///< Percentage (of the cube's size) to bounce up in to the air by.
 
 // Base colors for the objects:
+const Vector4 TEXT_COLOR( 1.0f, 1.0f, 1.0f, 1.0f );        ///< White.
 const Vector4 CUBE_COLOR( 1.0f, 1.0f, 1.0f, 1.0f );        ///< White.
 const Vector4 FLOOR_COLOR( 1.0f, 1.0f, 1.0f, 1.0f );       ///< White.
 const Vector4 REFLECTION_COLOR( 0.6f, 0.6f, 0.6f, 0.6f );  ///< Note that alpha is not 1.0f, to make the blend more photo-realistic.
@@ -116,11 +116,29 @@ private:
   {
     Stage stage = Stage::GetCurrent();
 
-    // Creates a default view with a default tool-bar.
-    // The view is added to the stage.
-    Toolkit::ToolBar toolBar;
-    Layer toolBarLayer = DemoHelper::CreateView( application, mView, toolBar, BACKGROUND_IMAGE, TOOLBAR_IMAGE, APPLICATION_TITLE );
-    stage.Add( toolBarLayer );
+    // Hide the indicator bar
+    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+
+    // Creates the background image.
+    Toolkit::Control background = Dali::Toolkit::Control::New();
+    background.SetAnchorPoint( Dali::AnchorPoint::CENTER );
+    background.SetParentOrigin( Dali::ParentOrigin::CENTER );
+    background.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS );
+    Dali::Property::Map map;
+    map["rendererType"] = "IMAGE";
+    map["url"] = BACKGROUND_IMAGE;
+    background.SetProperty( Dali::Toolkit::Control::Property::BACKGROUND, map );
+    stage.Add( background );
+
+    // Create a TextLabel for the application title.
+    Toolkit::TextLabel label = Toolkit::TextLabel::New( APPLICATION_TITLE );
+    label.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+    // Set the parent origin to a small percentage below the top (so the demo will scale for different resolutions).
+    label.SetParentOrigin( Vector3( 0.5f, 0.03f, 0.5f ) );
+    label.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
+    label.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
+    label.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, TEXT_COLOR );
+    stage.Add( label );
 
     // Layer to hold the 3D scene.
     Layer layer = Layer::New();
diff --git a/examples/text-editor/text-editor-example.cpp b/examples/text-editor/text-editor-example.cpp
index 5ec61b7..eb83eec 100644
--- a/examples/text-editor/text-editor-example.cpp
+++ b/examples/text-editor/text-editor-example.cpp
@@ -131,6 +131,13 @@ public:
 
     mEditor.SetBackgroundColor( TEXT_EDITOR_BACKGROUND_COLOR );
 
+    const Size boundingBoxSize( stageSize * TEXT_EDITOR_RELATIVE_SIZE.GetVectorXY() );
+    Rect<int> boundingBox( 0,
+                           static_cast<int>( toolBarHeight ),
+                           static_cast<int>( boundingBoxSize.width ),
+                           static_cast<int>( boundingBoxSize.height - toolBarHeight ) );
+
+    mEditor.SetProperty( TextEditor::Property::DECORATION_BOUNDING_BOX, boundingBox );
     mEditor.SetProperty( TextEditor::Property::TEXT_COLOR, Color::BLACK );
     mEditor.SetProperty( TextEditor::Property::TEXT,
                          "Lorem ipsum dolor sit amet, aeque definiebas ea mei, posse iracundia ne cum.\n"
diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp
index 6d357eb..1b21b48 100644
--- a/examples/text-field/text-field-example.cpp
+++ b/examples/text-field/text-field-example.cpp
@@ -75,6 +75,9 @@ public:
     stage.SetBackgroundColor( Vector4( 0.04f, 0.345f, 0.392f, 1.0f ) );
     stage.KeyEventSignal().Connect(this, &TextFieldExample::OnKeyEvent);
 
+    // Hide the indicator bar
+    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+
     mButton = CreateFolderButton();
     mButton.ClickedSignal().Connect( this, &TextFieldExample::OnButtonClicked );
     stage.Add( mButton );
diff --git a/examples/tilt/tilt-example.cpp b/examples/tilt/tilt-example.cpp
index 0adc72e..230704a 100644
--- a/examples/tilt/tilt-example.cpp
+++ b/examples/tilt/tilt-example.cpp
@@ -59,6 +59,9 @@ public:
     stage.GetRootLayer().TouchSignal().Connect( this, &TiltController::OnTouch );
 
     CreateSensor();
+
+    // Connect signals to allow Back and Escape to exit.
+    stage.KeyEventSignal().Connect( this, &TiltController::OnKeyEvent );
   }
 
   void CreateSensor()
@@ -88,6 +91,21 @@ public:
     mTextLabel.RotateBy(pitchRot);;
   }
 
+  /**
+   * @brief OnKeyEvent signal handler.
+   * @param[in] event The key event information
+   */
+  void OnKeyEvent( const KeyEvent& event )
+  {
+    if( event.state == KeyEvent::Down )
+    {
+      if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
+      {
+        mApplication.Quit();
+      }
+    }
+  }
+
 private:
   Application&  mApplication;
   TiltSensor mTiltSensor;
diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index 4f312c2..7e5beb9 100755
--- a/packaging/com.samsung.dali-demo.spec
+++ b/packaging/com.samsung.dali-demo.spec
@@ -2,7 +2,7 @@
 
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.1.45
+Version:    1.2.0
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -76,7 +76,9 @@ cmake -DDALI_APP_DIR=%{dali_app_ro_dir} \
 %if 0%{?enable_debug}
       -DCMAKE_BUILD_TYPE=Debug \
 %endif
-      -DLOCAL_STYLE_DIR=%{local_style_dir} .
+      -DLOCAL_STYLE_DIR=%{local_style_dir} \
+      -DINTERNATIONALIZATION:BOOL=OFF \
+      .
 
 make %{?jobs:-j%jobs}
 
diff --git a/resources/images/light-icon.png b/resources/images/light-icon.png
new file mode 100644
index 0000000..ff9fcf7
--- /dev/null
+++ b/resources/images/light-icon.png
diff --git a/demo/po/as.po b/resources/po/as.po
index 8dfe3d0..3d30f88 100755
--- a/demo/po/as.po
+++ b/resources/po/as.po
@@ -1,11 +1,14 @@
+msgid "DALI_DEMO_STR_TITLE_BLOCKS"
+msgstr "অৱৰুদ্ধ কৰক"
+
 msgid "DALI_DEMO_STR_TITLE_BUBBLES"
 msgstr "বেলুন"
 
-msgid "DALI_DEMO_STR_TITLE_BLOCKS"
-msgstr "অৱৰুদ্ধ কৰক"
+msgid "DALI_DEMO_STR_TITLE_BUTTONS"
+msgstr "ক্লিক্"
 
-msgid "DALI_DEMO_STR_TITLE_CLUSTER"
-msgstr "থুপ"
+msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
+msgstr "ঝুৰ্"
 
 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
 msgstr "ঘনক পৰিৱৰ্তনীয় প্ৰভাৱ"
@@ -13,38 +16,116 @@ msgstr "ঘনক পৰিৱৰ্তনীয় প্ৰভাৱ"
 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
 msgstr "পৰিৱৰ্তনীয় প্ৰভাৱ"
 
+msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
+msgstr "অকৃতকাৰ্য্য হ"
+
+msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
+msgstr "Emoji"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
+msgstr "অনুবিম্ব ইজাৰ"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
+msgstr "প্ৰতিচ্ছবি স্কেল কৰক"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
+msgstr "অনুবিম্ব"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
+msgstr "অনুবিম্ব অনুৰেখ পত্ৰ"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
+msgstr "অনুবিম্ব Pixel Area"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
+msgstr "অনুবিম্ব SVG"
+
 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
 msgstr "আইটেম দর্শন"
 
+msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
+msgstr "ছাঁয়া"
+
+msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
+msgstr "অঁকোৱা-পকোৱা"
+
+msgid "DALI_DEMO_STR_TITLE_LOGGING"
+msgstr "Logging"
+
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "পৰিবৰ্দ্ধক"
 
+msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
+msgstr "মেশ অঙ্কুৰিত"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
+msgstr "মেশ অসংযোগ"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
+msgstr "3D অনুগামী"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
+msgstr "মেটাবল মহা-বিস্ফোৰণবাদ"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
+msgstr "মেটাবল প্ৰতিসৰিত"
+
 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
 msgstr "অস্পষ্ট"
 
 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
 msgstr "বিস্তাৰ"
 
+msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
+msgstr "অইন অনুবিম্ব"
+
+msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
+msgstr "অকণমান আপোচ কৰ্"
+
 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
 msgstr "পৃষ্ঠা লেআউট"
 
+msgid "DALI_DEMO_STR_TITLE_POPUP"
+msgstr "পোপা মেনু"
+
+msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
+msgstr "অংশ্যমান অৰ্কিড"
+
 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
 msgstr "ৰেডিয়েল নক্সা"
 
 msgid "DALI_DEMO_STR_TITLE_REFRACTION"
 msgstr "প্ৰতিফলিত কৰক"
 
+msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
+msgstr "চক্ৰলেখন"
+
+msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
+msgstr "লিপি"
+
 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
 msgstr "স্ক্ৰ'ল কৰক"
 
-msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
-msgstr "ছাঁয়া"
+msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
+msgstr "অস্পষ্টকৈ অপুষ্পক"
 
-msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
-msgstr "লিপি"
+msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
+msgstr "টেক্সটারেদ মেশ"
 
-msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
-msgstr "প্ৰতিচ্ছবি স্কেল কৰক"
+msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
+msgstr "অকনিষ্ঠ আনুবংশিক"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
+msgstr "অকনিষ্ঠ অগ্ৰণী"
 
 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
 msgstr "লেৱেল কৰক"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
+msgstr "অক্ষশক্তি অঁকা অকনিষ্ঠ"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
+msgstr "অকনিষ্ঠ অৰ্জুন বঁটা"
+
+msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
+msgstr "টিল্ট অনুভূতি"
\ No newline at end of file
diff --git a/demo/po/de.po b/resources/po/de.po
index e75f9de..8524b05 100755
--- a/demo/po/de.po
+++ b/resources/po/de.po
@@ -1,11 +1,14 @@
+msgid "DALI_DEMO_STR_TITLE_BLOCKS"
+msgstr "Blöcke"
+
 msgid "DALI_DEMO_STR_TITLE_BUBBLES"
 msgstr "Schaumbildung"
 
-msgid "DALI_DEMO_STR_TITLE_BLOCKS"
-msgstr "Blöcke"
+msgid "DALI_DEMO_STR_TITLE_BUTTONS"
+msgstr "Tasten"
 
-msgid "DALI_DEMO_STR_TITLE_CLUSTER"
-msgstr "Cluster"
+msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
+msgstr "Farbverlauf "
 
 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
 msgstr "Würfel Übergangseffekt"
@@ -13,38 +16,116 @@ msgstr "Würfel Übergangseffekt"
 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
 msgstr "Auflösen Übergangseffekt"
 
+msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
+msgstr "Auswirkungen"
+
+msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
+msgstr "Emoji"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
+msgstr "Bild Montage und Sampling"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
+msgstr "Bildskalierung"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
+msgstr "Bildansicht "
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
+msgstr "Bildansicht mit Transparenz"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
+msgstr "Bildansicht Pixelbereich"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
+msgstr "Bildansicht SVG"
+
 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
 msgstr "Item-Ansicht"
 
+msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
+msgstr "Licht und Schatten"
+
+msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
+msgstr "Linien"
+
+msgid "DALI_DEMO_STR_TITLE_LOGGING"
+msgstr "Logging"
+
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "Bildschirmlupe"
 
+msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
+msgstr "Mesh Veränderung"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
+msgstr "Mesh Sortierung"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
+msgstr "3D-Modelle"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
+msgstr "Metaball Explosion"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
+msgstr "Metaball Brechung"
+
 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
 msgstr "Bewegungsunschärfe"
 
 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
 msgstr "Bewegung Strecke"
 
+msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
+msgstr "Nativen Bild"
+
+msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
+msgstr "Größe Verhandlung"
+
 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
 msgstr "Seite wechseln"
 
+msgid "DALI_DEMO_STR_TITLE_POPUP"
+msgstr "Popup-Menü"
+
+msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
+msgstr "Grundformen"
+
 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
 msgstr "Radialmenü"
 
 msgid "DALI_DEMO_STR_TITLE_REFRACTION"
 msgstr "Brechung"
 
+msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
+msgstr "Schablone"
+
+msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
+msgstr "Scripting"
+
 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
 msgstr "Scroll-Ansicht"
 
-msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
-msgstr "Licht und Schatten"
+msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
+msgstr "Unschärfe und blühen"
 
-msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
-msgstr "Scripting"
+msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
+msgstr "Strukturiertem Mesh"
 
-msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
-msgstr "Bildskalierung"
+msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
+msgstr "Texteditor"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
+msgstr "Textfeld"
 
 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
 msgstr "Beschriftung"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
+msgstr "Mehrere Sprachen Beschriftung"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
+msgstr "Text Scrollen"
+
+msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
+msgstr "Neigungssensor"
diff --git a/resources/po/en.po b/resources/po/en.po
new file mode 120000
index 0000000..2ed6a9a
--- /dev/null
+++ b/resources/po/en.po
@@ -0,0 +1 @@
+en_US.po
\ No newline at end of file
diff --git a/resources/po/en_GB.po b/resources/po/en_GB.po
new file mode 100755
index 0000000..3cbc74c
--- /dev/null
+++ b/resources/po/en_GB.po
@@ -0,0 +1,131 @@
+msgid "DALI_DEMO_STR_TITLE_BLOCKS"
+msgstr "Blocks"
+
+msgid "DALI_DEMO_STR_TITLE_BUBBLES"
+msgstr "Bubbles"
+
+msgid "DALI_DEMO_STR_TITLE_BUTTONS"
+msgstr "Buttons"
+
+msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
+msgstr "Colour Gradient"
+
+msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
+msgstr "Cube Effect"
+
+msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
+msgstr "Dissolve Effect"
+
+msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
+msgstr "Effects View"
+
+msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
+msgstr "Emoji Text"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
+msgstr "Image Fitting and Sampling"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
+msgstr "Image Scaling Grid"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
+msgstr "Image View"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
+msgstr "Image View Alpha Blending"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
+msgstr "Image View Pixel Area"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
+msgstr "Image View SVG"
+
+msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
+msgstr "Item View"
+
+msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
+msgstr "Lights and Shadows"
+
+msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
+msgstr "Mesh Line"
+
+msgid "DALI_DEMO_STR_TITLE_LOGGING"
+msgstr "Logging"
+
+msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
+msgstr "Magnifier"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
+msgstr "Mesh Morph"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
+msgstr "Mesh Sorting"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
+msgstr "Mesh Visual"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
+msgstr "Metaball Explosion"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
+msgstr "Metaball Refraction"
+
+msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
+msgstr "Motion Blur"
+
+msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
+msgstr "Motion Stretch"
+
+msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
+msgstr "Native Image Source"
+
+msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
+msgstr "Negotiate Size"
+
+msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
+msgstr "Page Turn View"
+
+msgid "DALI_DEMO_STR_TITLE_POPUP"
+msgstr "Popup"
+
+msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
+msgstr "Primitive Shapes"
+
+msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
+msgstr "Radial Menu"
+
+msgid "DALI_DEMO_STR_TITLE_REFRACTION"
+msgstr "Refraction"
+
+msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
+msgstr "Renderer Stencil"
+
+msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
+msgstr "Script-based UI"
+
+msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
+msgstr "Scroll View"
+
+msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
+msgstr "Super Blur and Bloom"
+
+msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
+msgstr "Mesh Texture"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
+msgstr "Text Editor"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
+msgstr "Text Field"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
+msgstr "Text Label"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
+msgstr "Text Scripts"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
+msgstr "Text Scrolling"
+
+msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
+msgstr "Tilt Sensor"
diff --git a/resources/po/en_US.po b/resources/po/en_US.po
new file mode 100755
index 0000000..aab93ba
--- /dev/null
+++ b/resources/po/en_US.po
@@ -0,0 +1,131 @@
+msgid "DALI_DEMO_STR_TITLE_BLOCKS"
+msgstr "Blocks"
+
+msgid "DALI_DEMO_STR_TITLE_BUBBLES"
+msgstr "Bubbles"
+
+msgid "DALI_DEMO_STR_TITLE_BUTTONS"
+msgstr "Buttons"
+
+msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
+msgstr "Color Gradient"
+
+msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
+msgstr "Cube Effect"
+
+msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
+msgstr "Dissolve Effect"
+
+msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
+msgstr "Effects View"
+
+msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
+msgstr "Emoji Text"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
+msgstr "Image Fitting and Sampling"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
+msgstr "Image Scaling Grid"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
+msgstr "Image View"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
+msgstr "Image View Alpha Blending"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
+msgstr "Image View Pixel Area"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
+msgstr "Image View SVG"
+
+msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
+msgstr "Item View"
+
+msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
+msgstr "Lights and Shadows"
+
+msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
+msgstr "Mesh Line"
+
+msgid "DALI_DEMO_STR_TITLE_LOGGING"
+msgstr "Logging"
+
+msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
+msgstr "Magnifier"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
+msgstr "Mesh Morph"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
+msgstr "Mesh Sorting"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
+msgstr "Mesh Visual"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
+msgstr "Metaball Explosion"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
+msgstr "Metaball Refraction"
+
+msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
+msgstr "Motion Blur"
+
+msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
+msgstr "Motion Stretch"
+
+msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
+msgstr "Native Image Source"
+
+msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
+msgstr "Negotiate Size"
+
+msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
+msgstr "Page Turn View"
+
+msgid "DALI_DEMO_STR_TITLE_POPUP"
+msgstr "Popup"
+
+msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
+msgstr "Primitive Shapes"
+
+msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
+msgstr "Radial Menu"
+
+msgid "DALI_DEMO_STR_TITLE_REFRACTION"
+msgstr "Refraction"
+
+msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
+msgstr "Renderer Stencil"
+
+msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
+msgstr "Script-based UI"
+
+msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
+msgstr "Scroll View"
+
+msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
+msgstr "Super Blur and Bloom"
+
+msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
+msgstr "Mesh Texture"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
+msgstr "Text Editor"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
+msgstr "Text Field"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
+msgstr "Text Label"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
+msgstr "Text Scripts"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
+msgstr "Text Scrolling"
+
+msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
+msgstr "Tilt Sensor"
diff --git a/demo/po/es.po b/resources/po/es.po
old mode 100644
new mode 100755
index 179a69e..d3216e8
--- a/demo/po/es.po
+++ b/resources/po/es.po
@@ -1,11 +1,14 @@
+msgid "DALI_DEMO_STR_TITLE_BLOCKS"
+msgstr "Bloques"
+
 msgid "DALI_DEMO_STR_TITLE_BUBBLES"
 msgstr "Burbujas"
 
-msgid "DALI_DEMO_STR_TITLE_BLOCKS"
-msgstr "Bloques"
+msgid "DALI_DEMO_STR_TITLE_BUTTONS"
+msgstr "Botones"
 
-msgid "DALI_DEMO_STR_TITLE_CLUSTER"
-msgstr "Agrupación"
+msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
+msgstr "Gradiente de color"
 
 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
 msgstr "Transición cubos"
@@ -13,38 +16,116 @@ msgstr "Transición cubos"
 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
 msgstr "Transición disolver"
 
+msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
+msgstr "Vista de efectos"
+
+msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
+msgstr "Texto con emojis"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
+msgstr "Modo de encaje y muestreo"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
+msgstr "Modo de escalado de imagen"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
+msgstr "Control con imagenes"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
+msgstr "Control con imagenes con transparencias"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
+msgstr "Control con imagenes con area de pixeles"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
+msgstr "Control con imagenes SVG"
+
 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
 msgstr "Vista de elementos"
 
+msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
+msgstr "Luces y sombras"
+
+msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
+msgstr "Lineas"
+
+msgid "DALI_DEMO_STR_TITLE_LOGGING"
+msgstr "Control de entrada"
+
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "Lupa"
 
+msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
+msgstr "Transformacion de geometrias"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
+msgstr "Ordenacion de geometrias"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
+msgstr "Gemeotria 3D"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
+msgstr "Explosion de metabolas"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
+msgstr "Refraccion de metabolas"
+
 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
 msgstr "Desenfoque de movimiento"
 
 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
 msgstr "Movimiento con deformación"
 
+msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
+msgstr "Fuente de imagenes nativas"
+
+msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
+msgstr "Negociacion de tamaño"
+
 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
 msgstr "Vista de páginas"
 
+msgid "DALI_DEMO_STR_TITLE_POPUP"
+msgstr "Popup"
+
+msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
+msgstr "Primitvas 3D"
+
 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
 msgstr "Menú radial"
 
 msgid "DALI_DEMO_STR_TITLE_REFRACTION"
 msgstr "Refracción"
 
+msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
+msgstr "Dibujado con stencil"
+
+msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
+msgstr "Interfaz definida por Script"
+
 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
 msgstr "Vista de desplazamiento"
 
-msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
-msgstr "Luces y sombras"
+msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
+msgstr "Efecto blur y bloom"
 
-msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
-msgstr "Interfaz definida por Script"
+msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
+msgstr "Geometria con texturas"
 
-msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
-msgstr "Modos de escalado de imagen"
+msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
+msgstr "Editor de texto"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
+msgstr "Campo de texto"
 
 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
 msgstr "Etiqueta de texto"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
+msgstr "Textos internacionales"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
+msgstr "Texto con desplazamiento"
+
+msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
+msgstr "Sensor de inclinacion"
diff --git a/demo/po/ko.po b/resources/po/ko.po
index 78f5987..b7cdee7 100755
--- a/demo/po/ko.po
+++ b/resources/po/ko.po
@@ -1,11 +1,14 @@
+msgid "DALI_DEMO_STR_TITLE_BLOCKS"
+msgstr "블록"
+
 msgid "DALI_DEMO_STR_TITLE_BUBBLES"
 msgstr "방울"
 
-msgid "DALI_DEMO_STR_TITLE_BLOCKS"
-msgstr "블록"
+msgid "DALI_DEMO_STR_TITLE_BUTTONS"
+msgstr ""
 
-msgid "DALI_DEMO_STR_TITLE_CLUSTER"
-msgstr "클러스터"
+msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
+msgstr ""
 
 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
 msgstr "입방체 전환"
@@ -13,38 +16,116 @@ msgstr "입방체 전환"
 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
 msgstr "디졸브 전환"
 
+msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
+msgstr "이미지 확대"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
+msgstr ""
+
 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
 msgstr "아이템 뷰"
 
+msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
+msgstr "빛과 그림자"
+
+msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_LOGGING"
+msgstr ""
+
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "돋보기"
 
+msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
+msgstr ""
+
 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
 msgstr "모션 블러"
 
 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
 msgstr "늘이기"
 
+msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
+msgstr ""
+
 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
 msgstr "책장 넘기기"
 
+msgid "DALI_DEMO_STR_TITLE_POPUP"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
+msgstr ""
+
 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
 msgstr "레이디 얼 메뉴"
 
 msgid "DALI_DEMO_STR_TITLE_REFRACTION"
 msgstr "굴절 효과"
 
+msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
+msgstr "스크립팅"
+
 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
 msgstr "스크롤 뷰"
 
-msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
-msgstr "빛과 그림자"
+msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
+msgstr ""
 
-msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
-msgstr "스크립팅"
+msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
+msgstr ""
 
-msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
-msgstr "이미지 확대"
+msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
+msgstr ""
 
 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
 msgstr "텍스트 라벨"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
+msgstr ""
+
+msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
+msgstr ""
\ No newline at end of file
diff --git a/demo/po/ml.po b/resources/po/ml.po
index 90049da..1f477a5 100755
--- a/demo/po/ml.po
+++ b/resources/po/ml.po
@@ -1,11 +1,14 @@
+msgid "DALI_DEMO_STR_TITLE_BLOCKS"
+msgstr "തടയപ്പെട്ട"
+
 msgid "DALI_DEMO_STR_TITLE_BUBBLES"
 msgstr "കുമിള"
 
-msgid "DALI_DEMO_STR_TITLE_BLOCKS"
-msgstr "തടയപ്പെട്ട"
+msgid "DALI_DEMO_STR_TITLE_BUTTONS"
+msgstr "ബട്ടണുകൾ"
 
-msgid "DALI_DEMO_STR_TITLE_CLUSTER"
-msgstr "ക്ലസ്റ്റര്"
+msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
+msgstr "വർണ്ണ ഗ്രേഡിയന്റ്"
 
 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
 msgstr "സമചതുരക്കട്ട സംക്രമണ ഇഫക്ട്"
@@ -13,38 +16,116 @@ msgstr "സമചതുരക്കട്ട സംക്രമണ ഇഫക്�
 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
 msgstr "സ്ഥാനാന്തരം സംക്രമണ ഇഫക്ട്"
 
+msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
+msgstr "എഫക്റ്റുകൾ"
+
+msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
+msgstr "ഇമോട്ടികോണുകൾ"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
+msgstr "ചിത്രം ഉചിതമാണ് ആൻഡ് ഒരുപറ്റം"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
+msgstr "ഇമേജിംഗ്"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
+msgstr "ചിത്രം കാഴ്ച"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
+msgstr "ചിത്രം കാഴ്ച"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
+msgstr "സുതാര്യത ഉപയോഗിച്ച് ഇമേജ് കാഴ്ച"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
+msgstr "ചിത്രം കാഴ്ച SVG"
+
 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
 msgstr "ഇനം കാഴ്ച"
 
+msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
+msgstr "നിഴല്"
+
+msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
+msgstr "വര"
+
+msgid "DALI_DEMO_STR_TITLE_LOGGING"
+msgstr "ലോഗിംഗ്"
+
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "ഭൂതക്കണ്ണാടി"
 
+msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
+msgstr "മോർഫ് mesh"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
+msgstr "തരംതിരിക്കലിനായി mesh"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
+msgstr "3D മോഡലിങ്"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
+msgstr "മെറ്റാ പന്ത് സ്ഫോടനം"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
+msgstr "മെറ്റാ പന്ത് അപവർത്തനം"
+
 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
 msgstr "അവ്യക്തമാക്കല്"
 
 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
 msgstr "സ്ട്രെച്ച്"
 
+msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
+msgstr "നേറ്റീവ് ചിത്രം"
+
+msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
+msgstr "വലുപ്പം കൂടിയാലോചന"
+
 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
 msgstr "പേജ് ലേഔട്ട്"
 
+msgid "DALI_DEMO_STR_TITLE_POPUP"
+msgstr "പോപപ്പ് മെനുവിൽ"
+
+msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
+msgstr "അടിസ്ഥാന രൂപങ്ങൾ"
+
 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
 msgstr "റേഡിയല് രേഖാചിത്രം"
 
 msgid "DALI_DEMO_STR_TITLE_REFRACTION"
 msgstr "പ്രതിഫലിക്കുക"
 
+msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
+msgstr "സീരിയോലിത്തോഗ്രാഫ്"
+
+msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
+msgstr "സ്ക്രിപ്റ്റ്"
+
 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
 msgstr "സ്ക്രോള്ചെയ്യുക കാഴ്ച"
 
-msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
-msgstr "നിഴല്"
+msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
+msgstr "മങ്ങൽ പൂക്കൽ"
 
-msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
-msgstr "സ്ക്രിപ്റ്റ്"
+msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
+msgstr "ടെക്സ്ചർ mesh"
 
-msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
-msgstr "ഇമേജിംഗ്"
+msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
+msgstr "ടെക്സ്റ്റ് എഡിറ്റർ"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
+msgstr "ടെക്സ്റ്റ് ഫീൽഡ്"
 
 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
 msgstr "ലേബലുചെയ്യുക"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
+msgstr "ഒന്നിലധികം ഭാഷ വാചകം"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
+msgstr "ടെക്സ്റ്റ് സ്ക്രോളിംഗ്"
+
+msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
+msgstr "ചെരിവ് സെൻസർ"
\ No newline at end of file
diff --git a/demo/po/ur.po b/resources/po/ur.po
old mode 100644
new mode 100755
index b2c3302..935a8ab
--- a/demo/po/ur.po
+++ b/resources/po/ur.po
@@ -1,11 +1,14 @@
+msgid "DALI_DEMO_STR_TITLE_BLOCKS"
+msgstr "اینٹیں"
+
 msgid "DALI_DEMO_STR_TITLE_BUBBLES"
 msgstr "بلبلے"
 
-msgid "DALI_DEMO_STR_TITLE_BLOCKS"
-msgstr "اینٹیں"
+msgid "DALI_DEMO_STR_TITLE_BUTTONS"
+msgstr "بٹنوں"
 
-msgid "DALI_DEMO_STR_TITLE_CLUSTER"
-msgstr "کلسٹر"
+msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
+msgstr "رنگ میلان"
 
 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
 msgstr "کیوب منتقلی"
@@ -13,38 +16,116 @@ msgstr "کیوب منتقلی"
 msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
 msgstr "حل منتقلی"
 
+msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
+msgstr "اثرات"
+
+msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
+msgstr "اموٹکان"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
+msgstr "تصویر فٹنگ"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
+msgstr "تصویر پیمائی"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
+msgstr "تصویر کنٹرول"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
+msgstr "تصویر کنٹرول"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
+msgstr "تصویر کنٹرول شفافیت کے ساتھ"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
+msgstr "تصویر کنٹرول SVG"
+
 msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
 msgstr "چیزوں کی فہرست"
 
+msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
+msgstr "روشنی اور سائے"
+
+msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
+msgstr "لکیریں"
+
+msgid "DALI_DEMO_STR_TITLE_LOGGING"
+msgstr "لاگنگ"
+
 msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
 msgstr "مکبر"
 
+msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
+msgstr "میش کی تبدیلی"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
+msgstr "میش کی چھنٹائی"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
+msgstr "3D میش"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
+msgstr "میٹابال دھماکہ"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
+msgstr "میٹابال اپورتن"
+
 msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
 msgstr "دھندلانے کی حرکت"
 
 msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
 msgstr "کھینچھنے کی حرکت"
 
+msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
+msgstr "نیٹو تصویر"
+
+msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
+msgstr "سائز مذاکرات"
+
 msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
 msgstr "کتاب"
 
+msgid "DALI_DEMO_STR_TITLE_POPUP"
+msgstr "پاپ اپ"
+
+msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
+msgstr "سادہ ماڈلیے"
+
 msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
 msgstr "ریڈیل مینو"
 
 msgid "DALI_DEMO_STR_TITLE_REFRACTION"
 msgstr "رفراکشن"
 
+msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
+msgstr "سٹینسل"
+
+msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
+msgstr "سکرپٹ"
+
 msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
 msgstr "سکرول ویو"
 
-msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
-msgstr "روشنی اور سائے"
+msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
+msgstr "دھندلاپن اور بلوم"
 
-msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
-msgstr "سکرپٹ"
+msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
+msgstr "ٹیکسچرد میش"
 
-msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
-msgstr "تصویر پیمائی"
+msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
+msgstr "حروف ایڈیٹر"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
+msgstr "حروف لائن ایڈیٹر"
 
 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
-msgstr "لیبل"
+msgstr "حروف کا لیبل"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
+msgstr "کئی زبانوں"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
+msgstr "حروف کاسکرال "
+
+msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
+msgstr "ٹلٹ سینسر"
diff --git a/resources/po/zn_CH.po b/resources/po/zn_CH.po
new file mode 100755
index 0000000..17c43ab
--- /dev/null
+++ b/resources/po/zn_CH.po
@@ -0,0 +1,131 @@
+msgid "DALI_DEMO_STR_TITLE_BLOCKS"
+msgstr "块体"
+
+msgid "DALI_DEMO_STR_TITLE_BUBBLES"
+msgstr "气泡"
+
+msgid "DALI_DEMO_STR_TITLE_BUTTONS"
+msgstr "按钮"
+
+msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
+msgstr "颜色梯度"
+
+msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
+msgstr "方块切换效果"
+
+msgid "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION"
+msgstr "冰消瓦解切换效果"
+
+msgid "DALI_DEMO_STR_TITLE_EFFECTS_VIEW"
+msgstr "效果视图"
+
+msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
+msgstr "表情符号"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
+msgstr "图像填充及采样"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
+msgstr "图像缩放"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW"
+msgstr "图像视图"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING"
+msgstr "图像视图透明度"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA"
+msgstr "图像视图像素区域"
+
+msgid "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG"
+msgstr "图像视图 SVG"
+
+msgid "DALI_DEMO_STR_TITLE_ITEM_VIEW"
+msgstr "项目视图"
+
+msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
+msgstr "阴影"
+
+msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
+msgstr "线条"
+
+msgid "DALI_DEMO_STR_TITLE_LOGGING"
+msgstr "记录"
+
+msgid "DALI_DEMO_STR_TITLE_MAGNIFIER"
+msgstr "放大鏡"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_MORPH"
+msgstr "网格变形"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_SORTING"
+msgstr "网格排序"
+
+msgid "DALI_DEMO_STR_TITLE_MESH_VISUAL"
+msgstr "3D模型"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION"
+msgstr "元球爆炸"
+
+msgid "DALI_DEMO_STR_TITLE_METABALL_REFRAC"
+msgstr "元球折射"
+
+msgid "DALI_DEMO_STR_TITLE_MOTION_BLUR"
+msgstr "动作模糊"
+
+msgid "DALI_DEMO_STR_TITLE_MOTION_STRETCH"
+msgstr "动作拉伸"
+
+msgid "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE"
+msgstr "本地图像"
+
+msgid "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE"
+msgstr "尺寸协商"
+
+msgid "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW"
+msgstr "翻页"
+
+msgid "DALI_DEMO_STR_TITLE_POPUP"
+msgstr "弹窗"
+
+msgid "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES"
+msgstr "基本形状"
+
+msgid "DALI_DEMO_STR_TITLE_RADIAL_MENU"
+msgstr "径向菜单"
+
+msgid "DALI_DEMO_STR_TITLE_REFRACTION"
+msgstr "折射"
+
+msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
+msgstr "模板缓冲"
+
+msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
+msgstr "脚本用户界面"
+
+msgid "DALI_DEMO_STR_TITLE_SCROLL_VIEW"
+msgstr "滚动视图"
+
+msgid "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM"
+msgstr "模糊及泛光"
+
+msgid "DALI_DEMO_STR_TITLE_TEXTURED_MESH"
+msgstr "纹理网格"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_EDITOR"
+msgstr "文字编辑器"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_FIELD"
+msgstr "文字栏"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
+msgstr "标签"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE"
+msgstr "多语言标签"
+
+msgid "DALI_DEMO_STR_TITLE_TEXT_SCROLLING"
+msgstr "滚动文字"
+
+msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
+msgstr "倾斜传感器"
\ No newline at end of file
diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h
index 092a237..b1320c2 100644
--- a/shared/dali-demo-strings.h
+++ b/shared/dali-demo-strings.h
@@ -32,91 +32,100 @@ extern "C"
 
 #ifdef INTERNATIONALIZATION_ENABLED
 
-#define DALI_DEMO_STR_TITLE_BUBBLES dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BUBBLES")
-#define DALI_DEMO_STR_TITLE_BLOCKS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BLOCKS")
-#define DALI_DEMO_STR_TITLE_CUBE_TRANSITION dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_CUBE_TRANSITION")
-#define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION")
-#define DALI_DEMO_STR_TITLE_ITEM_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ITEM_VIEW")
-#define DALI_DEMO_STR_TITLE_RENDERER_STENCIL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERER_STENCIL")
-#define DALI_DEMO_STR_TITLE_MAGNIFIER dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MAGNIFIER")
-#define DALI_DEMO_STR_TITLE_MOTION_BLUR dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MOTION_BLUR")
-#define DALI_DEMO_STR_TITLE_MOTION_STRETCH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MOTION_STRETCH")
-#define DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW")
-#define DALI_DEMO_STR_TITLE_RADIAL_MENU dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RADIAL_MENU")
-#define DALI_DEMO_STR_TITLE_REFRACTION dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_REFRACTION")
-#define DALI_DEMO_STR_TITLE_SCROLL_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCROLL_VIEW")
-#define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS")
-#define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI")
-#define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING")
-#define DALI_DEMO_STR_TITLE_IMAGE_SCALING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_SCALING")
-#define DALI_DEMO_STR_TITLE_TEXT_FIELD dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_FIELD")
-#define DALI_DEMO_STR_TITLE_TEXT_LABEL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL")
-#define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE")
-#define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT")
-#define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE")
-#define DALI_DEMO_STR_TITLE_POPUP dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_POPUP")
-#define DALI_DEMO_STR_TITLE_BUTTONS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BUTTONS")
-#define DALI_DEMO_STR_TITLE_LOGGING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LOGGING")
-#define DALI_DEMO_STR_TITLE_MESH_MORPH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_MESH_MORPH")
-#define DALI_DEMO_STR_TITLE_MESH_SORTING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_MESH_SORTING")
-#define DALI_DEMO_STR_TITLE_TEXTURED_MESH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TEXTURED_MESH")
-#define DALI_DEMO_STR_TITLE_LINE_MESH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_LINE_MESH")
-#define DALI_DEMO_STR_TITLE_COLOR_GRADIENT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_COLOR_GRADIENT")
-#define DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_SUPER_BLUR_BLOOM")
-#define DALI_DEMO_STR_TITLE_EFFECTS_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_EFFECTS_VIEW")
+#define DALI_DEMO_STR_TITLE_BLOCKS                      dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BLOCKS")
+#define DALI_DEMO_STR_TITLE_BUBBLES                     dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BUBBLES")
+#define DALI_DEMO_STR_TITLE_BUTTONS                     dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BUTTONS")
+#define DALI_DEMO_STR_TITLE_COLOR_GRADIENT              dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_COLOR_GRADIENT")
+#define DALI_DEMO_STR_TITLE_CUBE_TRANSITION             dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_CUBE_TRANSITION")
+#define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION         dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION")
+#define DALI_DEMO_STR_TITLE_EFFECTS_VIEW                dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EFFECTS_VIEW")
+#define DALI_DEMO_STR_TITLE_EMOJI_TEXT                  dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT")
+#define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING      dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING")
+#define DALI_DEMO_STR_TITLE_IMAGE_SCALING               dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_SCALING")
+#define DALI_DEMO_STR_TITLE_IMAGE_VIEW                  dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW")
+#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING")
+#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA       dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA")
+#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG              dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG")
+#define DALI_DEMO_STR_TITLE_ITEM_VIEW                   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ITEM_VIEW")
+#define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS          dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS")
+#define DALI_DEMO_STR_TITLE_LINE_MESH                   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LINE_MESH")
+#define DALI_DEMO_STR_TITLE_LOGGING                     dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LOGGING")
+#define DALI_DEMO_STR_TITLE_MAGNIFIER                   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MAGNIFIER")
+#define DALI_DEMO_STR_TITLE_MESH_MORPH                  dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MESH_MORPH")
+#define DALI_DEMO_STR_TITLE_MESH_SORTING                dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MESH_SORTING")
+#define DALI_DEMO_STR_TITLE_MESH_VISUAL                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MESH_VISUAL")
+#define DALI_DEMO_STR_TITLE_METABALL_EXPLOSION          dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_METABALL_EXPLOSION")
+#define DALI_DEMO_STR_TITLE_METABALL_REFRAC             dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_METABALL_REFRAC")
+#define DALI_DEMO_STR_TITLE_MOTION_BLUR                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MOTION_BLUR")
+#define DALI_DEMO_STR_TITLE_MOTION_STRETCH              dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MOTION_STRETCH")
+#define DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE         dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE")
+#define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE              dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE")
+#define DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW              dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW")
+#define DALI_DEMO_STR_TITLE_POPUP                       dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_POPUP")
+#define DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES            dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES")
+#define DALI_DEMO_STR_TITLE_RADIAL_MENU                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RADIAL_MENU")
+#define DALI_DEMO_STR_TITLE_REFRACTION                  dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_REFRACTION")
+#define DALI_DEMO_STR_TITLE_RENDERER_STENCIL            dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERER_STENCIL")
+#define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI             dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI")
+#define DALI_DEMO_STR_TITLE_SCROLL_VIEW                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCROLL_VIEW")
+#define DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM            dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM")
+#define DALI_DEMO_STR_TITLE_TEXTURED_MESH               dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXTURED_MESH")
+#define DALI_DEMO_STR_TITLE_TEXT_EDITOR                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_EDITOR")
+#define DALI_DEMO_STR_TITLE_TEXT_FIELD                  dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_FIELD")
+#define DALI_DEMO_STR_TITLE_TEXT_LABEL                  dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL")
+#define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE")
+#define DALI_DEMO_STR_TITLE_TEXT_SCROLLING              dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_SCROLLING")
+#define DALI_DEMO_STR_TITLE_TILT_SENSOR                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TILT_SENSOR")
 
 #else // !INTERNATIONALIZATION_ENABLED
 
-#define DALI_DEMO_STR_TITLE_BUBBLES                   "Bubbles"
-#define DALI_DEMO_STR_TITLE_BLOCKS                    "Blocks"
-#define DALI_DEMO_STR_TITLE_CUBE_TRANSITION           "Cube Effect"
-#define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION       "Dissolve Effect"
-#define DALI_DEMO_STR_TITLE_ITEM_VIEW                 "Item View"
-#define DALI_DEMO_STR_TITLE_RENDERER_STENCIL          "Renderer Stencils"
-#define DALI_DEMO_STR_TITLE_MAGNIFIER                 "Magnifier"
-#define DALI_DEMO_STR_TITLE_MODEL_3D_VIEWER           "Model 3D Viewer"
-#define DALI_DEMO_STR_TITLE_MOTION_BLUR               "Motion Blur"
-#define DALI_DEMO_STR_TITLE_MOTION_STRETCH            "Motion Stretch"
-#define DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW            "Page Turn View"
-#define DALI_DEMO_STR_TITLE_RADIAL_MENU               "Radial Menu"
-#define DALI_DEMO_STR_TITLE_REFRACTION                "Refract Effect"
-#define DALI_DEMO_STR_TITLE_SCROLL_VIEW               "Scroll View"
-#define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS        "Lights and shadows"
-#define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI           "Script Based UI"
-#define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING    "Image Fitting and Sampling"
-#define DALI_DEMO_STR_TITLE_IMAGE_SCALING             "Image Scaling Grid"
-#define DALI_DEMO_STR_TITLE_TEXT_FIELD                "Text Field"
-#define DALI_DEMO_STR_TITLE_TEXT_LABEL                "Text Label"
-#define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE "Text Scripts"
-#define DALI_DEMO_STR_TITLE_EMOJI_TEXT                "Emoji Text"
-#define DALI_DEMO_STR_TITLE_TEXT_SCROLLING            "Text Scrolling"
-#define DALI_DEMO_STR_TITLE_TEXT_EDITOR               "Text Editor"
-#define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE            "Negotiate Size"
-#define DALI_DEMO_STR_TITLE_POPUP                     "Popup"
-#define DALI_DEMO_STR_TITLE_BUTTONS                   "Buttons"
-#define DALI_DEMO_STR_TITLE_LOGGING                   "Logging"
-#define DALI_DEMO_STR_TITLE_MESH_MORPH                "Mesh Morph"
-#define DALI_DEMO_STR_TITLE_MESH_SORTING              "Mesh Sorting"
-#define DALI_DEMO_STR_TITLE_METABALL_EXPLOSION        "Metaball Explosion"
-#define DALI_DEMO_STR_TITLE_METABALL_REFRAC           "Metaball Refractions"
-#define DALI_DEMO_STR_TITLE_TEXTURED_MESH             "Mesh Texture"
-#define DALI_DEMO_STR_TITLE_LINE_MESH                 "Mesh Line"
-#define DALI_DEMO_STR_TITLE_COLOR_GRADIENT            "Color Gradient"
-#define DALI_DEMO_STR_TITLE_IMAGE_VIEW                "Image View"
-#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA     "Image View Pixel Area"
-#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING "Image View Alpha Blending"
-#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG            "Image View SVG"
-#define DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM          "Super Blur and Bloom"
-#define DALI_DEMO_STR_TITLE_EFFECTS_VIEW              "Effects View"
-#define DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE       "Native Image Source"
-#define DALI_DEMO_STR_TITLE_MESH_VISUAL               "Mesh Visual"
-#define DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES          "Primitive Shapes"
+#define DALI_DEMO_STR_TITLE_BLOCKS                      "Blocks"
+#define DALI_DEMO_STR_TITLE_BUBBLES                     "Bubbles"
+#define DALI_DEMO_STR_TITLE_BUTTONS                     "Buttons"
+#define DALI_DEMO_STR_TITLE_COLOR_GRADIENT              "Color Gradient"
+#define DALI_DEMO_STR_TITLE_CUBE_TRANSITION             "Cube Effect"
+#define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION         "Dissolve Effect"
+#define DALI_DEMO_STR_TITLE_EFFECTS_VIEW                "Effects View"
+#define DALI_DEMO_STR_TITLE_EMOJI_TEXT                  "Emoji Text"
+#define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING      "Image Fitting and Sampling"
+#define DALI_DEMO_STR_TITLE_IMAGE_SCALING               "Image Scaling Grid"
+#define DALI_DEMO_STR_TITLE_IMAGE_VIEW                  "Image View"
+#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING   "Image View Alpha Blending"
+#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA       "Image View Pixel Area"
+#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG              "Image View SVG"
+#define DALI_DEMO_STR_TITLE_ITEM_VIEW                   "Item View"
+#define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS          "Lights and shadows"
+#define DALI_DEMO_STR_TITLE_LINE_MESH                   "Mesh Line"
+#define DALI_DEMO_STR_TITLE_LOGGING                     "Logging"
+#define DALI_DEMO_STR_TITLE_MAGNIFIER                   "Magnifier"
+#define DALI_DEMO_STR_TITLE_MESH_MORPH                  "Mesh Morph"
+#define DALI_DEMO_STR_TITLE_MESH_SORTING                "Mesh Sorting"
+#define DALI_DEMO_STR_TITLE_MESH_VISUAL                 "Mesh Visual"
+#define DALI_DEMO_STR_TITLE_METABALL_EXPLOSION          "Metaball Explosion"
+#define DALI_DEMO_STR_TITLE_METABALL_REFRAC             "Metaball Refractions"
+#define DALI_DEMO_STR_TITLE_MOTION_BLUR                 "Motion Blur"
+#define DALI_DEMO_STR_TITLE_MOTION_STRETCH              "Motion Stretch"
+#define DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE         "Native Image Source"
+#define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE              "Negotiate Size"
+#define DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW              "Page Turn View"
+#define DALI_DEMO_STR_TITLE_POPUP                       "Popup"
+#define DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES            "Primitive Shapes"
+#define DALI_DEMO_STR_TITLE_RADIAL_MENU                 "Radial Menu"
+#define DALI_DEMO_STR_TITLE_REFRACTION                  "Refract Effect"
+#define DALI_DEMO_STR_TITLE_RENDERER_STENCIL            "Renderer Stencils"
+#define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI             "Script Based UI"
+#define DALI_DEMO_STR_TITLE_SCROLL_VIEW                 "Scroll View"
+#define DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM            "Super Blur and Bloom"
+#define DALI_DEMO_STR_TITLE_TEXTURED_MESH               "Mesh Texture"
+#define DALI_DEMO_STR_TITLE_TEXT_EDITOR                 "Text Editor"
+#define DALI_DEMO_STR_TITLE_TEXT_FIELD                  "Text Field"
+#define DALI_DEMO_STR_TITLE_TEXT_LABEL                  "Text Label"
+#define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE   "Text Scripts"
+#define DALI_DEMO_STR_TITLE_TEXT_SCROLLING              "Text Scrolling"
+#define DALI_DEMO_STR_TITLE_TILT_SENSOR                 "Tilt Sensor"
 
 #endif
 
-#define DALI_DEMO_STR_TITLE_TILT_SENSOR "Tilt Sensor"
-
-
 #ifdef __cplusplus
 }
 #endif // __cplusplus
diff --git a/shared/view.h b/shared/view.h
index 2606fd2..cc7ca8f 100644
--- a/shared/view.h
+++ b/shared/view.h
@@ -118,6 +118,9 @@ Dali::Layer CreateView( Dali::Application& application,
 {
   Dali::Stage stage = Dali::Stage::GetCurrent();
 
+  // Hide the indicator bar
+  application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+
   // Create default View.
   view = Dali::Toolkit::Control::New();
   view.SetAnchorPoint( Dali::AnchorPoint::CENTER );