diff --git a/com.samsung.dali-demo.xml b/com.samsung.dali-demo.xml
index b7980de..fb4f507 100644
--- a/com.samsung.dali-demo.xml
+++ b/com.samsung.dali-demo.xml
@@ -106,9 +106,6 @@
 	<ui-application appid="animated-shapes.example" exec="/usr/apps/com.samsung.dali-demo/bin/animated-shapes.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Animated shapes</label>
 	</ui-application>
-	<ui-application appid="path-animation.example" exec="/usr/apps/com.samsung.dali-demo/bin/path-animation.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
-		<label>Path Animation</label>
-	</ui-application>
 	<ui-application appid="atlas.example" exec="/usr/apps/com.samsung.dali-demo/bin/atlas.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Atlas</label>
 	</ui-application>
diff --git a/demo/dali-demo.cpp b/demo/dali-demo.cpp
index 408eb58..b39b070 100644
--- a/demo/dali-demo.cpp
+++ b/demo/dali-demo.cpp
@@ -36,6 +36,7 @@ int DALI_EXPORT_API main(int argc, char **argv)
   // Create the demo launcher
   DaliTableView demo(app);
 
+  demo.AddExample(Example("animated-shapes.example", DALI_DEMO_STR_TITLE_ANIMATED_SHAPES));
   demo.AddExample(Example("bubble-effect.example", DALI_DEMO_STR_TITLE_BUBBLES));
   demo.AddExample(Example("blocks.example", DALI_DEMO_STR_TITLE_BLOCKS));
   demo.AddExample(Example("cube-transition-effect.example", DALI_DEMO_STR_TITLE_CUBE_TRANSITION));
diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp
index d3e422e..1de6db9 100644
--- a/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@ -45,12 +45,15 @@ const std::string TILE_BACKGROUND(DEMO_IMAGE_DIR "item-background.9.png");
 const std::string TILE_BACKGROUND_ALPHA( DEMO_IMAGE_DIR "demo-tile-texture.9.png" );
 const std::string TILE_FOCUS( DEMO_IMAGE_DIR "tile-focus.9.png" );
 
-// Keyboard focus constants.
+// Keyboard focus effect constants.
 const float KEYBOARD_FOCUS_ANIMATION_DURATION = 1.0f;           ///< The total duration of the keyboard focus animation
 const float KEYBOARD_FOCUS_START_SCALE = 1.05f;                 ///< The starting scale of the focus highlight
 const float KEYBOARD_FOCUS_END_SCALE = 1.18f;                   ///< The end scale of the focus highlight
 const float KEYBOARD_FOCUS_END_ALPHA = 0.7f;                    ///< The end alpha of the focus highlight
 const float KEYBOARD_FOCUS_INITIAL_FADE_PERCENTAGE = 0.16f;     ///< The duration of the initial fade (from translucent to the end-alpha) as a percentage of the overal animation duration.
+const Vector3 startScale( KEYBOARD_FOCUS_START_SCALE, KEYBOARD_FOCUS_START_SCALE, KEYBOARD_FOCUS_START_SCALE ); ///< @see KEYBOARD_FOCUS_START_SCALE
+const Vector3 endScale( KEYBOARD_FOCUS_END_SCALE, KEYBOARD_FOCUS_END_SCALE, KEYBOARD_FOCUS_END_SCALE );         ///< @see KEYBOARD_FOCUS_END_SCALE
+const float initialFadeDuration = KEYBOARD_FOCUS_ANIMATION_DURATION * KEYBOARD_FOCUS_INITIAL_FADE_PERCENTAGE;   ///< @see KEYBOARD_FOCUS_INITIAL_FADE_PERCENTAGE
 
 const float TILE_LABEL_PADDING = 8.0f;                          ///< Border between edge of tile and the example text
 const float BUTTON_PRESS_ANIMATION_TIME = 0.35f;                ///< Time to perform button scale effect.
@@ -260,6 +263,9 @@ void DaliTableView::Initialize( Application& application )
   logo.SetAnchorPoint( AnchorPoint::TOP_CENTER );
   logo.SetParentOrigin( Vector3( 0.5f, 0.1f, 0.5f ) );
   logo.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+  // The logo should appear on top of everything.
+  logo.SetDrawMode( DrawMode::OVERLAY_2D );
+  mRootActor.Add( logo );
 
   // Show version in a popup when log is tapped
   mLogoTapDetector = TapGestureDetector::New();
@@ -291,9 +297,6 @@ void DaliTableView::Initialize( Application& application )
   bubbleContainer.SetParentOrigin( ParentOrigin::CENTER );
   SetupBackground( bubbleContainer );
 
-  mRootActor.Add( logo );
-  // We use depth index to bring the logo above the bubbles (as an alternative to creating actors).
-  logo.GetRendererAt( 0 ).SetProperty( Renderer::Property::DEPTH_INDEX, 30000 );
   mRootActor.Add( bubbleContainer );
   mRootActor.Add( mScrollView );
 
@@ -324,64 +327,50 @@ void DaliTableView::Initialize( Application& application )
   mAnimationTimer.Start();
   mBackgroundAnimsPlaying = true;
 
+  CreateFocusEffect();
+}
+
+void DaliTableView::CreateFocusEffect()
+{
+  // Hook the required signals to manage the focus.
   KeyboardFocusManager::Get().PreFocusChangeSignal().Connect( this, &DaliTableView::OnKeyboardPreFocusChange );
   KeyboardFocusManager::Get().FocusedActorEnterKeySignal().Connect( this, &DaliTableView::OnFocusedActorActivated );
   AccessibilityManager::Get().FocusedActorActivatedSignal().Connect( this, &DaliTableView::OnFocusedActorActivated );
 
-  mFocusContainer = ImageView::New( TILE_FOCUS );
-  mFocusContainer.SetParentOrigin( ParentOrigin::CENTER );
-  mFocusContainer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-  mFocusContainer.SetInheritScale( false );
-  mFocusContainer.SetColorMode( USE_OWN_COLOR );
-  mFocusContainer.SetName( "focusActor" );
-  mFocusContainer.OnStageSignal().Connect( this, &DaliTableView::OnStageConnect );
-
-  mFocusInner = ImageView::New( TILE_FOCUS );
-  mFocusInner.SetParentOrigin( ParentOrigin::CENTER );
-  mFocusInner.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-  mFocusInner.SetInheritScale( false );
-  mFocusInner.SetColorMode( USE_OWN_COLOR );
-  mFocusInner.SetName( "focusActor" );
-  mFocusInner.OnStageSignal().Connect( this, &DaliTableView::OnStageConnect );
-  mFocusContainer.Add( mFocusInner );
-
-  // Setup the keyboard focus highlight.
-  Vector3 startScale( KEYBOARD_FOCUS_START_SCALE, KEYBOARD_FOCUS_START_SCALE, KEYBOARD_FOCUS_START_SCALE );
-  Vector3 endScale( KEYBOARD_FOCUS_END_SCALE, KEYBOARD_FOCUS_END_SCALE, KEYBOARD_FOCUS_END_SCALE );
-  mFocusAnimation = Animation::New( KEYBOARD_FOCUS_ANIMATION_DURATION );
-  mFocusAnimationInner = Animation::New( KEYBOARD_FOCUS_ANIMATION_DURATION );
-
-  mFocusContainer.SetScale( startScale );
-  mFocusInner.SetScale( startScale );
-  mFocusContainer.SetOpacity( 0.0f );
-  mFocusInner.SetOpacity( 0.0f );
-  const float initialFadeDuration = KEYBOARD_FOCUS_ANIMATION_DURATION * KEYBOARD_FOCUS_INITIAL_FADE_PERCENTAGE;
-
-  mFocusAnimation.AnimateTo( Property( mFocusContainer, Actor::Property::COLOR_ALPHA ), KEYBOARD_FOCUS_END_ALPHA, AlphaFunction::LINEAR, TimePeriod( 0.0f, initialFadeDuration ) );
-  mFocusAnimation.AnimateTo( Property( mFocusContainer, Actor::Property::SCALE ), endScale, AlphaFunction::LINEAR, TimePeriod( initialFadeDuration, KEYBOARD_FOCUS_ANIMATION_DURATION - initialFadeDuration ) );
-  mFocusAnimation.AnimateTo( Property( mFocusContainer, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction::LINEAR, TimePeriod( initialFadeDuration, KEYBOARD_FOCUS_ANIMATION_DURATION - initialFadeDuration ) );
-
-  mFocusAnimationInner.AnimateTo( Property( mFocusInner, Actor::Property::COLOR_ALPHA ), KEYBOARD_FOCUS_END_ALPHA, AlphaFunction::LINEAR, TimePeriod( 0.0f, initialFadeDuration ) );
-  mFocusAnimationInner.AnimateTo( Property( mFocusInner, Actor::Property::SCALE ), endScale, AlphaFunction::LINEAR, TimePeriod( initialFadeDuration, KEYBOARD_FOCUS_ANIMATION_DURATION - initialFadeDuration ) );
-  mFocusAnimationInner.AnimateTo( Property( mFocusInner, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction::LINEAR, TimePeriod( initialFadeDuration, KEYBOARD_FOCUS_ANIMATION_DURATION - initialFadeDuration ) );
+  // Loop to create both actors for the focus highlight effect.
+  for( unsigned int i = 0; i < FOCUS_ANIMATION_ACTOR_NUMBER; ++i )
+  {
+    mFocusEffect[i].actor = ImageView::New( TILE_FOCUS );
+    mFocusEffect[i].actor.SetParentOrigin( ParentOrigin::CENTER );
+    mFocusEffect[i].actor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+    mFocusEffect[i].actor.SetInheritScale( false );
+    mFocusEffect[i].actor.SetColorMode( USE_OWN_COLOR );
+
+    // Setup initial values pre-animation.
+    mFocusEffect[i].actor.SetScale( startScale );
+    mFocusEffect[i].actor.SetOpacity( 0.0f );
+
+    // Create and setup the animation to do the following:
+    //   1) Initial fade in over short period of time
+    //   2) Zoom in (larger) and fade out simultaneously over longer period of time.
+    mFocusEffect[i].animation = Animation::New( KEYBOARD_FOCUS_ANIMATION_DURATION );
+
+    mFocusEffect[i].animation.AnimateTo( Property( mFocusEffect[i].actor, Actor::Property::COLOR_ALPHA ), KEYBOARD_FOCUS_END_ALPHA, AlphaFunction::LINEAR, TimePeriod( 0.0f, initialFadeDuration ) );
+    mFocusEffect[i].animation.AnimateTo( Property( mFocusEffect[i].actor, Actor::Property::SCALE ), endScale, AlphaFunction::LINEAR, TimePeriod( initialFadeDuration, KEYBOARD_FOCUS_ANIMATION_DURATION - initialFadeDuration ) );
+    mFocusEffect[i].animation.AnimateTo( Property( mFocusEffect[i].actor, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction::LINEAR, TimePeriod( initialFadeDuration, KEYBOARD_FOCUS_ANIMATION_DURATION - initialFadeDuration ) );
+
+    mFocusEffect[i].animation.SetLooping( true );
+  }
+
+  // Parent the secondary effect from the primary.
+  mFocusEffect[0].actor.Add( mFocusEffect[1].actor );
 
   // Play the animation on the 1st glow object.
-  mFocusAnimation.SetLooping( true );
-  mFocusAnimation.Play();
+  mFocusEffect[0].animation.Play();
   // Stagger the animation on the 2st glow object half way through.
-  mFocusAnimationInner.SetLooping( true );
-  mFocusAnimationInner.PlayFrom( KEYBOARD_FOCUS_ANIMATION_DURATION / 2.0f );
+  mFocusEffect[1].animation.PlayFrom( KEYBOARD_FOCUS_ANIMATION_DURATION / 2.0f );
 
-  KeyboardFocusManager::Get().SetFocusIndicatorActor( mFocusContainer );
-}
-
-void DaliTableView::OnStageConnect( Dali::Actor actor )
-{
-  // If this is one of the keyboard focus actors, place it behind the object it is focusing.
-  if( actor.GetName() == "focusActor" )
-  {
-    actor.GetRendererAt( 0 ).SetProperty( Dali::Renderer::Property::DEPTH_INDEX, -40000 );
-  }
+  KeyboardFocusManager::Get().SetFocusIndicatorActor( mFocusEffect[0].actor );
 }
 
 void DaliTableView::ApplyCubeEffectToPages()
@@ -510,12 +499,14 @@ void DaliTableView::Rotate( unsigned int degrees )
 
 Actor DaliTableView::CreateTile( const std::string& name, const std::string& title, const Dali::Vector3& sizeMultiplier, Vector2& position )
 {
-  Actor content = Actor::New();
-  content.SetName( name );
-  content.SetAnchorPoint( AnchorPoint::CENTER );
-  content.SetParentOrigin( ParentOrigin::CENTER );
-  content.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
-  content.SetSizeModeFactor( sizeMultiplier );
+  Actor focusableTile = Actor::New();
+  focusableTile.SetParentOrigin( ParentOrigin::CENTER );
+  focusableTile.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
+  focusableTile.SetSizeModeFactor( sizeMultiplier );
+  focusableTile.SetName( name );
+
+  // Set the tile to be keyboard focusable
+  focusableTile.SetKeyboardFocusable( true );
 
   Toolkit::ImageView tileContent = ImageView::New();
   tileContent.SetParentOrigin( ParentOrigin::CENTER );
@@ -542,7 +533,7 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
   shaderPosition.AddSource( Source( mScrollView, ScrollView::Property::SCROLL_POSITION ) );
   shaderPosition.SetRemoveAction( Constraint::Discard );
   shaderPosition.Apply();
-  content.Add( tileContent );
+  focusableTile.Add( tileContent );
 
   // Create an ImageView for the 9-patch border around the tile.
   ImageView borderImage = ImageView::New( TILE_BACKGROUND );
@@ -564,16 +555,13 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
 
   // Pad around the label as its size is the same as the 9-patch border. It will overlap it without padding.
   label.SetPadding( Padding( TILE_LABEL_PADDING, TILE_LABEL_PADDING, TILE_LABEL_PADDING, TILE_LABEL_PADDING ) );
-  content.Add( label );
-
-  // Set the tile to be keyboard focusable
-  content.SetKeyboardFocusable( true );
+  focusableTile.Add( label );
 
-  // connect to the touch events
-  content.TouchSignal().Connect( this, &DaliTableView::OnTilePressed );
-  content.HoveredSignal().Connect( this, &DaliTableView::OnTileHovered );
+  // Connect to the touch events
+  focusableTile.TouchSignal().Connect( this, &DaliTableView::OnTilePressed );
+  focusableTile.HoveredSignal().Connect( this, &DaliTableView::OnTileHovered );
 
-  return content;
+  return focusableTile;
 }
 
 bool DaliTableView::OnTilePressed( Actor actor, const TouchData& event )
diff --git a/demo/dali-table-view.h b/demo/dali-table-view.h
index 749bf4b..c91f2fc 100644
--- a/demo/dali-table-view.h
+++ b/demo/dali-table-view.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_DEMO_H__
-#define __DALI_DEMO_H__
+#ifndef DALI_DEMO_H
+#define DALI_DEMO_H
 
 /*
- * Copyright (c) 2015 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.
@@ -32,7 +32,6 @@ typedef std::vector<Dali::Animation> AnimationList;
 typedef AnimationList::iterator AnimationListIter;
 typedef AnimationList::const_iterator AnimationListConstIter;
 
-
 /**
  * Example information
  *
@@ -97,6 +96,8 @@ public:
 
 private: // Application callbacks & implementation
 
+  static const unsigned int FOCUS_ANIMATION_ACTOR_NUMBER = 2; ///< The number of elements used to form the custom focus effect
+
   /**
    * Shape enum for create function
    */
@@ -320,6 +321,11 @@ private: // Application callbacks & implementation
   void PlayAnimation();
 
   /**
+   * @brief Creates and sets up the custom effect used for the keyboard (and mouse) focus.
+   */
+  void CreateFocusEffect();
+
+  /**
    * Callback when the keyboard focus is going to be changed.
    *
    * @param[in] current The current focused actor
@@ -384,10 +390,15 @@ private:
   Dali::TapGestureDetector        mLogoTapDetector;          ///< To detect taps on the logo
   Dali::Toolkit::Popup            mVersionPopup;             ///< Displays DALi library version information
 
-  Dali::Toolkit::ImageView        mFocusContainer;           ///< The parent keyboard focus highlight actor
-  Dali::Toolkit::ImageView        mFocusInner;               ///< The child keyboard focus highlight actor
-  Dali::Animation                 mFocusAnimation;           ///< The animation for the parent keyboard focus highlight actor
-  Dali::Animation                 mFocusAnimationInner;      ///< The animation for the child keyboard focus highlight actor
+  /**
+   * This struct encapsulates all data relevant to each of the elements used within the custom keyboard focus effect.
+   */
+  struct FocusEffect
+  {
+    Dali::Toolkit::ImageView        actor;                   ///< The parent keyboard focus highlight actor
+    Dali::Animation                 animation;               ///< The animation for the parent keyboard focus highlight actor
+  };
+  FocusEffect mFocusEffect[FOCUS_ANIMATION_ACTOR_NUMBER];    ///< The elements used to create the custom focus effect
 
   std::vector< Dali::Actor >      mPages;                    ///< List of pages.
   AnimationList                   mBackgroundAnimations;     ///< List of background bubble animations
@@ -402,4 +413,4 @@ private:
 
 };
 
-#endif // __DALI_DEMO_H__
+#endif // DALI_DEMO_H
diff --git a/examples/animated-shapes/animated-shapes-example.cpp b/examples/animated-shapes/animated-shapes-example.cpp
new file mode 100644
index 0000000..dd79982
--- /dev/null
+++ b/examples/animated-shapes/animated-shapes-example.cpp
@@ -0,0 +1,475 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali/dali.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include "shared/view.h"
+
+#include <sstream>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+namespace
+{
+
+const char* APPLICATION_TITLE("Animated Shapes");
+
+const char* VERTEX_SHADER = DALI_COMPOSE_SHADER
+(
+  attribute mediump vec3 aCoefficient;
+  uniform mediump mat4 uMvpMatrix;
+  uniform mediump vec3 uPosition[MAX_POINT_COUNT];
+  varying lowp vec2 vCoefficient;
+  void main()
+  {
+    int vertexId = int(aCoefficient.z);
+    gl_Position = uMvpMatrix * vec4(uPosition[vertexId], 1.0);
+
+    vCoefficient = aCoefficient.xy;
+  }
+);
+
+// Fragment shader.
+const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER
+(
+  uniform lowp vec4 uColor;
+  varying lowp vec2 vCoefficient;
+  void main()
+  {
+    lowp float C = (vCoefficient.x*vCoefficient.x-vCoefficient.y);
+    lowp float Cdx = dFdx(C);
+    lowp float Cdy = dFdy(C);
+
+    lowp float distance = float(C / sqrt(Cdx*Cdx + Cdy*Cdy));
+    lowp float alpha = 0.5 - distance;
+    gl_FragColor = vec4( uColor.rgb, uColor.a * alpha );
+  }
+);
+
+Shader CreateShader( unsigned int pointCount )
+{
+  std::ostringstream vertexShader;
+  vertexShader << "#define MAX_POINT_COUNT "<< pointCount << "\n"<<VERTEX_SHADER;
+
+  std::ostringstream fragmentShader;
+  fragmentShader << "#extension GL_OES_standard_derivatives : enable "<< "\n"<<FRAGMENT_SHADER;
+
+  Shader shader = Shader::New( vertexShader.str(), fragmentShader.str() );
+  for( unsigned int i(0); i<pointCount; ++i )
+  {
+    std::ostringstream propertyName;
+    propertyName << "uPosition["<<i<<"]";
+    shader.RegisterProperty(propertyName.str(),Vector3(0.0f,0.0f,0.0f) );
+  }
+
+  return shader;
+}
+
+} //unnamed namespace
+
+// This example shows resolution independent rendering and animation of curves using the gpu.
+//
+class AnimatedShapesExample : public ConnectionTracker
+{
+public:
+
+  AnimatedShapesExample( Application& application )
+: mApplication( application )
+{
+    // Connect to the Application's Init signal
+    mApplication.InitSignal().Connect( this, &AnimatedShapesExample::Create );
+}
+
+  ~AnimatedShapesExample()
+  {
+    // Nothing to do here;
+  }
+
+  // The Init signal is received once (only) during the Application lifetime
+  void Create( Application& application )
+  {
+    // Hide the indicator bar
+    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+
+    Stage stage = Stage::GetCurrent();
+
+    // Creates the background gradient
+    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.Insert( Visual::Property::TYPE,  Visual::GRADIENT );
+    Property::Array stopOffsets;
+    stopOffsets.PushBack( 0.0f );
+    stopOffsets.PushBack( 1.0f );
+    map.Insert( GradientVisual::Property::STOP_OFFSET, stopOffsets );
+    Property::Array stopColors;
+    stopColors.PushBack( Vector4( 0.0f,0.0f,1.0f,1.0f ) );
+    stopColors.PushBack( Vector4( 1.0f,1.0f,1.0f,1.0f ) );
+    map.Insert( GradientVisual::Property::STOP_COLOR, stopColors );
+    Vector2 halfStageSize = Stage::GetCurrent().GetSize()*0.5f;
+    map.Insert( GradientVisual::Property::START_POSITION,  Vector2(0.0f,-halfStageSize.y) );
+    map.Insert( GradientVisual::Property::END_POSITION,  Vector2(0.0f,halfStageSize.y)  );
+    map.Insert( GradientVisual::Property::UNITS, GradientVisual::Units::USER_SPACE );
+    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 );
+    label.SetParentOrigin( Vector3( 0.5f, 0.0f, 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, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
+    stage.Add( label );
+
+    CreateTriangleMorph(Vector3( stage.GetSize().x*0.5f, stage.GetSize().y*0.15f, 0.0f), 100.0f );
+    CreateCircleMorph( Vector3( stage.GetSize().x*0.5f, stage.GetSize().y*0.5f, 0.0f), 55.0f );
+    CreateQuadMorph( Vector3( stage.GetSize().x*0.5f, stage.GetSize().y*0.85f, 0.0f), 60.0f );
+
+    stage.KeyEventSignal().Connect( this, &AnimatedShapesExample::OnKeyEvent );
+  }
+
+  void CreateTriangleMorph( Vector3 center, float side )
+  {
+    float h = ( side *0.5f ) / 0.866f;
+
+    Vector3 v0 = Vector3( -h, h, 0.0f );
+    Vector3 v1 = Vector3( 0.0f, -side * 0.366f, 0.0f );
+    Vector3 v2 = Vector3( h, h, 0.0f );
+
+    Vector3 v3 = v0 + ( ( v1 - v0 ) * 0.5f );
+    Vector3 v4 = v1 + ( ( v2 - v1 ) * 0.5f );
+    Vector3 v5 = v2 + ( ( v0 - v2 ) * 0.5f );
+
+    Shader shader = CreateShader( 12 );
+    shader.SetProperty( shader.GetPropertyIndex( "uPosition[0]"), v0 );
+    shader.SetProperty( shader.GetPropertyIndex( "uPosition[1]"), v3 );
+    shader.SetProperty( shader.GetPropertyIndex( "uPosition[2]"), v1 );
+
+    shader.SetProperty( shader.GetPropertyIndex( "uPosition[3]"), v1 );
+    shader.SetProperty( shader.GetPropertyIndex( "uPosition[4]"), v4 );
+    shader.SetProperty( shader.GetPropertyIndex( "uPosition[5]"), v2 );
+
+    shader.SetProperty( shader.GetPropertyIndex( "uPosition[6]"), v2 );
+    shader.SetProperty( shader.GetPropertyIndex( "uPosition[7]"), v5 );
+    shader.SetProperty( shader.GetPropertyIndex( "uPosition[8]"), v0 );
+
+    shader.SetProperty( shader.GetPropertyIndex( "uPosition[9]"),  v0 );
+    shader.SetProperty( shader.GetPropertyIndex( "uPosition[10]"), v1 );
+    shader.SetProperty( shader.GetPropertyIndex( "uPosition[11]"), v2 );
+
+
+    //Create geometry
+    static const Vector3 vertexData[] = { Dali::Vector3( 0.0f, 0.0f, 0.0f ),
+                                          Dali::Vector3( 0.5f, 0.0f, 1.0f ),
+                                          Dali::Vector3( 1.0f, 1.0f, 2.0f ),
+
+                                          Dali::Vector3( 0.0f, 0.0f, 3.0f ),
+                                          Dali::Vector3( 0.5f, 0.0f, 4.0f ),
+                                          Dali::Vector3( 1.0f, 1.0f, 5.0f ),
+
+                                          Dali::Vector3( 0.0f, 0.0f, 6.0f ),
+                                          Dali::Vector3( 0.5f, 0.0f, 7.0f ),
+                                          Dali::Vector3( 1.0f, 1.0f, 8.0f ),
+
+                                          Dali::Vector3( 0.0f, 1.0f, 9.0f ),
+                                          Dali::Vector3( 0.0f, 1.0f, 10.0f ),
+                                          Dali::Vector3( 0.0f, 1.0f, 11.0f )
+    };
+
+    unsigned short indexData[] = { 0, 2, 1, 3, 5, 4, 6, 8, 7, 9, 11, 10 };
+
+    //Create a vertex buffer for vertex positions and texture coordinates
+    Dali::Property::Map vertexFormat;
+    vertexFormat["aCoefficient"] = Dali::Property::VECTOR3;
+    Dali::PropertyBuffer vertexBuffer = Dali::PropertyBuffer::New( vertexFormat );
+    vertexBuffer.SetData( vertexData, sizeof(vertexData)/sizeof(vertexData[0]));
+
+    //Create the geometry
+    Dali::Geometry geometry = Dali::Geometry::New();
+    geometry.AddVertexBuffer( vertexBuffer );
+    geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
+
+    Renderer renderer = Renderer::New( geometry, shader );
+    renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
+
+    Actor actor = Actor::New();
+    actor.SetSize( 400.0f, 400.0f );
+    actor.SetPosition( center );
+    actor.SetAnchorPoint( AnchorPoint::CENTER );
+    actor.SetColor(Vector4(1.0f,1.0f,0.0f,1.0f) );
+    actor.AddRenderer( renderer );
+
+    Stage stage = Stage::GetCurrent();
+    stage.Add( actor );
+
+    //Animation
+    Animation animation = Animation::New(5.0f);
+    KeyFrames k0 = KeyFrames::New();
+    k0.Add( 0.0f,v3  );
+    k0.Add( 0.5f, v3 + Vector3(-150.0f,-150.0f,0.0f));
+    k0.Add( 1.0f, v3 );
+    animation.AnimateBetween( Property(shader, "uPosition[1]"),k0, AlphaFunction::EASE_IN_OUT_SINE );
+
+    k0 = KeyFrames::New();
+    k0.Add( 0.0f,v4  );
+    k0.Add( 0.5f, v4 + Vector3(150.0f,-150.0f,0.0f));
+    k0.Add( 1.0f, v4 );
+    animation.AnimateBetween( Property(shader,"uPosition[4]"),k0, AlphaFunction::EASE_IN_OUT_SINE );
+
+    k0 = KeyFrames::New();
+    k0.Add( 0.0f,v5  );
+    k0.Add( 0.5f, v5 + Vector3(0.0,150.0f,0.0f));
+    k0.Add( 1.0f, v5 );
+    animation.AnimateBetween( Property(shader, "uPosition[7]"),k0, AlphaFunction::EASE_IN_OUT_SINE );
+    animation.SetLooping( true );
+    animation.Play();
+  }
+
+  void CreateCircleMorph( Vector3 center, float radius )
+  {
+    Shader shader = CreateShader( 16 );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[0]"), Vector3( -radius, -radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[1]"), Vector3( 0.0f, -radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[2]"), Vector3( radius, -radius, 0.0f ) );
+
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[3]"), Vector3( radius, -radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[4]"), Vector3( radius, 0.0f, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[5]"), Vector3( radius, radius, 0.0f ) );
+
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[6]"), Vector3( radius, radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[7]"), Vector3( 0.0f, radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[8]"), Vector3( -radius, radius, 0.0f ) );
+
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[9]"),  Vector3( -radius, radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[10]"), Vector3( -radius, 0.0f, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[11]"), Vector3( -radius, -radius, 0.0f ) );
+
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[12]"), Vector3( -radius, -radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[13]"),  Vector3( radius, -radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[14]"), Vector3( radius, radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[15]"), Vector3( -radius, radius, 0.0f ) );
+
+    //shader.SetProperty( shader.GetPropertyIndex("uLineWidth"), 2.0f );
+
+    static const Vector3 vertexData[] = { Vector3( 0.0f, 0.0f, 0.0f ),
+                                          Vector3( 0.5f, 0.0f, 1.0f ),
+                                          Vector3( 1.0f, 1.0f, 2.0f ),
+                                          Vector3( 0.0f, 0.0f, 3.0f ),
+                                          Vector3( 0.5f, 0.0f, 4.0f ),
+                                          Vector3( 1.0f, 1.0f, 5.0f ),
+                                          Vector3( 0.0f, 0.0f, 6.0f ),
+                                          Vector3( 0.5f, 0.0f, 7.0f ),
+                                          Vector3( 1.0f, 1.0f, 8.0f ),
+                                          Vector3( 0.0f, 0.0f, 9.0f ),
+                                          Vector3( 0.5f, 0.0f, 10.0f ),
+                                          Vector3( 1.0f, 1.0f, 11.0f ),
+                                          Vector3( 0.0f, 1.0f, 12.0f ),
+                                          Vector3( 0.0f, 1.0f, 13.0f ),
+                                          Vector3( 0.0f, 1.0f, 14.0f ),
+                                          Vector3( 0.0f, 1.0f, 15.0f )};
+
+    short unsigned int indexData[] = { 0, 2, 1, 3, 5, 4, 6, 8, 7, 9, 11, 10, 12, 13, 14, 12, 14, 15 };
+
+    //Create a vertex buffer for vertex positions and texture coordinates
+    Dali::Property::Map vertexFormat;
+    vertexFormat["aCoefficient"] = Dali::Property::VECTOR3;
+    Dali::PropertyBuffer vertexBuffer = Dali::PropertyBuffer::New( vertexFormat );
+    vertexBuffer.SetData( vertexData, sizeof(vertexData)/sizeof(vertexData[0]));
+
+    //Create the geometry
+    Dali::Geometry geometry = Dali::Geometry::New();
+    geometry.AddVertexBuffer( vertexBuffer );
+    geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
+
+    Renderer renderer = Renderer::New( geometry, shader );
+    renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
+
+    Actor actor = Actor::New();
+    actor.SetSize( 400.0f, 400.0f );
+    actor.SetPosition( center );
+    actor.SetAnchorPoint( AnchorPoint::CENTER );
+    actor.AddRenderer( renderer );
+
+    Stage stage = Stage::GetCurrent();
+    stage.Add( actor );
+
+    //Animation
+    Animation animation = Animation::New(5.0f);
+    KeyFrames k0 = KeyFrames::New();
+    k0.Add( 0.0f, Vector3( 0.0f,-radius*1.85, 0.0f ) );
+    k0.Add( 0.5f, Vector3( -radius*1.85, -radius*3.0f, 0.0f ) );
+    k0.Add( 1.0f, Vector3( 0.0f,-radius*1.85, 0.0f ) );
+    animation.AnimateBetween( Property( shader, shader.GetPropertyIndex("uPosition[1]") ),k0, AlphaFunction::EASE_IN_OUT_SINE );
+
+    k0 = KeyFrames::New();
+    k0.Add( 0.0f, Vector3( radius*1.85, 0.0f, 0.0f ) );
+    k0.Add( 0.5f, Vector3( radius*3.0f,-radius*1.85, 0.0f ) );
+    k0.Add( 1.0f, Vector3( radius*1.85,0.0f, 0.0f ) );
+    animation.AnimateBetween( Property(shader, shader.GetPropertyIndex("uPosition[4]")),k0, AlphaFunction::EASE_IN_OUT_SINE );
+
+    k0 = KeyFrames::New();
+    k0.Add( 0.0f, Vector3( 0.0f, radius*1.85, 0.0f ) );
+    k0.Add( 0.5f, Vector3( radius*1.85, radius*3.0f, 0.0f) );
+    k0.Add( 1.0f, Vector3( 0.0f, radius*1.85, 0.0f) );
+    animation.AnimateBetween( Property( shader, shader.GetPropertyIndex("uPosition[7]") ),k0, AlphaFunction::EASE_IN_OUT_SINE );
+
+    k0 = KeyFrames::New();
+    k0.Add( 0.0f, Vector3( -radius*1.85, 0.0f, 0.0f) );
+    k0.Add( 0.5f, Vector3(-radius*3.0f, radius*1.85, 0.0f) );
+    k0.Add( 1.0f, Vector3( -radius*1.85, 0.0f, 0.0f) );
+    animation.AnimateBetween( Property( shader, shader.GetPropertyIndex("uPosition[10]") ),k0, AlphaFunction::EASE_IN_OUT_SINE );
+
+    animation.AnimateBy( Property( actor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(-90.0f) ), Vector3::ZAXIS ) );
+    animation.SetLooping( true );
+    animation.Play();
+  }
+
+  void CreateQuadMorph( Vector3 center, float radius )
+  {
+    Shader shader = CreateShader( 16 );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[0]"), Vector3( -radius, -radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[1]"), Vector3( 0.0f, -radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[2]"), Vector3( radius, -radius, 0.0f ) );
+
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[3]"), Vector3( radius, -radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[4]"), Vector3( radius, 0.0f, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[5]"), Vector3( radius, radius, 0.0f ) );
+
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[6]"), Vector3( radius, radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[7]"), Vector3( 0.0f, radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[8]"), Vector3( -radius, radius, 0.0f ) );
+
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[9]"), Vector3( -radius, radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[10]"), Vector3( -radius, 0.0f, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[11]"), Vector3( -radius, -radius, 0.0f ) );
+
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[12]"), Vector3( -radius, -radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[13]"), Vector3( radius, -radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[14]"), Vector3( radius, radius, 0.0f ) );
+    shader.SetProperty( shader.GetPropertyIndex("uPosition[15]"), Vector3( -radius, radius, 0.0f ) );
+
+    static const Vector3 vertexData[] = { Dali::Vector3( 0.0f, 0.0f, 0.0f ),
+                                          Dali::Vector3( 0.5f, 0.0f, 1.0f ),
+                                          Dali::Vector3( 1.0f, 1.0f, 2.0f ),
+
+                                          Dali::Vector3( 0.0f, 0.0f, 3.0f ),
+                                          Dali::Vector3( 0.5f, 0.0f, 4.0f ),
+                                          Dali::Vector3( 1.0f, 1.0f, 5.0f ),
+
+                                          Dali::Vector3( 0.0f, 0.0f, 6.0f ),
+                                          Dali::Vector3( 0.5f, 0.0f, 7.0f ),
+                                          Dali::Vector3( 1.0f, 1.0f, 8.0f ),
+
+                                          Dali::Vector3( 0.0f, 0.0f, 9.0f ),
+                                          Dali::Vector3( 0.5f, 0.0f, 10.0f ),
+                                          Dali::Vector3( 1.0f, 1.0f, 11.0f ),
+
+                                          Dali::Vector3( 0.0f, 1.0f, 12.0f ),
+                                          Dali::Vector3( 0.0f, 1.0f, 13.0f ),
+                                          Dali::Vector3( 0.0f, 1.0f, 14.0f ),
+                                          Dali::Vector3( 0.0f, 1.0f, 15.0f ) };
+
+    short unsigned int indexData[] = { 0, 2, 1, 3, 5, 4, 6, 8, 7, 9, 11, 10, 12, 15, 14, 12, 14, 13 };
+
+    //Create a vertex buffer for vertex positions and texture coordinates
+    Dali::Property::Map vertexFormat;
+    vertexFormat["aCoefficient"] = Dali::Property::VECTOR3;
+    Dali::PropertyBuffer vertexBuffer = Dali::PropertyBuffer::New( vertexFormat );
+    vertexBuffer.SetData( vertexData, sizeof(vertexData)/sizeof(vertexData[0]));
+
+    //Create the geometry
+    Dali::Geometry geometry = Dali::Geometry::New();
+    geometry.AddVertexBuffer( vertexBuffer );
+    geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
+
+    Renderer renderer = Renderer::New( geometry, shader );
+    renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
+
+    Actor actor = Actor::New();
+    actor.SetSize( 400.0f, 400.0f );
+    actor.SetPosition( center );
+    actor.SetAnchorPoint( AnchorPoint::CENTER );
+    actor.SetColor(Vector4(1.0f,0.0f,0.0f,1.0f) );
+    actor.AddRenderer( renderer );
+
+    Stage stage = Stage::GetCurrent();
+    stage.Add( actor );
+
+    //Animation
+    Animation animation = Animation::New( 5.0f );
+    KeyFrames k0 = KeyFrames::New();
+    k0.Add( 0.0f, Vector3( 0.0f, -radius, 0.0f ) );
+    k0.Add( 0.5f, Vector3( 0.0f, -radius*4.0f, 0.0f ) );
+    k0.Add( 1.0f, Vector3( 0.0f, -radius, 0.0f ) );
+    animation.AnimateBetween( Property(shader, shader.GetPropertyIndex("uPosition[1]")),k0, AlphaFunction::EASE_IN_OUT_SINE );
+
+    k0 = KeyFrames::New();
+    k0.Add( 0.0f, Vector3( radius, 0.0f, 0.0f ) );
+    k0.Add( 0.5f, Vector3( radius*4.0f, 0.0f, 0.0f ) );
+    k0.Add( 1.0f, Vector3( radius, 0.0f, 0.0f ) );
+    animation.AnimateBetween( Property(shader, shader.GetPropertyIndex("uPosition[4]")),k0, AlphaFunction::EASE_IN_OUT_SINE );
+
+    k0 = KeyFrames::New();
+    k0.Add( 0.0f, Vector3( 0.0f, radius, 0.0f ) );
+    k0.Add( 0.5f, Vector3( 0.0f, radius*4.0f, 0.0f ) );
+    k0.Add( 1.0f, Vector3( 0.0f, radius, 0.0f ) );
+    animation.AnimateBetween( Property(shader, shader.GetPropertyIndex("uPosition[7]")),k0, AlphaFunction::EASE_IN_OUT_SINE );
+
+    k0 = KeyFrames::New();
+    k0.Add( 0.0f, Vector3( -radius, 0.0f, 0.0f ) );
+    k0.Add( 0.5f, Vector3( -radius*4.0f,0.0f, 0.0f ) );
+    k0.Add( 1.0f, Vector3( -radius,  0.0f, 0.0f ) );
+    animation.AnimateBetween( Property(shader, shader.GetPropertyIndex("uPosition[10]")),k0, AlphaFunction::EASE_IN_OUT_SINE );
+
+    animation.AnimateBy( Property( actor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(90.0f) ), Vector3::ZAXIS ) );
+    animation.SetLooping( true );
+    animation.Play();
+  }
+
+  /**
+   * Main key event handler
+   */
+  void OnKeyEvent(const KeyEvent& event)
+  {
+    if( event.state == KeyEvent::Down && (IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ))  )
+    {
+      mApplication.Quit();
+    }
+  }
+
+private:
+  Application&                mApplication;
+
+};
+
+void RunTest( Application& application )
+{
+  AnimatedShapesExample test( application );
+  application.MainLoop();
+}
+
+int main( int argc, char **argv )
+{
+  Application application = Application::New( &argc, &argv );
+  RunTest( application );
+
+  return 0;
+}
diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index b79fa5b..90d023f 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.2.8
+Version:    1.2.9
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
diff --git a/resources/po/as.po b/resources/po/as.po
index 3ac32ab..66883d0 100755
--- a/resources/po/as.po
+++ b/resources/po/as.po
@@ -1,3 +1,6 @@
+msgid "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES"
+msgstr "অ্যানিমেটেড আকার"
+
 msgid "DALI_DEMO_STR_TITLE_BLOCKS"
 msgstr "অৱৰুদ্ধ কৰক"
 
diff --git a/resources/po/de.po b/resources/po/de.po
index c1a57a0..7901ce0 100755
--- a/resources/po/de.po
+++ b/resources/po/de.po
@@ -1,3 +1,6 @@
+msgid "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES"
+msgstr "Animierte Formen"
+
 msgid "DALI_DEMO_STR_TITLE_BLOCKS"
 msgstr "Blöcke"
 
diff --git a/resources/po/en_GB.po b/resources/po/en_GB.po
index abf951f..b248e0f 100755
--- a/resources/po/en_GB.po
+++ b/resources/po/en_GB.po
@@ -1,3 +1,6 @@
+msgid "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES"
+msgstr "Animated Shapes"
+
 msgid "DALI_DEMO_STR_TITLE_BLOCKS"
 msgstr "Blocks"
 
diff --git a/resources/po/en_US.po b/resources/po/en_US.po
index 0d89012..8b7d4e9 100755
--- a/resources/po/en_US.po
+++ b/resources/po/en_US.po
@@ -1,3 +1,6 @@
+msgid "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES"
+msgstr "Animated Shapes"
+
 msgid "DALI_DEMO_STR_TITLE_BLOCKS"
 msgstr "Blocks"
 
diff --git a/resources/po/es.po b/resources/po/es.po
index e5f82f2..cfef651 100755
--- a/resources/po/es.po
+++ b/resources/po/es.po
@@ -1,3 +1,6 @@
+msgid "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES"
+msgstr "Formas Animadas"
+
 msgid "DALI_DEMO_STR_TITLE_BLOCKS"
 msgstr "Bloques"
 
diff --git a/resources/po/ko.po b/resources/po/ko.po
index 5e3fbb4..a09b572 100755
--- a/resources/po/ko.po
+++ b/resources/po/ko.po
@@ -1,3 +1,6 @@
+msgid "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES"
+msgstr "애니메이션 모양"
+
 msgid "DALI_DEMO_STR_TITLE_BLOCKS"
 msgstr "블록"
 
diff --git a/resources/po/ml.po b/resources/po/ml.po
index ec5c34d..d439c77 100755
--- a/resources/po/ml.po
+++ b/resources/po/ml.po
@@ -1,3 +1,6 @@
+msgid "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES"
+msgstr "ആനിമേഷൻ രൂപങ്ങൾ"
+
 msgid "DALI_DEMO_STR_TITLE_BLOCKS"
 msgstr "തടയപ്പെട്ട"
 
diff --git a/resources/po/ur.po b/resources/po/ur.po
index 822fc80..1548a1e 100755
--- a/resources/po/ur.po
+++ b/resources/po/ur.po
@@ -1,3 +1,6 @@
+msgid "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES"
+msgstr "متحرک شکلیں"
+
 msgid "DALI_DEMO_STR_TITLE_BLOCKS"
 msgstr "اینٹیں"
 
diff --git a/resources/po/zn_CH.po b/resources/po/zn_CH.po
index d3654cd..af3ef77 100755
--- a/resources/po/zn_CH.po
+++ b/resources/po/zn_CH.po
@@ -1,3 +1,6 @@
+msgid "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES"
+msgstr "动画造型"
+
 msgid "DALI_DEMO_STR_TITLE_BLOCKS"
 msgstr "块体"
 
diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h
index 4a17bf1..60d8049 100644
--- a/shared/dali-demo-strings.h
+++ b/shared/dali-demo-strings.h
@@ -32,6 +32,7 @@ extern "C"
 
 #ifdef INTERNATIONALIZATION_ENABLED
 
+#define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES             dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES")
 #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")
@@ -81,6 +82,7 @@ extern "C"
 
 #else // !INTERNATIONALIZATION_ENABLED
 
+#define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES             "Animated Shapes"
 #define DALI_DEMO_STR_TITLE_BLOCKS                      "Blocks"
 #define DALI_DEMO_STR_TITLE_BUBBLES                     "Bubbles"
 #define DALI_DEMO_STR_TITLE_BUTTONS                     "Buttons"