From 7c64de3eb83568579ed0cc4878d8a0a508b010cd Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 8 Dec 2012 02:16:17 +0000
Subject: update themes with update_themes.py

---
 .../presets/interface_theme/back_to_black.xml      | 1379 +++++++++----------
 .../presets/interface_theme/blender_24x.xml        | 1325 +++++++++----------
 .../scripts/presets/interface_theme/elsyiun.xml    | 1381 ++++++++++----------
 .../scripts/presets/interface_theme/hexagon.xml    | 1345 +++++++++----------
 .../presets/interface_theme/ubuntu_ambiance.xml    | 1369 +++++++++----------
 5 files changed, 3407 insertions(+), 3392 deletions(-)

(limited to 'release')

diff --git a/release/scripts/presets/interface_theme/back_to_black.xml b/release/scripts/presets/interface_theme/back_to_black.xml
index 805aa9bd184..0a77aa132a8 100644
--- a/release/scripts/presets/interface_theme/back_to_black.xml
+++ b/release/scripts/presets/interface_theme/back_to_black.xml
@@ -1,849 +1,852 @@
 <bpy>
   <Theme>
+    <user_interface>
+      <ThemeUserInterface icon_file=""
+                          icon_alpha="1"
+                          axis_x="#dc0000"
+                          axis_y="#00dc00"
+                          axis_z="#0000dc">
+        <wcol_regular>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_regular>
+        <wcol_tool>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_tool>
+        <wcol_radio>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_radio>
+        <wcol_text>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#e4e4e4"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_text>
+        <wcol_option>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#000000ff"
+                             text="#c7c7c7"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_option>
+        <wcol_toggle>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_toggle>
+        <wcol_num>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#2a2a2aff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_num>
+        <wcol_numslider>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#111111ff"
+                             item="#33406bff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_numslider>
+        <wcol_box>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_box>
+        <wcol_menu>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#2a2a2aff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu>
+        <wcol_pulldown>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_pulldown>
+        <wcol_menu_back>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu_back>
+        <wcol_tooltip>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#191919e6"
+                             inner_sel="#2d2d2de6"
+                             item="#646464ff"
+                             text="#ffffff"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_tooltip>
+        <wcol_menu_item>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu_item>
+        <wcol_scroll>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_scroll>
+        <wcol_progress>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_progress>
+        <wcol_list_item>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_list_item>
+        <wcol_state>
+          <ThemeWidgetStateColors inner_anim="#56ff00"
+                                  inner_anim_sel="#56ff00"
+                                  inner_key="#fff400"
+                                  inner_key_sel="#fff400"
+                                  inner_driven="#b400ff"
+                                  inner_driven_sel="#9900e6"
+                                  blend="0.1">
+          </ThemeWidgetStateColors>
+        </wcol_state>
+        <panel>
+          <ThemePanelColors header="#000000ff"
+                            show_header="FALSE">
+          </ThemePanelColors>
+        </panel>
+      </ThemeUserInterface>
+    </user_interface>
     <view_3d>
-      <ThemeView3D object_active="#ff8c19"
-                   editmesh_active="#ff020080"
-                   act_spline="#db2512"
-                   handle_align="#803060"
-                   handle_sel_align="#f090a0"
-                   handle_auto="#909000"
-                   handle_sel_auto="#f0ff40"
-                   bone_pose="#50c8ff"
-                   bone_pose_active="#8cffff"
-                   bone_solid="#c8c8c8"
-                   bundle_solid="#c8c8c8"
+      <ThemeView3D grid="#222222"
+                   panel="#a5a5a57f"
+                   wire="#888888"
+                   lamp="#c1d40028"
+                   speaker="#535353"
                    camera="#000000"
-                   camera_path="#5a5a5a"
-                   frame_current="#60c040"
-                   edge_crease="#cc0099"
-                   extra_edge_len="#ffedf8"
-                   edge_seam="#db2512"
+                   empty="#000000"
+                   object_selected="#f15800"
+                   object_active="#ff8c19"
+                   object_grouped="#083008"
+                   object_grouped_active="#55bb55"
+                   transform="#ffffff"
+                   vertex="#72cfdd"
+                   vertex_select="#ff8500"
+                   vertex_size="3"
                    edge_select="#ffa000"
+                   edge_seam="#db2512"
                    edge_sharp="#ff2020"
+                   edge_crease="#cc0099"
                    edge_facesel="#6b6b6b"
-                   empty="#000000"
                    face="#73828f12"
-                   extra_face_angle="#00c900"
-                   extra_face_area="#fff000"
+                   face_select="#ffa4003c"
                    face_dot="#ffa900"
                    facedot_size="4"
-                   normal="#22dddd"
-                   face_select="#ffa4003c"
-                   handle_free="#7f7f7f"
-                   handle_sel_free="#3b3b3b"
-                   grid="#222222"
-                   lamp="#c1d40028"
-                   lastsel_point="#ffffff"
                    nurb_uline="#909000"
                    nurb_vline="#803060"
                    nurb_sel_uline="#f0ff40"
                    nurb_sel_vline="#f090a0"
-                   object_grouped="#083008"
-                   object_grouped_active="#55bb55"
-                   object_selected="#f15800"
-                   outline_width="1"
-                   panel="#a5a5a57f"
-                   skin_root="#000000"
-                   speaker="#535353"
-                   transform="#ffffff"
+                   act_spline="#db2512"
+                   handle_free="#7f7f7f"
+                   handle_auto="#909000"
                    handle_vect="#409030"
+                   handle_align="#803060"
+                   handle_sel_free="#3b3b3b"
+                   handle_sel_auto="#f0ff40"
                    handle_sel_vect="#40c030"
-                   vertex="#72cfdd"
+                   handle_sel_align="#f090a0"
+                   lastsel_point="#ffffff"
+                   extra_edge_len="#ffedf8"
+                   extra_face_angle="#00c900"
+                   extra_face_area="#fff000"
+                   editmesh_active="#ff020080"
+                   normal="#22dddd"
                    vertex_normal="#2361dd"
-                   vertex_select="#ff8500"
-                   vertex_size="3"
-                   wire="#888888">
-        <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#979797"
-                             header_text_hi="#ffffff"
-                             button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
-                             button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#0f0f0f">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeView3D>
-    </view_3d>
-    <clip_editor>
-      <ThemeClipEditor active_marker="#ffffff"
-                       frame_current="#1b501b"
-                       disabled_marker="#7f0000"
-                       grid="#5e5e5e"
-                       handle_vertex="#e2e2e2"
-                       handle_vertex_select="#ffff00"
-                       handle_vertex_size="4"
-                       locked_marker="#7f7f7f"
-                       marker="#7f7f00"
-                       marker_outline="#0094af"
-                       path_after="#0000ff"
-                       path_before="#ff0000"
-                       selected_marker="#ffff00"
-                       strips="#0c0a0a"
-                       strips_selected="#ff8c00">
+                   bone_solid="#c8c8c8"
+                   bone_pose="#50c8ff"
+                   bone_pose_active="#8cffff"
+                   frame_current="#60c040"
+                   outline_width="1"
+                   bundle_solid="#c8c8c8"
+                   camera_path="#5a5a5a"
+                   skin_root="#000000">
         <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#979797"
-                             header_text_hi="#ffffff"
-                             button="#070707"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
-                             button_title="#c5c5c5"
-                             text="#ffffff"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#0f0f0f"
                              title="#5d5d5d"
-                             back="#0d0d0d">
-          </ThemeSpaceGeneric>
-        </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#666666"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeClipEditor>
-    </clip_editor>
-    <console>
-      <ThemeConsole cursor="#dc6060"
-                    line_error="#dc6060"
-                    line_info="#00aa00"
-                    line_input="#cecece"
-                    line_output="#6080ff">
-        <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#979797"
-                             header_text_hi="#ffffff"
-                             button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
-                             button_title="#c5c5c5"
                              text="#7d7d7d"
                              text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#0f0f0f">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeConsole>
-    </console>
-    <dopesheet_editor>
-      <ThemeDopeSheet active_channels_group="#87b17d"
-                      channel_group="#4f6549"
-                      channels="#707070"
-                      channels_selected="#60c040"
-                      frame_current="#2a5c1c"
-                      dopesheet_channel="#52606e"
-                      dopesheet_subchannel="#7c8996"
-                      grid="#212121"
-                      long_key="#0c0a0a"
-                      long_key_selected="#ff8c00"
-                      summary="#00000000"
-                      value_sliders="#000000"
-                      view_sliders="#969696">
-        <space>
-          <ThemeSpaceGeneric header="#000000"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#ffffff"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#080808">
-          </ThemeSpaceGeneric>
-        </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#020202"
-                                 list_text="#ebebeb"
-                                 list_text_hi="#ffffff"
-                                 list_title="#2c2c2c">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeDopeSheet>
-    </dopesheet_editor>
-    <file_browser>
-      <ThemeFileBrowser active_file="#b1b1b1"
-                        active_file_text="#ffffff"
-                        scroll_handle="#7f7070"
-                        scrollbar="#a0a0a0"
-                        selected_file="#354d66"
-                        tiles="#343434">
-        <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#979797"
-                             header_text_hi="#ffffff"
-                             button="#000000"
                              button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
-                             button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#000000">
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#181818"
-                                 list_text="#5d5d5d"
-                                 list_text_hi="#ffffff"
-                                 list_title="#9e9e9e">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeFileBrowser>
-    </file_browser>
+      </ThemeView3D>
+    </view_3d>
     <graph_editor>
-      <ThemeGraphEditor active_channels_group="#87b17d"
-                        handle_align="#803060"
-                        handle_sel_align="#f090a0"
-                        handle_auto="#909000"
-                        handle_sel_auto="#f0ff40"
-                        handle_auto_clamped="#994030"
-                        handle_sel_auto_clamped="#f0af90"
-                        channel_group="#4f6549"
-                        channels_region="#6d6d6d"
-                        frame_current="#336622"
-                        dopesheet_channel="#52606e"
-                        dopesheet_subchannel="#7c8996"
-                        handle_free="#808080"
-                        handle_sel_free="#808080"
-                        grid="#262626"
-                        handle_vertex="#808080"
-                        handle_vertex_select="#ff8500"
-                        handle_vertex_size="3"
-                        lastsel_point="#808080"
+      <ThemeGraphEditor grid="#262626"
                         panel="#ffffff"
-                        handle_vect="#409030"
-                        handle_sel_vect="#40c030"
+                        window_sliders="#969696"
+                        channels_region="#6d6d6d"
                         vertex="#ffffff"
                         vertex_select="#ff8500"
                         vertex_size="3"
-                        window_sliders="#969696">
+                        handle_free="#808080"
+                        handle_auto="#909000"
+                        handle_vect="#409030"
+                        handle_align="#803060"
+                        handle_sel_free="#808080"
+                        handle_sel_auto="#f0ff40"
+                        handle_sel_vect="#40c030"
+                        handle_sel_align="#f090a0"
+                        handle_auto_clamped="#994030"
+                        handle_sel_auto_clamped="#f0af90"
+                        lastsel_point="#808080"
+                        frame_current="#336622"
+                        handle_vertex="#808080"
+                        handle_vertex_select="#ff8500"
+                        handle_vertex_size="3"
+                        channel_group="#4f6549"
+                        active_channels_group="#87b17d"
+                        dopesheet_channel="#52606e"
+                        dopesheet_subchannel="#7c8996">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#0d0d0d"
+                             title="#5d5d5d"
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#ffffff"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#0d0d0d">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#1a1a1a"
+                                 list_title="#000000"
                                  list_text="#bbbbbb"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeGraphEditor>
     </graph_editor>
-    <image_editor>
-      <ThemeImageEditor editmesh_active="#ffffff80"
-                        face="#ffffff0a"
-                        face_dot="#ff8500"
-                        facedot_size="3"
-                        face_select="#ff85003c"
-                        scope_back="#050505ff"
-                        preview_stitch_active="#e1d2c323"
-                        preview_stitch_edge="#ff8500b2"
-                        preview_stitch_face="#1242b026"
-                        preview_stitch_stitchable="#00ff00ff"
-                        preview_stitch_unstitchable="#ff0000ff"
-                        preview_stitch_vert="#ff85007f"
-                        vertex="#0f13bb"
-                        vertex_select="#ff8500"
-                        vertex_size="3">
+    <file_browser>
+      <ThemeFileBrowser selected_file="#354d66"
+                        tiles="#343434"
+                        scrollbar="#a0a0a0"
+                        scroll_handle="#7f7070"
+                        active_file="#b1b1b1"
+                        active_file_text="#ffffff">
         <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#979797"
-                             header_text_hi="#ffffff"
-                             button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
-                             button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#000000"
                              title="#5d5d5d"
-                             back="#000000">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeImageEditor>
-    </image_editor>
-    <info>
-      <ThemeInfo>
-        <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#adadad"
-                             header_text_hi="#ffffff"
-                             button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
-                             button_title="#c5c5c5"
-                             text="#9b9b9b"
+                             text="#7d7d7d"
                              text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#000000">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeInfo>
-    </info>
-    <logic_editor>
-      <ThemeLogicEditor panel="#a5a5a5">
-        <space>
-          <ThemeSpaceGeneric header="#000000"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#070707">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeLogicEditor>
-    </logic_editor>
+        <space_list>
+          <ThemeSpaceListGeneric list="#181818"
+                                 list_title="#9e9e9e"
+                                 list_text="#5d5d5d"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeFileBrowser>
+    </file_browser>
     <nla_editor>
-      <ThemeNLAEditor active_action="#00000000"
-                      frame_current="#2f6421"
-                      grid="#5e5e5e"
-                      meta_strips="#000000"
-                      meta_strips_selected="#000000"
+      <ThemeNLAEditor grid="#5e5e5e"
+                      view_sliders="#969696"
+                      active_action="#00000000"
                       active_action_unset="#00000000"
-                      sound_strips="#000000"
-                      sound_strips_selected="#000000"
                       strips="#aa8d8d"
                       strips_selected="#ff8c00"
                       transition_strips="#000000"
                       transition_strips_selected="#000000"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
                       tweak="#000000"
                       tweak_duplicate="#000000"
-                      view_sliders="#969696">
+                      frame_current="#2f6421">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#0d0d0d"
+                             title="#585858"
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c3c3c3"
-                             text="#ffffff"
-                             text_hi="#ffffff"
-                             title="#585858"
-                             back="#0d0d0d">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#0c0c0c"
+                                 list_title="#383838"
                                  list_text="#d8d8d8"
-                                 list_text_hi="#ffffff"
-                                 list_title="#383838">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeNLAEditor>
     </nla_editor>
-    <node_editor>
-      <ThemeNodeEditor node_active="#ffffff"
-                       converter_node="#113941"
-                       frame_node="#9a9b9ba0"
-                       group_node="#091a07"
-                       in_out_node="#273053"
-                       node_backdrop="#202030bc"
-                       node_selected="#ffffff"
-                       noodle_curving="5"
-                       operator_node="#0e3157"
-                       selected_text="#7f7070"
-                       wire_select="#0019ff"
-                       wire="#6eafff">
+    <dopesheet_editor>
+      <ThemeDopeSheet grid="#212121"
+                      value_sliders="#000000"
+                      view_sliders="#969696"
+                      channels="#707070"
+                      channels_selected="#60c040"
+                      channel_group="#4f6549"
+                      active_channels_group="#87b17d"
+                      long_key="#0c0a0a"
+                      long_key_selected="#ff8c00"
+                      frame_current="#2a5c1c"
+                      dopesheet_channel="#52606e"
+                      dopesheet_subchannel="#7c8996"
+                      summary="#00000000">
         <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#c7c7c7"
+          <ThemeSpaceGeneric back="#080808"
+                             title="#5d5d5d"
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#000000">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
-          <ThemeSpaceListGeneric list="#a5a5a5"
-                                 list_text="#ffffff"
-                                 list_text_hi="#b8ffff"
-                                 list_title="#ffffff">
+          <ThemeSpaceListGeneric list="#020202"
+                                 list_title="#2c2c2c"
+                                 list_text="#ebebeb"
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeNodeEditor>
-    </node_editor>
-    <outliner>
-      <ThemeOutliner match="#245824"
-                     selected_highlight="#212844">
+      </ThemeDopeSheet>
+    </dopesheet_editor>
+    <image_editor>
+      <ThemeImageEditor vertex="#0f13bb"
+                        vertex_select="#ff8500"
+                        vertex_size="3"
+                        face="#ffffff0a"
+                        face_select="#ff85003c"
+                        face_dot="#ff8500"
+                        facedot_size="3"
+                        editmesh_active="#ffffff80"
+                        scope_back="#050505ff"
+                        preview_stitch_face="#1242b026"
+                        preview_stitch_edge="#ff8500b2"
+                        preview_stitch_vert="#ff85007f"
+                        preview_stitch_stitchable="#00ff00ff"
+                        preview_stitch_unstitchable="#ff0000ff"
+                        preview_stitch_active="#e1d2c323">
         <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#979797"
-                             header_text_hi="#ffffff"
-                             button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
-                             button_title="#c5c5c5"
-                             text="#cccccc"
+          <ThemeSpaceGeneric back="#000000"
+                             title="#5d5d5d"
+                             text="#7d7d7d"
                              text_hi="#ffffff"
-                             title="#9b9b9b"
-                             back="#070707">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeOutliner>
-    </outliner>
-    <properties>
-      <ThemeProperties panel="#828282">
-        <space>
-          <ThemeSpaceGeneric header="#000000"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#000000">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeProperties>
-    </properties>
+      </ThemeImageEditor>
+    </image_editor>
     <sequence_editor>
-      <ThemeSequenceEditor audio_strip="#2e8f8f"
+      <ThemeSequenceEditor grid="#282828"
+                           window_sliders="#a0a0a0"
+                           movie_strip="#516987"
                            movieclip_strip="#20208f"
-                           frame_current="#2f5f23"
-                           draw_action="#50c8ff"
-                           effect_strip="#a9547c"
-                           grid="#282828"
                            image_strip="#6d5881"
-                           keyframe="#ff8500"
-                           meta_strip="#6d9183"
-                           movie_strip="#516987"
-                           preview_back="#000000"
                            scene_strip="#4e983e"
+                           audio_strip="#2e8f8f"
+                           effect_strip="#a9547c"
                            transition_strip="#a25f6f"
-                           window_sliders="#a0a0a0">
+                           meta_strip="#6d9183"
+                           frame_current="#2f5f23"
+                           keyframe="#ff8500"
+                           draw_action="#50c8ff"
+                           preview_back="#000000">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#202020"
+                             title="#5d5d5d"
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#f3f3f3"
                              header_text_hi="#ffffff"
                              button="#020202"
-                             button_text="#dddddd"
-                             button_text_hi="#ffffff"
                              button_title="#bdbdbd"
-                             text="#ffffff"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#202020">
+                             button_text="#dddddd"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeSequenceEditor>
     </sequence_editor>
+    <properties>
+      <ThemeProperties panel="#828282">
+        <space>
+          <ThemeSpaceGeneric back="#000000"
+                             title="#5d5d5d"
+                             text="#7d7d7d"
+                             text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#979797"
+                             header_text_hi="#ffffff"
+                             button="#000000"
+                             button_title="#c5c5c5"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeProperties>
+    </properties>
     <text_editor>
-      <ThemeTextEditor cursor="#ff0000"
-                       syntax_special="#969629"
-                       line_numbers_background="#191919"
+      <ThemeTextEditor line_numbers_background="#191919"
                        selected_text="#202020"
+                       cursor="#ff0000"
                        syntax_builtin="#cf3d99"
+                       syntax_special="#969629"
                        syntax_comment="#249d60"
-                       syntax_numbers="#3c68ff"
-                       syntax_string="#cc3535">
+                       syntax_string="#cc3535"
+                       syntax_numbers="#3c68ff">
+        <space>
+          <ThemeSpaceGeneric back="#050505"
+                             title="#9e9e9e"
+                             text="#ebebeb"
+                             text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#b9b9b9"
+                             header_text_hi="#ffffff"
+                             button="#000000"
+                             button_title="#d8d8d8"
+                             button_text="#cccccc"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeTextEditor>
+    </text_editor>
+    <timeline>
+      <ThemeTimeline grid="#272727"
+                     frame_current="#2e5820">
+        <space>
+          <ThemeSpaceGeneric back="#000000"
+                             title="#5d5d5d"
+                             text="#c7c7c7"
+                             text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#979797"
+                             header_text_hi="#ffffff"
+                             button="#000000"
+                             button_title="#c5c5c5"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeTimeline>
+    </timeline>
+    <node_editor>
+      <ThemeNodeEditor node_selected="#ffffff"
+                       node_active="#ffffff"
+                       wire="#6eafff"
+                       wire_select="#0019ff"
+                       selected_text="#7f7070"
+                       node_backdrop="#202030bc"
+                       in_out_node="#273053"
+                       converter_node="#113941"
+                       operator_node="#0e3157"
+                       group_node="#091a07"
+                       frame_node="#9a9b9ba0"
+                       noodle_curving="5">
+        <space>
+          <ThemeSpaceGeneric back="#000000"
+                             title="#5d5d5d"
+                             text="#7d7d7d"
+                             text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#c7c7c7"
+                             header_text_hi="#ffffff"
+                             button="#000000"
+                             button_title="#c5c5c5"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#a5a5a5"
+                                 list_title="#ffffff"
+                                 list_text="#ffffff"
+                                 list_text_hi="#b8ffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeNodeEditor>
+    </node_editor>
+    <logic_editor>
+      <ThemeLogicEditor panel="#a5a5a5">
         <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#b9b9b9"
+          <ThemeSpaceGeneric back="#070707"
+                             title="#5d5d5d"
+                             text="#7d7d7d"
+                             text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#cccccc"
-                             button_text_hi="#ffffff"
-                             button_title="#d8d8d8"
-                             text="#ebebeb"
-                             text_hi="#ffffff"
-                             title="#9e9e9e"
-                             back="#050505">
+                             button_title="#c5c5c5"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTextEditor>
-    </text_editor>
-    <timeline>
-      <ThemeTimeline frame_current="#2e5820"
-                     grid="#272727">
+      </ThemeLogicEditor>
+    </logic_editor>
+    <outliner>
+      <ThemeOutliner match="#245824"
+                     selected_highlight="#212844">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#070707"
+                             title="#9b9b9b"
+                             text="#cccccc"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#c7c7c7"
-                             text_hi="#ffffff"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeOutliner>
+    </outliner>
+    <info>
+      <ThemeInfo>
+        <space>
+          <ThemeSpaceGeneric back="#000000"
                              title="#5d5d5d"
-                             back="#000000">
+                             text="#9b9b9b"
+                             text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#adadad"
+                             header_text_hi="#ffffff"
+                             button="#000000"
+                             button_title="#c5c5c5"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTimeline>
-    </timeline>
-    <user_interface>
-      <ThemeUserInterface icon_alpha="1"
-                          icon_file="">
-        <wcol_box>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_box>
-        <wcol_list_item>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_list_item>
-        <wcol_menu_back>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_back>
-        <wcol_menu_item>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_item>
-        <wcol_menu>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#2a2a2aff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu>
-        <wcol_num>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#2a2a2aff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_num>
-        <wcol_option>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#000000ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#c7c7c7"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_option>
-        <panel>
-          <ThemePanelColors header="#000000ff"
-                            show_header="FALSE">
-          </ThemePanelColors>
-        </panel>
-        <wcol_progress>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_progress>
-        <wcol_pulldown>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_pulldown>
-        <wcol_radio>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_radio>
-        <wcol_regular>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_regular>
-        <wcol_scroll>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_scroll>
-        <wcol_numslider>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#111111ff"
-                             item="#33406bff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_numslider>
-        <wcol_state>
-          <ThemeWidgetStateColors inner_anim="#56ff00"
-                                  inner_anim_sel="#56ff00"
-                                  blend="0.1"
-                                  inner_driven="#b400ff"
-                                  inner_driven_sel="#9900e6"
-                                  inner_key="#fff400"
-                                  inner_key_sel="#fff400">
-          </ThemeWidgetStateColors>
-        </wcol_state>
-        <wcol_text>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#e4e4e4"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_text>
-        <wcol_toggle>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_toggle>
-        <wcol_tool>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tool>
-        <wcol_tooltip>
-          <ThemeWidgetColors inner="#191919e6"
-                             inner_sel="#2d2d2de6"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#ffffff"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tooltip>
-      </ThemeUserInterface>
-    </user_interface>
+      </ThemeInfo>
+    </info>
     <user_preferences>
       <ThemeUserPreferences>
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#000000"
+                             title="#5d5d5d"
+                             text="#7d7d7d"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeUserPreferences>
+    </user_preferences>
+    <console>
+      <ThemeConsole line_output="#6080ff"
+                    line_input="#cecece"
+                    line_info="#00aa00"
+                    line_error="#dc6060"
+                    cursor="#dc6060">
+        <space>
+          <ThemeSpaceGeneric back="#0f0f0f"
+                             title="#5d5d5d"
                              text="#7d7d7d"
                              text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#979797"
+                             header_text_hi="#ffffff"
+                             button="#000000"
+                             button_title="#c5c5c5"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeConsole>
+    </console>
+    <clip_editor>
+      <ThemeClipEditor marker_outline="#0094af"
+                       marker="#7f7f00"
+                       active_marker="#ffffff"
+                       selected_marker="#ffff00"
+                       disabled_marker="#7f0000"
+                       locked_marker="#7f7f7f"
+                       path_before="#ff0000"
+                       path_after="#0000ff"
+                       grid="#5e5e5e"
+                       frame_current="#1b501b"
+                       handle_vertex="#e2e2e2"
+                       handle_vertex_select="#ffff00"
+                       handle_vertex_size="4"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
+        <space>
+          <ThemeSpaceGeneric back="#0d0d0d"
                              title="#5d5d5d"
-                             back="#000000">
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#979797"
+                             header_text_hi="#ffffff"
+                             button="#070707"
+                             button_title="#c5c5c5"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeUserPreferences>
-    </user_preferences>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeClipEditor>
+    </clip_editor>
     <bone_color_sets>
-      <ThemeBoneColorSet active="#f70a0a"
-                         show_colored_constraints="FALSE"
-                         normal="#9a0000"
-                         select="#bd1111">
+      <ThemeBoneColorSet normal="#9a0000"
+                         select="#bd1111"
+                         active="#f70a0a"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#fa9900"
-                         show_colored_constraints="FALSE"
-                         normal="#f74018"
-                         select="#f66913">
+      <ThemeBoneColorSet normal="#f74018"
+                         select="#f66913"
+                         active="#fa9900"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#83ef1d"
-                         show_colored_constraints="FALSE"
-                         normal="#1e9109"
-                         select="#59b70b">
+      <ThemeBoneColorSet normal="#1e9109"
+                         select="#59b70b"
+                         active="#83ef1d"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#5ec1ef"
-                         show_colored_constraints="FALSE"
-                         normal="#0a3694"
-                         select="#3667df">
+      <ThemeBoneColorSet normal="#0a3694"
+                         select="#3667df"
+                         active="#5ec1ef"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f05d91"
-                         show_colored_constraints="FALSE"
-                         normal="#a9294e"
-                         select="#c1416a">
+      <ThemeBoneColorSet normal="#a9294e"
+                         select="#c1416a"
+                         active="#f05d91"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#8764d5"
-                         show_colored_constraints="FALSE"
-                         normal="#430c78"
-                         select="#543aa3">
+      <ThemeBoneColorSet normal="#430c78"
+                         select="#543aa3"
+                         active="#8764d5"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#6fb6ab"
-                         show_colored_constraints="FALSE"
-                         normal="#24785a"
-                         select="#3c9579">
+      <ThemeBoneColorSet normal="#24785a"
+                         select="#3c9579"
+                         active="#6fb6ab"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#9bc2cd"
-                         show_colored_constraints="FALSE"
-                         normal="#4b707c"
-                         select="#6a8691">
+      <ThemeBoneColorSet normal="#4b707c"
+                         select="#6a8691"
+                         active="#9bc2cd"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f3ff00"
-                         show_colored_constraints="FALSE"
-                         normal="#f4c90c"
-                         select="#eec236">
+      <ThemeBoneColorSet normal="#f4c90c"
+                         select="#eec236"
+                         active="#f3ff00"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#ffffff"
-                         show_colored_constraints="FALSE"
-                         normal="#1e2024"
-                         select="#484c56">
+      <ThemeBoneColorSet normal="#1e2024"
+                         select="#484c56"
+                         active="#ffffff"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#d330d6"
-                         show_colored_constraints="FALSE"
-                         normal="#6f2f6a"
-                         select="#9845be">
+      <ThemeBoneColorSet normal="#6f2f6a"
+                         select="#9845be"
+                         active="#d330d6"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bbef5b"
-                         show_colored_constraints="FALSE"
-                         normal="#6c8e22"
-                         select="#7fb022">
+      <ThemeBoneColorSet normal="#6c8e22"
+                         select="#7fb022"
+                         active="#bbef5b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#dedede"
-                         show_colored_constraints="FALSE"
-                         normal="#8d8d8d"
-                         select="#b0b0b0">
+      <ThemeBoneColorSet normal="#8d8d8d"
+                         select="#b0b0b0"
+                         active="#dedede"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bd6a11"
-                         show_colored_constraints="FALSE"
-                         normal="#834326"
-                         select="#8b5811">
+      <ThemeBoneColorSet normal="#834326"
+                         select="#8b5811"
+                         active="#bd6a11"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#34622b"
-                         show_colored_constraints="FALSE"
-                         normal="#08310e"
-                         select="#1c430b">
+      <ThemeBoneColorSet normal="#08310e"
+                         select="#1c430b"
+                         active="#34622b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
     </bone_color_sets>
   </Theme>
diff --git a/release/scripts/presets/interface_theme/blender_24x.xml b/release/scripts/presets/interface_theme/blender_24x.xml
index 232276e300e..18ae3072208 100644
--- a/release/scripts/presets/interface_theme/blender_24x.xml
+++ b/release/scripts/presets/interface_theme/blender_24x.xml
@@ -1,849 +1,852 @@
 <bpy>
   <Theme>
+    <user_interface>
+      <ThemeUserInterface icon_file=""
+                          icon_alpha="1"
+                          axis_x="#dc0000"
+                          axis_y="#00dc00"
+                          axis_z="#0000dc">
+        <wcol_regular>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#999999ff"
+                             inner_sel="#646464ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_regular>
+        <wcol_tool>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#c6bab0ff"
+                             inner_sel="#646464ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_tool>
+        <wcol_radio>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#d0d0d0ff"
+                             inner_sel="#667677ff"
+                             item="#ffffffff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_radio>
+        <wcol_text>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#aea8b2ff"
+                             inner_sel="#999999ff"
+                             item="#5a5a5aff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="10">
+          </ThemeWidgetColors>
+        </wcol_text>
+        <wcol_option>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#aababbff"
+                             inner_sel="#667677ff"
+                             item="#ffffffff"
+                             text="#000000"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_option>
+        <wcol_toggle>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#d0d0d0ff"
+                             inner_sel="#7d7d7dff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="15"
+                             shadedown="-15">
+          </ThemeWidgetColors>
+        </wcol_toggle>
+        <wcol_num>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#a1a1a1a4"
+                             inner_sel="#999999ff"
+                             item="#585858ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_num>
+        <wcol_numslider>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#808080ff"
+                             inner_sel="#999999ff"
+                             item="#d2d2d2ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-20"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_numslider>
+        <wcol_box>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#d4d4d4ff"
+                             inner_sel="#646464ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_box>
+        <wcol_menu>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#d0d0d0ff"
+                             inner_sel="#464646ff"
+                             item="#717171ff"
+                             text="#000000"
+                             text_sel="#cccccc"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_menu>
+        <wcol_pulldown>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#3f3f3fff"
+                             inner_sel="#7f7f7fff"
+                             item="#ffffffff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="15"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_pulldown>
+        <wcol_menu_back>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#d2d2d2ff"
+                             inner_sel="#999999ff"
+                             item="#646464ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="-25"
+                             shadedown="25">
+          </ThemeWidgetColors>
+        </wcol_menu_back>
+        <wcol_tooltip>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#ffffddff"
+                             inner_sel="#2d2d2de6"
+                             item="#646464ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_tooltip>
+        <wcol_menu_item>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#7f7f7fff"
+                             item="#ffffffff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu_item>
+        <wcol_scroll>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#b4b4b42e"
+                             inner_sel="#646464b4"
+                             item="#b4b4b4ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_scroll>
+        <wcol_progress>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#bebebeff"
+                             inner_sel="#646464b4"
+                             item="#444444ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_progress>
+        <wcol_list_item>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#7f7f7fff"
+                             item="#000000ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_list_item>
+        <wcol_state>
+          <ThemeWidgetStateColors inner_anim="#73be4c"
+                                  inner_anim_sel="#5aa633"
+                                  inner_key="#f0eb64"
+                                  inner_key_sel="#d7d34b"
+                                  inner_driven="#b400ff"
+                                  inner_driven_sel="#9900e6"
+                                  blend="0.5">
+          </ThemeWidgetStateColors>
+        </wcol_state>
+        <panel>
+          <ThemePanelColors header="#00000019"
+                            show_header="FALSE">
+          </ThemePanelColors>
+        </panel>
+      </ThemeUserInterface>
+    </user_interface>
     <view_3d>
-      <ThemeView3D object_active="#ffbbff"
-                   editmesh_active="#ffffff80"
-                   act_spline="#db2512"
-                   handle_align="#803060"
-                   handle_sel_align="#f090a0"
-                   handle_auto="#909000"
-                   handle_sel_auto="#f0ff40"
-                   bone_pose="#50c8ff"
-                   bone_pose_active="#8cffff"
-                   bone_solid="#c8c8c8"
-                   bundle_solid="#c8c8c8"
+      <ThemeView3D grid="#5c5c5c"
+                   panel="#a5a5a5ff"
+                   wire="#000000"
+                   lamp="#00000028"
+                   speaker="#000000"
                    camera="#000000"
-                   camera_path="#000000"
-                   frame_current="#60c040"
-                   edge_crease="#cc0099"
-                   extra_edge_len="#200000"
-                   edge_seam="#e69632"
+                   empty="#000000"
+                   object_selected="#ff88ff"
+                   object_active="#ffbbff"
+                   object_grouped="#104010"
+                   object_grouped_active="#55bb55"
+                   transform="#ffffff"
+                   vertex="#ff70ff"
+                   vertex_select="#ffff70"
+                   vertex_size="2"
                    edge_select="#cece38"
+                   edge_seam="#e69632"
                    edge_sharp="#ff2020"
+                   edge_crease="#cc0099"
                    edge_facesel="#4b4b4b"
-                   empty="#000000"
                    face="#0032961e"
-                   extra_face_angle="#000080"
-                   extra_face_area="#002000"
+                   face_select="#c864c83c"
                    face_dot="#ff8a30"
                    facedot_size="4"
-                   normal="#22dddd"
-                   face_select="#c864c83c"
-                   handle_free="#000000"
-                   handle_sel_free="#000000"
-                   grid="#5c5c5c"
-                   lamp="#00000028"
-                   lastsel_point="#ffffff"
                    nurb_uline="#909000"
                    nurb_vline="#803060"
                    nurb_sel_uline="#f0ff40"
                    nurb_sel_vline="#f090a0"
-                   object_grouped="#104010"
-                   object_grouped_active="#55bb55"
-                   object_selected="#ff88ff"
-                   outline_width="1"
-                   panel="#a5a5a5ff"
-                   skin_root="#000000"
-                   speaker="#000000"
-                   transform="#ffffff"
+                   act_spline="#db2512"
+                   handle_free="#000000"
+                   handle_auto="#909000"
                    handle_vect="#409030"
+                   handle_align="#803060"
+                   handle_sel_free="#000000"
+                   handle_sel_auto="#f0ff40"
                    handle_sel_vect="#40c030"
-                   vertex="#ff70ff"
+                   handle_sel_align="#f090a0"
+                   lastsel_point="#ffffff"
+                   extra_edge_len="#200000"
+                   extra_face_angle="#000080"
+                   extra_face_area="#002000"
+                   editmesh_active="#ffffff80"
+                   normal="#22dddd"
                    vertex_normal="#2361dd"
-                   vertex_select="#ffff70"
-                   vertex_size="2"
-                   wire="#000000">
+                   bone_solid="#c8c8c8"
+                   bone_pose="#50c8ff"
+                   bone_pose_active="#8cffff"
+                   frame_current="#60c040"
+                   outline_width="1"
+                   bundle_solid="#c8c8c8"
+                   camera_path="#000000"
+                   skin_root="#000000">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#b4b4b4"
-                             button_text="#5a5a5a"
-                             button_text_hi="#ffffff"
-                             button_title="#5a5a5a"
-                             text="#000000"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#757575"
                              title="#000000"
-                             back="#757575">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeView3D>
-    </view_3d>
-    <clip_editor>
-      <ThemeClipEditor active_marker="#ffffff"
-                       frame_current="#60c040"
-                       disabled_marker="#7f0000"
-                       grid="#5e5e5e"
-                       handle_vertex="#000000"
-                       handle_vertex_select="#ffff00"
-                       handle_vertex_size="4"
-                       locked_marker="#7f7f7f"
-                       marker="#7f7f00"
-                       marker_outline="#000000"
-                       path_after="#0000ff"
-                       path_before="#ff0000"
-                       selected_marker="#ffff00"
-                       strips="#0c0a0a"
-                       strips_selected="#ff8c00">
-        <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#757575">
-          </ThemeSpaceGeneric>
-        </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#666666"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeClipEditor>
-    </clip_editor>
-    <console>
-      <ThemeConsole cursor="#dc6060"
-                    line_error="#dc6060"
-                    line_info="#00aa00"
-                    line_input="#ffffff"
-                    line_output="#000000">
-        <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#b4b4b4">
+                             button_title="#5a5a5a"
+                             button_text="#5a5a5a"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeConsole>
-    </console>
-    <dopesheet_editor>
-      <ThemeDopeSheet active_channels_group="#87b17d"
-                      channel_group="#4f6549"
-                      channels="#707070"
-                      channels_selected="#60c040"
-                      frame_current="#60c040"
-                      dopesheet_channel="#52606e"
-                      dopesheet_subchannel="#7c8996"
-                      grid="#858585"
-                      long_key="#0c0a0a"
-                      long_key_selected="#ff8c00"
-                      summary="#00000000"
-                      value_sliders="#000000"
-                      view_sliders="#969696">
+      </ThemeView3D>
+    </view_3d>
+    <graph_editor>
+      <ThemeGraphEditor grid="#818181"
+                        panel="#ffffff"
+                        window_sliders="#969696"
+                        channels_region="#707070"
+                        vertex="#000000"
+                        vertex_select="#ff8500"
+                        vertex_size="3"
+                        handle_free="#000000"
+                        handle_auto="#909000"
+                        handle_vect="#409030"
+                        handle_align="#803060"
+                        handle_sel_free="#000000"
+                        handle_sel_auto="#f0ff40"
+                        handle_sel_vect="#40c030"
+                        handle_sel_align="#f090a0"
+                        handle_auto_clamped="#000000"
+                        handle_sel_auto_clamped="#000000"
+                        lastsel_point="#ffffff"
+                        frame_current="#60c040"
+                        handle_vertex="#000000"
+                        handle_vertex_select="#ff8500"
+                        handle_vertex_size="3"
+                        channel_group="#4f6549"
+                        active_channels_group="#87b17d"
+                        dopesheet_channel="#52606e"
+                        dopesheet_subchannel="#7c8996">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#979797"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#727272"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#a0a0a0">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#b4b4b4"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeDopeSheet>
-    </dopesheet_editor>
+      </ThemeGraphEditor>
+    </graph_editor>
     <file_browser>
-      <ThemeFileBrowser active_file="#828282"
-                        active_file_text="#ffffff"
-                        scroll_handle="#7f7070"
+      <ThemeFileBrowser selected_file="#a0a0d0"
+                        tiles="#b4b4b4"
                         scrollbar="#a0a0a0"
-                        selected_file="#a0a0d0"
-                        tiles="#b4b4b4">
+                        scroll_handle="#7f7070"
+                        active_file="#828282"
+                        active_file_text="#ffffff">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#808080"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#0f0f0f"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#0f0f0f"
-                             title="#000000"
-                             back="#808080">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#b4b4b4"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeFileBrowser>
     </file_browser>
-    <graph_editor>
-      <ThemeGraphEditor active_channels_group="#87b17d"
-                        handle_align="#803060"
-                        handle_sel_align="#f090a0"
-                        handle_auto="#909000"
-                        handle_sel_auto="#f0ff40"
-                        handle_auto_clamped="#000000"
-                        handle_sel_auto_clamped="#000000"
-                        channel_group="#4f6549"
-                        channels_region="#707070"
-                        frame_current="#60c040"
-                        dopesheet_channel="#52606e"
-                        dopesheet_subchannel="#7c8996"
-                        handle_free="#000000"
-                        handle_sel_free="#000000"
-                        grid="#818181"
-                        handle_vertex="#000000"
-                        handle_vertex_select="#ff8500"
-                        handle_vertex_size="3"
-                        lastsel_point="#ffffff"
-                        panel="#ffffff"
-                        handle_vect="#409030"
-                        handle_sel_vect="#40c030"
-                        vertex="#000000"
-                        vertex_select="#ff8500"
-                        vertex_size="3"
-                        window_sliders="#969696">
+    <nla_editor>
+      <ThemeNLAEditor grid="#5e5e5e"
+                      view_sliders="#969696"
+                      active_action="#00000000"
+                      active_action_unset="#00000000"
+                      strips="#0c0a0a"
+                      strips_selected="#ff8c00"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
+                      frame_current="#60c040">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#757575"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#b4b4b4"
                              button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#b4b4b4"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeNLAEditor>
+    </nla_editor>
+    <dopesheet_editor>
+      <ThemeDopeSheet grid="#858585"
+                      value_sliders="#000000"
+                      view_sliders="#969696"
+                      channels="#707070"
+                      channels_selected="#60c040"
+                      channel_group="#4f6549"
+                      active_channels_group="#87b17d"
+                      long_key="#0c0a0a"
+                      long_key_selected="#ff8c00"
+                      frame_current="#60c040"
+                      dopesheet_channel="#52606e"
+                      dopesheet_subchannel="#7c8996"
+                      summary="#00000000">
+        <space>
+          <ThemeSpaceGeneric back="#a0a0a0"
+                             title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#979797">
+                             header="#b4b4b4"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#b4b4b4"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#b4b4b4"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeGraphEditor>
-    </graph_editor>
+      </ThemeDopeSheet>
+    </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor editmesh_active="#ffffff80"
+      <ThemeImageEditor vertex="#000000"
+                        vertex_select="#ff8500"
+                        vertex_size="3"
                         face="#ffffff0a"
+                        face_select="#ff85003c"
                         face_dot="#ff8500"
                         facedot_size="3"
-                        face_select="#ff85003c"
+                        editmesh_active="#ffffff80"
                         scope_back="#b4b4b4ff"
-                        preview_stitch_active="#e1d2c323"
-                        preview_stitch_edge="#ff8500b2"
                         preview_stitch_face="#1242b026"
+                        preview_stitch_edge="#ff8500b2"
+                        preview_stitch_vert="#ff85007f"
                         preview_stitch_stitchable="#00ff00ff"
                         preview_stitch_unstitchable="#ff0000ff"
-                        preview_stitch_vert="#ff85007f"
-                        vertex="#000000"
-                        vertex_select="#ff8500"
-                        vertex_size="3">
+                        preview_stitch_active="#e1d2c323">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#353535"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#353535">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeImageEditor>
     </image_editor>
-    <info>
-      <ThemeInfo>
+    <sequence_editor>
+      <ThemeSequenceEditor grid="#404040"
+                           window_sliders="#a0a0a0"
+                           movie_strip="#516987"
+                           movieclip_strip="#20208f"
+                           image_strip="#6d5881"
+                           scene_strip="#4e983e"
+                           audio_strip="#2e8f8f"
+                           effect_strip="#a9547c"
+                           transition_strip="#a25f6f"
+                           meta_strip="#6d9183"
+                           frame_current="#60c040"
+                           keyframe="#ff8500"
+                           draw_action="#50c8ff"
+                           preview_back="#000000">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#949494"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#b4b4b4">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeInfo>
-    </info>
-    <logic_editor>
-      <ThemeLogicEditor panel="#a5a5a5">
+      </ThemeSequenceEditor>
+    </sequence_editor>
+    <properties>
+      <ThemeProperties panel="#828282">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#b4b4b4"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#b4b4b4">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeLogicEditor>
-    </logic_editor>
-    <nla_editor>
-      <ThemeNLAEditor active_action="#00000000"
-                      frame_current="#60c040"
-                      grid="#5e5e5e"
-                      meta_strips="#000000"
-                      meta_strips_selected="#000000"
-                      active_action_unset="#00000000"
-                      sound_strips="#000000"
-                      sound_strips_selected="#000000"
-                      strips="#0c0a0a"
-                      strips_selected="#ff8c00"
-                      transition_strips="#000000"
-                      transition_strips_selected="#000000"
-                      tweak="#000000"
-                      tweak_duplicate="#000000"
-                      view_sliders="#969696">
+      </ThemeProperties>
+    </properties>
+    <text_editor>
+      <ThemeTextEditor line_numbers_background="#818181"
+                       selected_text="#c67777"
+                       cursor="#ff0000"
+                       syntax_builtin="#800050"
+                       syntax_special="#5f5f00"
+                       syntax_comment="#006432"
+                       syntax_string="#640000"
+                       syntax_numbers="#0000c8">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#999999"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeTextEditor>
+    </text_editor>
+    <timeline>
+      <ThemeTimeline grid="#5b5b5b"
+                     frame_current="#60c040">
+        <space>
+          <ThemeSpaceGeneric back="#999999"
+                             title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#757575">
+                             header="#b4b4b4"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#b4b4b4"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#b4b4b4"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeNLAEditor>
-    </nla_editor>
+      </ThemeTimeline>
+    </timeline>
     <node_editor>
-      <ThemeNodeEditor node_active="#ffffff"
-                       converter_node="#686a75"
-                       frame_node="#9a9b9ba0"
-                       group_node="#69756e"
-                       in_out_node="#646464"
+      <ThemeNodeEditor node_selected="#ffffff"
+                       node_active="#ffffff"
+                       wire="#000000"
+                       wire_select="#ffffff"
+                       selected_text="#7f7070"
                        node_backdrop="#9b9b9ba0"
-                       node_selected="#ffffff"
-                       noodle_curving="5"
+                       in_out_node="#646464"
+                       converter_node="#686a75"
                        operator_node="#6c696f"
-                       selected_text="#7f7070"
-                       wire_select="#ffffff"
-                       wire="#000000">
+                       group_node="#69756e"
+                       frame_node="#9a9b9ba0"
+                       noodle_curving="5">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#757575"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#757575">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#a5a5a5"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeNodeEditor>
     </node_editor>
-    <outliner>
-      <ThemeOutliner match="#337f33"
-                     selected_highlight="#82878c">
+    <logic_editor>
+      <ThemeLogicEditor panel="#a5a5a5">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#b4b4b4"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#999999">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeOutliner>
-    </outliner>
-    <properties>
-      <ThemeProperties panel="#828282">
+      </ThemeLogicEditor>
+    </logic_editor>
+    <outliner>
+      <ThemeOutliner match="#337f33"
+                     selected_highlight="#82878c">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#999999"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#b4b4b4">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeProperties>
-    </properties>
-    <sequence_editor>
-      <ThemeSequenceEditor audio_strip="#2e8f8f"
-                           movieclip_strip="#20208f"
-                           frame_current="#60c040"
-                           draw_action="#50c8ff"
-                           effect_strip="#a9547c"
-                           grid="#404040"
-                           image_strip="#6d5881"
-                           keyframe="#ff8500"
-                           meta_strip="#6d9183"
-                           movie_strip="#516987"
-                           preview_back="#000000"
-                           scene_strip="#4e983e"
-                           transition_strip="#a25f6f"
-                           window_sliders="#a0a0a0">
+      </ThemeOutliner>
+    </outliner>
+    <info>
+      <ThemeInfo>
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#b4b4b4"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#949494">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeSequenceEditor>
-    </sequence_editor>
-    <text_editor>
-      <ThemeTextEditor cursor="#ff0000"
-                       syntax_special="#5f5f00"
-                       line_numbers_background="#818181"
-                       selected_text="#c67777"
-                       syntax_builtin="#800050"
-                       syntax_comment="#006432"
-                       syntax_numbers="#0000c8"
-                       syntax_string="#640000">
+      </ThemeInfo>
+    </info>
+    <user_preferences>
+      <ThemeUserPreferences>
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#999999"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#999999">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTextEditor>
-    </text_editor>
-    <timeline>
-      <ThemeTimeline frame_current="#60c040"
-                     grid="#5b5b5b">
+      </ThemeUserPreferences>
+    </user_preferences>
+    <console>
+      <ThemeConsole line_output="#000000"
+                    line_input="#ffffff"
+                    line_info="#00aa00"
+                    line_error="#dc6060"
+                    cursor="#dc6060">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#b4b4b4"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#999999">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTimeline>
-    </timeline>
-    <user_interface>
-      <ThemeUserInterface icon_alpha="1"
-                          icon_file="">
-        <wcol_box>
-          <ThemeWidgetColors inner="#d4d4d4ff"
-                             inner_sel="#646464ff"
-                             item="#191919ff"
-                             outline="#262626"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_box>
-        <wcol_list_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#7f7f7fff"
-                             item="#000000ff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_list_item>
-        <wcol_menu_back>
-          <ThemeWidgetColors inner="#d2d2d2ff"
-                             inner_sel="#999999ff"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="25"
-                             shadetop="-25"
-                             show_shaded="FALSE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_back>
-        <wcol_menu_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#7f7f7fff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_item>
-        <wcol_menu>
-          <ThemeWidgetColors inner="#d0d0d0ff"
-                             inner_sel="#464646ff"
-                             item="#717171ff"
-                             outline="#262626"
-                             shadedown="-10"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#cccccc">
-          </ThemeWidgetColors>
-        </wcol_menu>
-        <wcol_num>
-          <ThemeWidgetColors inner="#a1a1a1a4"
-                             inner_sel="#999999ff"
-                             item="#585858ff"
-                             outline="#262626"
-                             shadedown="0"
-                             shadetop="-5"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_num>
-        <wcol_option>
-          <ThemeWidgetColors inner="#aababbff"
-                             inner_sel="#667677ff"
-                             item="#ffffffff"
-                             outline="#262626"
-                             shadedown="-10"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_option>
-        <panel>
-          <ThemePanelColors header="#00000019"
-                            show_header="FALSE">
-          </ThemePanelColors>
-        </panel>
-        <wcol_progress>
-          <ThemeWidgetColors inner="#bebebeff"
-                             inner_sel="#646464b4"
-                             item="#444444ff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_progress>
-        <wcol_pulldown>
-          <ThemeWidgetColors inner="#3f3f3fff"
-                             inner_sel="#7f7f7fff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="-10"
-                             shadetop="15"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_pulldown>
-        <wcol_radio>
-          <ThemeWidgetColors inner="#d0d0d0ff"
-                             inner_sel="#667677ff"
-                             item="#ffffffff"
-                             outline="#262626"
-                             shadedown="-10"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_radio>
-        <wcol_regular>
-          <ThemeWidgetColors inner="#999999ff"
-                             inner_sel="#646464ff"
-                             item="#191919ff"
-                             outline="#262626"
-                             shadedown="-10"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_regular>
-        <wcol_scroll>
-          <ThemeWidgetColors inner="#b4b4b42e"
-                             inner_sel="#646464b4"
-                             item="#b4b4b4ff"
-                             outline="#262626"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_scroll>
-        <wcol_numslider>
-          <ThemeWidgetColors inner="#808080ff"
-                             inner_sel="#999999ff"
-                             item="#d2d2d2ff"
-                             outline="#262626"
-                             shadedown="0"
-                             shadetop="-20"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_numslider>
-        <wcol_state>
-          <ThemeWidgetStateColors inner_anim="#73be4c"
-                                  inner_anim_sel="#5aa633"
-                                  blend="0.5"
-                                  inner_driven="#b400ff"
-                                  inner_driven_sel="#9900e6"
-                                  inner_key="#f0eb64"
-                                  inner_key_sel="#d7d34b">
-          </ThemeWidgetStateColors>
-        </wcol_state>
-        <wcol_text>
-          <ThemeWidgetColors inner="#aea8b2ff"
-                             inner_sel="#999999ff"
-                             item="#5a5a5aff"
-                             outline="#262626"
-                             shadedown="10"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_text>
-        <wcol_toggle>
-          <ThemeWidgetColors inner="#d0d0d0ff"
-                             inner_sel="#7d7d7dff"
-                             item="#191919ff"
-                             outline="#262626"
-                             shadedown="-15"
-                             shadetop="15"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_toggle>
-        <wcol_tool>
-          <ThemeWidgetColors inner="#c6bab0ff"
-                             inner_sel="#646464ff"
-                             item="#191919ff"
-                             outline="#262626"
-                             shadedown="-10"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tool>
-        <wcol_tooltip>
-          <ThemeWidgetColors inner="#ffffddff"
-                             inner_sel="#2d2d2de6"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tooltip>
-      </ThemeUserInterface>
-    </user_interface>
-    <user_preferences>
-      <ThemeUserPreferences>
+      </ThemeConsole>
+    </console>
+    <clip_editor>
+      <ThemeClipEditor marker_outline="#000000"
+                       marker="#7f7f00"
+                       active_marker="#ffffff"
+                       selected_marker="#ffff00"
+                       disabled_marker="#7f0000"
+                       locked_marker="#7f7f7f"
+                       path_before="#ff0000"
+                       path_after="#0000ff"
+                       grid="#5e5e5e"
+                       frame_current="#60c040"
+                       handle_vertex="#000000"
+                       handle_vertex_select="#ffff00"
+                       handle_vertex_size="4"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#757575"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#999999">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeUserPreferences>
-    </user_preferences>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeClipEditor>
+    </clip_editor>
     <bone_color_sets>
-      <ThemeBoneColorSet active="#f70a0a"
-                         show_colored_constraints="FALSE"
-                         normal="#9a0000"
-                         select="#bd1111">
+      <ThemeBoneColorSet normal="#9a0000"
+                         select="#bd1111"
+                         active="#f70a0a"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#fa9900"
-                         show_colored_constraints="FALSE"
-                         normal="#f74018"
-                         select="#f66913">
+      <ThemeBoneColorSet normal="#f74018"
+                         select="#f66913"
+                         active="#fa9900"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#83ef1d"
-                         show_colored_constraints="FALSE"
-                         normal="#1e9109"
-                         select="#59b70b">
+      <ThemeBoneColorSet normal="#1e9109"
+                         select="#59b70b"
+                         active="#83ef1d"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#5ec1ef"
-                         show_colored_constraints="FALSE"
-                         normal="#0a3694"
-                         select="#3667df">
+      <ThemeBoneColorSet normal="#0a3694"
+                         select="#3667df"
+                         active="#5ec1ef"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f05d91"
-                         show_colored_constraints="FALSE"
-                         normal="#a9294e"
-                         select="#c1416a">
+      <ThemeBoneColorSet normal="#a9294e"
+                         select="#c1416a"
+                         active="#f05d91"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#8764d5"
-                         show_colored_constraints="FALSE"
-                         normal="#430c78"
-                         select="#543aa3">
+      <ThemeBoneColorSet normal="#430c78"
+                         select="#543aa3"
+                         active="#8764d5"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#6fb6ab"
-                         show_colored_constraints="FALSE"
-                         normal="#24785a"
-                         select="#3c9579">
+      <ThemeBoneColorSet normal="#24785a"
+                         select="#3c9579"
+                         active="#6fb6ab"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#9bc2cd"
-                         show_colored_constraints="FALSE"
-                         normal="#4b707c"
-                         select="#6a8691">
+      <ThemeBoneColorSet normal="#4b707c"
+                         select="#6a8691"
+                         active="#9bc2cd"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f3ff00"
-                         show_colored_constraints="FALSE"
-                         normal="#f4c90c"
-                         select="#eec236">
+      <ThemeBoneColorSet normal="#f4c90c"
+                         select="#eec236"
+                         active="#f3ff00"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#ffffff"
-                         show_colored_constraints="FALSE"
-                         normal="#1e2024"
-                         select="#484c56">
+      <ThemeBoneColorSet normal="#1e2024"
+                         select="#484c56"
+                         active="#ffffff"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#d330d6"
-                         show_colored_constraints="FALSE"
-                         normal="#6f2f6a"
-                         select="#9845be">
+      <ThemeBoneColorSet normal="#6f2f6a"
+                         select="#9845be"
+                         active="#d330d6"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bbef5b"
-                         show_colored_constraints="FALSE"
-                         normal="#6c8e22"
-                         select="#7fb022">
+      <ThemeBoneColorSet normal="#6c8e22"
+                         select="#7fb022"
+                         active="#bbef5b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#dedede"
-                         show_colored_constraints="FALSE"
-                         normal="#8d8d8d"
-                         select="#b0b0b0">
+      <ThemeBoneColorSet normal="#8d8d8d"
+                         select="#b0b0b0"
+                         active="#dedede"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bd6a11"
-                         show_colored_constraints="FALSE"
-                         normal="#834326"
-                         select="#8b5811">
+      <ThemeBoneColorSet normal="#834326"
+                         select="#8b5811"
+                         active="#bd6a11"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#34622b"
-                         show_colored_constraints="FALSE"
-                         normal="#08310e"
-                         select="#1c430b">
+      <ThemeBoneColorSet normal="#08310e"
+                         select="#1c430b"
+                         active="#34622b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
     </bone_color_sets>
   </Theme>
diff --git a/release/scripts/presets/interface_theme/elsyiun.xml b/release/scripts/presets/interface_theme/elsyiun.xml
index 581f5ce82d6..c10eb108000 100644
--- a/release/scripts/presets/interface_theme/elsyiun.xml
+++ b/release/scripts/presets/interface_theme/elsyiun.xml
@@ -1,849 +1,852 @@
 <bpy>
   <Theme>
+    <user_interface>
+      <ThemeUserInterface icon_file=""
+                          icon_alpha="1"
+                          axis_x="#dc0000"
+                          axis_y="#00dc00"
+                          axis_z="#0000dc">
+        <wcol_regular>
+          <ThemeWidgetColors outline="#191919"
+                             inner="#4e4e4eff"
+                             inner_sel="#b67e3eff"
+                             item="#191919ff"
+                             text="#b8b8b8"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_regular>
+        <wcol_tool>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#414141ff"
+                             inner_sel="#b67e3eff"
+                             item="#191919ff"
+                             text="#b8b8b8"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_tool>
+        <wcol_radio>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#414141ff"
+                             inner_sel="#b67e3eff"
+                             item="#ffffffff"
+                             text="#b8b8b8"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_radio>
+        <wcol_text>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#7a8287ff"
+                             inner_sel="#999999ff"
+                             item="#5a5a5aff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_text>
+        <wcol_option>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#4e4e4eff"
+                             inner_sel="#a9753aff"
+                             item="#ffffffff"
+                             text="#b8b8b8"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_option>
+        <wcol_toggle>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#555555ff"
+                             inner_sel="#796348ff"
+                             item="#191919ff"
+                             text="#b8b8b8"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_toggle>
+        <wcol_num>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#414141ff"
+                             inner_sel="#999999ff"
+                             item="#7a7a7aff"
+                             text="#b8b8b8"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_num>
+        <wcol_numslider>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#606068ff"
+                             inner_sel="#91919dff"
+                             item="#4b4b4bff"
+                             text="#a2a2a2"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_numslider>
+        <wcol_box>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#4b4b4bff"
+                             inner_sel="#646464ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="-7">
+          </ThemeWidgetColors>
+        </wcol_box>
+        <wcol_menu>
+          <ThemeWidgetColors outline="#2c2c2c"
+                             inner="#444444ff"
+                             inner_sel="#464646ff"
+                             item="#7a7a7aff"
+                             text="#b8b8b8"
+                             text_sel="#cccccc"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu>
+        <wcol_pulldown>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#3f3f3fff"
+                             inner_sel="#f78805ff"
+                             item="#ffffffff"
+                             text="#b8b8b8"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="25"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_pulldown>
+        <wcol_menu_back>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#3b3b3bff"
+                             inner_sel="#2d2d2de6"
+                             item="#646464ff"
+                             text="#b8b8b8"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_menu_back>
+        <wcol_tooltip>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#191919e6"
+                             inner_sel="#2d2d2de6"
+                             item="#646464ff"
+                             text="#ffffff"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_tooltip>
+        <wcol_menu_item>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#b67e3eff"
+                             item="#ffffffff"
+                             text="#b8b8b8"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="20">
+          </ThemeWidgetColors>
+        </wcol_menu_item>
+        <wcol_scroll>
+          <ThemeWidgetColors outline="#2d2d2d"
+                             inner="#6c707200"
+                             inner_sel="#646464b4"
+                             item="#414141ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_scroll>
+        <wcol_progress>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#bebebeff"
+                             inner_sel="#646464b4"
+                             item="#444444ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_progress>
+        <wcol_list_item>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#a9753777"
+                             item="#000000ff"
+                             text="#e0e0e0"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_list_item>
+        <wcol_state>
+          <ThemeWidgetStateColors inner_anim="#339900"
+                                  inner_anim_sel="#2b8000"
+                                  inner_key="#999300"
+                                  inner_key_sel="#666200"
+                                  inner_driven="#b400ff"
+                                  inner_driven_sel="#9900e6"
+                                  blend="0.5">
+          </ThemeWidgetStateColors>
+        </wcol_state>
+        <panel>
+          <ThemePanelColors header="#00000019"
+                            show_header="FALSE">
+          </ThemePanelColors>
+        </panel>
+      </ThemeUserInterface>
+    </user_interface>
     <view_3d>
-      <ThemeView3D object_active="#ffc280"
-                   editmesh_active="#ffffff80"
-                   act_spline="#db2512"
-                   handle_align="#803060"
-                   handle_sel_align="#f090a0"
-                   handle_auto="#909000"
-                   handle_sel_auto="#f0ff40"
-                   bone_pose="#50c8ff"
-                   bone_pose_active="#8cffff"
-                   bone_solid="#c8c8c8"
-                   bundle_solid="#c8c8c8"
+      <ThemeView3D grid="#585858"
+                   panel="#a5a5a57f"
+                   wire="#000000"
+                   lamp="#00000028"
+                   speaker="#000000"
                    camera="#000000"
-                   camera_path="#000000"
-                   frame_current="#60c040"
-                   edge_crease="#cc0099"
-                   extra_edge_len="#200000"
-                   edge_seam="#db2512"
+                   empty="#000000"
+                   object_selected="#ff8500"
+                   object_active="#ffc280"
+                   object_grouped="#083008"
+                   object_grouped_active="#55bb55"
+                   transform="#ffffff"
+                   vertex="#657780"
+                   vertex_select="#ff7c00"
+                   vertex_size="3"
                    edge_select="#cb7027"
+                   edge_seam="#db2512"
                    edge_sharp="#00ffff"
+                   edge_crease="#cc0099"
                    edge_facesel="#4b4b4b"
-                   empty="#000000"
                    face="#00000036"
-                   extra_face_angle="#000080"
-                   extra_face_area="#002000"
+                   face_select="#a47c5b73"
                    face_dot="#be6925"
                    facedot_size="3"
-                   normal="#22dddd"
-                   face_select="#a47c5b73"
-                   handle_free="#000000"
-                   handle_sel_free="#000000"
-                   grid="#585858"
-                   lamp="#00000028"
-                   lastsel_point="#ffffff"
                    nurb_uline="#909000"
                    nurb_vline="#803060"
                    nurb_sel_uline="#f0ff40"
                    nurb_sel_vline="#f090a0"
-                   object_grouped="#083008"
-                   object_grouped_active="#55bb55"
-                   object_selected="#ff8500"
-                   outline_width="1"
-                   panel="#a5a5a57f"
-                   skin_root="#000000"
-                   speaker="#000000"
-                   transform="#ffffff"
+                   act_spline="#db2512"
+                   handle_free="#000000"
+                   handle_auto="#909000"
                    handle_vect="#409030"
+                   handle_align="#803060"
+                   handle_sel_free="#000000"
+                   handle_sel_auto="#f0ff40"
                    handle_sel_vect="#40c030"
-                   vertex="#657780"
+                   handle_sel_align="#f090a0"
+                   lastsel_point="#ffffff"
+                   extra_edge_len="#200000"
+                   extra_face_angle="#000080"
+                   extra_face_area="#002000"
+                   editmesh_active="#ffffff80"
+                   normal="#22dddd"
                    vertex_normal="#2361dd"
-                   vertex_select="#ff7c00"
-                   vertex_size="3"
-                   wire="#000000">
+                   bone_solid="#c8c8c8"
+                   bone_pose="#50c8ff"
+                   bone_pose_active="#8cffff"
+                   frame_current="#60c040"
+                   outline_width="1"
+                   bundle_solid="#c8c8c8"
+                   camera_path="#000000"
+                   skin_root="#000000">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#000000"
+                             text="#b8b8b8"
+                             text_hi="#e9e9e9"
+                             header="#3b3b3b"
                              header_text="#b9b9b9"
                              header_text_hi="#ffffff"
                              button="#3b3b3b"
-                             button_text="#979797"
-                             button_text_hi="#ffffff"
                              button_title="#979797"
-                             text="#b8b8b8"
-                             text_hi="#e9e9e9"
-                             title="#000000"
-                             back="#4b4b4b">
+                             button_text="#979797"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeView3D>
     </view_3d>
-    <clip_editor>
-      <ThemeClipEditor active_marker="#ffffff"
-                       frame_current="#60c040"
-                       disabled_marker="#7f0000"
-                       grid="#5e5e5e"
-                       handle_vertex="#000000"
-                       handle_vertex_select="#ffff00"
-                       handle_vertex_size="4"
-                       locked_marker="#7f7f7f"
-                       marker="#7f7f00"
-                       marker_outline="#000000"
-                       path_after="#0000ff"
-                       path_before="#ff0000"
-                       selected_marker="#ffff00"
-                       strips="#0c0a0a"
-                       strips_selected="#ff8c00">
-        <space>
-          <ThemeSpaceGeneric header="#313131"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#3b3b3b"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#393939">
-          </ThemeSpaceGeneric>
-        </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#666666"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeClipEditor>
-    </clip_editor>
-    <console>
-      <ThemeConsole cursor="#dc6060"
-                    line_error="#dc6060"
-                    line_info="#00aa00"
-                    line_input="#ffffff"
-                    line_output="#b8b8b8">
-        <space>
-          <ThemeSpaceGeneric header="#303030"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#3b3b3b"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#202020">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeConsole>
-    </console>
-    <dopesheet_editor>
-      <ThemeDopeSheet active_channels_group="#87b17d"
-                      channel_group="#4f6549"
-                      channels="#707070"
-                      channels_selected="#60c040"
-                      frame_current="#60c040"
-                      dopesheet_channel="#52606e"
-                      dopesheet_subchannel="#7c8996"
-                      grid="#585858"
-                      long_key="#0c0a0a"
-                      long_key_selected="#ff8c00"
-                      summary="#00000000"
-                      value_sliders="#000000"
-                      view_sliders="#969696">
-        <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#aaaaaa"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#ffffff"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#4b4b4b">
-          </ThemeSpaceGeneric>
-        </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#3b3b3b"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeDopeSheet>
-    </dopesheet_editor>
-    <file_browser>
-      <ThemeFileBrowser active_file="#828282"
-                        active_file_text="#fafafa"
-                        scroll_handle="#7f7070"
-                        scrollbar="#a0a0a0"
-                        selected_file="#755129"
-                        tiles="#3b3b3b">
-        <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
-                             header_text="#8b8b8b"
-                             header_text_hi="#ffffff"
-                             button="#303030"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#cacaca"
-                             text_hi="#0f0f0f"
-                             title="#8b8b8b"
-                             back="#4b4b4b">
-          </ThemeSpaceGeneric>
-        </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#3b3b3b"
-                                 list_text="#8b8b8b"
-                                 list_text_hi="#ffffff"
-                                 list_title="#8b8b8b">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeFileBrowser>
-    </file_browser>
     <graph_editor>
-      <ThemeGraphEditor active_channels_group="#87b17d"
-                        handle_align="#803060"
-                        handle_sel_align="#f090a0"
+      <ThemeGraphEditor grid="#585858"
+                        panel="#ffffff"
+                        window_sliders="#969696"
+                        channels_region="#707070"
+                        vertex="#000000"
+                        vertex_select="#ff8500"
+                        vertex_size="3"
+                        handle_free="#000000"
                         handle_auto="#909000"
+                        handle_vect="#409030"
+                        handle_align="#803060"
+                        handle_sel_free="#000000"
                         handle_sel_auto="#f0ff40"
+                        handle_sel_vect="#40c030"
+                        handle_sel_align="#f090a0"
                         handle_auto_clamped="#994030"
                         handle_sel_auto_clamped="#f0af90"
-                        channel_group="#4f6549"
-                        channels_region="#707070"
+                        lastsel_point="#ffffff"
                         frame_current="#60c040"
-                        dopesheet_channel="#52606e"
-                        dopesheet_subchannel="#545d66"
-                        handle_free="#000000"
-                        handle_sel_free="#000000"
-                        grid="#585858"
                         handle_vertex="#000000"
                         handle_vertex_select="#ff8500"
                         handle_vertex_size="4"
-                        lastsel_point="#ffffff"
-                        panel="#ffffff"
-                        handle_vect="#409030"
-                        handle_sel_vect="#40c030"
-                        vertex="#000000"
-                        vertex_select="#ff8500"
-                        vertex_size="3"
-                        window_sliders="#969696">
+                        channel_group="#4f6549"
+                        active_channels_group="#87b17d"
+                        dopesheet_channel="#52606e"
+                        dopesheet_subchannel="#545d66">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#8b8b8b"
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#3b3b3b"
-                             button_text="#8b8b8b"
-                             button_text_hi="#ffffff"
                              button_title="#8b8b8b"
-                             text="#ffffff"
-                             text_hi="#ffffff"
-                             title="#8b8b8b"
-                             back="#4b4b4b">
+                             button_text="#8b8b8b"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3b3b3b"
+                                 list_title="#8b8b8b"
                                  list_text="#8b8b8b"
-                                 list_text_hi="#ffffff"
-                                 list_title="#8b8b8b">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeGraphEditor>
     </graph_editor>
-    <image_editor>
-      <ThemeImageEditor editmesh_active="#ffffff80"
-                        face="#a47c5b0a"
-                        face_dot="#ffffff"
-                        facedot_size="3"
-                        face_select="#a47c5b3c"
-                        scope_back="#303030ff"
-                        preview_stitch_active="#e1d2c323"
-                        preview_stitch_edge="#ff8500b2"
-                        preview_stitch_face="#1242b026"
-                        preview_stitch_stitchable="#00ff00ff"
-                        preview_stitch_unstitchable="#ff0000ff"
-                        preview_stitch_vert="#ff85007f"
-                        vertex="#32adec"
-                        vertex_select="#be6925"
-                        vertex_size="3">
+    <file_browser>
+      <ThemeFileBrowser selected_file="#755129"
+                        tiles="#3b3b3b"
+                        scrollbar="#a0a0a0"
+                        scroll_handle="#7f7070"
+                        active_file="#828282"
+                        active_file_text="#fafafa">
         <space>
-          <ThemeSpaceGeneric header="#303030"
-                             header_text="#000000"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#8b8b8b"
+                             text="#cacaca"
+                             text_hi="#0f0f0f"
+                             header="#3b3b3b"
+                             header_text="#8b8b8b"
                              header_text_hi="#ffffff"
                              button="#303030"
-                             button_text="#8b8b8b"
-                             button_text_hi="#ffffff"
-                             button_title="#8b8b8b"
-                             text="#8b8b8b"
-                             text_hi="#ffffff"
-                             title="#8b8b8b"
-                             back="#4b4b4b">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeImageEditor>
-    </image_editor>
-    <info>
-      <ThemeInfo>
-        <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
-                             header_text="#000000"
-                             header_text_hi="#000000"
-                             button="#3b3b3b"
-                             button_text="#000000"
-                             button_text_hi="#000000"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#000000"
-                             title="#000000"
-                             back="#727272">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeInfo>
-    </info>
-    <logic_editor>
-      <ThemeLogicEditor panel="#3b3b3b">
-        <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#3b3b3b"
-                             button_text="#8b8b8b"
-                             button_text_hi="#ffffff"
-                             button_title="#8b8b8b"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#3b3b3b">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeLogicEditor>
-    </logic_editor>
+        <space_list>
+          <ThemeSpaceListGeneric list="#3b3b3b"
+                                 list_title="#8b8b8b"
+                                 list_text="#8b8b8b"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeFileBrowser>
+    </file_browser>
     <nla_editor>
-      <ThemeNLAEditor active_action="#00000000"
-                      frame_current="#60c040"
-                      grid="#585858"
-                      meta_strips="#000000"
-                      meta_strips_selected="#000000"
+      <ThemeNLAEditor grid="#585858"
+                      view_sliders="#969696"
+                      active_action="#00000000"
                       active_action_unset="#00000000"
-                      sound_strips="#000000"
-                      sound_strips_selected="#000000"
                       strips="#0c0a0a"
                       strips_selected="#ff8c00"
                       transition_strips="#000000"
                       transition_strips_selected="#000000"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
                       tweak="#000000"
                       tweak_duplicate="#000000"
-                      view_sliders="#969696">
+                      frame_current="#60c040">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#8b8b8b"
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#3b3b3b"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#ffffff"
-                             text_hi="#ffffff"
-                             title="#8b8b8b"
-                             back="#4b4b4b">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3b3b3b"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeNLAEditor>
     </nla_editor>
-    <node_editor>
-      <ThemeNodeEditor node_active="#ffffff"
-                       converter_node="#575675"
-                       frame_node="#9a9b9ba0"
-                       group_node="#1e7524"
-                       in_out_node="#e08706"
-                       node_backdrop="#9b9b9ba0"
-                       node_selected="#ffffff"
-                       noodle_curving="5"
-                       operator_node="#2c6f6f"
-                       selected_text="#7f7070"
-                       wire_select="#ffffff"
-                       wire="#000000">
+    <dopesheet_editor>
+      <ThemeDopeSheet grid="#585858"
+                      value_sliders="#000000"
+                      view_sliders="#969696"
+                      channels="#707070"
+                      channels_selected="#60c040"
+                      channel_group="#4f6549"
+                      active_channels_group="#87b17d"
+                      long_key="#0c0a0a"
+                      long_key_selected="#ff8c00"
+                      frame_current="#60c040"
+                      dopesheet_channel="#52606e"
+                      dopesheet_subchannel="#7c8996"
+                      summary="#00000000">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#000000"
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#3b3b3b"
-                             button_text="#8b8b8b"
-                             button_text_hi="#ffffff"
-                             button_title="#8b8b8b"
-                             text="#dbdbdb"
-                             text_hi="#ffffff"
-                             title="#8b8b8b"
-                             back="#3b3b3b">
+                             button="#aaaaaa"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
-          <ThemeSpaceListGeneric list="#a5a5a5"
+          <ThemeSpaceListGeneric list="#3b3b3b"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeNodeEditor>
-    </node_editor>
-    <outliner>
-      <ThemeOutliner match="#337f33"
-                     selected_highlight="#82878c">
+      </ThemeDopeSheet>
+    </dopesheet_editor>
+    <image_editor>
+      <ThemeImageEditor vertex="#32adec"
+                        vertex_select="#be6925"
+                        vertex_size="3"
+                        face="#a47c5b0a"
+                        face_select="#a47c5b3c"
+                        face_dot="#ffffff"
+                        facedot_size="3"
+                        editmesh_active="#ffffff80"
+                        scope_back="#303030ff"
+                        preview_stitch_face="#1242b026"
+                        preview_stitch_edge="#ff8500b2"
+                        preview_stitch_vert="#ff85007f"
+                        preview_stitch_stitchable="#00ff00ff"
+                        preview_stitch_unstitchable="#ff0000ff"
+                        preview_stitch_active="#e1d2c323">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#8b8b8b"
+                             text="#8b8b8b"
+                             text_hi="#ffffff"
+                             header="#303030"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#cacaca"
+                             button="#303030"
+                             button_title="#8b8b8b"
+                             button_text="#8b8b8b"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeImageEditor>
+    </image_editor>
+    <sequence_editor>
+      <ThemeSequenceEditor grid="#818181"
+                           window_sliders="#a0a0a0"
+                           movie_strip="#516987"
+                           movieclip_strip="#20208f"
+                           image_strip="#6d5881"
+                           scene_strip="#4e983e"
+                           audio_strip="#2e8f8f"
+                           effect_strip="#a9547c"
+                           transition_strip="#a25f6f"
+                           meta_strip="#6d9183"
+                           frame_current="#60c040"
+                           keyframe="#ff8500"
+                           draw_action="#50c8ff"
+                           preview_back="#000000">
+        <space>
+          <ThemeSpaceGeneric back="#636363"
+                             title="#8b8b8b"
+                             text="#ffffff"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#4b4b4b">
+                             header="#3b3b3b"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#3b3b3b"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeOutliner>
-    </outliner>
+      </ThemeSequenceEditor>
+    </sequence_editor>
     <properties>
       <ThemeProperties panel="#828282">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#3b3b3b"
+                             title="#979797"
+                             text="#b8b8b8"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#727272"
-                             button_text="#b8b8b8"
-                             button_text_hi="#ffffff"
                              button_title="#b8b8b8"
-                             text="#b8b8b8"
-                             text_hi="#ffffff"
-                             title="#979797"
-                             back="#3b3b3b">
+                             button_text="#b8b8b8"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeProperties>
     </properties>
-    <sequence_editor>
-      <ThemeSequenceEditor audio_strip="#2e8f8f"
-                           movieclip_strip="#20208f"
-                           frame_current="#60c040"
-                           draw_action="#50c8ff"
-                           effect_strip="#a9547c"
-                           grid="#818181"
-                           image_strip="#6d5881"
-                           keyframe="#ff8500"
-                           meta_strip="#6d9183"
-                           movie_strip="#516987"
-                           preview_back="#000000"
-                           scene_strip="#4e983e"
-                           transition_strip="#a25f6f"
-                           window_sliders="#a0a0a0">
+    <text_editor>
+      <ThemeTextEditor line_numbers_background="#2e2e2e"
+                       selected_text="#4e4e8f"
+                       cursor="#8b8bff"
+                       syntax_builtin="#808bed"
+                       syntax_special="#c080d0"
+                       syntax_comment="#cd8b00"
+                       syntax_string="#ffcd8b"
+                       syntax_numbers="#f0ad6d">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#1e1e27"
+                             title="#8b8b8b"
+                             text="#cfbfad"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#3b3b3b"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#ffffff"
+                             button_title="#8b8b8b"
+                             button_text="#8b8b8b"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeTextEditor>
+    </text_editor>
+    <timeline>
+      <ThemeTimeline grid="#5b5b5b"
+                     frame_current="#60c040">
+        <space>
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#000000"
+                             text="#b8b8b8"
                              text_hi="#ffffff"
+                             header="#3b3b3b"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#727272"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeTimeline>
+    </timeline>
+    <node_editor>
+      <ThemeNodeEditor node_selected="#ffffff"
+                       node_active="#ffffff"
+                       wire="#000000"
+                       wire_select="#ffffff"
+                       selected_text="#7f7070"
+                       node_backdrop="#9b9b9ba0"
+                       in_out_node="#e08706"
+                       converter_node="#575675"
+                       operator_node="#2c6f6f"
+                       group_node="#1e7524"
+                       frame_node="#9a9b9ba0"
+                       noodle_curving="5">
+        <space>
+          <ThemeSpaceGeneric back="#3b3b3b"
                              title="#8b8b8b"
-                             back="#636363">
+                             text="#dbdbdb"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#3b3b3b"
+                             button_title="#8b8b8b"
+                             button_text="#8b8b8b"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeSequenceEditor>
-    </sequence_editor>
-    <text_editor>
-      <ThemeTextEditor cursor="#8b8bff"
-                       syntax_special="#c080d0"
-                       line_numbers_background="#2e2e2e"
-                       selected_text="#4e4e8f"
-                       syntax_builtin="#808bed"
-                       syntax_comment="#cd8b00"
-                       syntax_numbers="#f0ad6d"
-                       syntax_string="#ffcd8b">
+        <space_list>
+          <ThemeSpaceListGeneric list="#a5a5a5"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeNodeEditor>
+    </node_editor>
+    <logic_editor>
+      <ThemeLogicEditor panel="#3b3b3b">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#3b3b3b"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#3b3b3b"
-                             button_text="#8b8b8b"
-                             button_text_hi="#ffffff"
                              button_title="#8b8b8b"
-                             text="#cfbfad"
-                             text_hi="#ffffff"
-                             title="#8b8b8b"
-                             back="#1e1e27">
+                             button_text="#8b8b8b"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTextEditor>
-    </text_editor>
-    <timeline>
-      <ThemeTimeline frame_current="#60c040"
-                     grid="#5b5b5b">
+      </ThemeLogicEditor>
+    </logic_editor>
+    <outliner>
+      <ThemeOutliner match="#337f33"
+                     selected_highlight="#82878c">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#000000"
+                             text="#cacaca"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#b8b8b8"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#4b4b4b">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTimeline>
-    </timeline>
-    <user_interface>
-      <ThemeUserInterface icon_alpha="1"
-                          icon_file="">
-        <wcol_box>
-          <ThemeWidgetColors inner="#4b4b4bff"
-                             inner_sel="#646464ff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="-7"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_box>
-        <wcol_list_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#a9753777"
-                             item="#000000ff"
-                             outline="#000000"
-                             shadedown="-10"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#e0e0e0"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_list_item>
-        <wcol_menu_back>
-          <ThemeWidgetColors inner="#3b3b3bff"
-                             inner_sel="#2d2d2de6"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#b8b8b8"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_back>
-        <wcol_menu_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#b67e3eff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="20"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_menu_item>
-        <wcol_menu>
-          <ThemeWidgetColors inner="#444444ff"
-                             inner_sel="#464646ff"
-                             item="#7a7a7aff"
-                             outline="#2c2c2c"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#cccccc">
-          </ThemeWidgetColors>
-        </wcol_menu>
-        <wcol_num>
-          <ThemeWidgetColors inner="#414141ff"
-                             inner_sel="#999999ff"
-                             item="#7a7a7aff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_num>
-        <wcol_option>
-          <ThemeWidgetColors inner="#4e4e4eff"
-                             inner_sel="#a9753aff"
-                             item="#ffffffff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_option>
-        <panel>
-          <ThemePanelColors header="#00000019"
-                            show_header="FALSE">
-          </ThemePanelColors>
-        </panel>
-        <wcol_progress>
-          <ThemeWidgetColors inner="#bebebeff"
-                             inner_sel="#646464b4"
-                             item="#444444ff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_progress>
-        <wcol_pulldown>
-          <ThemeWidgetColors inner="#3f3f3fff"
-                             inner_sel="#f78805ff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="25"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_pulldown>
-        <wcol_radio>
-          <ThemeWidgetColors inner="#414141ff"
-                             inner_sel="#b67e3eff"
-                             item="#ffffffff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_radio>
-        <wcol_regular>
-          <ThemeWidgetColors inner="#4e4e4eff"
-                             inner_sel="#b67e3eff"
-                             item="#191919ff"
-                             outline="#191919"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#b8b8b8"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_regular>
-        <wcol_scroll>
-          <ThemeWidgetColors inner="#6c707200"
-                             inner_sel="#646464b4"
-                             item="#414141ff"
-                             outline="#2d2d2d"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_scroll>
-        <wcol_numslider>
-          <ThemeWidgetColors inner="#606068ff"
-                             inner_sel="#91919dff"
-                             item="#4b4b4bff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="-10"
-                             show_shaded="TRUE"
-                             text="#a2a2a2"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_numslider>
-        <wcol_state>
-          <ThemeWidgetStateColors inner_anim="#339900"
-                                  inner_anim_sel="#2b8000"
-                                  blend="0.5"
-                                  inner_driven="#b400ff"
-                                  inner_driven_sel="#9900e6"
-                                  inner_key="#999300"
-                                  inner_key_sel="#666200">
-          </ThemeWidgetStateColors>
-        </wcol_state>
-        <wcol_text>
-          <ThemeWidgetColors inner="#7a8287ff"
-                             inner_sel="#999999ff"
-                             item="#5a5a5aff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
+      </ThemeOutliner>
+    </outliner>
+    <info>
+      <ThemeInfo>
+        <space>
+          <ThemeSpaceGeneric back="#727272"
+                             title="#000000"
                              text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_text>
-        <wcol_toggle>
-          <ThemeWidgetColors inner="#555555ff"
-                             inner_sel="#796348ff"
-                             item="#191919ff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_toggle>
-        <wcol_tool>
-          <ThemeWidgetColors inner="#414141ff"
-                             inner_sel="#b67e3eff"
-                             item="#191919ff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tool>
-        <wcol_tooltip>
-          <ThemeWidgetColors inner="#191919e6"
-                             inner_sel="#2d2d2de6"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#ffffff"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tooltip>
-      </ThemeUserInterface>
-    </user_interface>
+                             text_hi="#000000"
+                             header="#3b3b3b"
+                             header_text="#000000"
+                             header_text_hi="#000000"
+                             button="#3b3b3b"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#000000">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeInfo>
+    </info>
     <user_preferences>
       <ThemeUserPreferences>
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#3b3b3b"
+                             title="#000000"
+                             text="#b8b8b8"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#b8b8b8"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#3b3b3b">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeUserPreferences>
     </user_preferences>
+    <console>
+      <ThemeConsole line_output="#b8b8b8"
+                    line_input="#ffffff"
+                    line_info="#00aa00"
+                    line_error="#dc6060"
+                    cursor="#dc6060">
+        <space>
+          <ThemeSpaceGeneric back="#202020"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#303030"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#3b3b3b"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeConsole>
+    </console>
+    <clip_editor>
+      <ThemeClipEditor marker_outline="#000000"
+                       marker="#7f7f00"
+                       active_marker="#ffffff"
+                       selected_marker="#ffff00"
+                       disabled_marker="#7f0000"
+                       locked_marker="#7f7f7f"
+                       path_before="#ff0000"
+                       path_after="#0000ff"
+                       grid="#5e5e5e"
+                       frame_current="#60c040"
+                       handle_vertex="#000000"
+                       handle_vertex_select="#ffff00"
+                       handle_vertex_size="4"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
+        <space>
+          <ThemeSpaceGeneric back="#393939"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#313131"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#3b3b3b"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeClipEditor>
+    </clip_editor>
     <bone_color_sets>
-      <ThemeBoneColorSet active="#f70a0a"
-                         show_colored_constraints="FALSE"
-                         normal="#9a0000"
-                         select="#bd1111">
+      <ThemeBoneColorSet normal="#9a0000"
+                         select="#bd1111"
+                         active="#f70a0a"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#fa9900"
-                         show_colored_constraints="FALSE"
-                         normal="#f74018"
-                         select="#f66913">
+      <ThemeBoneColorSet normal="#f74018"
+                         select="#f66913"
+                         active="#fa9900"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#83ef1d"
-                         show_colored_constraints="FALSE"
-                         normal="#1e9109"
-                         select="#59b70b">
+      <ThemeBoneColorSet normal="#1e9109"
+                         select="#59b70b"
+                         active="#83ef1d"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#5ec1ef"
-                         show_colored_constraints="FALSE"
-                         normal="#0a3694"
-                         select="#3667df">
+      <ThemeBoneColorSet normal="#0a3694"
+                         select="#3667df"
+                         active="#5ec1ef"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f05d91"
-                         show_colored_constraints="FALSE"
-                         normal="#a9294e"
-                         select="#c1416a">
+      <ThemeBoneColorSet normal="#a9294e"
+                         select="#c1416a"
+                         active="#f05d91"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#8764d5"
-                         show_colored_constraints="FALSE"
-                         normal="#430c78"
-                         select="#543aa3">
+      <ThemeBoneColorSet normal="#430c78"
+                         select="#543aa3"
+                         active="#8764d5"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#6fb6ab"
-                         show_colored_constraints="FALSE"
-                         normal="#24785a"
-                         select="#3c9579">
+      <ThemeBoneColorSet normal="#24785a"
+                         select="#3c9579"
+                         active="#6fb6ab"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#9bc2cd"
-                         show_colored_constraints="FALSE"
-                         normal="#4b707c"
-                         select="#6a8691">
+      <ThemeBoneColorSet normal="#4b707c"
+                         select="#6a8691"
+                         active="#9bc2cd"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f3ff00"
-                         show_colored_constraints="FALSE"
-                         normal="#f4c90c"
-                         select="#eec236">
+      <ThemeBoneColorSet normal="#f4c90c"
+                         select="#eec236"
+                         active="#f3ff00"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#ffffff"
-                         show_colored_constraints="FALSE"
-                         normal="#1e2024"
-                         select="#484c56">
+      <ThemeBoneColorSet normal="#1e2024"
+                         select="#484c56"
+                         active="#ffffff"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#d330d6"
-                         show_colored_constraints="FALSE"
-                         normal="#6f2f6a"
-                         select="#9845be">
+      <ThemeBoneColorSet normal="#6f2f6a"
+                         select="#9845be"
+                         active="#d330d6"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bbef5b"
-                         show_colored_constraints="FALSE"
-                         normal="#6c8e22"
-                         select="#7fb022">
+      <ThemeBoneColorSet normal="#6c8e22"
+                         select="#7fb022"
+                         active="#bbef5b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#dedede"
-                         show_colored_constraints="FALSE"
-                         normal="#8d8d8d"
-                         select="#b0b0b0">
+      <ThemeBoneColorSet normal="#8d8d8d"
+                         select="#b0b0b0"
+                         active="#dedede"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bd6a11"
-                         show_colored_constraints="FALSE"
-                         normal="#834326"
-                         select="#8b5811">
+      <ThemeBoneColorSet normal="#834326"
+                         select="#8b5811"
+                         active="#bd6a11"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#34622b"
-                         show_colored_constraints="FALSE"
-                         normal="#08310e"
-                         select="#1c430b">
+      <ThemeBoneColorSet normal="#08310e"
+                         select="#1c430b"
+                         active="#34622b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
     </bone_color_sets>
   </Theme>
diff --git a/release/scripts/presets/interface_theme/hexagon.xml b/release/scripts/presets/interface_theme/hexagon.xml
index 61730583396..ad514bbbafa 100644
--- a/release/scripts/presets/interface_theme/hexagon.xml
+++ b/release/scripts/presets/interface_theme/hexagon.xml
@@ -1,849 +1,852 @@
 <bpy>
   <Theme>
+    <user_interface>
+      <ThemeUserInterface icon_file=""
+                          icon_alpha="1"
+                          axis_x="#dc0000"
+                          axis_y="#00dc00"
+                          axis_z="#0000dc">
+        <wcol_regular>
+          <ThemeWidgetColors outline="#191919"
+                             inner="#8d909fff"
+                             inner_sel="#859cb9ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_regular>
+        <wcol_tool>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#8d909fff"
+                             inner_sel="#859cb9ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_tool>
+        <wcol_radio>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#8b8d9aff"
+                             inner_sel="#859cb9ff"
+                             item="#ffffffff"
+                             text="#000000"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_radio>
+        <wcol_text>
+          <ThemeWidgetColors outline="#464646"
+                             inner="#9b9eadff"
+                             inner_sel="#999999ff"
+                             item="#5a5a5aff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="25">
+          </ThemeWidgetColors>
+        </wcol_text>
+        <wcol_option>
+          <ThemeWidgetColors outline="#464646"
+                             inner="#bbbbbbff"
+                             inner_sel="#777777ff"
+                             item="#ffffffff"
+                             text="#cecece"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_option>
+        <wcol_toggle>
+          <ThemeWidgetColors outline="#464646"
+                             inner="#afafafff"
+                             inner_sel="#859cb9ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_toggle>
+        <wcol_num>
+          <ThemeWidgetColors outline="#464646"
+                             inner="#8d909fff"
+                             inner_sel="#999999ff"
+                             item="#5d5d5dff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_num>
+        <wcol_numslider>
+          <ThemeWidgetColors outline="#3f3f3f"
+                             inner="#b4b4b4ff"
+                             inner_sel="#999999ff"
+                             item="#b0b0b0ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-20"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_numslider>
+        <wcol_box>
+          <ThemeWidgetColors outline="#191919"
+                             inner="#80828eff"
+                             inner_sel="#646464ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_box>
+        <wcol_menu>
+          <ThemeWidgetColors outline="#3d3d3d"
+                             inner="#555d6dff"
+                             inner_sel="#464646ff"
+                             item="#9d9d9dff"
+                             text="#ffffff"
+                             text_sel="#cccccc"
+                             show_shaded="TRUE"
+                             shadetop="15"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu>
+        <wcol_pulldown>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#3f3f3fff"
+                             inner_sel="#50c8ffff"
+                             item="#ffffffff"
+                             text="#d8d8d8"
+                             text_sel="#000000"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_pulldown>
+        <wcol_menu_back>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#393c44eb"
+                             inner_sel="#2d2d2dff"
+                             item="#646464ff"
+                             text="#cecece"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="40"
+                             shadedown="-40">
+          </ThemeWidgetColors>
+        </wcol_menu_back>
+        <wcol_tooltip>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#191919e6"
+                             inner_sel="#2d2d2de6"
+                             item="#646464ff"
+                             text="#ffffff"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_tooltip>
+        <wcol_menu_item>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#69a5beff"
+                             item="#ffffffff"
+                             text="#d9d9d9"
+                             text_sel="#000000"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu_item>
+        <wcol_scroll>
+          <ThemeWidgetColors outline="#4f5057"
+                             inner="#5050502e"
+                             inner_sel="#646464b4"
+                             item="#737a8eff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_scroll>
+        <wcol_progress>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#bebebeff"
+                             inner_sel="#646464b4"
+                             item="#444444ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_progress>
+        <wcol_list_item>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#50c8ff62"
+                             item="#000000ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_list_item>
+        <wcol_state>
+          <ThemeWidgetStateColors inner_anim="#73be4c"
+                                  inner_anim_sel="#5aa633"
+                                  inner_key="#f0eb64"
+                                  inner_key_sel="#d7d34b"
+                                  inner_driven="#b400ff"
+                                  inner_driven_sel="#9900e6"
+                                  blend="0.5">
+          </ThemeWidgetStateColors>
+        </wcol_state>
+        <panel>
+          <ThemePanelColors header="#00000019"
+                            show_header="TRUE">
+          </ThemePanelColors>
+        </panel>
+      </ThemeUserInterface>
+    </user_interface>
     <view_3d>
-      <ThemeView3D object_active="#6ed8ff"
-                   editmesh_active="#00e8ff80"
-                   act_spline="#db2512"
-                   handle_align="#803060"
-                   handle_sel_align="#f090a0"
-                   handle_auto="#909000"
-                   handle_sel_auto="#f0ff40"
-                   bone_pose="#50c8ff"
-                   bone_pose_active="#8cffff"
-                   bone_solid="#c8c8c8"
-                   bundle_solid="#c8c8c8"
+      <ThemeView3D grid="#5e5e83"
+                   panel="#a5a5a5ff"
+                   wire="#000000"
+                   lamp="#00000028"
+                   speaker="#000000"
                    camera="#000000"
-                   camera_path="#000000"
-                   frame_current="#60c040"
-                   edge_crease="#cc0099"
-                   extra_edge_len="#200000"
-                   edge_seam="#e69632"
+                   empty="#000000"
+                   object_selected="#52c6ff"
+                   object_active="#6ed8ff"
+                   object_grouped="#104010"
+                   object_grouped_active="#55bb55"
+                   transform="#ffffff"
+                   vertex="#334cca"
+                   vertex_select="#0097da"
+                   vertex_size="3"
                    edge_select="#1151ce"
+                   edge_seam="#e69632"
                    edge_sharp="#ff2020"
+                   edge_crease="#cc0099"
                    edge_facesel="#4b4b4b"
-                   empty="#000000"
                    face="#affff418"
-                   extra_face_angle="#00008a"
-                   extra_face_area="#002000"
+                   face_select="#1151ce66"
                    face_dot="#4fc9ff"
                    facedot_size="3"
-                   normal="#00ffff"
-                   face_select="#1151ce66"
-                   handle_free="#000000"
-                   handle_sel_free="#000000"
-                   grid="#5e5e83"
-                   lamp="#00000028"
-                   lastsel_point="#ffffff"
                    nurb_uline="#909000"
                    nurb_vline="#803060"
                    nurb_sel_uline="#f0ff40"
                    nurb_sel_vline="#f090a0"
-                   object_grouped="#104010"
-                   object_grouped_active="#55bb55"
-                   object_selected="#52c6ff"
-                   outline_width="1"
-                   panel="#a5a5a5ff"
-                   skin_root="#000000"
-                   speaker="#000000"
-                   transform="#ffffff"
+                   act_spline="#db2512"
+                   handle_free="#000000"
+                   handle_auto="#909000"
                    handle_vect="#409030"
+                   handle_align="#803060"
+                   handle_sel_free="#000000"
+                   handle_sel_auto="#f0ff40"
                    handle_sel_vect="#40c030"
-                   vertex="#334cca"
+                   handle_sel_align="#f090a0"
+                   lastsel_point="#ffffff"
+                   extra_edge_len="#200000"
+                   extra_face_angle="#00008a"
+                   extra_face_area="#002000"
+                   editmesh_active="#00e8ff80"
+                   normal="#00ffff"
                    vertex_normal="#2361dd"
-                   vertex_select="#0097da"
-                   vertex_size="3"
-                   wire="#000000">
+                   bone_solid="#c8c8c8"
+                   bone_pose="#50c8ff"
+                   bone_pose_active="#8cffff"
+                   frame_current="#60c040"
+                   outline_width="1"
+                   bundle_solid="#c8c8c8"
+                   camera_path="#000000"
+                   skin_root="#000000">
         <space>
-          <ThemeSpaceGeneric header="#646875"
+          <ThemeSpaceGeneric back="#7f818d"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#646875"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#6c717f"
-                             button_text="#d7d7d7"
-                             button_text_hi="#ffffff"
                              button_title="#eaeaea"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#7f818d">
+                             button_text="#d7d7d7"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeView3D>
     </view_3d>
-    <clip_editor>
-      <ThemeClipEditor active_marker="#ffffff"
-                       frame_current="#60c040"
-                       disabled_marker="#7f0000"
-                       grid="#5e5e5e"
-                       handle_vertex="#000000"
-                       handle_vertex_select="#ffff00"
-                       handle_vertex_size="4"
-                       locked_marker="#7f7f7f"
-                       marker="#7f7f00"
-                       marker_outline="#000000"
-                       path_after="#0000ff"
-                       path_before="#ff0000"
-                       selected_marker="#ffff00"
-                       strips="#0c0a0a"
-                       strips_selected="#ff8c00">
+    <graph_editor>
+      <ThemeGraphEditor grid="#58587c"
+                        panel="#ffffff"
+                        window_sliders="#969696"
+                        channels_region="#707070"
+                        vertex="#000000"
+                        vertex_select="#ff8500"
+                        vertex_size="3"
+                        handle_free="#000000"
+                        handle_auto="#909000"
+                        handle_vect="#409030"
+                        handle_align="#803060"
+                        handle_sel_free="#000000"
+                        handle_sel_auto="#f0ff40"
+                        handle_sel_vect="#40c030"
+                        handle_sel_align="#f090a0"
+                        handle_auto_clamped="#000000"
+                        handle_sel_auto_clamped="#000000"
+                        lastsel_point="#ffffff"
+                        frame_current="#60c040"
+                        handle_vertex="#000000"
+                        handle_vertex_select="#ff8500"
+                        handle_vertex_size="3"
+                        channel_group="#4f6549"
+                        active_channels_group="#87b17d"
+                        dopesheet_channel="#52606e"
+                        dopesheet_subchannel="#7c8996">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#646875"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#7c7e88"
                              title="#000000"
-                             back="#7c7e88">
-          </ThemeSpaceGeneric>
-        </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#666666"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeClipEditor>
-    </clip_editor>
-    <console>
-      <ThemeConsole cursor="#dc6060"
-                    line_error="#dc0606"
-                    line_info="#00aa00"
-                    line_input="#ffffff"
-                    line_output="#000000">
-        <space>
-          <ThemeSpaceGeneric header="#5c606c"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#6c717f"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeConsole>
-    </console>
-    <dopesheet_editor>
-      <ThemeDopeSheet active_channels_group="#87b17d"
-                      channel_group="#4f6549"
-                      channels="#707070"
-                      channels_selected="#60c040"
-                      frame_current="#60c040"
-                      dopesheet_channel="#52606e"
-                      dopesheet_subchannel="#7c8996"
-                      grid="#58587c"
-                      long_key="#0c0a0a"
-                      long_key_selected="#ff8c00"
-                      summary="#00000000"
-                      value_sliders="#000000"
-                      view_sliders="#969696">
-        <space>
-          <ThemeSpaceGeneric header="#5c606c"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#6c717f"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#646875"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#6c717f"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeDopeSheet>
-    </dopesheet_editor>
+      </ThemeGraphEditor>
+    </graph_editor>
     <file_browser>
-      <ThemeFileBrowser active_file="#859cb9"
-                        active_file_text="#fafafa"
-                        scroll_handle="#7f7070"
+      <ThemeFileBrowser selected_file="#69a5be"
+                        tiles="#5c606c"
                         scrollbar="#a0a0a0"
-                        selected_file="#69a5be"
-                        tiles="#5c606c">
+                        scroll_handle="#7f7070"
+                        active_file="#859cb9"
+                        active_file_text="#fafafa">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#646875"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#0f0f0f"
+                             header="#5c606c"
                              header_text="#dddddd"
                              header_text_hi="#ffffff"
                              button="#6c717f"
-                             button_text="#d7d7d7"
-                             button_text_hi="#ffffff"
                              button_title="#d7d7d7"
-                             text="#000000"
-                             text_hi="#0f0f0f"
-                             title="#000000"
-                             back="#646875">
+                             button_text="#d7d7d7"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#6c717f"
+                                 list_title="#d7d7d7"
                                  list_text="#d7d7d7"
-                                 list_text_hi="#ffffff"
-                                 list_title="#d7d7d7">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeFileBrowser>
     </file_browser>
-    <graph_editor>
-      <ThemeGraphEditor active_channels_group="#87b17d"
-                        handle_align="#803060"
-                        handle_sel_align="#f090a0"
-                        handle_auto="#909000"
-                        handle_sel_auto="#f0ff40"
-                        handle_auto_clamped="#000000"
-                        handle_sel_auto_clamped="#000000"
-                        channel_group="#4f6549"
-                        channels_region="#707070"
-                        frame_current="#60c040"
-                        dopesheet_channel="#52606e"
-                        dopesheet_subchannel="#7c8996"
-                        handle_free="#000000"
-                        handle_sel_free="#000000"
-                        grid="#58587c"
-                        handle_vertex="#000000"
-                        handle_vertex_select="#ff8500"
-                        handle_vertex_size="3"
-                        lastsel_point="#ffffff"
-                        panel="#ffffff"
-                        handle_vect="#409030"
-                        handle_sel_vect="#40c030"
-                        vertex="#000000"
-                        vertex_select="#ff8500"
-                        vertex_size="3"
-                        window_sliders="#969696">
+    <nla_editor>
+      <ThemeNLAEditor grid="#5e5e5e"
+                      view_sliders="#969696"
+                      active_action="#00000000"
+                      active_action_unset="#00000000"
+                      strips="#0c0a0a"
+                      strips_selected="#ff8c00"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
+                      frame_current="#60c040">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#646875"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#646875"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeNLAEditor>
+    </nla_editor>
+    <dopesheet_editor>
+      <ThemeDopeSheet grid="#58587c"
+                      value_sliders="#000000"
+                      view_sliders="#969696"
+                      channels="#707070"
+                      channels_selected="#60c040"
+                      channel_group="#4f6549"
+                      active_channels_group="#87b17d"
+                      long_key="#0c0a0a"
+                      long_key_selected="#ff8c00"
+                      frame_current="#60c040"
+                      dopesheet_channel="#52606e"
+                      dopesheet_subchannel="#7c8996"
+                      summary="#00000000">
+        <space>
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             header="#5c606c"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#6c717f"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#6c717f"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeGraphEditor>
-    </graph_editor>
+      </ThemeDopeSheet>
+    </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor editmesh_active="#ffffff80"
+      <ThemeImageEditor vertex="#334cca"
+                        vertex_select="#50c8ff"
+                        vertex_size="3"
                         face="#ffffff0a"
+                        face_select="#50c8ff3c"
                         face_dot="#50c8ff"
                         facedot_size="3"
-                        face_select="#50c8ff3c"
+                        editmesh_active="#ffffff80"
                         scope_back="#646875ff"
-                        preview_stitch_active="#e1d2c323"
-                        preview_stitch_edge="#ff8500b2"
                         preview_stitch_face="#1242b026"
+                        preview_stitch_edge="#ff8500b2"
+                        preview_stitch_vert="#ff85007f"
                         preview_stitch_stitchable="#00ff00ff"
                         preview_stitch_unstitchable="#ff0000ff"
-                        preview_stitch_vert="#ff85007f"
-                        vertex="#334cca"
-                        vertex_select="#50c8ff"
-                        vertex_size="3">
+                        preview_stitch_active="#e1d2c323">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#646875"
-                             button_text="#eeeeee"
-                             button_text_hi="#ffffff"
                              button_title="#eeeeee"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             button_text="#eeeeee"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeImageEditor>
     </image_editor>
-    <info>
-      <ThemeInfo>
+    <sequence_editor>
+      <ThemeSequenceEditor grid="#404040"
+                           window_sliders="#a0a0a0"
+                           movie_strip="#516987"
+                           movieclip_strip="#20208f"
+                           image_strip="#6d5881"
+                           scene_strip="#4e983e"
+                           audio_strip="#2e8f8f"
+                           effect_strip="#a9547c"
+                           transition_strip="#a25f6f"
+                           meta_strip="#6d9183"
+                           frame_current="#60c040"
+                           keyframe="#ff8500"
+                           draw_action="#50c8ff"
+                           preview_back="#000000">
         <space>
-          <ThemeSpaceGeneric header="#646875"
-                             header_text="#dddddd"
-                             header_text_hi="#ffffff"
-                             button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
+          <ThemeSpaceGeneric back="#90929c"
+                             title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#b4b4b4">
+                             header="#5c606c"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#646875"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeInfo>
-    </info>
-    <logic_editor>
-      <ThemeLogicEditor panel="#a5a5a5">
+      </ThemeSequenceEditor>
+    </sequence_editor>
+    <properties>
+      <ThemeProperties panel="#828282">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#646875"
+                             title="#ffffff"
+                             text="#e7e7e7"
+                             text_hi="#ffffff"
+                             header="#646875"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#6c717f"
-                             button_text="#d7d7d7"
-                             button_text_hi="#ffffff"
-                             button_title="#d7d7d7"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             button="#727272"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeLogicEditor>
-    </logic_editor>
-    <nla_editor>
-      <ThemeNLAEditor active_action="#00000000"
-                      frame_current="#60c040"
-                      grid="#5e5e5e"
-                      meta_strips="#000000"
-                      meta_strips_selected="#000000"
-                      active_action_unset="#00000000"
-                      sound_strips="#000000"
-                      sound_strips_selected="#000000"
-                      strips="#0c0a0a"
-                      strips_selected="#ff8c00"
-                      transition_strips="#000000"
-                      transition_strips_selected="#000000"
-                      tweak="#000000"
-                      tweak_duplicate="#000000"
-                      view_sliders="#969696">
+      </ThemeProperties>
+    </properties>
+    <text_editor>
+      <ThemeTextEditor line_numbers_background="#5a5e6a"
+                       selected_text="#c67777"
+                       cursor="#ff0000"
+                       syntax_builtin="#800050"
+                       syntax_special="#5f5f00"
+                       syntax_comment="#006432"
+                       syntax_string="#640000"
+                       syntax_numbers="#0000c8">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#646875"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeTextEditor>
+    </text_editor>
+    <timeline>
+      <ThemeTimeline grid="#58587c"
+                     frame_current="#60c040">
+        <space>
+          <ThemeSpaceGeneric back="#646875"
+                             title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             header="#565863"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#5a5e6a"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#646875"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeNLAEditor>
-    </nla_editor>
+      </ThemeTimeline>
+    </timeline>
     <node_editor>
-      <ThemeNodeEditor node_active="#ffffff"
-                       converter_node="#686a84"
-                       frame_node="#9a9b9ba0"
-                       group_node="#69756e"
-                       in_out_node="#64647b"
+      <ThemeNodeEditor node_selected="#ffffff"
+                       node_active="#ffffff"
+                       wire="#000000"
+                       wire_select="#ffffff"
+                       selected_text="#7f7070"
                        node_backdrop="#9b9baca0"
-                       node_selected="#ffffff"
-                       noodle_curving="5"
+                       in_out_node="#64647b"
+                       converter_node="#686a84"
                        operator_node="#6c697e"
-                       selected_text="#7f7070"
-                       wire_select="#ffffff"
-                       wire="#000000">
+                       group_node="#69756e"
+                       frame_node="#9a9b9ba0"
+                       noodle_curving="5">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#646875"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#a7a7a7"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeNodeEditor>
     </node_editor>
-    <outliner>
-      <ThemeOutliner match="#245824"
-                     selected_highlight="#212844">
+    <logic_editor>
+      <ThemeLogicEditor panel="#a5a5a5">
         <space>
-          <ThemeSpaceGeneric header="#6c717f"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#e2e2e2"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#7c7e88"
                              title="#000000"
-                             back="#72747c">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeOutliner>
-    </outliner>
-    <properties>
-      <ThemeProperties panel="#828282">
-        <space>
-          <ThemeSpaceGeneric header="#646875"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#e7e7e7"
-                             text_hi="#ffffff"
-                             title="#ffffff"
-                             back="#646875">
+                             button="#6c717f"
+                             button_title="#d7d7d7"
+                             button_text="#d7d7d7"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeProperties>
-    </properties>
-    <sequence_editor>
-      <ThemeSequenceEditor audio_strip="#2e8f8f"
-                           movieclip_strip="#20208f"
-                           frame_current="#60c040"
-                           draw_action="#50c8ff"
-                           effect_strip="#a9547c"
-                           grid="#404040"
-                           image_strip="#6d5881"
-                           keyframe="#ff8500"
-                           meta_strip="#6d9183"
-                           movie_strip="#516987"
-                           preview_back="#000000"
-                           scene_strip="#4e983e"
-                           transition_strip="#a25f6f"
-                           window_sliders="#a0a0a0">
+      </ThemeLogicEditor>
+    </logic_editor>
+    <outliner>
+      <ThemeOutliner match="#245824"
+                     selected_highlight="#212844">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#72747c"
+                             title="#000000"
+                             text="#e2e2e2"
+                             text_hi="#ffffff"
+                             header="#6c717f"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#646875"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#727272"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#90929c">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeSequenceEditor>
-    </sequence_editor>
-    <text_editor>
-      <ThemeTextEditor cursor="#ff0000"
-                       syntax_special="#5f5f00"
-                       line_numbers_background="#5a5e6a"
-                       selected_text="#c67777"
-                       syntax_builtin="#800050"
-                       syntax_comment="#006432"
-                       syntax_numbers="#0000c8"
-                       syntax_string="#640000">
+      </ThemeOutliner>
+    </outliner>
+    <info>
+      <ThemeInfo>
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#646875"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
+          <ThemeSpaceGeneric back="#b4b4b4"
+                             title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             header="#646875"
+                             header_text="#dddddd"
+                             header_text_hi="#ffffff"
+                             button="#b4b4b4"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTextEditor>
-    </text_editor>
-    <timeline>
-      <ThemeTimeline frame_current="#60c040"
-                     grid="#58587c">
+      </ThemeInfo>
+    </info>
+    <user_preferences>
+      <ThemeUserPreferences>
         <space>
-          <ThemeSpaceGeneric header="#565863"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#5a5e6a"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#6c717f"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#646875">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTimeline>
-    </timeline>
-    <user_interface>
-      <ThemeUserInterface icon_alpha="1"
-                          icon_file="">
-        <wcol_box>
-          <ThemeWidgetColors inner="#80828eff"
-                             inner_sel="#646464ff"
-                             item="#191919ff"
-                             outline="#191919"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_box>
-        <wcol_list_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#50c8ff62"
-                             item="#000000ff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_list_item>
-        <wcol_menu_back>
-          <ThemeWidgetColors inner="#393c44eb"
-                             inner_sel="#2d2d2dff"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-40"
-                             shadetop="40"
-                             show_shaded="FALSE"
-                             text="#cecece"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_back>
-        <wcol_menu_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#69a5beff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#d9d9d9"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_menu_item>
-        <wcol_menu>
-          <ThemeWidgetColors inner="#555d6dff"
-                             inner_sel="#464646ff"
-                             item="#9d9d9dff"
-                             outline="#3d3d3d"
-                             shadedown="0"
-                             shadetop="15"
-                             show_shaded="TRUE"
-                             text="#ffffff"
-                             text_sel="#cccccc">
-          </ThemeWidgetColors>
-        </wcol_menu>
-        <wcol_num>
-          <ThemeWidgetColors inner="#8d909fff"
-                             inner_sel="#999999ff"
-                             item="#5d5d5dff"
-                             outline="#464646"
-                             shadedown="0"
-                             shadetop="-10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_num>
-        <wcol_option>
-          <ThemeWidgetColors inner="#bbbbbbff"
-                             inner_sel="#777777ff"
-                             item="#ffffffff"
-                             outline="#464646"
-                             shadedown="0"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#cecece"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_option>
-        <panel>
-          <ThemePanelColors header="#00000019"
-                            show_header="TRUE">
-          </ThemePanelColors>
-        </panel>
-        <wcol_progress>
-          <ThemeWidgetColors inner="#bebebeff"
-                             inner_sel="#646464b4"
-                             item="#444444ff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_progress>
-        <wcol_pulldown>
-          <ThemeWidgetColors inner="#3f3f3fff"
-                             inner_sel="#50c8ffff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#d8d8d8"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_pulldown>
-        <wcol_radio>
-          <ThemeWidgetColors inner="#8b8d9aff"
-                             inner_sel="#859cb9ff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_radio>
-        <wcol_regular>
-          <ThemeWidgetColors inner="#8d909fff"
-                             inner_sel="#859cb9ff"
-                             item="#191919ff"
-                             outline="#191919"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_regular>
-        <wcol_scroll>
-          <ThemeWidgetColors inner="#5050502e"
-                             inner_sel="#646464b4"
-                             item="#737a8eff"
-                             outline="#4f5057"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_scroll>
-        <wcol_numslider>
-          <ThemeWidgetColors inner="#b4b4b4ff"
-                             inner_sel="#999999ff"
-                             item="#b0b0b0ff"
-                             outline="#3f3f3f"
-                             shadedown="0"
-                             shadetop="-20"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_numslider>
-        <wcol_state>
-          <ThemeWidgetStateColors inner_anim="#73be4c"
-                                  inner_anim_sel="#5aa633"
-                                  blend="0.5"
-                                  inner_driven="#b400ff"
-                                  inner_driven_sel="#9900e6"
-                                  inner_key="#f0eb64"
-                                  inner_key_sel="#d7d34b">
-          </ThemeWidgetStateColors>
-        </wcol_state>
-        <wcol_text>
-          <ThemeWidgetColors inner="#9b9eadff"
-                             inner_sel="#999999ff"
-                             item="#5a5a5aff"
-                             outline="#464646"
-                             shadedown="25"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_text>
-        <wcol_toggle>
-          <ThemeWidgetColors inner="#afafafff"
-                             inner_sel="#859cb9ff"
-                             item="#191919ff"
-                             outline="#464646"
-                             shadedown="0"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_toggle>
-        <wcol_tool>
-          <ThemeWidgetColors inner="#8d909fff"
-                             inner_sel="#859cb9ff"
-                             item="#191919ff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tool>
-        <wcol_tooltip>
-          <ThemeWidgetColors inner="#191919e6"
-                             inner_sel="#2d2d2de6"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#ffffff"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tooltip>
-      </ThemeUserInterface>
-    </user_interface>
-    <user_preferences>
-      <ThemeUserPreferences>
+      </ThemeUserPreferences>
+    </user_preferences>
+    <console>
+      <ThemeConsole line_output="#000000"
+                    line_input="#ffffff"
+                    line_info="#00aa00"
+                    line_error="#dc0606"
+                    cursor="#dc6060">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#6c717f"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeConsole>
+    </console>
+    <clip_editor>
+      <ThemeClipEditor marker_outline="#000000"
+                       marker="#7f7f00"
+                       active_marker="#ffffff"
+                       selected_marker="#ffff00"
+                       disabled_marker="#7f0000"
+                       locked_marker="#7f7f7f"
+                       path_before="#ff0000"
+                       path_after="#0000ff"
+                       grid="#5e5e5e"
+                       frame_current="#60c040"
+                       handle_vertex="#000000"
+                       handle_vertex_select="#ffff00"
+                       handle_vertex_size="4"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
+        <space>
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             header="#5c606c"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#646875"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeUserPreferences>
-    </user_preferences>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeClipEditor>
+    </clip_editor>
     <bone_color_sets>
-      <ThemeBoneColorSet active="#f70a0a"
-                         show_colored_constraints="FALSE"
-                         normal="#9a0000"
-                         select="#bd1111">
+      <ThemeBoneColorSet normal="#9a0000"
+                         select="#bd1111"
+                         active="#f70a0a"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#fa9900"
-                         show_colored_constraints="FALSE"
-                         normal="#f74018"
-                         select="#f66913">
+      <ThemeBoneColorSet normal="#f74018"
+                         select="#f66913"
+                         active="#fa9900"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#83ef1d"
-                         show_colored_constraints="FALSE"
-                         normal="#1e9109"
-                         select="#59b70b">
+      <ThemeBoneColorSet normal="#1e9109"
+                         select="#59b70b"
+                         active="#83ef1d"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#5ec1ef"
-                         show_colored_constraints="FALSE"
-                         normal="#0a3694"
-                         select="#3667df">
+      <ThemeBoneColorSet normal="#0a3694"
+                         select="#3667df"
+                         active="#5ec1ef"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f05d91"
-                         show_colored_constraints="FALSE"
-                         normal="#a9294e"
-                         select="#c1416a">
+      <ThemeBoneColorSet normal="#a9294e"
+                         select="#c1416a"
+                         active="#f05d91"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#8764d5"
-                         show_colored_constraints="FALSE"
-                         normal="#430c78"
-                         select="#543aa3">
+      <ThemeBoneColorSet normal="#430c78"
+                         select="#543aa3"
+                         active="#8764d5"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#6fb6ab"
-                         show_colored_constraints="FALSE"
-                         normal="#24785a"
-                         select="#3c9579">
+      <ThemeBoneColorSet normal="#24785a"
+                         select="#3c9579"
+                         active="#6fb6ab"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#9bc2cd"
-                         show_colored_constraints="FALSE"
-                         normal="#4b707c"
-                         select="#6a8691">
+      <ThemeBoneColorSet normal="#4b707c"
+                         select="#6a8691"
+                         active="#9bc2cd"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f3ff00"
-                         show_colored_constraints="FALSE"
-                         normal="#f4c90c"
-                         select="#eec236">
+      <ThemeBoneColorSet normal="#f4c90c"
+                         select="#eec236"
+                         active="#f3ff00"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#ffffff"
-                         show_colored_constraints="FALSE"
-                         normal="#1e2024"
-                         select="#484c56">
+      <ThemeBoneColorSet normal="#1e2024"
+                         select="#484c56"
+                         active="#ffffff"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#d330d6"
-                         show_colored_constraints="FALSE"
-                         normal="#6f2f6a"
-                         select="#9845be">
+      <ThemeBoneColorSet normal="#6f2f6a"
+                         select="#9845be"
+                         active="#d330d6"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bbef5b"
-                         show_colored_constraints="FALSE"
-                         normal="#6c8e22"
-                         select="#7fb022">
+      <ThemeBoneColorSet normal="#6c8e22"
+                         select="#7fb022"
+                         active="#bbef5b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#dedede"
-                         show_colored_constraints="FALSE"
-                         normal="#8d8d8d"
-                         select="#b0b0b0">
+      <ThemeBoneColorSet normal="#8d8d8d"
+                         select="#b0b0b0"
+                         active="#dedede"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bd6a11"
-                         show_colored_constraints="FALSE"
-                         normal="#834326"
-                         select="#8b5811">
+      <ThemeBoneColorSet normal="#834326"
+                         select="#8b5811"
+                         active="#bd6a11"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#34622b"
-                         show_colored_constraints="FALSE"
-                         normal="#08310e"
-                         select="#1c430b">
+      <ThemeBoneColorSet normal="#08310e"
+                         select="#1c430b"
+                         active="#34622b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
     </bone_color_sets>
   </Theme>
diff --git a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
index 05075f06239..8f4a42b6ab7 100644
--- a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
+++ b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
@@ -1,849 +1,852 @@
 <bpy>
   <Theme>
+    <user_interface>
+      <ThemeUserInterface icon_file=""
+                          icon_alpha="1"
+                          axis_x="#dc0000"
+                          axis_y="#00dc00"
+                          axis_z="#0000dc">
+        <wcol_regular>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#3c3b37ff"
+                             inner_sel="#131311ff"
+                             item="#cbc3bbff"
+                             text="#dfdfdf"
+                             text_sel="#dfdfdf"
+                             show_shaded="TRUE"
+                             shadetop="21"
+                             shadedown="-21">
+          </ThemeWidgetColors>
+        </wcol_regular>
+        <wcol_tool>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#3c3b37ff"
+                             inner_sel="#3c3b37ff"
+                             item="#cbc3bbff"
+                             text="#dfdbcf"
+                             text_sel="#f47421"
+                             show_shaded="TRUE"
+                             shadetop="17"
+                             shadedown="-17">
+          </ThemeWidgetColors>
+        </wcol_tool>
+        <wcol_radio>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#1a1a1aff"
+                             inner_sel="#6a3859ff"
+                             item="#3c3b37ff"
+                             text="#dfdbcf"
+                             text_sel="#dfdbcf"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="-5">
+          </ThemeWidgetColors>
+        </wcol_radio>
+        <wcol_text>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#272725ff"
+                             inner_sel="#171717ff"
+                             item="#6a3859ff"
+                             text="#dfdbcf"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_text>
+        <wcol_option>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#272727ff"
+                             inner_sel="#080808ff"
+                             item="#fff8ecff"
+                             text="#84817e"
+                             text_sel="#dfdbcf"
+                             show_shaded="TRUE"
+                             shadetop="15"
+                             shadedown="-5">
+          </ThemeWidgetColors>
+        </wcol_option>
+        <wcol_toggle>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#464640ff"
+                             inner_sel="#151515ff"
+                             item="#cbc3bbff"
+                             text="#c3bfb7"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="7"
+                             shadedown="-3">
+          </ThemeWidgetColors>
+        </wcol_toggle>
+        <wcol_num>
+          <ThemeWidgetColors outline="#080808"
+                             inner="#3c3b37ff"
+                             inner_sel="#171717ff"
+                             item="#ffffffff"
+                             text="#dfdbcf"
+                             text_sel="#f47421"
+                             show_shaded="TRUE"
+                             shadetop="20"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_num>
+        <wcol_numslider>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#181818ff"
+                             inner_sel="#151515ff"
+                             item="#6a3859ff"
+                             text="#eeedeb"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-22"
+                             shadedown="26">
+          </ThemeWidgetColors>
+        </wcol_numslider>
+        <wcol_box>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#252522ff"
+                             inner_sel="#646464ff"
+                             item="#0d0d0dff"
+                             text="#eeedeb"
+                             text_sel="#eeedeb"
+                             show_shaded="TRUE"
+                             shadetop="-5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_box>
+        <wcol_menu>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#3c3b37ff"
+                             inner_sel="#121212ff"
+                             item="#ffffffff"
+                             text="#dfdbcf"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_menu>
+        <wcol_pulldown>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#3f3f3fff"
+                             inner_sel="#f47421ff"
+                             item="#ffffffff"
+                             text="#dddddd"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_pulldown>
+        <wcol_menu_back>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#131312db"
+                             inner_sel="#2d2d2de6"
+                             item="#6a3859ff"
+                             text="#dddddd"
+                             text_sel="#dddddd"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_menu_back>
+        <wcol_tooltip>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#191919e6"
+                             inner_sel="#2d2d2de6"
+                             item="#646464ff"
+                             text="#ffffff"
+                             text_sel="#ff5d0d"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_tooltip>
+        <wcol_menu_item>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#00000000"
+                             inner_sel="#6a3859ff"
+                             item="#ffffffff"
+                             text="#a4a4a4"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="38"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu_item>
+        <wcol_scroll>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#000000b4"
+                             inner_sel="#646464c6"
+                             item="#2e2d2aff"
+                             text="#cbc3bb"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_scroll>
+        <wcol_progress>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#00000000"
+                             item="#00000000"
+                             text="#cbc3bb"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_progress>
+        <wcol_list_item>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#00000000"
+                             inner_sel="#6a3859ff"
+                             item="#cbc3bbff"
+                             text="#cbc3bb"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="1">
+          </ThemeWidgetColors>
+        </wcol_list_item>
+        <wcol_state>
+          <ThemeWidgetStateColors inner_anim="#308d00"
+                                  inner_anim_sel="#a7ff07"
+                                  inner_key="#105874"
+                                  inner_key_sel="#19b6ee"
+                                  inner_driven="#862074"
+                                  inner_driven_sel="#862074"
+                                  blend="0.1">
+          </ThemeWidgetStateColors>
+        </wcol_state>
+        <panel>
+          <ThemePanelColors header="#00000000"
+                            show_header="TRUE">
+          </ThemePanelColors>
+        </panel>
+      </ThemeUserInterface>
+    </user_interface>
     <view_3d>
-      <ThemeView3D object_active="#f47421"
-                   editmesh_active="#ffffff80"
-                   act_spline="#ee4000"
-                   handle_align="#93237f"
-                   handle_sel_align="#f47421"
-                   handle_auto="#00c59a"
-                   handle_sel_auto="#f47421"
-                   bone_pose="#50c8ff"
-                   bone_pose_active="#8cffff"
-                   bone_solid="#c8c8c8"
-                   bundle_solid="#c8c8c8"
+      <ThemeView3D grid="#3c3b37"
+                   panel="#a5a5a57f"
+                   wire="#93237f"
+                   lamp="#ffffff34"
+                   speaker="#93237f"
                    camera="#159dce"
-                   camera_path="#7dbd00"
-                   frame_current="#60c040"
-                   edge_crease="#ce33b8"
-                   extra_edge_len="#200000"
-                   edge_seam="#db4100"
+                   empty="#93237f"
+                   object_selected="#f15800"
+                   object_active="#f47421"
+                   object_grouped="#117211"
+                   object_grouped_active="#65d665"
+                   transform="#ffffff"
+                   vertex="#c96cb8"
+                   vertex_select="#f47421"
+                   vertex_size="2"
                    edge_select="#f47421"
+                   edge_seam="#db4100"
                    edge_sharp="#ff4c00"
+                   edge_crease="#ce33b8"
                    edge_facesel="#4b4b4b"
-                   empty="#93237f"
                    face="#75757512"
-                   extra_face_angle="#002000"
-                   extra_face_area="#0059ee"
+                   face_select="#f474213c"
                    face_dot="#f47421"
                    facedot_size="3"
-                   normal="#19b6ee"
-                   face_select="#f474213c"
-                   handle_free="#a5ca00"
-                   handle_sel_free="#f47421"
-                   grid="#3c3b37"
-                   lamp="#ffffff34"
-                   lastsel_point="#ffffff"
                    nurb_uline="#909000"
                    nurb_vline="#862074"
                    nurb_sel_uline="#f0ff40"
                    nurb_sel_vline="#d15d85"
-                   object_grouped="#117211"
-                   object_grouped_active="#65d665"
-                   object_selected="#f15800"
-                   outline_width="2"
-                   panel="#a5a5a57f"
-                   skin_root="#000000"
-                   speaker="#93237f"
-                   transform="#ffffff"
+                   act_spline="#ee4000"
+                   handle_free="#a5ca00"
+                   handle_auto="#00c59a"
                    handle_vect="#409030"
+                   handle_align="#93237f"
+                   handle_sel_free="#f47421"
+                   handle_sel_auto="#f47421"
                    handle_sel_vect="#82c036"
-                   vertex="#c96cb8"
+                   handle_sel_align="#f47421"
+                   lastsel_point="#ffffff"
+                   extra_edge_len="#200000"
+                   extra_face_angle="#002000"
+                   extra_face_area="#0059ee"
+                   editmesh_active="#ffffff80"
+                   normal="#19b6ee"
                    vertex_normal="#19b6ee"
-                   vertex_select="#f47421"
-                   vertex_size="2"
-                   wire="#93237f">
+                   bone_solid="#c8c8c8"
+                   bone_pose="#50c8ff"
+                   bone_pose_active="#8cffff"
+                   frame_current="#60c040"
+                   outline_width="2"
+                   bundle_solid="#c8c8c8"
+                   camera_path="#7dbd00"
+                   skin_root="#000000">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#9c9c9c"
+                             text="#9c9c9c"
+                             text_hi="#ffffff"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#9c9c9c"
-                             button_text_hi="#ffffff"
                              button_title="#9c9c9c"
-                             text="#9c9c9c"
-                             text_hi="#ffffff"
-                             title="#9c9c9c"
-                             back="#131311">
+                             button_text="#9c9c9c"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeView3D>
     </view_3d>
-    <clip_editor>
-      <ThemeClipEditor active_marker="#ffffff"
-                       frame_current="#f47421"
-                       disabled_marker="#7f0000"
-                       grid="#302e2c"
-                       handle_vertex="#000000"
-                       handle_vertex_select="#ffff00"
-                       handle_vertex_size="4"
-                       locked_marker="#7f7f7f"
-                       marker="#76243b"
-                       marker_outline="#000000"
-                       path_after="#19b6ee"
-                       path_before="#ff5100"
-                       selected_marker="#d5ff00"
-                       strips="#0c0a0a"
-                       strips_selected="#ff8c00">
-        <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#9c9c9c"
-                             header_text_hi="#ffffff"
-                             button="#3c3b37"
-                             button_text="#ffffff"
-                             button_text_hi="#ffffff"
-                             button_title="#9c9c9c"
-                             text="#9c9c9c"
-                             text_hi="#ffffff"
-                             title="#9c9c9c"
-                             back="#131311">
-          </ThemeSpaceGeneric>
-        </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#666666"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeClipEditor>
-    </clip_editor>
-    <console>
-      <ThemeConsole cursor="#f47421"
-                    line_error="#ff0000"
-                    line_info="#f47421"
-                    line_input="#19b6ee"
-                    line_output="#97f500">
+    <graph_editor>
+      <ThemeGraphEditor grid="#3c3b37"
+                        panel="#ffffff"
+                        window_sliders="#95948f"
+                        channels_region="#707070"
+                        vertex="#ffffff"
+                        vertex_select="#f49600"
+                        vertex_size="4"
+                        handle_free="#a5ca00"
+                        handle_auto="#00c59a"
+                        handle_vect="#409030"
+                        handle_align="#93237f"
+                        handle_sel_free="#f49600"
+                        handle_sel_auto="#f49600"
+                        handle_sel_vect="#40c030"
+                        handle_sel_align="#f49600"
+                        handle_auto_clamped="#03aa60"
+                        handle_sel_auto_clamped="#f49600"
+                        lastsel_point="#fafafa"
+                        frame_current="#f58032"
+                        handle_vertex="#bbbbbb"
+                        handle_vertex_select="#f49600"
+                        handle_vertex_size="4"
+                        channel_group="#4f6549"
+                        active_channels_group="#87b17d"
+                        dopesheet_channel="#695c6e"
+                        dopesheet_subchannel="#7c8996">
         <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#acacac"
-                             header_text_hi="#ffffff"
-                             button="#3c3b37"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#000000"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#9c9c9c"
+                             text="#e9e9e9"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#131311">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeConsole>
-    </console>
-    <dopesheet_editor>
-      <ThemeDopeSheet active_channels_group="#a2b15c"
-                      channel_group="#4f6549"
-                      channels="#9c9c9c"
-                      channels_selected="#6592f5"
-                      frame_current="#f58032"
-                      dopesheet_channel="#64486e"
-                      dopesheet_subchannel="#877096"
-                      grid="#525252"
-                      long_key="#0c0a0a"
-                      long_key_selected="#f47421"
-                      summary="#00000000"
-                      value_sliders="#000000"
-                      view_sliders="#9c9c9c">
-        <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#cacaca"
+                             header="#464541"
+                             header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#9c9c9c"
-                             button_text_hi="#ffffff"
                              button_title="#9c9c9c"
-                             text="#e7e7e7"
-                             text_hi="#ffffff"
-                             title="#9c9c9c"
-                             back="#131311">
+                             button_text="#9c9c9c"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3c3b37"
+                                 list_title="#ffffff"
                                  list_text="#e2e2e2"
-                                 list_text_hi="#f47421"
-                                 list_title="#ffffff">
+                                 list_text_hi="#f47421">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeDopeSheet>
-    </dopesheet_editor>
+      </ThemeGraphEditor>
+    </graph_editor>
     <file_browser>
-      <ThemeFileBrowser active_file="#eeedeb"
-                        active_file_text="#ffffff"
-                        scroll_handle="#7f7070"
+      <ThemeFileBrowser selected_file="#6b395a"
+                        tiles="#3c3b37"
                         scrollbar="#a0a0a0"
-                        selected_file="#6b395a"
-                        tiles="#3c3b37">
+                        scroll_handle="#7f7070"
+                        active_file="#eeedeb"
+                        active_file_text="#ffffff">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#000000"
+                             text="#b2b2b1"
+                             text_hi="#0f0f0f"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#b2b2b1"
-                             text_hi="#0f0f0f"
-                             title="#000000"
-                             back="#131311">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3c3b37"
+                                 list_title="#95948f"
                                  list_text="#95948f"
-                                 list_text_hi="#ffffff"
-                                 list_title="#95948f">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeFileBrowser>
     </file_browser>
-    <graph_editor>
-      <ThemeGraphEditor active_channels_group="#87b17d"
-                        handle_align="#93237f"
-                        handle_sel_align="#f49600"
-                        handle_auto="#00c59a"
-                        handle_sel_auto="#f49600"
-                        handle_auto_clamped="#03aa60"
-                        handle_sel_auto_clamped="#f49600"
-                        channel_group="#4f6549"
-                        channels_region="#707070"
-                        frame_current="#f58032"
-                        dopesheet_channel="#695c6e"
-                        dopesheet_subchannel="#7c8996"
-                        handle_free="#a5ca00"
-                        handle_sel_free="#f49600"
-                        grid="#3c3b37"
-                        handle_vertex="#bbbbbb"
-                        handle_vertex_select="#f49600"
-                        handle_vertex_size="4"
-                        lastsel_point="#fafafa"
-                        panel="#ffffff"
-                        handle_vect="#409030"
-                        handle_sel_vect="#40c030"
-                        vertex="#ffffff"
-                        vertex_select="#f49600"
-                        vertex_size="4"
-                        window_sliders="#95948f">
+    <nla_editor>
+      <ThemeNLAEditor grid="#5c5c52"
+                      view_sliders="#969696"
+                      active_action="#00000000"
+                      active_action_unset="#00000000"
+                      strips="#0c0a0a"
+                      strips_selected="#6b395a"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
+                      frame_current="#f58032">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#9c9c9c"
-                             button_text_hi="#ffffff"
-                             button_title="#9c9c9c"
-                             text="#e9e9e9"
-                             text_hi="#ffffff"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#3c3b37"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeNLAEditor>
+    </nla_editor>
+    <dopesheet_editor>
+      <ThemeDopeSheet grid="#525252"
+                      value_sliders="#000000"
+                      view_sliders="#9c9c9c"
+                      channels="#9c9c9c"
+                      channels_selected="#6592f5"
+                      channel_group="#4f6549"
+                      active_channels_group="#a2b15c"
+                      long_key="#0c0a0a"
+                      long_key_selected="#f47421"
+                      frame_current="#f58032"
+                      dopesheet_channel="#64486e"
+                      dopesheet_subchannel="#877096"
+                      summary="#00000000">
+        <space>
+          <ThemeSpaceGeneric back="#131311"
                              title="#9c9c9c"
-                             back="#131311">
+                             text="#e7e7e7"
+                             text_hi="#ffffff"
+                             header="#464541"
+                             header_text="#cacaca"
+                             header_text_hi="#ffffff"
+                             button="#3c3b37"
+                             button_title="#9c9c9c"
+                             button_text="#9c9c9c"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3c3b37"
+                                 list_title="#ffffff"
                                  list_text="#e2e2e2"
-                                 list_text_hi="#f47421"
-                                 list_title="#ffffff">
+                                 list_text_hi="#f47421">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeGraphEditor>
-    </graph_editor>
+      </ThemeDopeSheet>
+    </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor editmesh_active="#ffffff80"
+      <ThemeImageEditor vertex="#000000"
+                        vertex_select="#f47421"
+                        vertex_size="3"
                         face="#ffffff0a"
+                        face_select="#ff85003c"
                         face_dot="#f47421"
                         facedot_size="3"
-                        face_select="#ff85003c"
+                        editmesh_active="#ffffff80"
                         scope_back="#3c3b37ff"
-                        preview_stitch_active="#e1d2c323"
-                        preview_stitch_edge="#ff8500b2"
                         preview_stitch_face="#1242b026"
+                        preview_stitch_edge="#ff8500b2"
+                        preview_stitch_vert="#ff85007f"
                         preview_stitch_stitchable="#00ff00ff"
                         preview_stitch_unstitchable="#ff0000ff"
-                        preview_stitch_vert="#ff85007f"
-                        vertex="#000000"
-                        vertex_select="#f47421"
-                        vertex_size="3">
+                        preview_stitch_active="#e1d2c323">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#b9b9b9"
-                             button_text_hi="#ffffff"
                              button_title="#b1b1b1"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#131311">
+                             button_text="#b9b9b9"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeImageEditor>
     </image_editor>
-    <info>
-      <ThemeInfo>
+    <sequence_editor>
+      <ThemeSequenceEditor grid="#282828"
+                           window_sliders="#a0a0a0"
+                           movie_strip="#516987"
+                           movieclip_strip="#20208f"
+                           image_strip="#6d5881"
+                           scene_strip="#4e983e"
+                           audio_strip="#2e8f8f"
+                           effect_strip="#a9547c"
+                           transition_strip="#a25f6f"
+                           meta_strip="#6d9183"
+                           frame_current="#c06e11"
+                           keyframe="#f47421"
+                           draw_action="#50c8ff"
+                           preview_back="#000000">
         <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#ffffff"
-                             header_text_hi="#ffffff"
-                             button="#3c3b37"
-                             button_text="#eeedeb"
-                             button_text_hi="#ffffff"
-                             button_title="#eeedeb"
-                             text="#eeedeb"
+          <ThemeSpaceGeneric back="#191919"
+                             title="#acacac"
+                             text="#acacac"
                              text_hi="#ffffff"
-                             title="#eeedeb"
-                             back="#3c3b37">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeInfo>
-    </info>
-    <logic_editor>
-      <ThemeLogicEditor panel="#acacac">
-        <space>
-          <ThemeSpaceGeneric header="#464541"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
-                             button="#353430"
+                             button="#3c3b37"
+                             button_title="#acacac"
                              button_text="#acacac"
-                             button_text_hi="#ffffff"
-                             button_title="#7d7d7d"
-                             text="#acacac"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#29001b">
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeLogicEditor>
-    </logic_editor>
-    <nla_editor>
-      <ThemeNLAEditor active_action="#00000000"
-                      frame_current="#f58032"
-                      grid="#5c5c52"
-                      meta_strips="#000000"
-                      meta_strips_selected="#000000"
-                      active_action_unset="#00000000"
-                      sound_strips="#000000"
-                      sound_strips_selected="#000000"
-                      strips="#0c0a0a"
-                      strips_selected="#6b395a"
-                      transition_strips="#000000"
-                      transition_strips_selected="#000000"
-                      tweak="#000000"
-                      tweak_duplicate="#000000"
-                      view_sliders="#969696">
+      </ThemeSequenceEditor>
+    </sequence_editor>
+    <properties>
+      <ThemeProperties panel="#3c3b37">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#3c3b37"
+                             title="#acacac"
+                             text="#acacac"
+                             text_hi="#ffffff"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#131311">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#3c3b37"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeNLAEditor>
-    </nla_editor>
-    <node_editor>
-      <ThemeNodeEditor node_active="#ffffff"
-                       converter_node="#93be00"
-                       frame_node="#9a9b9ba0"
-                       group_node="#19b6ee"
-                       in_out_node="#f40051"
-                       node_backdrop="#52524ed1"
-                       node_selected="#ffffff"
-                       noodle_curving="5"
-                       operator_node="#000000"
-                       selected_text="#7f7070"
-                       wire_select="#f4b696"
-                       wire="#f45b00">
+      </ThemeProperties>
+    </properties>
+    <text_editor>
+      <ThemeTextEditor line_numbers_background="#3c3b37"
+                       selected_text="#641f44"
+                       cursor="#f47421"
+                       syntax_builtin="#d6ff01"
+                       syntax_special="#33a500"
+                       syntax_comment="#249d60"
+                       syntax_string="#6e00ff"
+                       syntax_numbers="#972144">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#000000"
+                             text="#19b6ee"
+                             text_hi="#ffffff"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
-                             button="#353430"
-                             button_text="#acacac"
-                             button_text_hi="#ffffff"
-                             button_title="#acacac"
+                             button="#191919"
+                             button_title="#64645e"
+                             button_text="#95948f"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeTextEditor>
+    </text_editor>
+    <timeline>
+      <ThemeTimeline grid="#272727"
+                     frame_current="#f47421">
+        <space>
+          <ThemeSpaceGeneric back="#131311"
+                             title="#000000"
+                             text="#9c9c9c"
+                             text_hi="#ffffff"
+                             header="#464541"
+                             header_text="#acacac"
+                             header_text_hi="#ffffff"
+                             button="#3c3b37"
+                             button_title="#9c9c9c"
+                             button_text="#9c9c9c"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeTimeline>
+    </timeline>
+    <node_editor>
+      <ThemeNodeEditor node_selected="#ffffff"
+                       node_active="#ffffff"
+                       wire="#f45b00"
+                       wire_select="#f4b696"
+                       selected_text="#7f7070"
+                       node_backdrop="#52524ed1"
+                       in_out_node="#f40051"
+                       converter_node="#93be00"
+                       operator_node="#000000"
+                       group_node="#19b6ee"
+                       frame_node="#9a9b9ba0"
+                       noodle_curving="5">
+        <space>
+          <ThemeSpaceGeneric back="#29001b"
+                             title="#000000"
                              text="#eeedeb"
                              text_hi="#cbcbcb"
-                             title="#000000"
-                             back="#29001b">
+                             header="#464541"
+                             header_text="#acacac"
+                             header_text_hi="#ffffff"
+                             button="#353430"
+                             button_title="#acacac"
+                             button_text="#acacac"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3c3b37"
+                                 list_title="#acacac"
                                  list_text="#acacac"
-                                 list_text_hi="#ffffff"
-                                 list_title="#acacac">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeNodeEditor>
     </node_editor>
+    <logic_editor>
+      <ThemeLogicEditor panel="#acacac">
+        <space>
+          <ThemeSpaceGeneric back="#29001b"
+                             title="#000000"
+                             text="#acacac"
+                             text_hi="#ffffff"
+                             header="#464541"
+                             header_text="#acacac"
+                             header_text_hi="#ffffff"
+                             button="#353430"
+                             button_title="#7d7d7d"
+                             button_text="#acacac"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeLogicEditor>
+    </logic_editor>
     <outliner>
       <ThemeOutliner match="#337f33"
                      selected_highlight="#6a3859">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#3c3b37"
+                             title="#000000"
+                             text="#cccccc"
+                             text_hi="#f47421"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#000000"
-                             button_text_hi="#f47421"
                              button_title="#000000"
-                             text="#cccccc"
-                             text_hi="#f47421"
-                             title="#000000"
-                             back="#3c3b37">
+                             button_text="#000000"
+                             button_text_hi="#f47421">
           </ThemeSpaceGeneric>
         </space>
       </ThemeOutliner>
     </outliner>
-    <properties>
-      <ThemeProperties panel="#3c3b37">
+    <info>
+      <ThemeInfo>
         <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#acacac"
-                             header_text_hi="#ffffff"
-                             button="#3c3b37"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#acacac"
+          <ThemeSpaceGeneric back="#3c3b37"
+                             title="#eeedeb"
+                             text="#eeedeb"
                              text_hi="#ffffff"
-                             title="#acacac"
-                             back="#3c3b37">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeProperties>
-    </properties>
-    <sequence_editor>
-      <ThemeSequenceEditor audio_strip="#2e8f8f"
-                           movieclip_strip="#20208f"
-                           frame_current="#c06e11"
-                           draw_action="#50c8ff"
-                           effect_strip="#a9547c"
-                           grid="#282828"
-                           image_strip="#6d5881"
-                           keyframe="#f47421"
-                           meta_strip="#6d9183"
-                           movie_strip="#516987"
-                           preview_back="#000000"
-                           scene_strip="#4e983e"
-                           transition_strip="#a25f6f"
-                           window_sliders="#a0a0a0">
-        <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#acacac"
+                             header="#464541"
+                             header_text="#ffffff"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#acacac"
-                             button_text_hi="#ffffff"
-                             button_title="#acacac"
-                             text="#acacac"
-                             text_hi="#ffffff"
-                             title="#acacac"
-                             back="#191919">
+                             button_title="#eeedeb"
+                             button_text="#eeedeb"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeSequenceEditor>
-    </sequence_editor>
-    <text_editor>
-      <ThemeTextEditor cursor="#f47421"
-                       syntax_special="#33a500"
-                       line_numbers_background="#3c3b37"
-                       selected_text="#641f44"
-                       syntax_builtin="#d6ff01"
-                       syntax_comment="#249d60"
-                       syntax_numbers="#972144"
-                       syntax_string="#6e00ff">
+      </ThemeInfo>
+    </info>
+    <user_preferences>
+      <ThemeUserPreferences>
         <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#acacac"
-                             header_text_hi="#ffffff"
-                             button="#191919"
-                             button_text="#95948f"
-                             button_text_hi="#ffffff"
-                             button_title="#64645e"
-                             text="#19b6ee"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#3c3b37"
                              title="#000000"
-                             back="#131311">
+                             text="#ccccc8"
+                             text_hi="#ffffff"
+                             header="#3c3b37"
+                             header_text="#d3d2cd"
+                             header_text_hi="#ffffff"
+                             button="#696965"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTextEditor>
-    </text_editor>
-    <timeline>
-      <ThemeTimeline frame_current="#f47421"
-                     grid="#272727">
+      </ThemeUserPreferences>
+    </user_preferences>
+    <console>
+      <ThemeConsole line_output="#97f500"
+                    line_input="#19b6ee"
+                    line_info="#f47421"
+                    line_error="#ff0000"
+                    cursor="#f47421">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#9c9c9c"
-                             button_text_hi="#ffffff"
-                             button_title="#9c9c9c"
-                             text="#9c9c9c"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#131311">
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTimeline>
-    </timeline>
-    <user_interface>
-      <ThemeUserInterface icon_alpha="1"
-                          icon_file="">
-        <wcol_box>
-          <ThemeWidgetColors inner="#252522ff"
-                             inner_sel="#646464ff"
-                             item="#0d0d0dff"
-                             outline="#0d0d0d"
-                             shadedown="0"
-                             shadetop="-5"
-                             show_shaded="TRUE"
-                             text="#eeedeb"
-                             text_sel="#eeedeb">
-          </ThemeWidgetColors>
-        </wcol_box>
-        <wcol_list_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#6a3859ff"
-                             item="#cbc3bbff"
-                             outline="#0d0d0d"
-                             shadedown="1"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#cbc3bb"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_list_item>
-        <wcol_menu_back>
-          <ThemeWidgetColors inner="#131312db"
-                             inner_sel="#2d2d2de6"
-                             item="#6a3859ff"
-                             outline="#0d0d0d"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#dddddd"
-                             text_sel="#dddddd">
-          </ThemeWidgetColors>
-        </wcol_menu_back>
-        <wcol_menu_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#6a3859ff"
-                             item="#ffffffff"
-                             outline="#0d0d0d"
-                             shadedown="0"
-                             shadetop="38"
-                             show_shaded="FALSE"
-                             text="#a4a4a4"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_item>
-        <wcol_menu>
-          <ThemeWidgetColors inner="#3c3b37ff"
-                             inner_sel="#121212ff"
-                             item="#ffffffff"
-                             outline="#0d0d0d"
-                             shadedown="-10"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#dfdbcf"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu>
-        <wcol_num>
-          <ThemeWidgetColors inner="#3c3b37ff"
-                             inner_sel="#171717ff"
-                             item="#ffffffff"
-                             outline="#080808"
-                             shadedown="-20"
-                             shadetop="20"
-                             show_shaded="TRUE"
-                             text="#dfdbcf"
-                             text_sel="#f47421">
-          </ThemeWidgetColors>
-        </wcol_num>
-        <wcol_option>
-          <ThemeWidgetColors inner="#272727ff"
-                             inner_sel="#080808ff"
-                             item="#fff8ecff"
-                             outline="#0d0d0d"
-                             shadedown="-5"
-                             shadetop="15"
-                             show_shaded="TRUE"
-                             text="#84817e"
-                             text_sel="#dfdbcf">
-          </ThemeWidgetColors>
-        </wcol_option>
-        <panel>
-          <ThemePanelColors header="#00000000"
-                            show_header="TRUE">
-          </ThemePanelColors>
-        </panel>
-        <wcol_progress>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#00000000"
-                             item="#00000000"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#cbc3bb"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_progress>
-        <wcol_pulldown>
-          <ThemeWidgetColors inner="#3f3f3fff"
-                             inner_sel="#f47421ff"
-                             item="#ffffffff"
-                             outline="#0d0d0d"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#dddddd"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_pulldown>
-        <wcol_radio>
-          <ThemeWidgetColors inner="#1a1a1aff"
-                             inner_sel="#6a3859ff"
-                             item="#3c3b37ff"
-                             outline="#000000"
-                             shadedown="-5"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#dfdbcf"
-                             text_sel="#dfdbcf">
-          </ThemeWidgetColors>
-        </wcol_radio>
-        <wcol_regular>
-          <ThemeWidgetColors inner="#3c3b37ff"
-                             inner_sel="#131311ff"
-                             item="#cbc3bbff"
-                             outline="#000000"
-                             shadedown="-21"
-                             shadetop="21"
-                             show_shaded="TRUE"
-                             text="#dfdfdf"
-                             text_sel="#dfdfdf">
-          </ThemeWidgetColors>
-        </wcol_regular>
-        <wcol_scroll>
-          <ThemeWidgetColors inner="#000000b4"
-                             inner_sel="#646464c6"
-                             item="#2e2d2aff"
-                             outline="#000000"
-                             shadedown="-10"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#cbc3bb"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_scroll>
-        <wcol_numslider>
-          <ThemeWidgetColors inner="#181818ff"
-                             inner_sel="#151515ff"
-                             item="#6a3859ff"
-                             outline="#0d0d0d"
-                             shadedown="26"
-                             shadetop="-22"
-                             show_shaded="TRUE"
-                             text="#eeedeb"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_numslider>
-        <wcol_state>
-          <ThemeWidgetStateColors inner_anim="#308d00"
-                                  inner_anim_sel="#a7ff07"
-                                  blend="0.1"
-                                  inner_driven="#862074"
-                                  inner_driven_sel="#862074"
-                                  inner_key="#105874"
-                                  inner_key_sel="#19b6ee">
-          </ThemeWidgetStateColors>
-        </wcol_state>
-        <wcol_text>
-          <ThemeWidgetColors inner="#272725ff"
-                             inner_sel="#171717ff"
-                             item="#6a3859ff"
-                             outline="#0d0d0d"
-                             shadedown="0"
-                             shadetop="-10"
-                             show_shaded="TRUE"
-                             text="#dfdbcf"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_text>
-        <wcol_toggle>
-          <ThemeWidgetColors inner="#464640ff"
-                             inner_sel="#151515ff"
-                             item="#cbc3bbff"
-                             outline="#000000"
-                             shadedown="-3"
-                             shadetop="7"
-                             show_shaded="TRUE"
-                             text="#c3bfb7"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_toggle>
-        <wcol_tool>
-          <ThemeWidgetColors inner="#3c3b37ff"
-                             inner_sel="#3c3b37ff"
-                             item="#cbc3bbff"
-                             outline="#000000"
-                             shadedown="-17"
-                             shadetop="17"
-                             show_shaded="TRUE"
-                             text="#dfdbcf"
-                             text_sel="#f47421">
-          </ThemeWidgetColors>
-        </wcol_tool>
-        <wcol_tooltip>
-          <ThemeWidgetColors inner="#191919e6"
-                             inner_sel="#2d2d2de6"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#ffffff"
-                             text_sel="#ff5d0d">
-          </ThemeWidgetColors>
-        </wcol_tooltip>
-      </ThemeUserInterface>
-    </user_interface>
-    <user_preferences>
-      <ThemeUserPreferences>
+      </ThemeConsole>
+    </console>
+    <clip_editor>
+      <ThemeClipEditor marker_outline="#000000"
+                       marker="#76243b"
+                       active_marker="#ffffff"
+                       selected_marker="#d5ff00"
+                       disabled_marker="#7f0000"
+                       locked_marker="#7f7f7f"
+                       path_before="#ff5100"
+                       path_after="#19b6ee"
+                       grid="#302e2c"
+                       frame_current="#f47421"
+                       handle_vertex="#000000"
+                       handle_vertex_select="#ffff00"
+                       handle_vertex_size="4"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
         <space>
-          <ThemeSpaceGeneric header="#3c3b37"
-                             header_text="#d3d2cd"
-                             header_text_hi="#ffffff"
-                             button="#696965"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#ccccc8"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#9c9c9c"
+                             text="#9c9c9c"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#3c3b37">
+                             header="#464541"
+                             header_text="#9c9c9c"
+                             header_text_hi="#ffffff"
+                             button="#3c3b37"
+                             button_title="#9c9c9c"
+                             button_text="#ffffff"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeUserPreferences>
-    </user_preferences>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeClipEditor>
+    </clip_editor>
     <bone_color_sets>
-      <ThemeBoneColorSet active="#f74700"
-                         show_colored_constraints="FALSE"
-                         normal="#9a2400"
-                         select="#bd3000">
+      <ThemeBoneColorSet normal="#9a2400"
+                         select="#bd3000"
+                         active="#f74700"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#ff9248"
-                         show_colored_constraints="FALSE"
-                         normal="#ff5d06"
-                         select="#ff7b20">
+      <ThemeBoneColorSet normal="#ff5d06"
+                         select="#ff7b20"
+                         active="#ff9248"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#c9ef1d"
-                         show_colored_constraints="FALSE"
-                         normal="#7f9103"
-                         select="#a8b700">
+      <ThemeBoneColorSet normal="#7f9103"
+                         select="#a8b700"
+                         active="#c9ef1d"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#95f5ff"
-                         show_colored_constraints="FALSE"
-                         normal="#19a3d5"
-                         select="#00d9ee">
+      <ThemeBoneColorSet normal="#19a3d5"
+                         select="#00d9ee"
+                         active="#95f5ff"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f05d91"
-                         show_colored_constraints="TRUE"
-                         normal="#a9294e"
-                         select="#c1416a">
+      <ThemeBoneColorSet normal="#a9294e"
+                         select="#c1416a"
+                         active="#f05d91"
+                         show_colored_constraints="TRUE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#8764d5"
-                         show_colored_constraints="FALSE"
-                         normal="#430c78"
-                         select="#543aa3">
+      <ThemeBoneColorSet normal="#430c78"
+                         select="#543aa3"
+                         active="#8764d5"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#6fb6ab"
-                         show_colored_constraints="FALSE"
-                         normal="#24785a"
-                         select="#3c9579">
+      <ThemeBoneColorSet normal="#24785a"
+                         select="#3c9579"
+                         active="#6fb6ab"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#9bc2cd"
-                         show_colored_constraints="FALSE"
-                         normal="#4b707c"
-                         select="#6a8691">
+      <ThemeBoneColorSet normal="#4b707c"
+                         select="#6a8691"
+                         active="#9bc2cd"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f3ff00"
-                         show_colored_constraints="FALSE"
-                         normal="#f4c90c"
-                         select="#eec236">
+      <ThemeBoneColorSet normal="#f4c90c"
+                         select="#eec236"
+                         active="#f3ff00"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#ffffff"
-                         show_colored_constraints="FALSE"
-                         normal="#1e2024"
-                         select="#484c56">
+      <ThemeBoneColorSet normal="#1e2024"
+                         select="#484c56"
+                         active="#ffffff"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#d330d6"
-                         show_colored_constraints="FALSE"
-                         normal="#6f2f6a"
-                         select="#9845be">
+      <ThemeBoneColorSet normal="#6f2f6a"
+                         select="#9845be"
+                         active="#d330d6"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bbef5b"
-                         show_colored_constraints="FALSE"
-                         normal="#6c8e22"
-                         select="#7fb022">
+      <ThemeBoneColorSet normal="#6c8e22"
+                         select="#7fb022"
+                         active="#bbef5b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#dedede"
-                         show_colored_constraints="FALSE"
-                         normal="#8d8d8d"
-                         select="#b0b0b0">
+      <ThemeBoneColorSet normal="#8d8d8d"
+                         select="#b0b0b0"
+                         active="#dedede"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bd6a11"
-                         show_colored_constraints="FALSE"
-                         normal="#834326"
-                         select="#8b5811">
+      <ThemeBoneColorSet normal="#834326"
+                         select="#8b5811"
+                         active="#bd6a11"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#34622b"
-                         show_colored_constraints="FALSE"
-                         normal="#08310e"
-                         select="#1c430b">
+      <ThemeBoneColorSet normal="#08310e"
+                         select="#1c430b"
+                         active="#34622b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
     </bone_color_sets>
   </Theme>
-- 
cgit v1.2.3