diff --git a/Carnival-Eclipse/libs/Carnival-2.5.0.jar b/Carnival-Eclipse/libs/Carnival-2.6.0.jar
similarity index 70%
rename from Carnival-Eclipse/libs/Carnival-2.5.0.jar
rename to Carnival-Eclipse/libs/Carnival-2.6.0.jar
index fbc8047a..8f94dc71 100644
Binary files a/Carnival-Eclipse/libs/Carnival-2.5.0.jar and b/Carnival-Eclipse/libs/Carnival-2.6.0.jar differ
diff --git a/Carnival-Eclipse/res/drawable-hdpi/bg_gadient.png b/Carnival-Eclipse/res/drawable-hdpi/carnival_bg_gadient.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-hdpi/bg_gadient.png
rename to Carnival-Eclipse/res/drawable-hdpi/carnival_bg_gadient.png
diff --git a/Carnival-Eclipse/res/drawable-hdpi/bg_pinstripe_tile.png b/Carnival-Eclipse/res/drawable-hdpi/carnival_bg_pinstripe_tile.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-hdpi/bg_pinstripe_tile.png
rename to Carnival-Eclipse/res/drawable-hdpi/carnival_bg_pinstripe_tile.png
diff --git a/Carnival-Eclipse/res/drawable-hdpi/ic_action_add_person.png b/Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_add_person.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-hdpi/ic_action_add_person.png
rename to Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_add_person.png
diff --git a/Carnival-Eclipse/res/drawable-hdpi/ic_action_call.png b/Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_call.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-hdpi/ic_action_call.png
rename to Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_call.png
diff --git a/Carnival-Eclipse/res/drawable-hdpi/ic_action_dial_pad.png b/Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_dial_pad.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-hdpi/ic_action_dial_pad.png
rename to Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_dial_pad.png
diff --git a/Carnival-Eclipse/res/drawable-hdpi/ic_action_end_call.png b/Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_end_call.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-hdpi/ic_action_end_call.png
rename to Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_end_call.png
diff --git a/Carnival-Eclipse/res/drawable-hdpi/ic_action_mic_muted.png b/Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_mic_muted.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-hdpi/ic_action_mic_muted.png
rename to Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_mic_muted.png
diff --git a/Carnival-Eclipse/res/drawable-hdpi/ic_action_pause.png b/Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_pause.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-hdpi/ic_action_pause.png
rename to Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_pause.png
diff --git a/Carnival-Eclipse/res/drawable-hdpi/ic_action_volume_on.png b/Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_volume_on.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-hdpi/ic_action_volume_on.png
rename to Carnival-Eclipse/res/drawable-hdpi/carnival_ic_action_volume_on.png
diff --git a/Carnival-Eclipse/res/drawable-hdpi/close_button_white.png b/Carnival-Eclipse/res/drawable-hdpi/close_button_white.png
deleted file mode 100644
index f7164e0c..00000000
Binary files a/Carnival-Eclipse/res/drawable-hdpi/close_button_white.png and /dev/null differ
diff --git a/Carnival-Eclipse/res/drawable-mdpi/ic_action_add_person.png b/Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_add_person.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-mdpi/ic_action_add_person.png
rename to Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_add_person.png
diff --git a/Carnival-Eclipse/res/drawable-mdpi/ic_action_call.png b/Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_call.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-mdpi/ic_action_call.png
rename to Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_call.png
diff --git a/Carnival-Eclipse/res/drawable-mdpi/ic_action_dial_pad.png b/Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_dial_pad.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-mdpi/ic_action_dial_pad.png
rename to Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_dial_pad.png
diff --git a/Carnival-Eclipse/res/drawable-mdpi/ic_action_end_call.png b/Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_end_call.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-mdpi/ic_action_end_call.png
rename to Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_end_call.png
diff --git a/Carnival-Eclipse/res/drawable-mdpi/ic_action_mic_muted.png b/Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_mic_muted.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-mdpi/ic_action_mic_muted.png
rename to Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_mic_muted.png
diff --git a/Carnival-Eclipse/res/drawable-mdpi/ic_action_pause.png b/Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_pause.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-mdpi/ic_action_pause.png
rename to Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_pause.png
diff --git a/Carnival-Eclipse/res/drawable-mdpi/ic_action_volume_on.png b/Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_volume_on.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-mdpi/ic_action_volume_on.png
rename to Carnival-Eclipse/res/drawable-mdpi/carnival_ic_action_volume_on.png
diff --git a/Carnival-Eclipse/res/drawable-xhdpi/ic_action_add_person.png b/Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_add_person.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xhdpi/ic_action_add_person.png
rename to Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_add_person.png
diff --git a/Carnival-Eclipse/res/drawable-xhdpi/ic_action_call.png b/Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_call.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xhdpi/ic_action_call.png
rename to Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_call.png
diff --git a/Carnival-Eclipse/res/drawable-xhdpi/ic_action_dial_pad.png b/Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_dial_pad.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xhdpi/ic_action_dial_pad.png
rename to Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_dial_pad.png
diff --git a/Carnival-Eclipse/res/drawable-xhdpi/ic_action_end_call.png b/Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_end_call.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xhdpi/ic_action_end_call.png
rename to Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_end_call.png
diff --git a/Carnival-Eclipse/res/drawable-xhdpi/ic_action_mic_muted.png b/Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_mic_muted.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xhdpi/ic_action_mic_muted.png
rename to Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_mic_muted.png
diff --git a/Carnival-Eclipse/res/drawable-xhdpi/ic_action_pause.png b/Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_pause.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xhdpi/ic_action_pause.png
rename to Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_pause.png
diff --git a/Carnival-Eclipse/res/drawable-xhdpi/ic_action_volume_on.png b/Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_volume_on.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xhdpi/ic_action_volume_on.png
rename to Carnival-Eclipse/res/drawable-xhdpi/carnival_ic_action_volume_on.png
diff --git a/Carnival-Eclipse/res/drawable-xxhdpi/ic_action_add_person.png b/Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_add_person.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xxhdpi/ic_action_add_person.png
rename to Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_add_person.png
diff --git a/Carnival-Eclipse/res/drawable-xxhdpi/ic_action_call.png b/Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_call.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xxhdpi/ic_action_call.png
rename to Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_call.png
diff --git a/Carnival-Eclipse/res/drawable-xxhdpi/ic_action_dial_pad.png b/Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_dial_pad.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xxhdpi/ic_action_dial_pad.png
rename to Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_dial_pad.png
diff --git a/Carnival-Eclipse/res/drawable-xxhdpi/ic_action_end_call.png b/Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_end_call.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xxhdpi/ic_action_end_call.png
rename to Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_end_call.png
diff --git a/Carnival-Eclipse/res/drawable-xxhdpi/ic_action_mic_muted.png b/Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_mic_muted.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xxhdpi/ic_action_mic_muted.png
rename to Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_mic_muted.png
diff --git a/Carnival-Eclipse/res/drawable-xxhdpi/ic_action_pause.png b/Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_pause.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xxhdpi/ic_action_pause.png
rename to Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_pause.png
diff --git a/Carnival-Eclipse/res/drawable-xxhdpi/ic_action_volume_on.png b/Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_volume_on.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable-xxhdpi/ic_action_volume_on.png
rename to Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_action_volume_on.png
diff --git a/Carnival-Eclipse/res/drawable/bg_view_all.xml b/Carnival-Eclipse/res/drawable/bg_view_all.xml
deleted file mode 100644
index dcb5b29d..00000000
--- a/Carnival-Eclipse/res/drawable/bg_view_all.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/button_pressed" android:state_focused="true" android:state_pressed="true"/>
-    <item android:drawable="@color/button_pressed" android:state_focused="false" android:state_pressed="true"/>
-    <item android:drawable="@color/button_pressed" android:state_focused="true"/>
-    <item android:drawable="@android:color/white" android:state_focused="false" android:state_pressed="false"/>
-</selector>
\ No newline at end of file
diff --git a/Carnival-Eclipse/res/drawable/bg_notification.xml b/Carnival-Eclipse/res/drawable/carnival_bg_notification.xml
similarity index 100%
rename from Carnival-Eclipse/res/drawable/bg_notification.xml
rename to Carnival-Eclipse/res/drawable/carnival_bg_notification.xml
diff --git a/Carnival-Eclipse/res/drawable/bg_pinstripe.xml b/Carnival-Eclipse/res/drawable/carnival_bg_pinstripe.xml
similarity index 72%
rename from Carnival-Eclipse/res/drawable/bg_pinstripe.xml
rename to Carnival-Eclipse/res/drawable/carnival_bg_pinstripe.xml
index c237d2ad..987a5f52 100644
--- a/Carnival-Eclipse/res/drawable/bg_pinstripe.xml
+++ b/Carnival-Eclipse/res/drawable/carnival_bg_pinstripe.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/bg_pinstripe_tile"
+    android:src="@drawable/carnival_bg_pinstripe_tile"
     android:tileMode="repeat">
 
 </bitmap>
\ No newline at end of file
diff --git a/Carnival-Eclipse/res/drawable/shadow.9.png b/Carnival-Eclipse/res/drawable/carnival_shadow.9.png
similarity index 100%
rename from Carnival-Eclipse/res/drawable/shadow.9.png
rename to Carnival-Eclipse/res/drawable/carnival_shadow.9.png
diff --git a/Carnival-Eclipse/res/layout/activity_fake_phone_call.xml b/Carnival-Eclipse/res/layout/carnival_activity_phone_call.xml
similarity index 81%
rename from Carnival-Eclipse/res/layout/activity_fake_phone_call.xml
rename to Carnival-Eclipse/res/layout/carnival_activity_phone_call.xml
index 78e0b826..81fa7277 100644
--- a/Carnival-Eclipse/res/layout/activity_fake_phone_call.xml
+++ b/Carnival-Eclipse/res/layout/carnival_activity_phone_call.xml
@@ -19,7 +19,7 @@
         android:layout_height="match_parent"
         android:layout_above="@+id/optionsContainer"
         android:id="@+id/gradientImageView"
-        android:src="@drawable/bg_gadient"
+        android:src="@drawable/carnival_bg_gadient"
         android:scaleType="fitXY" />
 
 
@@ -34,13 +34,13 @@
         android:paddingLeft="24dp"
         android:paddingRight="24dp"
         android:paddingBottom="16dp"
-        android:background="@color/call_header_bg"
+        android:background="@color/carnival_call_header_bg"
         android:id="@+id/call_header_container">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/call_name_demo"
+            android:text="@string/carnival_call_name_demo"
             android:id="@+id/callerNameTextView"
             android:textSize="18sp"
             android:textColor="@android:color/white"
@@ -51,7 +51,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/call_subtitle"
+            android:text="@string/carnival_call_subtitle"
             android:id="@+id/callSubtitleTextView"
             android:textColor="@android:color/white"
             android:layout_marginTop="5dp"
@@ -65,7 +65,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="right"
-        android:text="@string/call_status_incoming"
+        android:text="@string/carnival_call_status_incoming"
         android:textColor="@android:color/white"
         android:id="@+id/callStatusTextView"
         android:layout_below="@+id/call_header_container"
@@ -75,7 +75,7 @@
         android:paddingBottom="16dp"
         android:paddingLeft="24dp"
         android:paddingRight="24dp"
-        android:background="@color/call_status_bg"
+        android:background="@color/carnival_call_status_bg"
         android:typeface="normal" />
 
     <LinearLayout
@@ -86,39 +86,39 @@
         android:padding="24dp"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:background="@drawable/bg_pinstripe"
+        android:background="@drawable/carnival_bg_pinstripe"
         android:id="@+id/optionsContainer">
 
         <ImageButton
-            android:src="@drawable/ic_action_dial_pad"
+            android:src="@drawable/carnival_ic_action_dial_pad"
             android:background="@null"
             android:padding="6dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
         <ImageButton
-            android:src="@drawable/ic_action_volume_on"
+            android:src="@drawable/carnival_ic_action_volume_on"
             android:background="@null"
             android:padding="6dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
         <ImageButton
-            android:src="@drawable/ic_action_mic_muted"
+            android:src="@drawable/carnival_ic_action_mic_muted"
             android:background="@null"
             android:padding="6dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
         <ImageButton
-            android:src="@drawable/ic_action_pause"
+            android:src="@drawable/carnival_ic_action_pause"
             android:background="@null"
             android:padding="6dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
         <ImageButton
-            android:src="@drawable/ic_action_add_person"
+            android:src="@drawable/carnival_ic_action_add_person"
             android:background="@null"
             android:padding="6dp"
             android:layout_width="wrap_content"
@@ -139,18 +139,18 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="64dp"
-            android:src="@drawable/ic_action_call"
-            android:contentDescription="@string/accept_call"
-            android:background="@color/call_accept"/>
+            android:src="@drawable/carnival_ic_action_call"
+            android:contentDescription="@string/carnival_accept_call"
+            android:background="@color/carnival_call_accept"/>
 
         <ImageButton
             android:id="@+id/callDeclineButton"
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="64dp"
-            android:src="@drawable/ic_action_end_call"
-            android:contentDescription="@string/decline_call"
-            android:background="@color/call_decline"/>
+            android:src="@drawable/carnival_ic_action_end_call"
+            android:contentDescription="@string/carnival_decline_call"
+            android:background="@color/carnival_call_decline"/>
 
         </LinearLayout>
 
diff --git a/Carnival-Eclipse/res/layout/activity_stream.xml b/Carnival-Eclipse/res/layout/carnival_activity_stream.xml
similarity index 100%
rename from Carnival-Eclipse/res/layout/activity_stream.xml
rename to Carnival-Eclipse/res/layout/carnival_activity_stream.xml
diff --git a/Carnival-Eclipse/res/layout/fragment_message.xml b/Carnival-Eclipse/res/layout/carnival_view_message.xml
similarity index 58%
rename from Carnival-Eclipse/res/layout/fragment_message.xml
rename to Carnival-Eclipse/res/layout/carnival_view_message.xml
index eec5832d..75581504 100644
--- a/Carnival-Eclipse/res/layout/fragment_message.xml
+++ b/Carnival-Eclipse/res/layout/carnival_view_message.xml
@@ -2,75 +2,70 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:padding="5dp"
-    android:background="@drawable/shadow"
+    android:background="@drawable/carnival_shadow"
     android:layout_height="93dp">
     <RelativeLayout
         android:layout_width="match_parent"
-        android:background="@drawable/bg_notification"
+        android:background="@drawable/carnival_bg_notification"
         android:layout_height="wrap_content" >
 
         <TextView
-            android:id="@+id/textView1"
+            android:id="@+id/titleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_alignWithParentIfMissing="true"
             android:layout_marginLeft="7dp"
-            android:layout_marginTop="10dp"
-            android:layout_toLeftOf="@+id/closeButton"
-            android:layout_toRightOf="@+id/imageView1"
+            android:layout_marginStart="7dp"
+            android:layout_marginTop="7dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_toRightOf="@+id/thumbnailImageView"
+            android:layout_toEndOf="@+id/thumbnailImageView"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:textStyle="bold"
+            android:singleLine="true"
             android:lines="1"
             android:text="Your first engaging message"
             android:textColor="#3c3c3c"
             android:textSize="14sp" />
 
         <TextView
-            android:id="@+id/textView2"
+            android:id="@+id/bodyTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/textView1"
+            android:layout_alignLeft="@+id/titleTextView"
+            android:layout_alignStart="@+id/titleTextView"
             android:layout_alignWithParentIfMissing="true"
-            android:layout_below="@+id/textView1"
-            android:layout_marginBottom="10dp"
-            android:layout_toLeftOf="@+id/closeButton"
+            android:layout_below="@+id/titleTextView"
+            android:maxLines="3"
+            android:singleLine="false"
+            android:ellipsize="end"
             android:text="New mesages from Carnival will appear up here. Tap a message to read more, or view it later in the stream"
             android:textColor="#3c3c3c"
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
             android:textSize="14sp" />
 
         <ImageView
-            android:id="@+id/imageView1"
+            android:id="@+id/thumbnailImageView"
             android:layout_width="84dp"
             android:layout_height="84dp"
             android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:scaleType="centerCrop"
-            android:contentDescription="Message Image"
+            android:contentDescription="@string/carnival_message_image"
             android:layout_alignParentTop="true"
             android:background="@android:color/transparent"
             android:src="@null" />
 
         <Button
-            android:id="@+id/button2"
-            android:layout_width="wrap_content"
+            android:id="@+id/interactionButton"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:layout_toLeftOf="@+id/closeButton"
             android:background="@null"
             android:text="" />
 
-        <Button
-            android:id="@+id/closeButton"
-            android:layout_width="27dp"
-            android:layout_height="27dp"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentTop="true"
-            android:layout_marginRight="5dp"
-            android:background="@drawable/close_button_white"
-            />
-
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/Carnival-Eclipse/res/menu/message.xml b/Carnival-Eclipse/res/menu/message.xml
new file mode 100644
index 00000000..c2bf2e14
--- /dev/null
+++ b/Carnival-Eclipse/res/menu/message.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_item_share"
+        android:showAsAction="ifRoom"
+        android:title="Share"
+        android:icon="@android:drawable/ic_menu_share" />
+</menu>
\ No newline at end of file
diff --git a/Carnival-Eclipse/res/values-w820dp/dimens.xml b/Carnival-Eclipse/res/values-w820dp/dimens.xml
deleted file mode 100644
index 63fc8164..00000000
--- a/Carnival-Eclipse/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
-         (such as screen margins) for screens with more than 820dp of available width. This
-         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>
diff --git a/Carnival-Eclipse/res/values/color.xml b/Carnival-Eclipse/res/values/color.xml
index 01a4aad5..9c321f04 100644
--- a/Carnival-Eclipse/res/values/color.xml
+++ b/Carnival-Eclipse/res/values/color.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="call_header_bg">#aa000000</color>
-    <color name="call_status_bg">#aa267c94</color>
-    <color name="call_accept">#a4c739</color>
-    <color name="call_decline">#96180a</color>
-    <color name="button_pressed">#c0c0c0</color>
-    <color name="debug">#f0f</color>
+    <color name="carnival_call_header_bg">#aa000000</color>
+    <color name="carnival_call_status_bg">#aa267c94</color>
+    <color name="carnival_call_accept">#a4c739</color>
+    <color name="carnival_call_decline">#96180a</color>
 </resources>
diff --git a/Carnival-Eclipse/res/values/strings.xml b/Carnival-Eclipse/res/values/strings.xml
index d7768d8b..8069244f 100644
--- a/Carnival-Eclipse/res/values/strings.xml
+++ b/Carnival-Eclipse/res/values/strings.xml
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Carnival</string>
-    <string name="hello_world">Hello world!</string>
-    <string name="action_settings">Settings</string>
-    <string name="error_carnival_not_started">Carnival Engine not started. Please initialize it with Carnival.startEngine() first.</string>
-
-    <string name="call_subtitle">Video call</string>
-    <string name="call_name_demo">Carnival Mobile</string>
-    <string name="call_status_incoming">INCOMING</string>
-    <string name="call_status_connecting">CONNECTING…</string>
-    <string name="call_status_connected">CONNECTED</string>
-    <string name="call_status_disconnected">DISCONNECTED</string>
-    <string name="accept_call">Accept Call</string>
-    <string name="decline_call">Decline Call</string>
-    <string name="call_error">Cannot connect call</string>
-    <string name="view_all_message">View All Messages</string>
-    <string name="messages">Messages</string>
-    <string name="message">Message</string>
+    <string name="carnival_error_carnival_not_started">Carnival Engine not started. Please initialize it with Carnival.startEngine() first.</string>
+    <string name="carnival_call_subtitle">Video call</string>
+    <string name="carnival_call_name_demo">Carnival Mobile</string>
+    <string name="carnival_call_status_incoming">INCOMING</string>
+    <string name="carnival_call_status_connecting">CONNECTING…</string>
+    <string name="carnival_call_status_connected">CONNECTED</string>
+    <string name="carnival_call_status_disconnected">DISCONNECTED</string>
+    <string name="carnival_accept_call">Accept Call</string>
+    <string name="carnival_decline_call">Decline Call</string>
+    <string name="carnival_call_error">Cannot connect call</string>
+    <string name="carnival_messages">Messages</string>
+    <string name="carnival_message">Message</string>
+    <string name="carnival_message_image">Message Image</string>
 
 </resources>