diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar.xml b/AndorsTrail/res/drawable/ui_charcoal_buttonbar.xml
new file mode 100644
index 000000000..b0d2c4665
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_buttonbar.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg.xml b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg.xml
new file mode 100644
index 000000000..cfa9e145b
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_disabled_pressed.9.png
new file mode 100644
index 000000000..4c5877ec4
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_disabled_unpressed.9.png
new file mode 100644
index 000000000..02d49b35e
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_enabled_pressed.9.png
new file mode 100644
index 000000000..70ecfd9cf
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_enabled_unpressed.9.png
new file mode 100644
index 000000000..e05db1b43
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame.xml b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame.xml
new file mode 100644
index 000000000..da65cfaf5
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hleft.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hleft.9.png
new file mode 100644
index 000000000..9c7b6b26e
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hleft.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hmid.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hmid.9.png
new file mode 100644
index 000000000..a3a2b04f0
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hmid.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hright.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hright.9.png
new file mode 100644
index 000000000..bb3acf7ff
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hright.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_solo.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_solo.9.png
new file mode 100644
index 000000000..97ca80618
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_solo.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vbottom.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vbottom.9.png
new file mode 100644
index 000000000..dc5311b13
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vbottom.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vmid.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vmid.9.png
new file mode 100644
index 000000000..d4e9eb120
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vmid.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vtop.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vtop.9.png
new file mode 100644
index 000000000..4a551aa18
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vtop.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_groupindicator.xml b/AndorsTrail/res/drawable/ui_charcoal_groupindicator.xml
new file mode 100644
index 000000000..327853166
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_groupindicator.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
diff --git a/AndorsTrail/res/drawable/ui_charcoal_lightframe.9.png b/AndorsTrail/res/drawable/ui_charcoal_lightframe.9.png
new file mode 100644
index 000000000..da36e29b0
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_lightframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_lightframe_highlight.9.png b/AndorsTrail/res/drawable/ui_charcoal_lightframe_highlight.9.png
new file mode 100644
index 000000000..711ca02c6
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_lightframe_highlight.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_listseparator.xml b/AndorsTrail/res/drawable/ui_charcoal_listseparator.xml
new file mode 100644
index 000000000..d3215d574
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_listseparator.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
diff --git a/AndorsTrail/res/drawable/ui_charcoal_radiobutton.xml b/AndorsTrail/res/drawable/ui_charcoal_radiobutton.xml
new file mode 100644
index 000000000..f838e679a
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_radiobutton.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AndorsTrail/res/drawable/ui_charcoal_radiobutton_disabled_checked.9.png b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_disabled_checked.9.png
new file mode 100644
index 000000000..f0ebb6430
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_disabled_checked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_radiobutton_disabled_unchecked.9.png b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_disabled_unchecked.9.png
new file mode 100644
index 000000000..cccac0245
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_disabled_unchecked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_radiobutton_enabled_checked.9.png b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_enabled_checked.9.png
new file mode 100644
index 000000000..b16ec1a75
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_enabled_checked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_radiobutton_enabled_unchecked.9.png b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_enabled_unchecked.9.png
new file mode 100644
index 000000000..e0a82fb1f
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_enabled_unchecked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_richframe.9.png b/AndorsTrail/res/drawable/ui_charcoal_richframe.9.png
new file mode 100644
index 000000000..e3a3bb773
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_richframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner.xml b/AndorsTrail/res/drawable/ui_charcoal_spinner.xml
new file mode 100644
index 000000000..508402f80
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_spinner.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_arrow.9.png b/AndorsTrail/res/drawable/ui_charcoal_spinner_arrow.9.png
new file mode 100644
index 000000000..363b95b43
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_spinner_arrow.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_bg.xml b/AndorsTrail/res/drawable/ui_charcoal_spinner_bg.xml
new file mode 100644
index 000000000..a2e84b072
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_spinner_bg.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_spinner_disabled_pressed.9.png
new file mode 100644
index 000000000..ab84e0d00
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_spinner_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_spinner_disabled_unpressed.9.png
new file mode 100644
index 000000000..29a033055
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_spinner_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_spinner_enabled_pressed.9.png
new file mode 100644
index 000000000..27f8cca23
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_spinner_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_spinner_enabled_unpressed.9.png
new file mode 100644
index 000000000..a181e9722
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_spinner_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_list_bg.xml b/AndorsTrail/res/drawable/ui_charcoal_spinner_list_bg.xml
new file mode 100644
index 000000000..3c59cbdcd
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_spinner_list_bg.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/AndorsTrail/res/drawable/ui_charcoal_stdframe.9.png b/AndorsTrail/res/drawable/ui_charcoal_stdframe.9.png
new file mode 100644
index 000000000..7c24cf987
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_stdframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_submenu_indicator.9.png b/AndorsTrail/res/drawable/ui_charcoal_submenu_indicator.9.png
new file mode 100644
index 000000000..57469e341
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_submenu_indicator.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabframe.9.png b/AndorsTrail/res/drawable/ui_charcoal_tabframe.9.png
new file mode 100644
index 000000000..41982e5d2
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_tabframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabframe_topoverlay.9.png b/AndorsTrail/res/drawable/ui_charcoal_tabframe_topoverlay.9.png
new file mode 100644
index 000000000..e0339750a
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_tabframe_topoverlay.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabwidget.xml b/AndorsTrail/res/drawable/ui_charcoal_tabwidget.xml
new file mode 100644
index 000000000..b89b59617
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_tabwidget.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabwidget_disabled_selected.9.png b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_disabled_selected.9.png
new file mode 100644
index 000000000..6ef232afa
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_disabled_selected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabwidget_disabled_unselected.9.png b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_disabled_unselected.9.png
new file mode 100644
index 000000000..7ba6ffc0c
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_disabled_unselected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabwidget_enabled_selected.9.png b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_enabled_selected.9.png
new file mode 100644
index 000000000..abcc324ba
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_enabled_selected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabwidget_enabled_unselected.9.png b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_enabled_unselected.9.png
new file mode 100644
index 000000000..434814e42
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_enabled_unselected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_textbutton.xml b/AndorsTrail/res/drawable/ui_charcoal_textbutton.xml
new file mode 100644
index 000000000..7391c634f
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_textbutton.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AndorsTrail/res/drawable/ui_charcoal_textbutton_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_textbutton_disabled_pressed.9.png
new file mode 100644
index 000000000..f247d2fe1
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_textbutton_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_textbutton_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_textbutton_disabled_unpressed.9.png
new file mode 100644
index 000000000..382d4b411
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_textbutton_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_textbutton_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_textbutton_enabled_pressed.9.png
new file mode 100644
index 000000000..07274a5f0
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_textbutton_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_textbutton_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_textbutton_enabled_unpressed.9.png
new file mode 100644
index 000000000..a7d93226d
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_textbutton_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_togglebutton.xml b/AndorsTrail/res/drawable/ui_charcoal_togglebutton.xml
new file mode 100644
index 000000000..708e61857
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_togglebutton.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_pressed.9.png
index c90c5b833..feda4d421 100644
Binary files a/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_pressed.9.png and b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_unpressed.9.png
index 3235b6d71..a9787e910 100644
Binary files a/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_unpressed.9.png and b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_pressed.9.png
index fc9578e79..a42bce0cf 100644
Binary files a/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_pressed.9.png and b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_unpressed.9.png
index 93240c54d..6e4c73113 100644
Binary files a/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_unpressed.9.png and b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hleft.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hleft.9.png
index 7b93f26c5..c2454594d 100644
Binary files a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hleft.9.png and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hleft.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hmid.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hmid.9.png
index d9f231855..8f79fb040 100644
Binary files a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hmid.9.png and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hmid.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hright.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hright.9.png
index 353468b84..d25f5064c 100644
Binary files a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hright.9.png and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hright.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_solo.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_solo.9.png
index 096d9e29e..fbe93818d 100644
Binary files a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_solo.9.png and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_solo.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vbottom.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vbottom.9.png
index 5bf1b9d56..9389a08bb 100644
Binary files a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vbottom.9.png and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vbottom.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vmid.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vmid.9.png
index ed9328a67..4d22ea63b 100644
Binary files a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vmid.9.png and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vmid.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vtop.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vtop.9.png
index 1b8e5cee2..8e51c8deb 100644
Binary files a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vtop.9.png and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vtop.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_lightframe.9.png b/AndorsTrail/res/drawable/ui_green_lightframe.9.png
index dab82faa7..9153bdcd5 100644
Binary files a/AndorsTrail/res/drawable/ui_green_lightframe.9.png and b/AndorsTrail/res/drawable/ui_green_lightframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_lightframe_highlight.9.png b/AndorsTrail/res/drawable/ui_green_lightframe_highlight.9.png
index 1a89eb039..ab4dacac2 100644
Binary files a/AndorsTrail/res/drawable/ui_green_lightframe_highlight.9.png and b/AndorsTrail/res/drawable/ui_green_lightframe_highlight.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_checked.9.png b/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_checked.9.png
index 1d8baa827..2ca9b1f5a 100644
Binary files a/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_checked.9.png and b/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_checked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_unchecked.9.png b/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_unchecked.9.png
index e901fd5ba..0b721ac68 100644
Binary files a/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_unchecked.9.png and b/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_unchecked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_checked.9.png b/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_checked.9.png
index ef266f554..7fe938e6c 100644
Binary files a/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_checked.9.png and b/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_checked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_unchecked.9.png b/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_unchecked.9.png
index bd76e59c9..600c0ae4f 100644
Binary files a/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_unchecked.9.png and b/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_unchecked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_richframe.9.png b/AndorsTrail/res/drawable/ui_green_richframe.9.png
index 55d25b8d0..27e92e176 100644
Binary files a/AndorsTrail/res/drawable/ui_green_richframe.9.png and b/AndorsTrail/res/drawable/ui_green_richframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_spinner_arrow.9.png b/AndorsTrail/res/drawable/ui_green_spinner_arrow.9.png
index b39010a46..7b715ad56 100644
Binary files a/AndorsTrail/res/drawable/ui_green_spinner_arrow.9.png and b/AndorsTrail/res/drawable/ui_green_spinner_arrow.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_spinner_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_green_spinner_disabled_pressed.9.png
index 0ddbee67b..a8f849a5a 100644
Binary files a/AndorsTrail/res/drawable/ui_green_spinner_disabled_pressed.9.png and b/AndorsTrail/res/drawable/ui_green_spinner_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_spinner_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_green_spinner_disabled_unpressed.9.png
index d3579fd14..06c3fc5a4 100644
Binary files a/AndorsTrail/res/drawable/ui_green_spinner_disabled_unpressed.9.png and b/AndorsTrail/res/drawable/ui_green_spinner_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_spinner_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_green_spinner_enabled_pressed.9.png
index 78f0393b2..b845db2fa 100644
Binary files a/AndorsTrail/res/drawable/ui_green_spinner_enabled_pressed.9.png and b/AndorsTrail/res/drawable/ui_green_spinner_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_spinner_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_green_spinner_enabled_unpressed.9.png
index 44872ffe6..650bab900 100644
Binary files a/AndorsTrail/res/drawable/ui_green_spinner_enabled_unpressed.9.png and b/AndorsTrail/res/drawable/ui_green_spinner_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_stdframe.9.png b/AndorsTrail/res/drawable/ui_green_stdframe.9.png
index 238124e03..ec4d976cb 100644
Binary files a/AndorsTrail/res/drawable/ui_green_stdframe.9.png and b/AndorsTrail/res/drawable/ui_green_stdframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_submenu_indicator.9.png b/AndorsTrail/res/drawable/ui_green_submenu_indicator.9.png
index fd2c903a1..87647019b 100644
Binary files a/AndorsTrail/res/drawable/ui_green_submenu_indicator.9.png and b/AndorsTrail/res/drawable/ui_green_submenu_indicator.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_tabframe.9.png b/AndorsTrail/res/drawable/ui_green_tabframe.9.png
index e4a7a0aff..cb7272b8f 100644
Binary files a/AndorsTrail/res/drawable/ui_green_tabframe.9.png and b/AndorsTrail/res/drawable/ui_green_tabframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_tabframe_topoverlay.9.png b/AndorsTrail/res/drawable/ui_green_tabframe_topoverlay.9.png
index dbb7204a6..9998d9e9f 100644
Binary files a/AndorsTrail/res/drawable/ui_green_tabframe_topoverlay.9.png and b/AndorsTrail/res/drawable/ui_green_tabframe_topoverlay.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_selected.9.png b/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_selected.9.png
index 35e49a1f9..e87f995ca 100644
Binary files a/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_selected.9.png and b/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_selected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_unselected.9.png b/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_unselected.9.png
index 825588db1..5c550ce2d 100644
Binary files a/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_unselected.9.png and b/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_unselected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_selected.9.png b/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_selected.9.png
index e939c5be2..ae1afb13a 100644
Binary files a/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_selected.9.png and b/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_selected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_unselected.9.png b/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_unselected.9.png
index a56893e06..011ce1d9b 100644
Binary files a/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_unselected.9.png and b/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_unselected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_textbutton_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_green_textbutton_disabled_pressed.9.png
index 437f3d7d4..889338488 100644
Binary files a/AndorsTrail/res/drawable/ui_green_textbutton_disabled_pressed.9.png and b/AndorsTrail/res/drawable/ui_green_textbutton_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_textbutton_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_green_textbutton_disabled_unpressed.9.png
index af5af99ea..77dd8553b 100644
Binary files a/AndorsTrail/res/drawable/ui_green_textbutton_disabled_unpressed.9.png and b/AndorsTrail/res/drawable/ui_green_textbutton_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_textbutton_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_green_textbutton_enabled_pressed.9.png
index 19ef02bfe..f1c5a4e8b 100644
Binary files a/AndorsTrail/res/drawable/ui_green_textbutton_enabled_pressed.9.png and b/AndorsTrail/res/drawable/ui_green_textbutton_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_textbutton_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_green_textbutton_enabled_unpressed.9.png
index 2e0258b99..83f7d567a 100644
Binary files a/AndorsTrail/res/drawable/ui_green_textbutton_enabled_unpressed.9.png and b/AndorsTrail/res/drawable/ui_green_textbutton_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/values-v14/ui_theme.xml b/AndorsTrail/res/values-v14/ui_theme.xml
index 42bad700b..69b82f5c4 100644
--- a/AndorsTrail/res/values-v14/ui_theme.xml
+++ b/AndorsTrail/res/values-v14/ui_theme.xml
@@ -1,25 +1,29 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AndorsTrail/res/values/arrays.xml b/AndorsTrail/res/values/arrays.xml
index 4cbaabd5d..e7c3ec4eb 100644
--- a/AndorsTrail/res/values/arrays.xml
+++ b/AndorsTrail/res/values/arrays.xml
@@ -1,175 +1,177 @@
-
-
-
-
-
- - @string/questlog_includecompleted_hidecompleted
- - @string/questlog_includecompleted_includecompleted
- - @string/questlog_includecompleted_onlycompleted
-
-
-
-
- - @string/inventory_category_all
- - @string/inventory_category_weapons
- - @string/inventory_category_armor
- - @string/inventory_category_usable
- - @string/inventory_category_quest
- - @string/inventory_category_other
-
-
-
-
- - @string/inventory_sort_custom
- - @string/inventory_sort_name
- - @string/inventory_sort_price
- - @string/inventory_sort_quantity
- - @string/inventory_sort_rarity
- - @string/inventory_sort_type
-
-
-
-
- - @string/skill_category_all
- - @string/skill_category_offense
- - @string/skill_category_defense
- - @string/skill_category_criticals
- - @string/skill_category_immunity
- - @string/skill_category_utility
- - @string/skill_category_speciality
- - @string/skill_category_proficiency
-
-
-
-
- - @string/skill_sort_unsorted
- - @string/skill_sort_name
- - @string/skill_sort_points
- - @string/skill_sort_unlocked
-
-
-
-
- - @string/shoplist_sort_custom
- - @string/shoplist_sort_name
- - @string/shoplist_sort_price
- - @string/shoplist_sort_quantity
- - @string/shoplist_sort_rarity
- - @string/shoplist_sort_type
-
-
-
- - @string/preferences_display_loot_dialog
- - @string/preferences_display_loot_dialog_on_items
- - @string/preferences_display_loot_dialog_on_items_or_toast
- - @string/preferences_display_loot_toast
- - @string/preferences_display_loot_toast_on_items
- - @string/preferences_display_loot_never
-
-
- - 0
- - 3
- - 4
- - 1
- - 5
- - 2
-
-
-
- - @string/preferences_attackspeed_instant
- - @string/preferences_attackspeed_fast
- - @string/preferences_attackspeed_normal
- - @string/preferences_attackspeed_slow
-
-
- - 0
- - 400
- - 1000
- - 1500
-
-
-
- - @string/preferences_movementmethods_straight
- - @string/preferences_movementmethods_avoid
-
-
- - 0
- - 1
-
-
-
-
- - @string/preferences_display_theme_blue
- - @string/preferences_display_theme_green
-
-
- - 0
- - 1
-
-
-
-
- - @string/preferences_display_scaling_factor_normal
- - @string/preferences_display_scaling_factor_50_percent_larger
- - @string/preferences_display_scaling_factor_double
-
-
- - 1.0f
- - 1.5f
- - 2.0f
-
-
-
- - @string/preferences_movement_dpad_positions_disabled
- - @string/preferences_movement_dpad_positions_lower_right
- - @string/preferences_movement_dpad_positions_lower_left
- - @string/preferences_movement_dpad_positions_center_bottom
- - @string/preferences_movement_dpad_positions_center_left
- - @string/preferences_movement_dpad_positions_center_right
- - @string/preferences_movement_dpad_positions_upper_left
- - @string/preferences_movement_dpad_positions_upper_right
- - @string/preferences_movement_dpad_positions_center_top
-
-
- - 0
- - 1
- - 2
- - 3
- - 4
- - 5
- - 6
- - 7
- - 8
-
-
-
- - @string/preferences_display_overwrite_savegame_entries_always_confirm
- - @string/preferences_display_overwrite_savegame_entries_confirm_overwrite
- - @string/preferences_display_overwrite_savegame_entries_never_confirm
-
-
- - 0
- - 1
- - 2
-
-
-
- - @string/preferences_quickslots_placements_horizontal_center_bottom
- - @string/preferences_quickslots_placements_vertical_center_left
- - @string/preferences_quickslots_placements_vertical_center_right
- - @string/preferences_quickslots_placements_vertical_bottom_left
- - @string/preferences_quickslots_placements_horizontal_bottom_left
- - @string/preferences_quickslots_placements_horizontal_bottom_right
- - @string/preferences_quickslots_placements_vertical_bottom_right
-
-
- - 0
- - 1
- - 2
- - 3
- - 4
- - 5
- - 6
-
-
-
+
+
+
+
+
+ - @string/questlog_includecompleted_hidecompleted
+ - @string/questlog_includecompleted_includecompleted
+ - @string/questlog_includecompleted_onlycompleted
+
+
+
+
+ - @string/inventory_category_all
+ - @string/inventory_category_weapons
+ - @string/inventory_category_armor
+ - @string/inventory_category_usable
+ - @string/inventory_category_quest
+ - @string/inventory_category_other
+
+
+
+
+ - @string/inventory_sort_custom
+ - @string/inventory_sort_name
+ - @string/inventory_sort_price
+ - @string/inventory_sort_quantity
+ - @string/inventory_sort_rarity
+ - @string/inventory_sort_type
+
+
+
+
+ - @string/skill_category_all
+ - @string/skill_category_offense
+ - @string/skill_category_defense
+ - @string/skill_category_criticals
+ - @string/skill_category_immunity
+ - @string/skill_category_utility
+ - @string/skill_category_speciality
+ - @string/skill_category_proficiency
+
+
+
+
+ - @string/skill_sort_unsorted
+ - @string/skill_sort_name
+ - @string/skill_sort_points
+ - @string/skill_sort_unlocked
+
+
+
+
+ - @string/shoplist_sort_custom
+ - @string/shoplist_sort_name
+ - @string/shoplist_sort_price
+ - @string/shoplist_sort_quantity
+ - @string/shoplist_sort_rarity
+ - @string/shoplist_sort_type
+
+
+
+ - @string/preferences_display_loot_dialog
+ - @string/preferences_display_loot_dialog_on_items
+ - @string/preferences_display_loot_dialog_on_items_or_toast
+ - @string/preferences_display_loot_toast
+ - @string/preferences_display_loot_toast_on_items
+ - @string/preferences_display_loot_never
+
+
+ - 0
+ - 3
+ - 4
+ - 1
+ - 5
+ - 2
+
+
+
+ - @string/preferences_attackspeed_instant
+ - @string/preferences_attackspeed_fast
+ - @string/preferences_attackspeed_normal
+ - @string/preferences_attackspeed_slow
+
+
+ - 0
+ - 400
+ - 1000
+ - 1500
+
+
+
+ - @string/preferences_movementmethods_straight
+ - @string/preferences_movementmethods_avoid
+
+
+ - 0
+ - 1
+
+
+
+
+ - @string/preferences_display_theme_blue
+ - @string/preferences_display_theme_green
+ - @string/preferences_display_theme_charcoal
+
+
+ - 0
+ - 1
+ - 2
+
+
+
+
+ - @string/preferences_display_scaling_factor_normal
+ - @string/preferences_display_scaling_factor_50_percent_larger
+ - @string/preferences_display_scaling_factor_double
+
+
+ - 1.0f
+ - 1.5f
+ - 2.0f
+
+
+
+ - @string/preferences_movement_dpad_positions_disabled
+ - @string/preferences_movement_dpad_positions_lower_right
+ - @string/preferences_movement_dpad_positions_lower_left
+ - @string/preferences_movement_dpad_positions_center_bottom
+ - @string/preferences_movement_dpad_positions_center_left
+ - @string/preferences_movement_dpad_positions_center_right
+ - @string/preferences_movement_dpad_positions_upper_left
+ - @string/preferences_movement_dpad_positions_upper_right
+ - @string/preferences_movement_dpad_positions_center_top
+
+
+ - 0
+ - 1
+ - 2
+ - 3
+ - 4
+ - 5
+ - 6
+ - 7
+ - 8
+
+
+
+ - @string/preferences_display_overwrite_savegame_entries_always_confirm
+ - @string/preferences_display_overwrite_savegame_entries_confirm_overwrite
+ - @string/preferences_display_overwrite_savegame_entries_never_confirm
+
+
+ - 0
+ - 1
+ - 2
+
+
+
+ - @string/preferences_quickslots_placements_horizontal_center_bottom
+ - @string/preferences_quickslots_placements_vertical_center_left
+ - @string/preferences_quickslots_placements_vertical_center_right
+ - @string/preferences_quickslots_placements_vertical_bottom_left
+ - @string/preferences_quickslots_placements_horizontal_bottom_left
+ - @string/preferences_quickslots_placements_horizontal_bottom_right
+ - @string/preferences_quickslots_placements_vertical_bottom_right
+
+
+ - 0
+ - 1
+ - 2
+ - 3
+ - 4
+ - 5
+ - 6
+
+
+
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index 31b845a1e..a6c9fc04d 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -697,8 +697,9 @@ Every skill level increases the attack chance of weapons with %1$d %% of their o
Theme
Choose the UI theme. (requires restart)
- Blue
- Green
+ Cobalt
+ Manganate
+ Cast-Iron
Changing UI theme requires restart. Andor\'s Trail has been closed.
diff --git a/AndorsTrail/res/values/ui_theme.xml b/AndorsTrail/res/values/ui_theme.xml
index ce6f1e0cd..b79fa248b 100644
--- a/AndorsTrail/res/values/ui_theme.xml
+++ b/AndorsTrail/res/values/ui_theme.xml
@@ -199,7 +199,7 @@
-
+
+
+
+
+
+
+
+
+
+ #161616
+ #2e2e2e
+ #404040
+
+
+
+
+
+
+
+
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java
index 8f4746e9d..26224a527 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java
@@ -23,7 +23,8 @@ public class ThemeHelper {
public static enum Theme {
blue,
- green
+ green,
+ charcoal
}
private static final Map THEME_SETS = new HashMap();
@@ -33,6 +34,7 @@ public class ThemeHelper {
static {
THEME_SETS.put(Theme.blue, new ThemeSet(R.style.AndorsTrailTheme_Blue, R.style.AndorsTrailTheme_Blue_NoBackground, R.style.AndorsTrailDialogTheme_Blue));
THEME_SETS.put(Theme.green, new ThemeSet(R.style.AndorsTrailTheme_Green, R.style.AndorsTrailTheme_Green_NoBackground, R.style.AndorsTrailDialogTheme_Green));
+ THEME_SETS.put(Theme.charcoal, new ThemeSet(R.style.AndorsTrailTheme_Charcoal, R.style.AndorsTrailTheme_Charcoal_NoBackground, R.style.AndorsTrailDialogTheme_Charcoal));
}
public static int getThemeColor(Context context, int attrResId) {