Demokit UI Refresh

Change-Id: I0531d311b4a8812fafc94da363614114f728a0d6
Signed-off-by: Erik Gilling <konkers@android.com>

91 files changed, 387 insertions, 423 deletions

diff --git a/demokit/app/res/drawable-hdpi/droid_off.png b/demokit/app/res/drawable-hdpi/droid_off.png
deleted file mode 100644
index c908bf8..0000000
--- a/demokit/app/res/drawable-hdpi/droid_off.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-hdpi/droid_on.png b/demokit/app/res/drawable-hdpi/droid_on.png
deleted file mode 100644
index 0bd2390..0000000
--- a/demokit/app/res/drawable-hdpi/droid_on.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-hdpi/greenball.png b/demokit/app/res/drawable-hdpi/greenball.png
deleted file mode 100644
index 7851232..0000000
--- a/demokit/app/res/drawable-hdpi/greenball.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-hdpi/ic_launcher_demokit.png b/demokit/app/res/drawable-hdpi/ic_launcher_demokit.png
new file mode 100644
index 0000000..0de0a95
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/ic_launcher_demokit.png
diff --git a/demokit/app/res/drawable-hdpi/icon.png b/demokit/app/res/drawable-hdpi/icon.png
deleted file mode 100644
index 0496e35..0000000
--- a/demokit/app/res/drawable-hdpi/icon.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-hdpi/indicator_button1_off_noglow.png b/demokit/app/res/drawable-hdpi/indicator_button1_off_noglow.png
new file mode 100644
index 0000000..9cd43ce
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/indicator_button1_off_noglow.png
diff --git a/demokit/app/res/drawable-hdpi/indicator_button1_on_noglow.png b/demokit/app/res/drawable-hdpi/indicator_button1_on_noglow.png
new file mode 100644
index 0000000..d24866f
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/indicator_button1_on_noglow.png
diff --git a/demokit/app/res/drawable-hdpi/indicator_button2_off_noglow.png b/demokit/app/res/drawable-hdpi/indicator_button2_off_noglow.png
new file mode 100644
index 0000000..92f962f
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/indicator_button2_off_noglow.png
diff --git a/demokit/app/res/drawable-hdpi/indicator_button2_on_noglow.png b/demokit/app/res/drawable-hdpi/indicator_button2_on_noglow.png
new file mode 100644
index 0000000..2e24282
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/indicator_button2_on_noglow.png
diff --git a/demokit/app/res/drawable-hdpi/indicator_button3_off_noglow.png b/demokit/app/res/drawable-hdpi/indicator_button3_off_noglow.png
new file mode 100644
index 0000000..4f9e951
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/indicator_button3_off_noglow.png
diff --git a/demokit/app/res/drawable-hdpi/indicator_button3_on_noglow.png b/demokit/app/res/drawable-hdpi/indicator_button3_on_noglow.png
new file mode 100644
index 0000000..8cfefe6
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/indicator_button3_on_noglow.png
diff --git a/demokit/app/res/drawable-hdpi/indicator_button_capacitive_off_noglow.png b/demokit/app/res/drawable-hdpi/indicator_button_capacitive_off_noglow.png
new file mode 100644
index 0000000..ae46086
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/indicator_button_capacitive_off_noglow.png
diff --git a/demokit/app/res/drawable-hdpi/indicator_button_capacitive_on_noglow.png b/demokit/app/res/drawable-hdpi/indicator_button_capacitive_on_noglow.png
new file mode 100644
index 0000000..7afc536
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/indicator_button_capacitive_on_noglow.png
diff --git a/demokit/app/res/drawable-hdpi/joystick_background.png b/demokit/app/res/drawable-hdpi/joystick_background.png
new file mode 100644
index 0000000..7349fb7
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/joystick_background.png
diff --git a/demokit/app/res/drawable-hdpi/joystick_normal_holo_dark.png b/demokit/app/res/drawable-hdpi/joystick_normal_holo_dark.png
new file mode 100644
index 0000000..33796ac
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/joystick_normal_holo_dark.png
diff --git a/demokit/app/res/drawable-hdpi/joystick_pressed_holo_dark.png b/demokit/app/res/drawable-hdpi/joystick_pressed_holo_dark.png
new file mode 100644
index 0000000..4eba4b4
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/joystick_pressed_holo_dark.png
diff --git a/demokit/app/res/drawable-hdpi/redball.png b/demokit/app/res/drawable-hdpi/redball.png
deleted file mode 100644
index fba2f5d..0000000
--- a/demokit/app/res/drawable-hdpi/redball.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-hdpi/scrubber_control_holo_dark.png b/demokit/app/res/drawable-hdpi/scrubber_control_holo_dark.png
new file mode 100644
index 0000000..5947ee1
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/scrubber_control_holo_dark.png
diff --git a/demokit/app/res/drawable-hdpi/scrubber_horizontal_blue_holo_dark.9.png b/demokit/app/res/drawable-hdpi/scrubber_horizontal_blue_holo_dark.9.png
new file mode 100644
index 0000000..1dcd3b0
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/scrubber_horizontal_blue_holo_dark.9.png
diff --git a/demokit/app/res/drawable-hdpi/scrubber_horizontal_green_holo_dark.9.png b/demokit/app/res/drawable-hdpi/scrubber_horizontal_green_holo_dark.9.png
new file mode 100644
index 0000000..6221a0f
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/scrubber_horizontal_green_holo_dark.9.png
diff --git a/demokit/app/res/drawable-hdpi/scrubber_horizontal_holo_dark.9.png b/demokit/app/res/drawable-hdpi/scrubber_horizontal_holo_dark.9.png
new file mode 100644
index 0000000..6a162ed
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/scrubber_horizontal_holo_dark.9.png
diff --git a/demokit/app/res/drawable-hdpi/scrubber_horizontal_red_holo_dark.9.png b/demokit/app/res/drawable-hdpi/scrubber_horizontal_red_holo_dark.9.png
new file mode 100644
index 0000000..b785ebd
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/scrubber_horizontal_red_holo_dark.9.png
diff --git a/demokit/app/res/drawable-hdpi/scrubber_vertical_blue_holo_dark.9.png b/demokit/app/res/drawable-hdpi/scrubber_vertical_blue_holo_dark.9.png
new file mode 100644
index 0000000..5a22af5
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/scrubber_vertical_blue_holo_dark.9.png
diff --git a/demokit/app/res/drawable-hdpi/scrubber_vertical_green_holo_dark.9.png b/demokit/app/res/drawable-hdpi/scrubber_vertical_green_holo_dark.9.png
new file mode 100644
index 0000000..1ebd9f6
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/scrubber_vertical_green_holo_dark.9.png
diff --git a/demokit/app/res/drawable-hdpi/scrubber_vertical_red_holo_dark.9.png b/demokit/app/res/drawable-hdpi/scrubber_vertical_red_holo_dark.9.png
new file mode 100644
index 0000000..74800a4
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/scrubber_vertical_red_holo_dark.9.png
diff --git a/demokit/app/res/drawable-hdpi/tab_focused_holo_dark.9.png b/demokit/app/res/drawable-hdpi/tab_focused_holo_dark.9.png
new file mode 100644
index 0000000..39d0fc1
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/tab_focused_holo_dark.9.png
diff --git a/demokit/app/res/drawable-hdpi/tab_normal_holo_dark.9.png b/demokit/app/res/drawable-hdpi/tab_normal_holo_dark.9.png
new file mode 100644
index 0000000..bf001cf
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/tab_normal_holo_dark.9.png
diff --git a/demokit/app/res/drawable-hdpi/tab_touched_holo_dark.9.png b/demokit/app/res/drawable-hdpi/tab_touched_holo_dark.9.png
new file mode 100644
index 0000000..4c31e32
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/tab_touched_holo_dark.9.png
diff --git a/demokit/app/res/drawable-hdpi/toggle_button_off_holo_dark.9.png b/demokit/app/res/drawable-hdpi/toggle_button_off_holo_dark.9.png
new file mode 100644
index 0000000..52f172c
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/toggle_button_off_holo_dark.9.png
diff --git a/demokit/app/res/drawable-hdpi/toggle_button_on_holo_dark.9.png b/demokit/app/res/drawable-hdpi/toggle_button_on_holo_dark.9.png
new file mode 100644
index 0000000..404f888
--- /dev/null
+++ b/demokit/app/res/drawable-hdpi/toggle_button_on_holo_dark.9.png
diff --git a/demokit/app/res/drawable-ldpi/droid_off.png b/demokit/app/res/drawable-ldpi/droid_off.png
deleted file mode 100644
index 75a1bf6..0000000
--- a/demokit/app/res/drawable-ldpi/droid_off.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-ldpi/droid_on.png b/demokit/app/res/drawable-ldpi/droid_on.png
deleted file mode 100644
index 41dd449..0000000
--- a/demokit/app/res/drawable-ldpi/droid_on.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-ldpi/greenball.png b/demokit/app/res/drawable-ldpi/greenball.png
deleted file mode 100644
index 3a814fc..0000000
--- a/demokit/app/res/drawable-ldpi/greenball.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-ldpi/icon.png b/demokit/app/res/drawable-ldpi/icon.png
deleted file mode 100644
index ee36e96..0000000
--- a/demokit/app/res/drawable-ldpi/icon.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-ldpi/redball.png b/demokit/app/res/drawable-ldpi/redball.png
deleted file mode 100644
index 6e0add3..0000000
--- a/demokit/app/res/drawable-ldpi/redball.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-mdpi/droid_off.png b/demokit/app/res/drawable-mdpi/droid_off.png
deleted file mode 100644
index e7fcabf..0000000
--- a/demokit/app/res/drawable-mdpi/droid_off.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-mdpi/droid_on.png b/demokit/app/res/drawable-mdpi/droid_on.png
deleted file mode 100644
index 121f517..0000000
--- a/demokit/app/res/drawable-mdpi/droid_on.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-mdpi/greenball.png b/demokit/app/res/drawable-mdpi/greenball.png
deleted file mode 100644
index 7851232..0000000
--- a/demokit/app/res/drawable-mdpi/greenball.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-mdpi/ic_launcher_demokit.png b/demokit/app/res/drawable-mdpi/ic_launcher_demokit.png
new file mode 100644
index 0000000..2111755
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/ic_launcher_demokit.png
diff --git a/demokit/app/res/drawable-mdpi/icon.png b/demokit/app/res/drawable-mdpi/icon.png
deleted file mode 100644
index b01345c..0000000
--- a/demokit/app/res/drawable-mdpi/icon.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-mdpi/indicator_button1_off_holo_dark.png b/demokit/app/res/drawable-mdpi/indicator_button1_off_holo_dark.png
new file mode 100644
index 0000000..00461f4
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/indicator_button1_off_holo_dark.png
diff --git a/demokit/app/res/drawable-mdpi/indicator_button1_on_holo_dark.png b/demokit/app/res/drawable-mdpi/indicator_button1_on_holo_dark.png
new file mode 100644
index 0000000..387fe91
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/indicator_button1_on_holo_dark.png
diff --git a/demokit/app/res/drawable-mdpi/indicator_button2_off_holo_dark.png b/demokit/app/res/drawable-mdpi/indicator_button2_off_holo_dark.png
new file mode 100644
index 0000000..186627b
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/indicator_button2_off_holo_dark.png
diff --git a/demokit/app/res/drawable-mdpi/indicator_button2_on_holo_dark.png b/demokit/app/res/drawable-mdpi/indicator_button2_on_holo_dark.png
new file mode 100644
index 0000000..8ad4d8c
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/indicator_button2_on_holo_dark.png
diff --git a/demokit/app/res/drawable-mdpi/indicator_button3_off_holo_dark.png b/demokit/app/res/drawable-mdpi/indicator_button3_off_holo_dark.png
new file mode 100644
index 0000000..e078642
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/indicator_button3_off_holo_dark.png
diff --git a/demokit/app/res/drawable-mdpi/indicator_button3_on_holo_dark.png b/demokit/app/res/drawable-mdpi/indicator_button3_on_holo_dark.png
new file mode 100644
index 0000000..3314451
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/indicator_button3_on_holo_dark.png
diff --git a/demokit/app/res/drawable-mdpi/indicator_button_capacitive_off_holo_dark.png b/demokit/app/res/drawable-mdpi/indicator_button_capacitive_off_holo_dark.png
new file mode 100644
index 0000000..6cde802
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/indicator_button_capacitive_off_holo_dark.png
diff --git a/demokit/app/res/drawable-mdpi/indicator_button_capacitive_on_holo_dark.png b/demokit/app/res/drawable-mdpi/indicator_button_capacitive_on_holo_dark.png
new file mode 100644
index 0000000..e3fea37
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/indicator_button_capacitive_on_holo_dark.png
diff --git a/demokit/app/res/drawable-mdpi/joystick_background.png b/demokit/app/res/drawable-mdpi/joystick_background.png
new file mode 100644
index 0000000..6afdd44
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/joystick_background.png
diff --git a/demokit/app/res/drawable-mdpi/joystick_normal_holo_dark.png b/demokit/app/res/drawable-mdpi/joystick_normal_holo_dark.png
new file mode 100644
index 0000000..ab72d36
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/joystick_normal_holo_dark.png
diff --git a/demokit/app/res/drawable-mdpi/joystick_pressed_holo_dark.png b/demokit/app/res/drawable-mdpi/joystick_pressed_holo_dark.png
new file mode 100644
index 0000000..c0afa77
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/joystick_pressed_holo_dark.png
diff --git a/demokit/app/res/drawable-mdpi/redball.png b/demokit/app/res/drawable-mdpi/redball.png
deleted file mode 100644
index fba2f5d..0000000
--- a/demokit/app/res/drawable-mdpi/redball.png
+++ /dev/null
diff --git a/demokit/app/res/drawable-mdpi/scrubber_control_holo_dark.png b/demokit/app/res/drawable-mdpi/scrubber_control_holo_dark.png
new file mode 100644
index 0000000..90ece2a
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/scrubber_control_holo_dark.png
diff --git a/demokit/app/res/drawable-mdpi/scrubber_horizontal_blue_holo_dark.9.png b/demokit/app/res/drawable-mdpi/scrubber_horizontal_blue_holo_dark.9.png
new file mode 100644
index 0000000..3a7665b
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/scrubber_horizontal_blue_holo_dark.9.png
diff --git a/demokit/app/res/drawable-mdpi/scrubber_horizontal_green_holo_dark.9.png b/demokit/app/res/drawable-mdpi/scrubber_horizontal_green_holo_dark.9.png
new file mode 100644
index 0000000..dac988a
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/scrubber_horizontal_green_holo_dark.9.png
diff --git a/demokit/app/res/drawable-mdpi/scrubber_horizontal_holo_dark.9.png b/demokit/app/res/drawable-mdpi/scrubber_horizontal_holo_dark.9.png
new file mode 100644
index 0000000..ce62fbe
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/scrubber_horizontal_holo_dark.9.png
diff --git a/demokit/app/res/drawable-mdpi/scrubber_horizontal_red_holo_dark.9.png b/demokit/app/res/drawable-mdpi/scrubber_horizontal_red_holo_dark.9.png
new file mode 100644
index 0000000..bd349fd
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/scrubber_horizontal_red_holo_dark.9.png
diff --git a/demokit/app/res/drawable-mdpi/scrubber_vertical_blue_holo_dark.9.png b/demokit/app/res/drawable-mdpi/scrubber_vertical_blue_holo_dark.9.png
new file mode 100644
index 0000000..fd9ca52
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/scrubber_vertical_blue_holo_dark.9.png
diff --git a/demokit/app/res/drawable-mdpi/scrubber_vertical_green_holo_dark.9.png b/demokit/app/res/drawable-mdpi/scrubber_vertical_green_holo_dark.9.png
new file mode 100644
index 0000000..f5cc83e
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/scrubber_vertical_green_holo_dark.9.png
diff --git a/demokit/app/res/drawable-mdpi/scrubber_vertical_red_holo_dark.9.png b/demokit/app/res/drawable-mdpi/scrubber_vertical_red_holo_dark.9.png
new file mode 100644
index 0000000..26eaa3d
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/scrubber_vertical_red_holo_dark.9.png
diff --git a/demokit/app/res/drawable-mdpi/tab_focused_holo_dark.9.png b/demokit/app/res/drawable-mdpi/tab_focused_holo_dark.9.png
new file mode 100644
index 0000000..155d0e4
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/tab_focused_holo_dark.9.png
diff --git a/demokit/app/res/drawable-mdpi/tab_normal_holo_dark.9.png b/demokit/app/res/drawable-mdpi/tab_normal_holo_dark.9.png
new file mode 100644
index 0000000..380ffbb
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/tab_normal_holo_dark.9.png
diff --git a/demokit/app/res/drawable-mdpi/toggle_button_off_holo_dark.9.png b/demokit/app/res/drawable-mdpi/toggle_button_off_holo_dark.9.png
new file mode 100644
index 0000000..8cde52c
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/toggle_button_off_holo_dark.9.png
diff --git a/demokit/app/res/drawable-mdpi/toggle_button_on_holo_dark.9.png b/demokit/app/res/drawable-mdpi/toggle_button_on_holo_dark.9.png
new file mode 100644
index 0000000..8ed6cf7
--- /dev/null
+++ b/demokit/app/res/drawable-mdpi/toggle_button_on_holo_dark.9.png
diff --git a/demokit/app/res/drawable-nodpi/background_holo_dark.jpg b/demokit/app/res/drawable-nodpi/background_holo_dark.jpg
new file mode 100644
index 0000000..97eed62
--- /dev/null
+++ b/demokit/app/res/drawable-nodpi/background_holo_dark.jpg
diff --git a/demokit/app/res/drawable-nodpi/demokit_splash.png b/demokit/app/res/drawable-nodpi/demokit_splash.png
new file mode 100644
index 0000000..1dbd8e3
--- /dev/null
+++ b/demokit/app/res/drawable-nodpi/demokit_splash.png
diff --git a/demokit/app/res/drawable-xlarge-nodpi/background_holo_dark.png b/demokit/app/res/drawable-xlarge-nodpi/background_holo_dark.png
new file mode 100644
index 0000000..5d41f1f
--- /dev/null
+++ b/demokit/app/res/drawable-xlarge-nodpi/background_holo_dark.png
diff --git a/demokit/app/res/layout-xlarge-land/main.xml b/demokit/app/res/layout-xlarge-land/main.xml
new file mode 100644
index 0000000..4ba5569
--- /dev/null
+++ b/demokit/app/res/layout-xlarge-land/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="horizontal" android:layout_width="match_parent"
+	android:layout_height="match_parent" android:paddingLeft="20dip"
+	android:paddingBottom="80dip" android:layout_weight="1" android:background="@drawable/background_holo_dark">
+	<include layout="@layout/inputcontainer" android:id="@+id/inputContainer"
+		android:layout_width="400dip" android:layout_height="match_parent"
+		android:layout_weight="0" android:layout_marginRight = "50dip"/>
+	<include layout="@layout/output_tablet" android:id="@+id/outputContainer"
+		android:layout_width="wrap_content" android:layout_height="wrap_content"
+		android:layout_weight="1" />
+</LinearLayout>
diff --git a/demokit/app/res/layout-xlarge/main.xml b/demokit/app/res/layout-xlarge/main.xml
deleted file mode 100644
index 8fdf685..0000000
--- a/demokit/app/res/layout-xlarge/main.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <TableLayout android:id="@+id/tableLayout1" android:layout_width="match_parent" android:layout_height="wrap_content" android:addStatesFromChildren="true">
-        <TableRow android:id="@+id/tableRow1" android:layout_width="match_parent" android:layout_gravity="center_vertical" android:orientation="vertical" android:showDividers="beginning|middle|end" android:layout_weight="1" android:layout_height="wrap_content" android:baselineAligned="false" android:gravity="center_vertical" android:layout_marginBottom="8dip">
-            <TextView android:id="@+id/textView17" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/buttons" android:layout_marginRight="8dip"></TextView>
-            <LinearLayout android:id="@+id/linearLayout1" android:layout_height="wrap_content" android:verticalScrollbarPosition="right" android:layout_width="match_parent" android:layout_gravity="fill_horizontal">
-                <TextView android:id="@+id/textView1" android:layout_height="wrap_content" android:layout_width="match_parent" android:text="@string/button1" android:layout_gravity="center_vertical" android:layout_marginRight="8dip"></TextView>
-                <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droid_off" android:id="@+id/button1Image"></ImageView>
-            </LinearLayout>
-            <LinearLayout android:id="@+id/linearLayout5" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                <TextView android:layout_width="wrap_content" android:id="@+id/textView2" android:layout_height="wrap_content" android:text="@string/button2" android:layout_gravity="center_vertical" android:layout_marginRight="8dip"></TextView>
-                <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droid_off" android:id="@+id/button2Image"></ImageView>
-            </LinearLayout>
-            <LinearLayout android:id="@+id/linearLayout6" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                <TextView android:layout_width="wrap_content" android:id="@+id/textView3" android:layout_height="wrap_content" android:text="@string/button3" android:layout_gravity="center_vertical" android:layout_marginRight="8dip"></TextView>
-                <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droid_off" android:id="@+id/button3Image"></ImageView>
-            </LinearLayout>
-        </TableRow>
-        <TableRow android:id="@+id/tableRow14" android:layout_width="wrap_content" android:layout_height="wrap_content">
-            <TextView android:id="@+id/textView19" android:layout_height="wrap_content" android:layout_width="wrap_content"></TextView>
-            <TextView android:id="@+id/textView20" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/led1"></TextView>
-            <TextView android:layout_gravity="center_horizontal" android:id="@+id/textView21" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/led2"></TextView>
-            <TextView android:layout_gravity="center_horizontal" android:id="@+id/textView22" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/led3"></TextView>
-        </TableRow>
-        <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow4" android:layout_width="match_parent" android:layout_weight="1" android:gravity="center_vertical" android:layout_marginBottom="8dip">
-            <TextView android:id="@+id/textView5" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:text="@string/red"></TextView>
-            <SeekBar android:layout_height="wrap_content" android:max="255" android:id="@+id/led1Red" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar>
-            <SeekBar android:id="@+id/led2Red" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar>
-            <SeekBar android:id="@+id/led3Red" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar>
-        </TableRow>
-        <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow5" android:layout_width="match_parent" android:layout_weight="1" android:gravity="center_vertical" android:layout_marginBottom="8dip">
-            <TextView android:id="@+id/textView6" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:text="@string/green"></TextView>
-            <SeekBar android:layout_height="wrap_content" android:max="255" android:id="@+id/led1Green" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar>
-            <SeekBar android:id="@+id/led2Green" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar>
-            <SeekBar android:id="@+id/led3Green" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar>
-        </TableRow>
-        <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow6" android:layout_width="match_parent" android:layout_weight="1" android:gravity="center_vertical" android:layout_marginBottom="8dip">
-            <TextView android:id="@+id/textView7" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:text="@string/blue"></TextView>
-            <SeekBar android:layout_height="wrap_content" android:max="255" android:id="@+id/led1Blue" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar>
-            <SeekBar android:id="@+id/led2Blue" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar>
-            <SeekBar android:id="@+id/led3Blue" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar>
-        </TableRow>
-        <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow2" android:layout_width="match_parent" android:layout_weight="1" android:gravity="center_vertical" android:layout_marginBottom="8dip">
-            <TextView android:id="@+id/textView18" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/relays" android:layout_marginRight="8dip"></TextView>
-            <LinearLayout android:id="@+id/linearLayout2" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                <TextView android:text="@string/relay1" android:id="@+id/textView4" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip"></TextView>
-                <ToggleButton android:text="ToggleButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/relay1Button"></ToggleButton>
-            </LinearLayout>
-            <LinearLayout android:id="@+id/linearLayout7" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                <TextView android:layout_width="wrap_content" android:id="@+id/textView14" android:layout_height="wrap_content" android:text="@string/relay2" android:layout_marginRight="8dip"></TextView>
-                <ToggleButton android:layout_width="wrap_content" android:text="ToggleButton" android:layout_height="wrap_content" android:id="@+id/relay2Button"></ToggleButton>
-            </LinearLayout>
-        </TableRow>
-        <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow3" android:layout_width="match_parent" android:layout_weight="1" android:layout_marginBottom="8dip">
-            <TextView android:text="@string/temperature" android:id="@+id/textView15" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip"></TextView>
-            <TextView android:id="@+id/temperature" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
-        </TableRow>
-        <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow13" android:layout_width="match_parent" android:layout_weight="1" android:layout_marginBottom="8dip">
-            <TextView android:text="@string/light" android:id="@+id/textView16" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip"></TextView>
-            <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/light"></TextView>
-        </TableRow>
-        <TableRow android:id="@+id/tableRow7" android:layout_width="wrap_content" android:layout_height="wrap_content">
-            <TextView android:layout_marginRight="8dip" android:id="@+id/textView8" android:layout_width="wrap_content" android:text="@string/servos" android:layout_height="wrap_content"></TextView>
-            <SeekBar android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:id="@+id/servo1" android:max="255" android:progress="127"></SeekBar>
-            <SeekBar android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:id="@+id/servo2" android:max="255" android:progress="127"></SeekBar>
-            <SeekBar android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:id="@+id/servo3" android:max="255" android:progress="127"></SeekBar>
-        </TableRow>
-        <TableRow android:layout_width="match_parent" android:id="@+id/tableRow8" android:layout_height="wrap_content">
-            <TextView android:id="@+id/textView9" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/joystick"></TextView>
-            <LinearLayout android:id="@+id/linearLayout3" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                <TextView android:layout_width="wrap_content" android:id="@+id/textView10" android:layout_height="wrap_content" android:text="@string/x" android:layout_marginRight="8dip"></TextView>
-                <TextView android:layout_width="wrap_content" android:id="@+id/joyX" android:layout_height="wrap_content"></TextView>
-            </LinearLayout>
-            <LinearLayout android:id="@+id/linearLayout4" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                <TextView android:layout_width="wrap_content" android:id="@+id/textView12" android:layout_height="wrap_content" android:text="@string/y" android:layout_marginRight="8dip"></TextView>
-                <TextView android:layout_width="wrap_content" android:id="@+id/joyY" android:layout_height="wrap_content"></TextView>
-            </LinearLayout>
-            <LinearLayout android:id="@+id/linearLayout5" android:layout_width="wrap_content" android:layout_height="wrap_content">
-	      <TextView android:layout_width="wrap_content" android:id="@+id/textViewJoyButton" android:layout_height="wrap_content" android:text="@string/button" android:layout_marginRight="8dip"></TextView>
-	      <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droid_off" android:id="@+id/joyButtonImage"></ImageView>
-            </LinearLayout>
-
-
-        </TableRow>
-        <TableRow android:layout_width="match_parent" android:id="@+id/tableRow9" android:layout_height="wrap_content">
-            <TextView android:id="@+id/textView11" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="@string/cap"></TextView>
-            <ImageView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_gravity="left" android:src="@drawable/droid_off" android:id="@+id/cap"></ImageView>
-        </TableRow>
-    </TableLayout>
-
-</LinearLayout>
diff --git a/demokit/app/res/layout/buttoncontainer.xml b/demokit/app/res/layout/buttoncontainer.xml
new file mode 100644
index 0000000..117ee2b
--- /dev/null
+++ b/demokit/app/res/layout/buttoncontainer.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/ButtonContainer"
+	android:paddingLeft="5dip" android:layout_width="fill_parent"
+	android:orientation="vertical" android:layout_height="wrap_content" >
+	<TextView android:text="Buttons" android:id="@+id/lightPercentValue"
+		style="@style/DemoKitControlLabel" android:layout_weight="1"
+		android:layout_height="wrap_content" android:layout_width="wrap_content"
+		android:gravity="center|top"></TextView>
+	<LinearLayout android:id="@+id/ButtonContainer"
+		android:layout_width="fill_parent" android:orientation="horizontal"
+		android:layout_weight="1" android:layout_marginTop="5dip"
+		android:layout_height="wrap_content" android:layout_gravity="center_vertical">
+		<ImageButton android:background="@null" android:id="@+id/Button1"
+			style="@style/DemoKitButtonDisplay" android:src="@drawable/indicator_button1_off_noglow"></ImageButton>
+		<ImageButton android:background="@null" android:id="@+id/Button2"
+			style="@style/DemoKitButtonDisplay" android:src="@drawable/indicator_button2_off_noglow"></ImageButton>
+		<ImageButton android:background="@null" android:id="@+id/Button3"
+			style="@style/DemoKitButtonDisplay" android:src="@drawable/indicator_button3_off_noglow"></ImageButton>
+		<ImageButton android:background="@null" android:id="@+id/Button4"
+			style="@style/DemoKitButtonDisplay" android:src="@drawable/indicator_button_capacitive_off_noglow"></ImageButton>
+	</LinearLayout>
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/color_sliders.xml b/demokit/app/res/layout/color_sliders.xml
new file mode 100644
index 0000000..0eb670c
--- /dev/null
+++ b/demokit/app/res/layout/color_sliders.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent" android:layout_height="wrap_content"
+	android:orientation="vertical" android:padding="0dip"
+	android:layout_margin="0dip">
+	<include layout="@layout/led_slider"  android:layout_width="match_parent" android:layout_height="wrap_content"/>
+	<include layout="@layout/led_slider"  android:layout_width="match_parent" android:layout_height="wrap_content"/>
+	<include layout="@layout/led_slider"  android:layout_width="match_parent" android:layout_height="wrap_content"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/demokit/app/res/layout/inputcontainer.xml b/demokit/app/res/layout/inputcontainer.xml
new file mode 100644
index 0000000..2c2f18f
--- /dev/null
+++ b/demokit/app/res/layout/inputcontainer.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent" android:layout_height="match_parent"
+	android:orientation="vertical" android:weightSum="2">
+	<include layout="@layout/templightcontainer" android:id="@+id/TempLightContainer_ref"
+		android:layout_width="match_parent" android:layout_height="wrap_content"
+		android:layout_weight="1" />
+	<include layout="@layout/buttoncontainer" android:id="@+id/ButtonContainer_ref"
+		android:layout_width="match_parent" android:layout_height="wrap_content"
+		android:layout_weight="1" />
+	<include layout="@layout/joycontainer" android:id="@+id/JoyContainer_ref"
+		android:layout_width="match_parent" android:layout_height="wrap_content"
+		android:layout_weight="0" />
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/joycontainer.xml b/demokit/app/res/layout/joycontainer.xml
new file mode 100644
index 0000000..ff35579
--- /dev/null
+++ b/demokit/app/res/layout/joycontainer.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/JoyContainer"
+	android:layout_width="fill_parent" android:orientation="vertical"
+	android:layout_height="wrap_content" android:paddingLeft="5dip">
+	<TextView android:text="Joystick" android:id="@+id/joystickLabel"
+		android:layout_width="wrap_content" android:layout_height="fill_parent"
+		style="@style/DemoKitControlLabel" android:gravity="center"
+		android:layout_marginTop="10dp" android:layout_marginBottom="-40dp"></TextView>
+	<com.google.android.DemoKit.JoystickView
+		android:id="@+id/joystickView" android:layout_height="wrap_content"
+		android:src="@drawable/joystick_background" android:layout_width="match_parent"
+		android:layout_gravity="center_horizontal|bottom"></com.google.android.DemoKit.JoystickView>
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/led_slider.xml b/demokit/app/res/layout/led_slider.xml
new file mode 100644
index 0000000..77eed2b
--- /dev/null
+++ b/demokit/app/res/layout/led_slider.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent" android:layout_height="wrap_content"
+	android:orientation="horizontal" android:layout_weight="1">
+	<TextView android:text="@string/ledLabel" style="@style/DemoKitLEDText"
+		android:layout_gravity="left|center_vertical" android:layout_width="40dip" android:clickable="true"/>
+	<com.google.android.DemoKit.Slider
+		android:layout_height="wrap_content" android:layout_width="wrap_content"
+		android:layout_weight="1"></com.google.android.DemoKit.Slider>
+	<TextView android:text="155" style="@style/DemoKitLEDText" android:layout_width="40dip"
+		android:layout_gravity="center_vertical|right"  android:gravity="right" android:clickable="true"/>
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/leds_tablet.xml b/demokit/app/res/layout/leds_tablet.xml
new file mode 100644
index 0000000..f9f6cfb
--- /dev/null
+++ b/demokit/app/res/layout/leds_tablet.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+	android:orientation="horizontal" android:layout_height="match_parent"  android:layout_weight="1">
+	<include layout="@layout/vertical_color_sliders" android:id="@+id/leds1" android:layout_weight="1"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<include layout="@layout/vertical_color_sliders" android:id="@+id/leds2" android:layout_weight="1"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<include layout="@layout/vertical_color_sliders" android:id="@+id/leds3" android:layout_weight="1"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/main.xml b/demokit/app/res/layout/main.xml
index 6dbf840..1c52750 100644
--- a/demokit/app/res/layout/main.xml
+++ b/demokit/app/res/layout/main.xml
@@ -1,297 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <!-- Buttons -->
-            <TextView
-                android:id="@+id/textView17" android:layout_alignParentLeft="true"
-                android:layout_width="wrap_content" android:layout_height="wrap_content" 
-                android:text="@string/buttons" android:layout_marginRight="8dip"/>
-            <TextView
-                android:id="@+id/textView1" android:layout_below="@id/textView17"
-                android:layout_height="wrap_content" android:layout_width="wrap_content"
-                android:text="@string/button1" android:layout_gravity="center_vertical" 
-                android:layout_marginRight="12dip" android:layout_marginLeft="8dp"
-                android:paddingTop="30dp" android:layout_marginBottom="5dp"/>
-            <ImageView
-                android:id="@+id/button1Image" android:layout_toRightOf="@id/textView1"
-                android:layout_alignBottom="@id/textView1" 
-                android:layout_marginTop="8dp" android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:src="@drawable/droid_off"/>
-            <TextView 
-                android:id="@+id/textView2" android:layout_width="wrap_content" 
-                android:layout_height="wrap_content" android:layout_toRightOf="@id/button1Image"
-                android:layout_marginLeft="24dp" android:text="@string/button2" 
-                android:layout_gravity="center_vertical" android:layout_marginRight="12dip"
-                 android:layout_alignBottom="@id/textView1"/>
-            <ImageView
-                android:id="@+id/button2Image" android:layout_toRightOf="@id/textView2"
-                android:layout_alignBottom="@id/textView2" android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:layout_marginTop="8dp"
-                android:src="@drawable/droid_off"/>
-            <TextView 
-                android:id="@+id/textView3" android:layout_toRightOf="@id/button2Image"
-                android:layout_marginLeft="24dp" android:layout_alignBottom="@id/textView1"
-                android:layout_marginRight="12dp" android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:text="@string/button3"
-                android:layout_gravity="center_vertical"/>
-            <ImageView
-                android:id="@+id/button3Image" android:layout_toRightOf="@id/textView3"
-                android:layout_alignBottom="@id/textView3" android:layout_marginTop="8dp"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:src="@drawable/droid_off"/>
-                
-            <!-- LED 1 -->    
-            <TextView
-                android:id="@+id/textView20" android:layout_height="wrap_content"
-                android:layout_width="match_parent" android:layout_gravity="center_horizontal"
-                android:text="@string/led1" android:layout_below="@id/textView1"
-                android:paddingTop="30dp"/>
-            <TextView 
-                android:id="@+id/textView5" android:layout_below="@id/textView20"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:layout_marginRight="8dip" android:text="@string/red"
-                android:paddingTop="20dp"/>
-            <SeekBar
-                android:id="@+id/led1Red"
-                android:layout_alignParentRight="true"
-                android:layout_height="wrap_content" android:layout_alignBottom="@id/textView5"
-                android:max="255" android:layout_width="250dp" android:layout_marginRight="16dip"/>
-            <TextView
-                android:id="@+id/textView6" android:layout_below="@id/textView5"
-                android:paddingTop="20dp"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:layout_marginRight="8dip" android:text="@string/green"/>
-            <SeekBar
-                android:id="@+id/led1Green" 
-                android:layout_alignParentRight="true"
-                android:layout_alignBottom="@id/textView6" android:layout_height="wrap_content"
-                android:max="255" android:layout_marginRight="16dip"
-                android:layout_width="250dip"/>
-            <TextView
-                android:id="@+id/textView7" android:layout_below="@id/textView6"
-                android:paddingTop="20dp"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:layout_marginRight="8dip" android:text="@string/blue"/>
-            <SeekBar
-                android:id="@+id/led1Blue" android:layout_alignParentRight="true"
-                android:layout_height="wrap_content" android:max="255"
-                android:layout_marginRight="16dip" android:layout_width="250dip"
-                android:layout_alignBottom="@id/textView7"/>
-
-            <!-- LED 2 -->
-            <TextView
-                android:id="@+id/textView21" android:layout_height="wrap_content"
-                android:layout_width="match_parent" android:layout_gravity="center_horizontal"
-                android:text="@string/led2" android:layout_below="@id/led1Blue"
-                android:paddingTop="30dp"/>
-            <TextView
-                android:id="@+id/textView5_2" android:layout_below="@id/textView21"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:layout_marginRight="8dip" android:text="@string/red"
-                android:paddingTop="20dp"/>
-            <SeekBar
-                android:id="@+id/led2Red" android:layout_alignParentRight="true"
-                android:layout_height="wrap_content" android:layout_alignBottom="@id/textView5_2"
-                android:max="255" android:layout_width="250dp" android:layout_marginRight="16dip"/>
-            <TextView
-                android:id="@+id/textView6_2" android:layout_below="@id/textView5_2"
-                android:paddingTop="20dp" android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:layout_marginRight="8dip"
-                android:text="@string/green"/>
-            <SeekBar
-                android:id="@+id/led2Green" android:layout_alignParentRight="true"
-                android:layout_alignBottom="@id/textView6_2" android:layout_height="wrap_content"
-                android:max="255" android:layout_marginRight="16dip"
-                android:layout_width="250dip"/>
-            <TextView
-                android:id="@+id/textView7_2" android:layout_below="@id/textView6_2"
-                android:paddingTop="20dp" android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:layout_marginRight="8dip"
-                android:text="@string/blue"/>
-            <SeekBar
-                android:id="@+id/led2Blue" android:layout_alignParentRight="true"
-                android:layout_height="wrap_content" android:max="255"
-                android:layout_marginRight="16dip" android:layout_width="250dip"
-                android:layout_alignBottom="@id/textView7_2"/>
-
-            <!-- LED 3 -->
-            <TextView
-                android:id="@+id/textView22" android:layout_height="wrap_content"
-                android:layout_width="match_parent" android:layout_gravity="center_horizontal"
-                android:text="@string/led3" android:layout_below="@id/led2Blue"
-                android:paddingTop="30dp"/>
-            <TextView
-                android:id="@+id/textView5_3" android:layout_below="@id/textView22"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:layout_marginRight="8dip" android:text="@string/red"
-                android:paddingTop="20dp"/>
-            <SeekBar
-                android:id="@+id/led3Red" android:layout_alignParentRight="true"
-                android:layout_height="wrap_content" android:layout_alignBottom="@id/textView5_3"
-                android:max="255" android:layout_width="250dp" android:layout_marginRight="16dip"/>
-            <TextView
-                android:id="@+id/textView6_3" android:layout_below="@id/textView5_3"
-                android:paddingTop="20dp" android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:layout_marginRight="8dip"
-                android:text="@string/green"/>
-            <SeekBar
-                android:id="@+id/led3Green" android:layout_alignParentRight="true"
-                android:layout_alignBottom="@id/textView6_3" android:layout_height="wrap_content"
-                android:max="255" android:layout_marginRight="16dip"
-                android:layout_width="250dip"/>
-            <TextView
-                android:id="@+id/textView7_3" android:layout_below="@id/textView6_3"
-                android:paddingTop="20dp" android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:layout_marginRight="8dip"
-                android:text="@string/blue"/>
-            <SeekBar
-                android:id="@+id/led3Blue" android:layout_alignParentRight="true"
-                android:layout_height="wrap_content" android:max="255"
-                android:layout_marginRight="16dip" android:layout_width="250dip"
-                android:layout_alignBottom="@id/textView7_3"/>
-
-            <!-- Relays -->
-            <TextView
-                android:id="@+id/textView18" android:layout_below="@id/led3Blue"
-                android:paddingTop="60dp" android:layout_alignParentLeft="true"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:text="@string/relays" android:layout_marginRight="8dip"/>
-            <ToggleButton
-                android:id="@+id/relay1Button" android:text="ToggleButton"
-                android:layout_toRightOf="@id/textView18"
-                android:layout_alignBottom="@id/textView18" android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:layout_marginLeft="12dp"/>
-            <TextView
-                android:id="@+id/textView4" android:layout_below="@id/relay1Button"
-                android:layout_alignLeft="@id/relay1Button"
-                android:layout_alignRight="@id/relay1Button" android:text="@string/relay1"
-                android:layout_width="wrap_content" android:gravity="center_horizontal"
-                android:layout_marginTop="4dp" android:layout_height="wrap_content"/>
-            <ToggleButton
-                android:id="@+id/relay2Button" android:text="ToggleButton"
-                android:layout_alignBottom="@id/textView18"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:layout_marginRight="12dp" android:layout_alignParentRight="true"/>
-            <TextView
-                android:id="@+id/textView4" android:layout_below="@id/relay2Button"
-                android:layout_alignLeft="@id/relay2Button"
-                android:layout_alignRight="@id/relay2Button" android:text="@string/relay2"
-                android:layout_width="wrap_content" android:gravity="center_horizontal"
-                android:layout_marginTop="4dp" android:layout_height="wrap_content"/>
-
-            <!-- Temperature -->                 
-            <TextView
-                android:id="@+id/textView15" android:text="@string/temperature"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:layout_marginRight="8dip" android:layout_below="@id/textView18"
-                android:paddingTop="50dp" android:layout_alignParentLeft="true"/>
-            <TextView
-                android:id="@+id/temperature" android:layout_toRightOf="@id/textView15"
-                android:layout_alignBottom="@id/textView15" android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <!--  Light -->
-            <TextView
-                android:id="@+id/light" android:layout_alignParentRight="true"
-                android:layout_alignBottom="@id/textView15" android:layout_width="50dp"
-                android:layout_height="wrap_content"/>
-            <TextView
-                android:id="@+id/textView16" android:text="@string/light"
-                android:layout_alignBottom="@id/light" android:layout_toLeftOf="@id/light"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:layout_marginRight="8dip"/>
-
-            <!-- Servos -->
-            <TextView
-                android:id="@+id/textView8" android:layout_height="wrap_content"
-                android:layout_width="match_parent" android:layout_gravity="center_horizontal"
-                android:text="@string/servos" android:layout_below="@id/textView15"
-                android:paddingTop="30dp"/>
-            <TextView 
-                android:id="@+id/servo1Text" android:layout_below="@id/textView8"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:layout_marginRight="8dip" android:text="@string/servo1"
-                android:paddingTop="20dp"/>
-            <SeekBar
-                android:id="@+id/servo1" android:layout_alignParentRight="true"
-                android:progress="127" android:layout_height="wrap_content"
-                android:layout_alignBottom="@id/servo1Text" android:max="255"
-                android:layout_width="250dp" android:layout_marginRight="16dip"/>
-            <TextView
-                android:id="@+id/servo2Text" android:layout_below="@id/servo1Text"
-                android:paddingTop="20dp" android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:layout_marginRight="8dip"
-                android:text="@string/servo2"/>
-            <SeekBar
-                android:id="@+id/servo2" android:layout_alignParentRight="true"
-                android:progress="127" android:layout_alignBottom="@id/servo2Text"
-                android:layout_height="wrap_content" android:max="255"
-                android:layout_marginRight="16dip" android:layout_width="250dip"/>
-            <TextView
-                android:id="@+id/servo3Text" android:layout_below="@id/servo2Text"
-                android:paddingTop="20dp" android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:layout_marginRight="8dip"
-                android:text="@string/servo3"/>
-            <SeekBar
-                android:id="@+id/servo3" android:layout_alignParentRight="true"
-                android:layout_height="wrap_content" android:max="255"
-                android:layout_marginRight="16dip" android:layout_width="250dip"
-                android:layout_alignBottom="@id/servo3Text" android:progress="127"/>
-            
-            <!-- Joystick -->
-            <TextView
-                android:id="@+id/textView9" android:layout_below="@id/servo3Text"
-                android:padding="30dp" android:text="@string/joystick"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-            <TextView
-                android:layout_width="wrap_content" android:id="@+id/textView10"
-                android:layout_height="wrap_content" android:text="@string/x"
-                android:layout_marginRight="8dip" android:paddingTop="20dp"
-                android:layout_below="@id/textView9" android:layout_alignParentLeft="true"/>
-            <TextView
-                android:layout_width="wrap_content" android:id="@+id/joyX"
-                android:layout_height="wrap_content" android:layout_toRightOf="@id/textView10"
-                android:layout_alignBottom="@id/textView10"/>
-            <TextView
-                android:layout_width="wrap_content" android:id="@+id/textView12"
-                android:layout_height="wrap_content" android:text="@string/y"
-                android:layout_marginRight="8dip" android:paddingTop="20dp"
-                android:layout_below="@id/textView10" android:layout_alignParentLeft="true"/>
-            <TextView
-                android:layout_width="wrap_content" android:id="@+id/joyY"
-                android:layout_height="wrap_content" android:layout_toRightOf="@id/textView12"
-                android:layout_alignBottom="@id/textView12"/>
-           <TextView
-                android:layout_width="wrap_content" android:id="@+id/textViewJoyButton"
-                android:layout_height="wrap_content" android:text="@string/button"
-                android:layout_marginRight="8dip" android:paddingTop="20dp"
-                android:layout_below="@id/textView12" android:layout_alignParentLeft="true"/>
-            <ImageView
-                android:src="@drawable/droid_off" android:id="@+id/joyButtonImage"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/textViewJoyButton"
-                android:layout_alignBottom="@id/textViewJoyButton"/>
-
-            <!-- Touch panel -->
-            <TextView
-                android:id="@+id/textView11" android:layout_below="@id/textViewJoyButton"
-                android:layout_width="wrap_content" android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical" android:text="@string/cap"
-                android:paddingTop="30dp"/>
-            <ImageView
-                android:id="@+id/cap" android:layout_marginLeft="8dp"
-                android:layout_height="wrap_content" android:layout_width="wrap_content"
-                android:layout_gravity="left" android:src="@drawable/droid_off"
-                android:layout_toRightOf="@id/textView11"
-                android:layout_alignBottom="@id/textView11"/>
-        </RelativeLayout>
-   </ScrollView>
+	android:layout_width="match_parent" android:layout_height="match_parent"
+	android:orientation="vertical" android:background="@drawable/background_holo_dark">
+	<LinearLayout android:id="@+id/InOutTabContainer"
+		android:layout_width="fill_parent" android:orientation="horizontal"
+		android:layout_height="48dip">
+		<TextView android:layout_width="wrap_content" android:id="@+id/inputLabel"
+			android:text="@string/input" style="@style/DemoKitTextBase"
+			android:gravity="center" android:layout_weight="1"
+			android:background="@drawable/tab_focused_holo_dark"
+			android:clickable="true" android:layout_gravity="center"
+			android:layout_height="match_parent"></TextView>
+		<TextView android:text="@string/output" android:id="@+id/outputLabel"
+			android:layout_width="wrap_content" android:layout_height="match_parent"
+			style="@style/DemoKitTextBase" android:gravity="center"
+			android:layout_weight="1" android:layout_gravity="center"
+			android:clickable="true"></TextView>
+	</LinearLayout>
+	<FrameLayout android:layout_width="match_parent"
+		android:layout_height="wrap_content" android:orientation="vertical"
+		android:paddingLeft="10dip" android:paddingRight="10dip">
+		<include layout="@layout/inputcontainer" android:id="@+id/inputContainer"
+			android:layout_width="match_parent" android:layout_height="wrap_content" />
+		<include layout="@layout/outputcontainer" android:id="@+id/outputContainer"
+			android:layout_width="match_parent" android:layout_height="wrap_content" />
+	</FrameLayout>
 </LinearLayout>
diff --git a/demokit/app/res/layout/no_device.xml b/demokit/app/res/layout/no_device.xml
new file mode 100644
index 0000000..b8492d4
--- /dev/null
+++ b/demokit/app/res/layout/no_device.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent" android:layout_weight="1"
+	android:layout_height="fill_parent" android:orientation="vertical"
+	android:background="@drawable/background_holo_dark"
+	android:layout_gravity="fill_horizontal">
+	<TextView android:layout_width="match_parent"
+		android:layout_height="wrap_content" android:id="@+id/textView1"
+		android:layout_weight="1" android:text="@string/no_device" style="@style/DemoKitNoDevice"
+		android:gravity="center"></TextView>
+	<ImageView android:id="@+id/imageView1" android:layout_width="match_parent"
+		android:layout_height="wrap_content" android:layout_gravity="fill_vertical"
+		android:src="@drawable/demokit_splash" android:layout_weight="1"></ImageView>
+</LinearLayout>
diff --git a/demokit/app/res/layout/output_tablet.xml b/demokit/app/res/layout/output_tablet.xml
new file mode 100644
index 0000000..bca2a7b
--- /dev/null
+++ b/demokit/app/res/layout/output_tablet.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent" android:layout_height="wrap_content"
+	android:orientation="vertical" android:layout_weight="1">
+	<include layout="@layout/servo_tablet" android:id="@+id/servo_tablet"
+		android:layout_width="match_parent" android:layout_height="wrap_content"
+		android:layout_weight="0" android:layout_gravity="center_vertical" />
+	<include layout="@layout/relay_tablet" android:layout_width="fill_parent" android:layout_weight="0" 
+		android:layout_height="wrap_content" />
+	<include layout="@layout/leds_tablet" android:layout_width="match_parent" android:layout_weight="1" 
+		android:layout_height="wrap_content" />
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/outputcontainer.xml b/demokit/app/res/layout/outputcontainer.xml
new file mode 100644
index 0000000..95b8b77
--- /dev/null
+++ b/demokit/app/res/layout/outputcontainer.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent" android:layout_height="wrap_content"
+	android:orientation="vertical" >
+	<include layout="@layout/servorelay" android:id="@+id/servoRelay_ref"
+		android:layout_height="wrap_content" />
+	<include layout="@layout/color_sliders" android:id="@+id/leds1"
+		android:layout_width="match_parent" android:layout_height="wrap_content" />
+	<include layout="@layout/color_sliders" android:id="@+id/leds2"
+		android:layout_width="match_parent" android:layout_height="wrap_content" />
+	<include layout="@layout/color_sliders" android:id="@+id/leds3"
+		android:layout_width="match_parent" android:layout_height="wrap_content" />
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/relay_tablet.xml b/demokit/app/res/layout/relay_tablet.xml
new file mode 100644
index 0000000..18f229b
--- /dev/null
+++ b/demokit/app/res/layout/relay_tablet.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
+	android:orientation="horizontal" android:layout_height="wrap_content">
+	<include android:id="@+id/relay1" layout="@layout/relaybutton"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<include android:id="@+id/relay2" layout="@layout/relaybutton"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/relaybutton.xml b/demokit/app/res/layout/relaybutton.xml
new file mode 100644
index 0000000..f6b8584
--- /dev/null
+++ b/demokit/app/res/layout/relaybutton.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_height="wrap_content" android:orientation="vertical"
+	android:layout_width="wrap_content" android:layout_marginTop="-10dip">
+	<TextView android:text="@string/relay1Label" style="@style/DemoKitControlLabel"
+		android:layout_width="match_parent" android:gravity="left"
+		android:layout_height="wrap_content"></TextView>
+	<ToggleButton style="@style/DemoKitRelayButton"
+		android:textOff="@string/off" android:textOn="@string/on"
+		android:layout_height="wrap_content" android:layout_width="match_parent"></ToggleButton>
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/servo.xml b/demokit/app/res/layout/servo.xml
new file mode 100644
index 0000000..6444773
--- /dev/null
+++ b/demokit/app/res/layout/servo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent" android:orientation="vertical"
+	android:layout_height="wrap_content">
+	<TextView android:layout_height="wrap_content" style="@style/DemoKitControlLabel"
+		android:layout_width="wrap_content" android:text="@string/servo1Label"></TextView>
+	<com.google.android.DemoKit.Slider
+		android:layout_height="wrap_content" android:layout_width="match_parent"
+		android:layout_marginTop="-7dip"></com.google.android.DemoKit.Slider>
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/servo_tablet.xml b/demokit/app/res/layout/servo_tablet.xml
new file mode 100644
index 0000000..23c6ee8
--- /dev/null
+++ b/demokit/app/res/layout/servo_tablet.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
+	android:layout_width="fill_parent" android:orientation="horizontal"
+	android:layout_height="wrap_content"
+	android:padding="20dip">
+	<include layout="@layout/servo" android:id="@+id/servo1"
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:layout_weight="1" />
+	<include layout="@layout/servo" android:id="@+id/servo2"
+		android:layout_weight="1" android:layout_width="fill_parent"
+		android:layout_height="wrap_content" />
+	<include layout="@layout/servo" android:id="@+id/servo3"
+		android:layout_weight="1" android:layout_width="fill_parent"
+		android:layout_height="wrap_content" />
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/servorelay.xml b/demokit/app/res/layout/servorelay.xml
new file mode 100644
index 0000000..6225731
--- /dev/null
+++ b/demokit/app/res/layout/servorelay.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/servoRelay" android:layout_width="match_parent"
+	android:orientation="horizontal" android:layout_height="wrap_content">
+	<LinearLayout android:layout_width="0dip"
+		android:layout_height="wrap_content" android:id="@+id/servos"
+		android:orientation="vertical" android:layout_weight="2">
+		<include layout="@layout/servo" android:id="@+id/servo1"
+			android:layout_width="match_parent" android:layout_height="wrap_content"
+			android:layout_weight="0.7" />
+		<include layout="@layout/servo" android:id="@+id/servo2"
+			android:layout_width="match_parent" android:layout_height="wrap_content" />
+		<include layout="@layout/servo" android:id="@+id/servo3"
+			android:layout_width="match_parent" android:layout_height="wrap_content" />
+	</LinearLayout>
+	<LinearLayout android:layout_height="wrap_content"
+		android:id="@+id/relays" android:orientation="vertical"
+		android:layout_width="0dip" android:layout_weight="1" android:padding="-10dip">
+		<include android:id="@+id/relay1" layout="@layout/relaybutton"
+			android:layout_width="wrap_content" android:layout_height="wrap_content" />
+		<include android:id="@+id/relay2" layout="@layout/relaybutton"
+			android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/templightcontainer.xml b/demokit/app/res/layout/templightcontainer.xml
new file mode 100644
index 0000000..d3a2ba1
--- /dev/null
+++ b/demokit/app/res/layout/templightcontainer.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/TempLightContainer" android:layout_width="fill_parent"
+	android:orientation="horizontal" android:layout_height="wrap_content"
+	android:paddingLeft="5dip">
+	<LinearLayout android:id="@+id/TempContainer"
+		android:layout_width="fill_parent" android:orientation="vertical"
+		android:layout_weight="1" android:layout_height="wrap_content">
+		<TextView android:id="@+id/tempLabel" android:text="Temp"
+			style="@style/DemoKitControlLabel" android:gravity="center"
+			android:layout_weight="1"></TextView>
+		<TextView android:text="45º" android:id="@+id/tempValue"
+			style="@style/DemoKitMeasurement" android:layout_weight="1"></TextView>
+		<TextView android:text=" " android:id="@+id/hiddenPercentValue"
+			style="@style/DemoKitControlLabel" android:gravity="center"
+			android:layout_weight="1"></TextView>
+	</LinearLayout>
+	<LinearLayout android:id="@+id/LightContainer"
+		android:layout_width="fill_parent" android:orientation="vertical"
+		android:layout_weight="1" android:layout_height="wrap_content">
+		<TextView android:id="@+id/lightPercentLabel" android:text="Light"
+			style="@style/DemoKitControlLabel" android:gravity="center"
+			android:layout_weight="1"></TextView>
+		<LinearLayout android:id="@+id/lightPercentValueContainer"
+			android:layout_width="fill_parent" android:orientation="horizontal"
+			android:layout_height="wrap_content">
+			<TextView android:text="23" android:id="@+id/lightPercentValue"
+				style="@style/DemoKitMeasurement"></TextView>
+			<TextView android:id="@+id/lightPercentSuffix" style="@style/DemoKitMeasurementSuffix"
+				android:gravity="top" android:text="%"></TextView>
+		</LinearLayout>
+		<LinearLayout android:id="@+id/lightRawValueContainer"
+			android:layout_width="wrap_content" android:orientation="horizontal"
+			android:layout_height="wrap_content">
+			<TextView android:text="200" android:id="@+id/lightRawValue"
+				style="@style/DemoKitControlLightLowerLabel"></TextView>
+			<TextView android:text="/1024"
+				style="@style/DemoKitControlLightLowerLabelConst"></TextView>
+		</LinearLayout>
+	</LinearLayout>
+</LinearLayout>
+
diff --git a/demokit/app/res/layout/vertical_color_sliders.xml b/demokit/app/res/layout/vertical_color_sliders.xml
new file mode 100644
index 0000000..db65e1e
--- /dev/null
+++ b/demokit/app/res/layout/vertical_color_sliders.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent" android:layout_height="wrap_content"
+	android:orientation="horizontal" >
+	<include layout="@layout/vertical_led_slider"
+		android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginRight="20dip"/>
+	<include layout="@layout/vertical_led_slider"
+		android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginRight="20dip"/>
+	<include layout="@layout/vertical_led_slider"
+		android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginRight="20dip"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/demokit/app/res/layout/vertical_led_slider.xml b/demokit/app/res/layout/vertical_led_slider.xml
new file mode 100644
index 0000000..a649648
--- /dev/null
+++ b/demokit/app/res/layout/vertical_led_slider.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="wrap_content" android:layout_height="match_parent"
+	android:orientation="vertical" android:layout_weight="1" android:layout_marginRight="30dip" android:paddingRight="20dip">
+	<TextView android:text="@string/ledLabel" style="@style/DemoKitLEDText"
+		android:layout_gravity="center" android:layout_height="20dip"
+		android:clickable="true" />
+	<com.google.android.DemoKit.VerticalSlider
+		android:layout_height="wrap_content" android:layout_width="wrap_content"
+		android:layout_weight="1" android:layout_gravity="center">
+	</com.google.android.DemoKit.VerticalSlider>
+		<TextView android:text="155" style="@style/DemoKitLEDText"
+			android:layout_height="20dip" android:layout_gravity="center"
+			android:gravity="center" android:clickable="true" />
+</LinearLayout>
+
diff --git a/demokit/app/res/values/attrs.xml b/demokit/app/res/values/attrs.xml
new file mode 100644
index 0000000..eeb5e0a
--- /dev/null
+++ b/demokit/app/res/values/attrs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<declare-styleable name="com.google.android.DemoKit.Slider">
+		<attr name="vertical" format="boolean" />
+	</declare-styleable>
+</resources> 
diff --git a/demokit/app/res/values/colors.xml b/demokit/app/res/values/colors.xml
new file mode 100644
index 0000000..c6d917f
--- /dev/null
+++ b/demokit/app/res/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<color name="DemoKitTextWhite">#FFF</color>
+	<color name="DemoKitLabelGray">#666</color>
+</resources>
diff --git a/demokit/app/res/values/strings.xml b/demokit/app/res/values/strings.xml
index 8a5d45d..740b91e 100644
--- a/demokit/app/res/values/strings.xml
+++ b/demokit/app/res/values/strings.xml
@@ -1,38 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="hello">Hello World, DemoKitActivity!</string>
-    <string name="app_name">DemoKit</string>
-    <string name="button">button</string>
-    <string name="button1">1</string>
-    <string name="button2">2</string>
-    <string name="button3">3</string>
-    <string name="led1Red">Led 1 Red</string>
-    <string name="led1Green">Led 1 Green</string>
-    <string name="led1Blue">Led 1 Blue</string>
-    <string name="led2Red">Led 2 Red</string>
-    <string name="led2Green">Led 2 Green</string>
-    <string name="led2Blue">Led 2 Blue</string>
-    <string name="led3Red">Led 3 Red</string>
-    <string name="led3Green">Led 3 Green</string>
-    <string name="led3Blue">Led 3 Blue</string>
-    <string name="relay1">1</string>
-    <string name="relay2">2</string>
-    <string name="temperature">Temperature</string>
-    <string name="light">Light</string>
-    <string name="buttons">Buttons</string>
-    <string name="relays">Relays</string>
-    <string name="led1">Led 1</string>
-    <string name="led2">Led 2</string>
-    <string name="led3">Led 3</string>
-    <string name="red">Red</string>
-    <string name="green">Green</string>
-    <string name="blue">Blue</string>
-    <string name="servos">Servos</string>
-    <string name="x">X</string>
-    <string name="y">Y</string>
-    <string name="joystick">Joystick</string>
-    <string name="cap">Cap Button</string>
-    <string name="servo1">1</string>
-    <string name="servo2">2</string>
-    <string name="servo3">3</string>
+	<string name="app_name">DemoKit</string>
+	<string name="input">In</string>
+	<string name="output">Out</string>
+	<string name="no_device">Please connect a DemoKit board.</string>
+	<string name="servo1Label">Servo<sub>1</sub></string>
+	<string name="ledLabel">LED<sub>1</sub></string>
+	<string name="relay1Label">Relay<sub>1</sub></string>
+	<string name="relay2Label">Relay<sub>2</sub></string>
+	<string name="off">Off</string>
+	<string name="on">On</string>
 </resources>
diff --git a/demokit/app/res/values/styles.xml b/demokit/app/res/values/styles.xml
new file mode 100644
index 0000000..d2f68c7
--- /dev/null
+++ b/demokit/app/res/values/styles.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<style name="DemoKitTextBase" parent="@android:style/TextAppearance.Medium">
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:typeface">sans</item>
+		<item name="android:textSize">24dip</item>
+		<item name="android:textColor">@color/DemoKitTextWhite</item>
+		<item name="android:background">@null</item>
+		<item name="android:includeFontPadding">false</item>
+	</style>
+	<style name="DemoKitControlLabel" parent="@style/DemoKitTextBase">
+		<item name="android:textSize">15dip</item>
+		<item name="android:textColor">@color/DemoKitLabelGray</item>
+		<item name="android:includeFontPadding">true</item>
+		<item name="android:layout_height">25dip</item>
+		<item name="android:lineSpacingExtra">2dip</item>
+	</style>
+	<style name="DemoKitControlLightLowerLabel" parent="@style/DemoKitTextBase">
+		<item name="android:layout_marginTop">-2dip</item>
+		<item name="android:textSize">15dip</item>
+		<item name="android:textColor">@color/DemoKitTextWhite</item>
+	</style>
+	<style name="DemoKitControlLightLowerLabelConst" parent="@style/DemoKitControlLightLowerLabel">
+		<item name="android:textColor">@color/DemoKitLabelGray</item>
+	</style>
+	<style name="DemoKitMeasurement" parent="@style/DemoKitTextBase">
+		<item name="android:textSize">40dip</item>
+		<item name="android:layout_marginTop">-8dip</item>
+		<item name="android:layout_marginBottom">0dip</item>
+		<item name="android:layout_gravity">top</item>
+	</style>
+	<style name="DemoKitLEDText" parent="@style/DemoKitControlLabel">
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+	</style>
+	<style name="DemoKitNoDevice" parent="@style/DemoKitTextBase">
+		<item name="android:textSize">30dip</item>
+	</style>
+	<style name="DemoKitMeasurementSuffix" parent="@style/DemoKitMeasurement">
+		<item name="android:textSize">20dip</item>
+	</style>
+	<style name="DemoKitButtonDisplay">
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_weight">1</item>
+		<item name="android:gravity">center_horizontal|bottom</item>
+		<item name="android:layout_gravity">center</item>
+		<item name="android:layout_margin">2dip</item>
+		<item name="android:padding">2dip</item>
+	</style>
+	<style name="DemoKitRelayButton" parent="@style/DemoKitTextBase">
+		<item name="android:textSize">15dip</item>
+		<item name="android:layout_marginTop">-10dip</item>
+		<item name="android:layout_height">70dip</item>
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:textColor">@color/DemoKitTextWhite</item>
+		<item name="android:gravity">center</item>
+		<item name="android:background">@drawable/toggle_button_off_holo_dark</item>
+	</style>
+</resources>