diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py
index 5a8dbf9ee80..bf232116bb6 100644
--- a/release/scripts/ui/space_userpref.py
+++ b/release/scripts/ui/space_userpref.py
@@ -37,13 +37,6 @@ class USERPREF_HT_header(bpy.types.Header):
             layout.operator("wm.keyconfig_export", "Export Key Configuration...").path = "keymap.py"
 
 
-class USERPREF_MT_view(bpy.types.Menu):
-    bl_label = "View"
-
-    def draw(self, context):
-        pass # layout = self.layout
-
-
 class USERPREF_PT_tabs(bpy.types.Panel):
     bl_label = ""
     bl_space_type = 'USER_PREFERENCES'
@@ -76,72 +69,75 @@ class USERPREF_PT_interface(bpy.types.Panel):
 
         split = layout.split()
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
 
-        sub1 = sub.column()
-        sub1.label(text="Display:")
-        sub1.prop(view, "tooltips")
-        sub1.prop(view, "display_object_info", text="Object Info")
-        sub1.prop(view, "use_large_cursors")
-        sub1.prop(view, "show_view_name", text="View Name")
-        sub1.prop(view, "show_playback_fps", text="Playback FPS")
-        sub1.prop(view, "global_scene")
-        sub1.prop(view, "pin_floating_panels")
-        sub1.prop(view, "object_origin_size")
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
-        sub1.prop(view, "show_mini_axis", text="Display Mini Axis")
-        sub2 = sub1.column()
-        sub2.enabled = view.show_mini_axis
-        sub2.prop(view, "mini_axis_size", text="Size")
-        sub2.prop(view, "mini_axis_brightness", text="Brightness")
+        col = colsplit.column()
+        col.label(text="Display:")
+        col.prop(view, "tooltips")
+        col.prop(view, "display_object_info", text="Object Info")
+        col.prop(view, "use_large_cursors")
+        col.prop(view, "show_view_name", text="View Name")
+        col.prop(view, "show_playback_fps", text="Playback FPS")
+        col.prop(view, "global_scene")
+        col.prop(view, "pin_floating_panels")
+        col.prop(view, "object_origin_size")
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
+        col.separator()
+        col.separator()
+        col.separator()
 
-        sub1 = sub.column()
-        sub1.label(text="View Manipulation:")
-        sub1.prop(view, "auto_depth")
-        sub1.prop(view, "global_pivot")
-        sub1.prop(view, "zoom_to_mouse")
-        sub1.prop(view, "rotate_around_selection")
-        sub1.separator()
+        col.prop(view, "show_mini_axis", text="Display Mini Axis")
+        sub = col.column()
+        sub.enabled = view.show_mini_axis
+        sub.prop(view, "mini_axis_size", text="Size")
+        sub.prop(view, "mini_axis_brightness", text="Brightness")
 
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
 
-        sub1.prop(view, "auto_perspective")
-        sub1.prop(view, "smooth_view")
-        sub1.prop(view, "rotation_angle")
+        col = colsplit.column()
+        col.label(text="View Manipulation:")
+        col.prop(view, "auto_depth")
+        col.prop(view, "global_pivot")
+        col.prop(view, "zoom_to_mouse")
+        col.prop(view, "rotate_around_selection")
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
-        sub1 = sub.column()
+        col.separator()
 
-#Toolbox doesn't exist yet
-#       sub1.label(text="Toolbox:")
-#       sub1.prop(view, "use_column_layout")
-#       sub1.label(text="Open Toolbox Delay:")
-#       sub1.prop(view, "open_left_mouse_delay", text="Hold LMB")
-#       sub1.prop(view, "open_right_mouse_delay", text="Hold RMB")
+        col.prop(view, "auto_perspective")
+        col.prop(view, "smooth_view")
+        col.prop(view, "rotation_angle")
 
-        #manipulator
-        sub1.prop(view, "use_manipulator")
-        sub2 = sub1.column()
-        sub2.enabled = view.use_manipulator
-        sub2.prop(view, "manipulator_size", text="Size")
-        sub2.prop(view, "manipulator_handle_size", text="Handle Size")
-        sub2.prop(view, "manipulator_hotspot", text="Hotspot")
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
+        
+        col = colsplit.column()
+        
+        #Toolbox doesn't exist yet
+        #col.label(text="Toolbox:")
+        #col.prop(view, "use_column_layout")
+        #col.label(text="Open Toolbox Delay:")
+        #col.prop(view, "open_left_mouse_delay", text="Hold LMB")
+        #col.prop(view, "open_right_mouse_delay", text="Hold RMB")
 
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
+        #Manipulator
+        col.prop(view, "use_manipulator")
+        sub = col.column()
+        sub.enabled = view.use_manipulator
+        sub.prop(view, "manipulator_size", text="Size")
+        sub.prop(view, "manipulator_handle_size", text="Handle Size")
+        sub.prop(view, "manipulator_hotspot", text="Hotspot")
 
-        sub1.label(text="Menus:")
-        sub1.prop(view, "open_mouse_over")
-        sub1.label(text="Menu Open Delay:")
-        sub1.prop(view, "open_toplevel_delay", text="Top Level")
-        sub1.prop(view, "open_sublevel_delay", text="Sub Level")
+        col.separator()
+        col.separator()
+        col.separator()
+
+        col.label(text="Menus:")
+        col.prop(view, "open_mouse_over")
+        col.label(text="Menu Open Delay:")
+        col.prop(view, "open_toplevel_delay", text="Top Level")
+        col.prop(view, "open_sublevel_delay", text="Sub Level")
 
 
 class USERPREF_PT_edit(bpy.types.Panel):
@@ -162,91 +158,100 @@ class USERPREF_PT_edit(bpy.types.Panel):
 
         split = layout.split()
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
 
-        sub1 = sub.column()
-        sub1.label(text="Link Materials To:")
-        sub1.row().prop(edit, "material_link", expand=True)
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
-        sub1.label(text="New Objects:")
-        sub1.prop(edit, "enter_edit_mode")
-        sub1.label(text="Align To:")
-        sub1.row().prop(edit, "object_align", expand=True)
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
+        col = colsplit.column()
+        col.label(text="Link Materials To:")
+        col.row().prop(edit, "material_link", expand=True)
 
-        sub1.label(text="Undo:")
-        sub1.prop(edit, "global_undo")
-        sub1.prop(edit, "undo_steps", text="Steps")
-        sub1.prop(edit, "undo_memory_limit", text="Memory Limit")
+        col.separator()
+        col.separator()
+        col.separator()
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
+        col.label(text="New Objects:")
+        col.prop(edit, "enter_edit_mode")
+        col.label(text="Align To:")
+        col.row().prop(edit, "object_align", expand=True)
+        
+        col.separator()
+        col.separator()
+        col.separator()
 
-        sub1 = sub.column()
-        sub1.label(text="Snap:")
-        sub1.prop(edit, "snap_translate", text="Translate")
-        sub1.prop(edit, "snap_rotate", text="Rotate")
-        sub1.prop(edit, "snap_scale", text="Scale")
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
-        sub1.label(text="Grease Pencil:")
-        sub1.prop(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance")
-        sub1.prop(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance")
-        # sub1.prop(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke")
-        sub1.prop(edit, "grease_pencil_eraser_radius", text="Eraser Radius")
-        sub1.prop(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
+        col.label(text="Undo:")
+        col.prop(edit, "global_undo")
+        col.prop(edit, "undo_steps", text="Steps")
+        col.prop(edit, "undo_memory_limit", text="Memory Limit")
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
 
-        sub1 = sub.column()
-        sub1.label(text="Keyframing:")
-        sub1.prop(edit, "use_visual_keying")
-        sub1.prop(edit, "keyframe_insert_needed", text="Only Insert Needed")
-        sub1.separator()
-        sub1.label(text="New F-Curve Defaults:")
-        sub1.prop(edit, "new_interpolation_type", text="Interpolation")
-        sub1.separator()
-        sub1.prop(edit, "auto_keying_enable", text="Auto Keyframing:")
-        sub2 = sub1.column()
-        sub2.active = edit.auto_keying_enable
-        sub2.prop(edit, "auto_keyframe_insert_keyingset", text="Only Insert for Keying Set")
-        sub2.prop(edit, "auto_keyframe_insert_available", text="Only Insert Available")
+        col = colsplit.column()
+        col.label(text="Snap:")
+        col.prop(edit, "snap_translate", text="Translate")
+        col.prop(edit, "snap_rotate", text="Rotate")
+        col.prop(edit, "snap_scale", text="Scale")
+        col.separator()
+        col.separator()
+        col.separator()
+        col.label(text="Grease Pencil:")
+        col.prop(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance")
+        col.prop(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance")
+        #col.prop(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke")
+        col.prop(edit, "grease_pencil_eraser_radius", text="Eraser Radius")
+        col.prop(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
 
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
 
-        sub1.label(text="Transform:")
-        sub1.prop(edit, "drag_immediately")
+        col = colsplit.column()
+        col.label(text="Keyframing:")
+        col.prop(edit, "use_visual_keying")
+        col.prop(edit, "keyframe_insert_needed", text="Only Insert Needed")
 
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
+        col.separator()
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
+        col.label(text="New F-Curve Defaults:")
+        col.prop(edit, "new_interpolation_type", text="Interpolation")
 
-        sub1 = sub.column()
-        sub1.label(text="Duplicate Data:")
-        sub1.prop(edit, "duplicate_mesh", text="Mesh")
-        sub1.prop(edit, "duplicate_surface", text="Surface")
-        sub1.prop(edit, "duplicate_curve", text="Curve")
-        sub1.prop(edit, "duplicate_text", text="Text")
-        sub1.prop(edit, "duplicate_metaball", text="Metaball")
-        sub1.prop(edit, "duplicate_armature", text="Armature")
-        sub1.prop(edit, "duplicate_lamp", text="Lamp")
-        sub1.prop(edit, "duplicate_material", text="Material")
-        sub1.prop(edit, "duplicate_texture", text="Texture")
-        sub1.prop(edit, "duplicate_fcurve", text="F-Curve")
-        sub1.prop(edit, "duplicate_action", text="Action")
-        sub1.prop(edit, "duplicate_particle", text="Particle")
+        col.separator()
+
+        col.prop(edit, "auto_keying_enable", text="Auto Keyframing:")
+
+        sub = col.column()
+
+        sub.active = edit.auto_keying_enable
+        sub.prop(edit, "auto_keyframe_insert_keyingset", text="Only Insert for Keying Set")
+        sub.prop(edit, "auto_keyframe_insert_available", text="Only Insert Available")
+
+        col.separator()
+        col.separator()
+        col.separator()
+
+        col.label(text="Transform:")
+        col.prop(edit, "drag_immediately")
+
+        col.separator()
+        col.separator()
+        col.separator()
+
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
+
+        col = colsplit.column()
+        col.label(text="Duplicate Data:")
+        col.prop(edit, "duplicate_mesh", text="Mesh")
+        col.prop(edit, "duplicate_surface", text="Surface")
+        col.prop(edit, "duplicate_curve", text="Curve")
+        col.prop(edit, "duplicate_text", text="Text")
+        col.prop(edit, "duplicate_metaball", text="Metaball")
+        col.prop(edit, "duplicate_armature", text="Armature")
+        col.prop(edit, "duplicate_lamp", text="Lamp")
+        col.prop(edit, "duplicate_material", text="Material")
+        col.prop(edit, "duplicate_texture", text="Texture")
+        col.prop(edit, "duplicate_fcurve", text="F-Curve")
+        col.prop(edit, "duplicate_action", text="Action")
+        col.prop(edit, "duplicate_particle", text="Particle")
 
 
 class USERPREF_PT_system(bpy.types.Panel):
@@ -270,106 +275,109 @@ class USERPREF_PT_system(bpy.types.Panel):
 
         split = layout.split()
 
-        col = split.column()
-        sub = col.split(percentage=0.9)
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
 
-        sub1 = sub.column()
-        sub1.label(text="General:")
-        sub1.prop(system, "dpi")
-        sub1.prop(system, "frame_server_port")
-        sub1.prop(system, "scrollback", text="Console Scrollback")
-        sub1.prop(system, "auto_run_python_scripts")
+        col = colsplit.column()
+        col.label(text="General:")
+        col.prop(system, "dpi")
+        col.prop(system, "frame_server_port")
+        col.prop(system, "scrollback", text="Console Scrollback")
+        col.prop(system, "auto_run_python_scripts")
 
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
+        col.separator()
+        col.separator()
+        col.separator()
 
-        sub1.label(text="Sound:")
-        sub1.row().prop(system, "audio_device", expand=True)
-        sub2 = sub1.column()
-        sub2.active = system.audio_device != 'NONE'
-        sub2.prop(system, "enable_all_codecs")
-        sub2.prop(system, "game_sound")
-        sub2.prop(system, "audio_channels", text="Channels")
-        sub2.prop(system, "audio_mixing_buffer", text="Mixing Buffer")
-        sub2.prop(system, "audio_sample_rate", text="Sample Rate")
-        sub2.prop(system, "audio_sample_format", text="Sample Format")
-
-        col = split.column()
-        sub = col.split(percentage=0.9)
-
-        sub1 = sub .column()
-        sub1.label(text="Weight Colors:")
-        sub1.prop(system, "use_weight_color_range", text="Use Custom Range")
-        sub2 = sub1.column()
-        sub2.active = system.use_weight_color_range
-        sub2.template_color_ramp(system, "weight_color_range", expand=True)
-
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
-
-        sub1.prop(system, "language")
-        sub1.label(text="Translate:")
-        sub1.prop(system, "translate_tooltips", text="Tooltips")
-        sub1.prop(system, "translate_buttons", text="Labels")
-        sub1.prop(system, "translate_toolbox", text="Toolbox")
-
-        sub1.separator()
-
-        sub1.prop(system, "use_textured_fonts")
-
-        col = split.column()
-        sub = col.split(percentage=0.9)
-
-        sub1 = sub.column()
-
-        sub1.label(text="Solid OpenGL lights:")
-
-        sub2 = sub1.split()
-
-        col = sub2.column()
-        col.prop(lamp0, "enabled")
+        col.label(text="Sound:")
+        col.row().prop(system, "audio_device", expand=True)
         sub = col.column()
-        sub.active = lamp0.enabled
-        sub.prop(lamp0, "diffuse_color")
-        sub.prop(lamp0, "specular_color")
-        sub.prop(lamp0, "direction")
-
-        col = sub2.column()
-        col.prop(lamp1, "enabled")
+        sub.active = system.audio_device != 'NONE'
+        #sub.prop(system, "enable_all_codecs")
+        sub.prop(system, "game_sound")
+        sub.prop(system, "audio_channels", text="Channels")
+        sub.prop(system, "audio_mixing_buffer", text="Mixing Buffer")
+        sub.prop(system, "audio_sample_rate", text="Sample Rate")
+        sub.prop(system, "audio_sample_format", text="Sample Format")
+        
+        col.separator()
+        col.separator()
+        col.separator()
+        
+        col.label(text="Weight Colors:")
+        col.prop(system, "use_weight_color_range", text="Use Custom Range")
         sub = col.column()
-        sub.active = lamp1.enabled
-        sub.prop(lamp1, "diffuse_color")
-        sub.prop(lamp1, "specular_color")
-        sub.prop(lamp1, "direction")
+        sub.active = system.use_weight_color_range
+        sub.template_color_ramp(system, "weight_color_range", expand=True)
+
+        #column = split.column()
+        #colsplit = column.split(percentage=0.85)
+
+        # No translation in 2.5 yet
+        #col.prop(system, "language")
+        #col.label(text="Translate:")
+        #col.prop(system, "translate_tooltips", text="Tooltips")
+        #col.prop(system, "translate_buttons", text="Labels")
+        #col.prop(system, "translate_toolbox", text="Toolbox")
+
+        #col.separator()
+
+        #col.prop(system, "use_textured_fonts")
+
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
+
+        col1 = colsplit.column()
+        col1.label(text="Solid OpenGL lights:")
+        
+        col = col1.split()
 
-        col = sub2.column()
-        col.prop(lamp2, "enabled")
         sub = col.column()
-        sub.active = lamp2.enabled
-        sub.prop(lamp2, "diffuse_color")
-        sub.prop(lamp2, "specular_color")
-        sub.prop(lamp2, "direction")
+        sub.prop(lamp0, "enabled")
+        subsub = sub.column()
+        subsub.active = lamp0.enabled
+        subsub.prop(lamp0, "diffuse_color")
+        subsub.prop(lamp0, "specular_color")
+        subsub.prop(lamp0, "direction")
 
-        sub1.label(text="OpenGL:")
-        sub1.prop(system, "clip_alpha", slider=True)
-        sub1.prop(system, "use_mipmaps")
-        sub1.prop(system, "use_vbos")
-        sub1.label(text="Window Draw Method:")
-        sub1.row().prop(system, "window_draw_method", expand=True)
-        sub1.label(text="Textures:")
-        sub1.prop(system, "gl_texture_limit", text="Limit Size")
-        sub1.prop(system, "texture_time_out", text="Time Out")
-        sub1.prop(system, "texture_collection_rate", text="Collection Rate")
+        sub = col.column()
+        sub.prop(lamp1, "enabled")
+        subsub = sub.column()
+        subsub.active = lamp1.enabled
+        subsub.prop(lamp1, "diffuse_color")
+        subsub.prop(lamp1, "specular_color")
+        subsub.prop(lamp1, "direction")
 
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
+        sub = col.column()
+        sub.prop(lamp2, "enabled")
+        subsub = sub.column()
+        subsub.active = lamp2.enabled
+        subsub.prop(lamp2, "diffuse_color")
+        subsub.prop(lamp2, "specular_color")
+        subsub.prop(lamp2, "direction")
+        
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
 
-        sub1.label(text="Sequencer:")
-        sub1.prop(system, "prefetch_frames")
-        sub1.prop(system, "memory_cache_limit")
+        col = colsplit.column()
+        col.label(text="OpenGL:")
+        col.prop(system, "clip_alpha", slider=True)
+        col.prop(system, "use_mipmaps")
+        col.prop(system, "use_vbos")
+        col.label(text="Window Draw Method:")
+        col.row().prop(system, "window_draw_method", expand=True)
+        col.label(text="Textures:")
+        col.prop(system, "gl_texture_limit", text="Limit Size")
+        col.prop(system, "texture_time_out", text="Time Out")
+        col.prop(system, "texture_collection_rate", text="Collection Rate")
+
+        col.separator()
+        col.separator()
+        col.separator()
+
+        col.label(text="Sequencer:")
+        col.prop(system, "prefetch_frames")
+        col.prop(system, "memory_cache_limit")
 
 
 class USERPREF_PT_theme(bpy.types.Panel):
@@ -380,7 +388,6 @@ class USERPREF_PT_theme(bpy.types.Panel):
 
     def poll(self, context):
         userpref = context.user_preferences
-
         return (userpref.active_section == 'THEMES')
 
     def draw(self, context):
@@ -388,7 +395,6 @@ class USERPREF_PT_theme(bpy.types.Panel):
 
         theme = context.user_preferences.themes[0]
 
-
         split = layout.split(percentage=0.33)
         split.prop(theme, "active_theme", text="")
 
@@ -413,7 +419,6 @@ class USERPREF_PT_theme(bpy.types.Panel):
             col.prop(v3d, "editmesh_active", slider=True)
 
             col = split.column()
-
             col.prop(v3d, "object_selected")
             col.prop(v3d, "object_active")
             col.prop(v3d, "object_grouped")
@@ -426,327 +431,326 @@ class USERPREF_PT_theme(bpy.types.Panel):
             col.prop(v3d, "normal")
             col.prop(v3d, "bone_solid")
             col.prop(v3d, "bone_pose")
+            #col.prop(v3d, "edge") Doesn't seem to work
 
-#           col.prop(v3d, "edge") Doesn't seem to work
         elif theme.active_theme == 'USER_INTERFACE':
-
             ui = theme.user_interface.wcol_regular
-
             layout.label(text="Regular:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
+            
             layout.separator()
 
             ui = theme.user_interface.wcol_tool
             layout.label(text="Tool:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_radio
             layout.label(text="Radio Buttons:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_text
             layout.label(text="Text:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_option
             layout.label(text="Option:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_toggle
             layout.label(text="Toggle:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_num
             layout.label(text="Number Field:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_numslider
             layout.label(text="Value Slider:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_box
             layout.label(text="Box:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_menu
             layout.label(text="Menu:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_pulldown
             layout.label(text="Pulldown:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_menu_back
             layout.label(text="Menu Back:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_menu_item
             layout.label(text="Menu Item:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_scroll
             layout.label(text="Scroll Bar:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_list_item
             layout.label(text="List Item:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "outline")
-            sub1.prop(ui, "item", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "inner", slider=True)
-            sub1.prop(ui, "inner_sel", slider=True)
-            sub1 = sub.column()
-            sub1.prop(ui, "text")
-            sub1.prop(ui, "text_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "shaded")
-            sub2 = sub1.column(align=True)
-            sub2.active = ui.shaded
-            sub2.prop(ui, "shadetop")
-            sub2.prop(ui, "shadedown")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "outline")
+            sub.prop(ui, "item", slider=True)
+            sub = row.column()
+            sub.prop(ui, "inner", slider=True)
+            sub.prop(ui, "inner_sel", slider=True)
+            sub = row.column()
+            sub.prop(ui, "text")
+            sub.prop(ui, "text_sel")
+            sub = row.column()
+            sub.prop(ui, "shaded")
+            subsub = sub.column(align=True)
+            subsub.active = ui.shaded
+            subsub.prop(ui, "shadetop")
+            subsub.prop(ui, "shadedown")
 
             ui = theme.user_interface.wcol_state
             layout.label(text="State:")
 
-            sub = layout.row()
-            sub1 = sub.column()
-            sub1.prop(ui, "inner_anim")
-            sub1.prop(ui, "inner_anim_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "inner_driven")
-            sub1.prop(ui, "inner_driven_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "inner_key")
-            sub1.prop(ui, "inner_key_sel")
-            sub1 = sub.column()
-            sub1.prop(ui, "blend")
+            row = layout.row()
+            sub = row.column()
+            sub.prop(ui, "inner_anim")
+            sub.prop(ui, "inner_anim_sel")
+            sub = row.column()
+            sub.prop(ui, "inner_driven")
+            sub.prop(ui, "inner_driven_sel")
+            sub = row.column()
+            sub.prop(ui, "inner_key")
+            sub.prop(ui, "inner_key_sel")
+            sub = row.column()
+            sub.prop(ui, "blend")
 
             ui = theme.user_interface
             layout.separator()
@@ -966,7 +970,6 @@ class USERPREF_PT_theme(bpy.types.Panel):
             col.prop(node, "button_title")
             col.prop(node, "button_text")
 
-
             col = split.column()
             col.prop(node, "text")
             col.prop(node, "text_hi")
@@ -1063,56 +1066,53 @@ class USERPREF_PT_file(bpy.types.Panel):
         userpref = context.user_preferences
         paths = userpref.filepaths
 
-        split = layout.split(percentage=0.6)
+        split = layout.split(percentage=0.7)
 
         col = split.column()
         col.label(text="File Paths:")
-        sub = col.split(percentage=0.3)
-
+        
+        colsplit = col.split(percentage=0.95)
+        col1 = colsplit.split(percentage=0.3)
+        
+        sub = col1.column()
         sub.label(text="Fonts:")
-        sub.prop(paths, "fonts_directory", text="")
-        sub = col.split(percentage=0.3)
         sub.label(text="Textures:")
-        sub.prop(paths, "textures_directory", text="")
-        sub = col.split(percentage=0.3)
         sub.label(text="Texture Plugins:")
-        sub.prop(paths, "texture_plugin_directory", text="")
-        sub = col.split(percentage=0.3)
         sub.label(text="Sequence Plugins:")
-        sub.prop(paths, "sequence_plugin_directory", text="")
-        sub = col.split(percentage=0.3)
         sub.label(text="Render Output:")
-        sub.prop(paths, "render_output_directory", text="")
-        sub = col.split(percentage=0.3)
         sub.label(text="Scripts:")
-        sub.prop(paths, "python_scripts_directory", text="")
-        sub = col.split(percentage=0.3)
         sub.label(text="Sounds:")
-        sub.prop(paths, "sounds_directory", text="")
-        sub = col.split(percentage=0.3)
         sub.label(text="Temp:")
+        
+        sub = col1.column()
+        sub.prop(paths, "fonts_directory", text="")
+        sub.prop(paths, "textures_directory", text="")
+        sub.prop(paths, "texture_plugin_directory", text="")
+        sub.prop(paths, "sequence_plugin_directory", text="")
+        sub.prop(paths, "render_output_directory", text="")
+        sub.prop(paths, "python_scripts_directory", text="")
+        sub.prop(paths, "sounds_directory", text="")
         sub.prop(paths, "temporary_directory", text="")
 
         col = split.column()
-        sub = col.split(percentage=0.2)
-        sub.column() # sub1, unused
-        sub2 = sub.column()
-        sub2.label(text="Save & Load:")
-        sub2.prop(paths, "use_relative_paths")
-        sub2.prop(paths, "compress_file")
-        sub2.prop(paths, "load_ui")
-        sub2.prop(paths, "filter_file_extensions")
-        sub2.prop(paths, "hide_dot_files_datablocks")
-        sub2.separator()
-        sub2.separator()
-        sub2.label(text="Auto Save:")
-        sub2.prop(paths, "save_version")
-        sub2.prop(paths, "recent_files")
-        sub2.prop(paths, "save_preview_images")
-        sub2.prop(paths, "auto_save_temporary_files")
-        sub3 = sub2.column()
-        sub3.enabled = paths.auto_save_temporary_files
-        sub3.prop(paths, "auto_save_time", text="Timer (mins)")
+        col.label(text="Save & Load:")
+        col.prop(paths, "use_relative_paths")
+        col.prop(paths, "compress_file")
+        col.prop(paths, "load_ui")
+        col.prop(paths, "filter_file_extensions")
+        col.prop(paths, "hide_dot_files_datablocks")
+        
+        col.separator()
+        col.separator()
+
+        col.label(text="Auto Save:")
+        col.prop(paths, "save_version")
+        col.prop(paths, "recent_files")
+        col.prop(paths, "save_preview_images")
+        col.prop(paths, "auto_save_temporary_files")
+        sub = col.column()
+        sub.enabled = paths.auto_save_temporary_files
+        sub.prop(paths, "auto_save_time", text="Timer (mins)")
 
 
 class USERPREF_PT_input(bpy.types.Panel):
@@ -1294,7 +1294,6 @@ class USERPREF_PT_input(bpy.types.Panel):
         itemrow.enabled = km.user_defined
 
 bpy.types.register(USERPREF_HT_header)
-bpy.types.register(USERPREF_MT_view)
 bpy.types.register(USERPREF_PT_tabs)
 bpy.types.register(USERPREF_PT_interface)
 bpy.types.register(USERPREF_PT_theme)
@@ -1465,4 +1464,4 @@ bpy.ops.add(WM_OT_keyconfig_export)
 bpy.ops.add(WM_OT_keymap_edit)
 bpy.ops.add(WM_OT_keymap_restore)
 bpy.ops.add(WM_OT_keyitem_add)
-bpy.ops.add(WM_OT_keyitem_remove)
+bpy.ops.add(WM_OT_keyitem_remove)
\ No newline at end of file