RNA

* DNA_userdef_types.h, done. Patch by Nathaniel Garbutt, thanks!

source/blender/makesdna/DNA_userdef_types.h

@@ -331,5 +331,11 @@ extern UserDef U; /* from blenkernel blender.c */
 #define GP_PAINT_DOSMOOTH		(1<<0)
 #define GP_PAINT_DOSIMPLIFY		(1<<1)
 
+/* theme drawtypes */
+#define TH_MINIMAL  	0
+#define TH_ROUNDSHADED	1
+#define TH_ROUNDED  	2
+#define TH_OLDSKOOL 	3
+#define TH_SHADED   	4
 
 #endif

source/blender/makesrna/RNA_access.h

@@ -36,6 +36,8 @@ struct Main;
 extern BlenderRNA BLENDER_RNA;
 
 extern StructRNA RNA_Action;
+extern StructRNA RNA_ActionChannel;
+extern StructRNA RNA_ActionGroup;
 extern StructRNA RNA_Actuator;
 extern StructRNA RNA_ActuatorSensor;
 extern StructRNA RNA_AlwaysSensor;
@@ -55,8 +57,8 @@ extern StructRNA RNA_BuildModifier;
 extern StructRNA RNA_Camera;
 extern StructRNA RNA_CastModifier;
 extern StructRNA RNA_CharInfo;
-extern StructRNA RNA_ClothModifier;
 extern StructRNA RNA_ClothCollisionSettings;
+extern StructRNA RNA_ClothModifier;
 extern StructRNA RNA_ClothSettings;
 extern StructRNA RNA_CollectionProperty;
 extern StructRNA RNA_CollisionModifier;
@@ -118,7 +120,6 @@ extern StructRNA RNA_Lattice;
 extern StructRNA RNA_LatticeModifier;
 extern StructRNA RNA_LatticePoint;
 extern StructRNA RNA_Library;
-extern StructRNA RNA_MappingTexture;
 extern StructRNA RNA_MCol;
 extern StructRNA RNA_MColLayer;
 extern StructRNA RNA_MFloatProperty;
@@ -223,11 +224,30 @@ extern StructRNA RNA_TextBox;
 extern StructRNA RNA_TextLine;
 extern StructRNA RNA_TextMarker;
 extern StructRNA RNA_Texture;
+extern StructRNA RNA_TextureSlot;
+extern StructRNA RNA_Theme;
+extern StructRNA RNA_ThemeActionEditor;
+extern StructRNA RNA_ThemeAudioWindow;
+extern StructRNA RNA_ThemeBoneColorSet;
+extern StructRNA RNA_ThemeButtonsWindow;
+extern StructRNA RNA_ThemeFileBrowser;
+extern StructRNA RNA_ThemeImageEditor;
+extern StructRNA RNA_ThemeIpoEditor;
+extern StructRNA RNA_ThemeNLAEditor;
+extern StructRNA RNA_ThemeNodeEditor;
+extern StructRNA RNA_ThemeOutliner;
+extern StructRNA RNA_ThemeSequenceEditor;
+extern StructRNA RNA_ThemeTextEditor;
+extern StructRNA RNA_ThemeTimeline;
+extern StructRNA RNA_ThemeUserInterface;
+extern StructRNA RNA_ThemeUserPreferences;
+extern StructRNA RNA_ThemeView3D;
 extern StructRNA RNA_TouchSensor;
 extern StructRNA RNA_TransformSequence;
 extern StructRNA RNA_UVProjectModifier;
 extern StructRNA RNA_UnknownType;
 extern StructRNA RNA_UserPreferences;
+extern StructRNA RNA_UserSolidLight;
 extern StructRNA RNA_VectorFont;
 extern StructRNA RNA_VertexGroup;
 extern StructRNA RNA_WaveModifier;

source/blender/makesrna/intern/makesrna.c

@@ -167,6 +167,15 @@ static int rna_enum_bitmask(PropertyRNA *prop)
 	return mask;
 }
 
+static int rna_color_quantize(PropertyRNA *prop, PropertyDefRNA *dp)
+{
+	if(prop->type == PROP_FLOAT && prop->subtype == PROP_COLOR)
+		if(strcmp(dp->dnatype, "float") != 0 && strcmp(dp->dnatype, "double") != 0)
+			return 1;
+	
+	return 0;
+}
+
 static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *prop, PropertyDefRNA *dp)
 {
 	char *func;
@@ -212,6 +221,8 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 				else {
 					if(prop->type == PROP_BOOLEAN && dp->booleanbit)
 						fprintf(f, "	return (%s(data->%s[index] & %d) != 0);\n", (dp->booleannegative)? "!": "", dp->dnaname, dp->booleanbit);
+					else if(rna_color_quantize(prop, dp))
+						fprintf(f, "	return (%s)(data->%s[index]/255.0f);\n", rna_type_type(prop), dp->dnaname);
 					else
 						fprintf(f, "	return (%s)%s(data->%s[index]);\n", rna_type_type(prop), (dp->booleannegative)? "!": "", dp->dnaname);
 				}
@@ -326,6 +337,9 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 						fprintf(f, "	if(%svalue) data->%s[index] |= %d;\n", (dp->booleannegative)? "!": "", dp->dnaname, dp->booleanbit);
 						fprintf(f, "	else data->%s[index] &= ~%d;\n", dp->dnaname, dp->booleanbit);
 					}
+					else if(rna_color_quantize(prop, dp)) {
+						fprintf(f, "	data->%s[index]= FTOCHAR(value);\n", dp->dnaname);
+					}
 					else {
 						rna_clamp_value(f, prop);
 						fprintf(f, "	data->%s[index]= %svalue;\n", dp->dnaname, (dp->booleannegative)? "!": "");

source/blender/makesrna/intern/rna_constraint.c

@@ -84,7 +84,7 @@ void rna_def_constraint_basedata(BlenderRNA *brna)
 	/* data */
 	srna= RNA_def_struct(brna, "Constraint", NULL );
 	RNA_def_struct_ui_text(srna, "Constraint", "alter the transformation of 'Objects' or 'Bones' from a number of predefined constraints");
-	//RNA_def_struct_refine_func(srna, "rna_Constraint_refine");  // XXX or should this go down below with the data?
+	RNA_def_struct_refine_func(srna, "rna_Constraint_refine");
 	RNA_def_struct_sdna(srna, "bConstraint");
 	
 	/* strings */

source/blender/makesrna/intern/rna_text.c

@@ -36,18 +36,6 @@
 
 #ifdef RNA_RUNTIME
 
-static float rna_TextMarker_color_get(PointerRNA *ptr, int index)
-{
-	TextMarker *marker= (TextMarker*)ptr->data;
-	return marker->color[index]/255.0f;
-}
-
-static void rna_TextMarker_color_set(PointerRNA *ptr, int index, float value)
-{
-	TextMarker *marker= (TextMarker*)ptr->data;
-	marker->color[index] = (char)(CLAMPIS(value*255.0f, 0, 255));
-}
-
 static void rna_Text_filename_get(PointerRNA *ptr, char *value)
 {
 	Text *text= (Text*)ptr->data;
@@ -163,7 +151,6 @@ static void rna_def_text_marker(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Edit All", "Edit all markers of the same group as one.");
 	
 	prop= RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR);
-	RNA_def_property_float_funcs(prop, "rna_TextMarker_color_get", "rna_TextMarker_color_set", NULL);
 	RNA_def_property_ui_text(prop, "Color", "Color to display the marker with.");
 }
 

source/blender/makesrna/intern/rna_userdef.c

@@ -30,28 +30,1671 @@
 #include "rna_internal.h"
 
 #include "DNA_userdef_types.h"
+#include "DNA_ipo_types.h"
 
 #ifdef RNA_RUNTIME
 
+static void rna_userdef_lmb_select_set(struct PointerRNA *ptr,int value)
+{
+	UserDef *userdef = (UserDef*)ptr->data;
+
+	if(value) {
+		userdef->flag |= USER_LMOUSESELECT;
+		userdef->flag &= ~USER_TWOBUTTONMOUSE;
+	}
+	else
+		userdef->flag &= ~USER_LMOUSESELECT;
+}
+
+static void rna_userdef_rmb_select_set(struct PointerRNA *ptr,int value)
+{
+	rna_userdef_lmb_select_set(ptr, !value);
+}
+
+static void rna_userdef_emulate_set(struct PointerRNA *ptr,int value)
+{
+	UserDef *userdef = (UserDef*)ptr->data;
+
+	if(userdef->flag & USER_LMOUSESELECT) 
+		userdef->flag &= ~USER_TWOBUTTONMOUSE;
+	else
+		userdef->flag ^= USER_TWOBUTTONMOUSE;
+}
+
+static int rna_userdef_autokeymode_get(struct PointerRNA *ptr)
+{
+	UserDef *userdef = (UserDef*)ptr->data;
+	short retval = userdef->autokey_mode;
+	
+	if(!(userdef->autokey_mode & AUTOKEY_ON))
+		retval |= AUTOKEY_ON;
+
+	return retval;
+}
+
+static void rna_userdef_autokeymode_set(struct PointerRNA *ptr,int value)
+{
+	UserDef *userdef = (UserDef*)ptr->data;
+
+	if(value == AUTOKEY_MODE_NORMAL) {
+		userdef->autokey_mode |= (AUTOKEY_MODE_NORMAL - AUTOKEY_ON);
+		userdef->autokey_mode &= ~(AUTOKEY_MODE_EDITKEYS - AUTOKEY_ON);
+	}
+	else if(value == AUTOKEY_MODE_EDITKEYS) {
+		userdef->autokey_mode |= (AUTOKEY_MODE_EDITKEYS - AUTOKEY_ON);
+		userdef->autokey_mode &= ~(AUTOKEY_MODE_NORMAL - AUTOKEY_ON);
+	}
+}
+
 #else
 
-static void rna_def_userdef(BlenderRNA *brna)
+static void rna_def_userdef_theme_ui(BlenderRNA *brna)
 {
 	StructRNA *srna;
 	PropertyRNA *prop;
 
-	srna= RNA_def_struct(brna, "UserPreferences", NULL);
-	RNA_def_struct_sdna(srna, "UserDef");
-	RNA_def_struct_ui_text(srna, "User Preferences", "");
+	static EnumPropertyItem button_theme_styles[] = {
+		{TH_MINIMAL, "MINIMAL", "Minimal", ""},
+		{TH_SHADED, "SHADED", "Shaded", ""},
+		{TH_ROUNDED, "ROUNDED", "Rounded", ""},
+		{TH_ROUNDSHADED, "ROUNDSHADED", "Round Shaded", ""},
+		{TH_OLDSKOOL, "OLDSKOOL", "Old Skool", ""},
+		{0, NULL, NULL, NULL}};
+
+	srna= RNA_def_struct(brna, "ThemeUserInterface", NULL);
+	RNA_def_struct_sdna(srna, "ThemeUI");
+	RNA_def_struct_ui_text(srna, "Theme User Interface", "Theme settings for user interface elements.");
+
+	prop= RNA_def_property(srna, "outline", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Outline", "");
+
+	prop= RNA_def_property(srna, "neutral", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Neutral", "");
+
+	prop= RNA_def_property(srna, "action", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Action", "");
+
+	prop= RNA_def_property(srna, "setting", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Setting", "");
+
+	prop= RNA_def_property(srna, "special_setting_1", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "setting1");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Special Setting 1", "");
+
+	prop= RNA_def_property(srna, "special_setting_2", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "setting2");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Special Setting 2", "");
+
+	prop= RNA_def_property(srna, "number_input", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "num");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Number Input", "");
+
+	prop= RNA_def_property(srna, "text_field", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "textfield");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Text Field", "");
+
+	prop= RNA_def_property(srna, "textfield_highlight", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "textfield_hi");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Text Field Highlight", "");
+
+	prop= RNA_def_property(srna, "popup", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Popup", "");
+
+	prop= RNA_def_property(srna, "text", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Text", "");
+
+	prop= RNA_def_property(srna, "text_highlight", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "text_hi");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Text highlight", "");
+
+	prop= RNA_def_property(srna, "menu_background", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "menu_back");
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "Menu Background", "");
+
+	prop= RNA_def_property(srna, "menu_item", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Menu Item", "");
+
+	prop= RNA_def_property(srna, "menu_highlight", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "menu_hilite");
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "Menu Highlight", "");
+
+	prop= RNA_def_property(srna, "menu_text", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Menu Text", "");
+
+	prop= RNA_def_property(srna, "menu_text_highlight", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "menu_text_hi");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Menu Text Highlight", "");
+
+	prop= RNA_def_property(srna, "button_draw_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "but_drawtype");
+	RNA_def_property_enum_items(prop, button_theme_styles);
+	RNA_def_property_ui_text(prop, "Button Draw Type", "");
+
+	prop= RNA_def_property(srna, "icon_file", PROP_STRING, PROP_FILEPATH);
+	RNA_def_property_string_sdna(prop, NULL, "iconfile");
+	RNA_def_property_ui_text(prop, "Icon File", "");
+}
+
+static void rna_def_userdef_theme_spaces_main(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	prop= RNA_def_property(srna, "back", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Back", "");
+
+	prop= RNA_def_property(srna, "text", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Text", "");
+
+	prop= RNA_def_property(srna, "text_highlight", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "text_hi");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Text Highlight", "");
+
+	prop= RNA_def_property(srna, "header", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Header", "");
+}
+
+static void rna_def_userdef_theme_spaces_vertex(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	prop= RNA_def_property(srna, "vertex", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Vertex", "");
+
+	prop= RNA_def_property(srna, "vertex_select", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Vertex Select", "");
+
+	prop= RNA_def_property(srna, "vertex_size", PROP_INT, PROP_NONE);
+	RNA_def_property_range(prop, 0, 255);
+	RNA_def_property_ui_text(prop, "Vertex Size", "");
+}
+
+static void rna_def_userdef_theme_spaces_edge(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	prop= RNA_def_property(srna, "edge_select", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "edge Select", "");
+
+	prop= RNA_def_property(srna, "edge_seam", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Edge Seam", "");
+
+	prop= RNA_def_property(srna, "edge_sharp", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Edge Sharp", "");
+
+	prop= RNA_def_property(srna, "edge_facesel", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Edge UV Face Select", "");
+}
+
+static void rna_def_userdef_theme_spaces_face(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	prop= RNA_def_property(srna, "face", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "Face", "");
+
+	prop= RNA_def_property(srna, "face_select", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "Face Selected", "");
+
+	prop= RNA_def_property(srna, "face_dot", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Face Dot Selected", "");
+
+	prop= RNA_def_property(srna, "facedot_size", PROP_INT, PROP_NONE);
+	RNA_def_property_range(prop, 0, 255);
+	RNA_def_property_ui_text(prop, "Face Dot Size", "");
+}
+
+static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* space_view3d */
+
+	srna= RNA_def_struct(brna, "ThemeView3D", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme 3D View", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+
+	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Grid", "");
+
+	prop= RNA_def_property(srna, "panel", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "Panel", "");
+
+	prop= RNA_def_property(srna, "wire", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Wire", "");
+
+	prop= RNA_def_property(srna, "lamp", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "Lamp", "");
+
+	prop= RNA_def_property(srna, "object_selected", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "select");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Object Selected", "");
+
+	prop= RNA_def_property(srna, "object_active", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "active");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Active Object", "");
+
+	prop= RNA_def_property(srna, "object_grouped", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "group");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Object Grouped", "");
+
+	prop= RNA_def_property(srna, "object_grouped_active", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "group_active");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Object Grouped Active", "");
+
+	prop= RNA_def_property(srna, "transform", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Transform", "");
+
+	rna_def_userdef_theme_spaces_vertex(srna);
+	rna_def_userdef_theme_spaces_edge(srna);
+	rna_def_userdef_theme_spaces_face(srna);
+
+	prop= RNA_def_property(srna, "editmesh_active", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "Active Vert/Edge/Face", "");
+
+	prop= RNA_def_property(srna, "normal", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Normal", "");
+
+	prop= RNA_def_property(srna, "bone_solid", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Bone Solid", "");
+
+	prop= RNA_def_property(srna, "bone_pose", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Bone Pose", "");
+
+	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "cframe");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Current Frame", "");
+}
+
+static void rna_def_userdef_theme_space_ipo(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* space_ipo */
+
+	srna= RNA_def_struct(brna, "ThemeIpoEditor", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme Ipo Editor", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+
+	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Grid", "");
+
+	prop= RNA_def_property(srna, "panel", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Panel", "");
+
+	prop= RNA_def_property(srna, "window_sliders", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade1");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Window Sliders", "");
+
+	prop= RNA_def_property(srna, "ipo_channels", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade2");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Ipo Channels", "");
+	
+	rna_def_userdef_theme_spaces_vertex(srna);
+
+	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "cframe");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Current Frame", "");
+
+	prop= RNA_def_property(srna, "handle_vertex", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Handle Vertex", "");
+
+	prop= RNA_def_property(srna, "handle_vertex_select", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Handle Vertex Select", "");
+
+	prop= RNA_def_property(srna, "handle_vertex_size", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Handle Vertex Size", "");
+}
+
+static void rna_def_userdef_theme_space_file(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* space_file  */
+
+	srna= RNA_def_struct(brna, "ThemeFileBrowser", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme File Browser", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+
+	prop= RNA_def_property(srna, "selected_file", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "hilite");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Selected File", "");
+
+	prop= RNA_def_property(srna, "tiles", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "panel");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Tiles", "");
+
+	prop= RNA_def_property(srna, "scrollbar", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade1");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Scrollbar", "");
+
+	prop= RNA_def_property(srna, "scroll_handle", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade2");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Scroll Handle", "");
+
+	prop= RNA_def_property(srna, "active_file", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "active");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Active File", "");
+	
+	prop= RNA_def_property(srna, "active_file_text", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "grid");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Active File Text", "");
+}
+
+static void rna_def_userdef_theme_space_oops(BlenderRNA *brna)
+{
+	StructRNA *srna;
+
+	/* space_oops */
+
+	srna= RNA_def_struct(brna, "ThemeOutliner", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme Outliner", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+}
+
+static void rna_def_userdef_theme_space_info(BlenderRNA *brna)
+{
+	StructRNA *srna;
+
+	/* space_info */
+
+	srna= RNA_def_struct(brna, "ThemeUserPreferences", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme User Preferences", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+}
+
+static void rna_def_userdef_theme_space_text(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* space_text */
+
+	srna= RNA_def_struct(brna, "ThemeTextEditor", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme Text Editor", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+
+	prop= RNA_def_property(srna, "line_numbers_background", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "grid");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Line Numbers Background", "");
+
+	prop= RNA_def_property(srna, "scroll_bar", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade1");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Scroll Bar", "");
+
+	prop= RNA_def_property(srna, "selected_text", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade2");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Selected Text", "");
+
+	prop= RNA_def_property(srna, "cursor", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "hilite");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Cursor", "");
+	
+	prop= RNA_def_property(srna, "syntax_builtin", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "syntaxb");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Syntax Builtin", "");
+	
+	prop= RNA_def_property(srna, "syntax_special", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "syntaxv");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Syntax Special", "");
+
+	prop= RNA_def_property(srna, "syntax_Comment", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "syntaxc");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Syntax Comment", "");
+	
+	prop= RNA_def_property(srna, "syntax_string", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "syntaxl");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Syntax String", "");
+
+	prop= RNA_def_property(srna, "syntax_numbers", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "syntaxn");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Syntax Numbers", "");
+}
+
+static void rna_def_userdef_theme_space_node(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* space_node */
+
+	srna= RNA_def_struct(brna, "ThemeNodeEditor", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme Node Editor", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+
+	prop= RNA_def_property(srna, "wires", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "wire");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Wires", "");
+
+	prop= RNA_def_property(srna, "wire_select", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "edge_select");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Wire Select", "");
+
+	prop= RNA_def_property(srna, "selected_text", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade2");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Selected Text", "");
+
+	prop= RNA_def_property(srna, "node_backdrop", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "syntaxl");
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "Node Backdrop", "");
+	
+	prop= RNA_def_property(srna, "in_out_node", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "syntaxn");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "In/Out Node", "");
+
+	prop= RNA_def_property(srna, "converter_node", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "syntaxv");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Converter Node", "");
+	
+	prop= RNA_def_property(srna, "operator_node", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "syntaxb");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Operator Node", "");
+
+	prop= RNA_def_property(srna, "group_node", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "syntaxc");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Group Node", "");
+}
+
+static void rna_def_userdef_theme_space_buts(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* space_buts */
+
+	srna= RNA_def_struct(brna, "ThemeButtonsWindow", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme Buttons Window", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+
+	prop= RNA_def_property(srna, "panel", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Panel", "");
+}
+
+static void rna_def_userdef_theme_space_time(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* space_time */
+
+	srna= RNA_def_struct(brna, "ThemeTimeline", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme Timeline", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+
+	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Grid", "");
+
+	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "cframe");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Current Frame", "");
+}
+
+static void rna_def_userdef_theme_space_sound(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* space_sound */
+
+	srna= RNA_def_struct(brna, "ThemeAudioWindow", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme Audio Window", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+
+	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Grid", "");
+
+	prop= RNA_def_property(srna, "window_sliders", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade1");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Window Sliders", "");
+
+	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "cframe");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Current Frame", "");
+}
+
+static void rna_def_userdef_theme_space_image(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* space_image */
+
+	srna= RNA_def_struct(brna, "ThemeImageEditor", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme Image Editor", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+	rna_def_userdef_theme_spaces_vertex(srna);
+	rna_def_userdef_theme_spaces_face(srna);
+
+	prop= RNA_def_property(srna, "editmesh_active", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "Active Vert/Edge/Face", "");
+}
+
+static void rna_def_userdef_theme_space_seq(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* space_seq */
+
+	srna= RNA_def_struct(brna, "ThemeSequenceEditor", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme Sequence Editor", "");
+
+	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Grid", "");
+
+	prop= RNA_def_property(srna, "window_sliders", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade1");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Window Sliders", "");
+
+	prop= RNA_def_property(srna, "movie_strip", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "movie");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Movie Strip", "");
+
+	prop= RNA_def_property(srna, "image_strip", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "image");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Image Strip", "");
+
+	prop= RNA_def_property(srna, "scene_strip", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "scene");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Scene Strip", "");
+
+	prop= RNA_def_property(srna, "audio_strip", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "audio");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Audio Strip", "");
+
+	prop= RNA_def_property(srna, "effect_strip", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "effect");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Effect Strip", "");
+
+	prop= RNA_def_property(srna, "plugin_strip", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "plugin");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Plugin Strip", "");
+
+	prop= RNA_def_property(srna, "transition_strip", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "transition");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Transition Strip", "");
+
+	prop= RNA_def_property(srna, "meta_strip", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "meta");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Meta Strip", "");
+
+	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "cframe");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Current Frame", "");
+
+	prop= RNA_def_property(srna, "keyframe", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "vertex_select");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Keyframe", "");
+
+	prop= RNA_def_property(srna, "draw_action", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "bone_pose");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Draw Action", "");
+}
+
+static void rna_def_userdef_theme_space_action(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* space_action */
+
+	srna= RNA_def_struct(brna, "ThemeActionEditor", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme Action Editor", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+
+	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Grid", "");
+
+	prop= RNA_def_property(srna, "rvk_sliders", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "face");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "RVK Sliders", "");
+
+	prop= RNA_def_property(srna, "view_sliders", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade1");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "View Sliders", "");
+
+	prop= RNA_def_property(srna, "channels", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade2");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Channels", "");
+
+	prop= RNA_def_property(srna, "channels_selected", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "hilite");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Channels Selected", "");
+
+	prop= RNA_def_property(srna, "channel_group", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "group");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Channel Group", "");
+
+	prop= RNA_def_property(srna, "active_channels_group", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "group_active");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Active Channel Group", "");
+
+	prop= RNA_def_property(srna, "long_key", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "strip");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Long Key", "");
+
+	prop= RNA_def_property(srna, "long_key_selected", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "strip_select");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Long Key Selected", "");
+
+	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "cframe");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Current Frame", "");
+}
+
+static void rna_def_userdef_theme_space_nla(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	/* space_nla */
+
+	srna= RNA_def_struct(brna, "ThemeNLAEditor", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme NLA Editor", "");
+
+	rna_def_userdef_theme_spaces_main(srna);
+
+	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Grid", "");
+
+	prop= RNA_def_property(srna, "view_sliders", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade1");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "View Sliders", "");
+	
+	prop= RNA_def_property(srna, "bars", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "shade2");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Bars", "");
+
+	prop= RNA_def_property(srna, "bars_selected", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "hilite");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Bars Selected", "");
+
+	prop= RNA_def_property(srna, "strips", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "strip");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "strips", "");
+
+	prop= RNA_def_property(srna, "strips_selected", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "strip_select");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Strips Selected", "");
+
+	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "cframe");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Current Frame", "");
+}
+
+static void rna_def_userdef_theme_colorset(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	srna= RNA_def_struct(brna, "ThemeBoneColorSet", NULL);
+	RNA_def_struct_sdna(srna, "ThemeWireColor");
+	RNA_def_struct_ui_text(srna, "Theme Bone Color Set", "Bone color sets.");
+
+	prop= RNA_def_property(srna, "normal", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "solid");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Normal", "Color used for the surface of bones.");
+
+	prop= RNA_def_property(srna, "selected", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "select");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Selected", "Color used for selected bones.");
+
+	prop= RNA_def_property(srna, "active", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Active", "Color used for active bones.");
+
+	prop= RNA_def_property(srna, "colored_constraints", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", TH_WIRECOLOR_CONSTCOLS);
+	RNA_def_property_ui_text(prop, "Colored Constraints", "Allow the use of colors indicating constraints/keyed status.");
+}
+
+static void rna_def_userdef_themes(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	srna= RNA_def_struct(brna, "Theme", NULL);
+	RNA_def_struct_sdna(srna, "bTheme");
+	RNA_def_struct_ui_text(srna, "Theme", "");
+
+	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
+	RNA_def_property_ui_text(prop, "Name", "Name of the theme.");
+	RNA_def_struct_name_property(srna, prop);
+
+	prop= RNA_def_property(srna, "user_interface", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "tui");
+	RNA_def_property_struct_type(prop, "ThemeUserInterface");
+	RNA_def_property_ui_text(prop, "User Interface", "");
+
+	prop= RNA_def_property(srna, "view_3d", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "tv3d");
+	RNA_def_property_struct_type(prop, "ThemeView3D");
+	RNA_def_property_ui_text(prop, "3D View", "");
+
+	prop= RNA_def_property(srna, "ipo_curve_editor", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "tipo");
+	RNA_def_property_struct_type(prop, "ThemeIpoEditor");
+	RNA_def_property_ui_text(prop, "Ipo Curve Editor", "");
+
+	prop= RNA_def_property(srna, "file_browser", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "tfile");
+	RNA_def_property_struct_type(prop, "ThemeFileBrowser");
+	RNA_def_property_ui_text(prop, "File Browser", "");
+
+	prop= RNA_def_property(srna, "nla_editor", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "tnla");
+	RNA_def_property_struct_type(prop, "ThemeNLAEditor");
+	RNA_def_property_ui_text(prop, "NLA Editor", "");
+
+	prop= RNA_def_property(srna, "action_editor", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "tact");
+	RNA_def_property_struct_type(prop, "ThemeActionEditor");
+	RNA_def_property_ui_text(prop, "Action Editor", "");
+
+	prop= RNA_def_property(srna, "image_editor", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "tima");
+	RNA_def_property_struct_type(prop, "ThemeImageEditor");
+	RNA_def_property_ui_text(prop, "Image Editor", "");
+
+	prop= RNA_def_property(srna, "sequence_editor", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "tseq");
+	RNA_def_property_struct_type(prop, "ThemeSequenceEditor");
+	RNA_def_property_ui_text(prop, "Sequence Editor", "");
+
+	prop= RNA_def_property(srna, "buttons_window", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "tbuts");
+	RNA_def_property_struct_type(prop, "ThemeButtonsWindow");
+	RNA_def_property_ui_text(prop, "Buttons Window", "");
+
+	prop= RNA_def_property(srna, "text_editor", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "text");
+	RNA_def_property_struct_type(prop, "ThemeTextEditor");
+	RNA_def_property_ui_text(prop, "Text Editor", "");
+
+	prop= RNA_def_property(srna, "timeline", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "ttime");
+	RNA_def_property_struct_type(prop, "ThemeTimeline");
+	RNA_def_property_ui_text(prop, "Timeline", "");
+
+	prop= RNA_def_property(srna, "node_editor", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "tnode");
+	RNA_def_property_struct_type(prop, "ThemeNodeEditor");
+	RNA_def_property_ui_text(prop, "Node Editor", "");
+
+	prop= RNA_def_property(srna, "outliner", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "toops");
+	RNA_def_property_struct_type(prop, "ThemeOutliner");
+	RNA_def_property_ui_text(prop, "Outliner", "");
+
+	prop= RNA_def_property(srna, "user_preferences", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "tinfo");
+	RNA_def_property_struct_type(prop, "ThemeUserPreferences");
+	RNA_def_property_ui_text(prop, "User Preferences", "");
+
+	prop= RNA_def_property(srna, "bone_color_sets", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_sdna(prop, NULL, "tarm", "");
+	RNA_def_property_struct_type(prop, "ThemeBoneColorSet");
+	RNA_def_property_ui_text(prop, "Bone Color Sets", "");
+}
+
+static void rna_def_userdef_dothemes(BlenderRNA *brna)
+{
+	rna_def_userdef_theme_ui(brna);
+	rna_def_userdef_theme_space_view3d(brna);
+	rna_def_userdef_theme_space_ipo(brna);
+	rna_def_userdef_theme_space_file(brna);
+	rna_def_userdef_theme_space_nla(brna);
+	rna_def_userdef_theme_space_action(brna);
+	rna_def_userdef_theme_space_image(brna);
+	rna_def_userdef_theme_space_seq(brna);
+	rna_def_userdef_theme_space_buts(brna);
+	rna_def_userdef_theme_space_text(brna);
+	rna_def_userdef_theme_space_time(brna);
+	rna_def_userdef_theme_space_node(brna);
+	rna_def_userdef_theme_space_oops(brna);
+	rna_def_userdef_theme_space_info(brna);
+	rna_def_userdef_theme_space_sound(brna);
+	rna_def_userdef_theme_colorset(brna);
+	rna_def_userdef_themes(brna);
+}
+
+static void rna_def_userdef_solidlight(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	srna= RNA_def_struct(brna, "UserSolidLight", NULL);
+	RNA_def_struct_sdna(srna, "SolidLight");
+	RNA_def_struct_ui_text(srna, "Solid Light", "Light used for OpenGL lighting in solid draw mode.");
+	
+	prop= RNA_def_property(srna, "enabled", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", 1);
+	RNA_def_property_ui_text(prop, "Enabled", "Enable this OpenGL light in solid draw mode.");
+
+	prop= RNA_def_property(srna, "direction", PROP_FLOAT, PROP_VECTOR);
+	RNA_def_property_float_sdna(prop, NULL, "vec");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Direction", "The direction that the OpenGL light is shining.");
+
+	prop= RNA_def_property(srna, "diffuse_color", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "col");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Diffuse Color", "The diffuse color of the OpenGL light.");
+
+	prop= RNA_def_property(srna, "specular_color", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "spec");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Specular Color", "The color of the lights specular highlight.");
+}
+
+static void rna_def_userdef_view(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	static EnumPropertyItem view_zoom_styles[] = {
+		{USER_ZOOM_CONT, "CONTINUE", "Continue", "Old style zoom, continues while moving mouse up or down."},
+		{USER_ZOOM_DOLLY, "DOLLY", "Dolly", "Zooms in and out based on vertical mouse movement."},
+		{USER_ZOOM_SCALE, "SCALE", "Scale", "Zooms in and out like scaling the view, mouse movements relative to center."},
+		{0, NULL, NULL, NULL}};
+
+	static EnumPropertyItem view_rotation_items[] = {
+		{0, "TURNTABLE", "Turntable", "Use turntable style rotation in the viewport."},
+		{USER_TRACKBALL, "TRACKBALL", "Trackball", "Use trackball style rotation in the viewport."},
+		{0, NULL, NULL, NULL}};
+
+
+	/* View and Controls  */
+
+	/* display */
+	prop= RNA_def_property(srna, "tooltips", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TOOLTIPS);
+	RNA_def_property_ui_text(prop, "Tooltips", "Display tooltips.");
+
+	prop= RNA_def_property(srna, "display_object_info", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_DRAWVIEWINFO);
+	RNA_def_property_ui_text(prop, "Display Object Info", "Display and objects name and frame number in 3d view.");
+
+	prop= RNA_def_property(srna, "global_scene", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_SCENEGLOBAL);
+	RNA_def_property_ui_text(prop, "Global Scene", "Forces the current Scene to be displayed in all Screens.");
+
+	prop= RNA_def_property(srna, "use_large_cursors", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "curssize", 0);
+	RNA_def_property_ui_text(prop, "Use Large Cursors", "Use large mouse cursors when available.");
+
+	prop= RNA_def_property(srna, "show_view_name", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SHOW_VIEWPORTNAME);
+	RNA_def_property_ui_text(prop, "Show View Name", "Show the name of the view's direction in each 3D View.");
+
+	prop= RNA_def_property(srna, "show_playback_fps", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SHOW_FPS);
+	RNA_def_property_ui_text(prop, "Show Playback FPS", "Show the frames per second screen refresh rate, while animation is played back.");
+	
+	/* menus */
+	prop= RNA_def_property(srna, "open_mouse_over", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_MENUOPENAUTO);
+	RNA_def_property_ui_text(prop, "Open On Mouse Over", "Open menu buttons and pulldowns automatically when the mouse is hovering.");
+	
+	prop= RNA_def_property(srna, "open_toplevel_delay", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "menuthreshold1");
+	RNA_def_property_range(prop, 1, 40);
+	RNA_def_property_ui_text(prop, "Top Level Menu Open Delay", "Time delay in 1/10 seconds before automatically opening top level menus.");
+
+	prop= RNA_def_property(srna, "open_sublevel_delay", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "menuthreshold2");
+	RNA_def_property_range(prop, 1, 40);
+	RNA_def_property_ui_text(prop, "Sub Level Menu Open Delay", "Time delay in 1/10 seconds before automatically opening sub level menus.");
+
+	/* Toolbox click-hold delay */
+	prop= RNA_def_property(srna, "open_left_mouse_delay", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "tb_leftmouse");
+	RNA_def_property_range(prop, 1, 40);
+	RNA_def_property_ui_text(prop, "Hold LMB Open Toolbox Delay", "Time in 1/10 seconds to hold the Left Mouse Button before opening the toolbox.");
+
+	prop= RNA_def_property(srna, "open_right_mouse_delay", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "tb_rightmouse");
+	RNA_def_property_range(prop, 1, 40);
+	RNA_def_property_ui_text(prop, "Hold RMB Open Toolbox Delay", "Time in 1/10 seconds to hold the Right Mouse Button before opening the toolbox.");
+
+	prop= RNA_def_property(srna, "pin_floating_panels", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_PANELPINNED);
+	RNA_def_property_ui_text(prop, "Pin Floating Panels", "Make floating panels invoked by a hotkey (eg. N Key) open at the previous location.");
+
+	prop= RNA_def_property(srna, "use_column_layout", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_PLAINMENUS);
+	RNA_def_property_ui_text(prop, "Use Column Layout", "Use a column layout for toolbox and do not flip the contents of any menu.");
+
+	/* snap to grid */
+	prop= RNA_def_property(srna, "snap_translate", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_AUTOGRABGRID);
+	RNA_def_property_ui_text(prop, "Enable Translation Snap", "Snap objects and sub-objects to grid units when moving.");
+
+	prop= RNA_def_property(srna, "snap_rotate", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_AUTOROTGRID);
+	RNA_def_property_ui_text(prop, "Enable Rotation Snap", "Snap objects and sub-objects to grid units when rotating.");
+
+	prop= RNA_def_property(srna, "snap_scale", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_AUTOSIZEGRID);
+	RNA_def_property_ui_text(prop, "Enable Scaling Snap", "Snap objects and sub-objects to grid units when scaling.");
+
+	prop= RNA_def_property(srna, "auto_depth", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ORBIT_ZBUF);
+	RNA_def_property_ui_text(prop, "Use Auto Depth", "Use the depth under the mouse to improve view pan/rotate/zoom functionality.");
+
+	prop= RNA_def_property(srna, "global_pivot", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_LOCKAROUND);
+	RNA_def_property_ui_text(prop, "Use Global Pivot", "Lock the same rotation/scaling pivot in all 3D Views.");
+
+	/* view zoom */
+	prop= RNA_def_property(srna, "viewport_zoom_style", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "viewzoom");
+	RNA_def_property_enum_items(prop, view_zoom_styles);
+	RNA_def_property_ui_text(prop, "Viewport Zoom Style", "Which style to use for viewport scaling.");
+
+	prop= RNA_def_property(srna, "zoom_to_mouse", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ZOOM_TO_MOUSEPOS);
+	RNA_def_property_ui_text(prop, "Zoom To Mouse Position", "Zoom in towards the mouse pointer's position in the 3D view, rather than the 2D window center.");
+
+	/* view rotation */
+	prop= RNA_def_property(srna, "view_rotation", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
+	RNA_def_property_enum_items(prop, view_rotation_items);
+	RNA_def_property_ui_text(prop, "View Rotation", "Rotation style in the viewport.");
+
+	prop= RNA_def_property(srna, "perspective_orthographic_switch", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_AUTOPERSP);
+	RNA_def_property_ui_text(prop, "Perspective/Orthographic Switch", "Automatically switch between orthographic and perspective when changing from top/front/side views.");
+
+	prop= RNA_def_property(srna, "rotate_around_selection", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ORBIT_SELECTION);
+	RNA_def_property_ui_text(prop, "Rotate Around Selection", "Use selection as the orbiting center.");
+
+	/* select with */
+	prop= RNA_def_property(srna, "left_mouse_button_select", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_LMOUSESELECT);
+	RNA_def_property_boolean_funcs(prop, NULL, "rna_userdef_lmb_select_set");
+	RNA_def_property_ui_text(prop, "Left Mouse Button Select", "Use left Mouse Button for selection.");
+	
+	prop= RNA_def_property(srna, "right_mouse_button_select", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_LMOUSESELECT);
+	RNA_def_property_boolean_funcs(prop, NULL, "rna_userdef_rmb_select_set");
+	RNA_def_property_ui_text(prop, "Right Mouse Button Select", "Use Right Mouse Button for selection.");
+	
+	prop= RNA_def_property(srna, "emulate_3_button_mouse", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TWOBUTTONMOUSE);
+	RNA_def_property_boolean_funcs(prop, NULL, "rna_userdef_emulate_set");
+	RNA_def_property_ui_text(prop, "Emulate 3 Button Mouse", "Emulates Middle Mouse with Alt+LeftMouse (doesnt work with Left Mouse Select option.)");
+	
+	prop= RNA_def_property(srna, "use_middle_mouse_paste", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_MMB_PASTE);
+	RNA_def_property_ui_text(prop, "Use Middle Mouse Paste", "In text window, paste with middle mouse button instead of panning.");
+
+	prop= RNA_def_property(srna, "show_mini_axis", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SHOW_ROTVIEWICON);
+	RNA_def_property_ui_text(prop, "Show Mini Axis", "Show a small rotating 3D axis in the bottom left corner of the 3D View.");
+
+	prop= RNA_def_property(srna, "mini_axis_size", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "rvisize");
+	RNA_def_property_range(prop, 10, 64);
+	RNA_def_property_ui_text(prop, "Mini Axis Size", "The axis icon's size.");
+
+	prop= RNA_def_property(srna, "mini_axis_brightness", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "rvibright");
+	RNA_def_property_range(prop, 0, 10);
+	RNA_def_property_ui_text(prop, "Mini Axis Brightness", "The brightness of the icon.");
+
+	/* middle mouse button */
+	prop= RNA_def_property(srna, "middle_mouse_rotate", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_VIEWMOVE);
+	RNA_def_property_ui_text(prop, "Use Middle Mouse Rotate", "Use the middle mouse button for rotation the viewport.");
+
+	prop= RNA_def_property(srna, "middle_mouse_pan", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_VIEWMOVE);
+	RNA_def_property_ui_text(prop, "Use Middle Mouse Pan", "Use the middle mouse button for panning the viewport.");
+
+	prop= RNA_def_property(srna, "wheel_invert_zoom", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_WHEELZOOMDIR);
+	RNA_def_property_ui_text(prop, "Wheel Invert Zoom", "Swap the Mouse Wheel zoom direction.");
+
+	prop= RNA_def_property(srna, "wheel_scroll_lines", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "wheellinescroll");
+	RNA_def_property_range(prop, 0, 32);
+	RNA_def_property_ui_text(prop, "Wheel Scroll Lines", "The number of lines scrolled at a time with the mouse wheel.");
+
+	prop= RNA_def_property(srna, "smooth_view", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "smooth_viewtx");
+	RNA_def_property_range(prop, 0, 1000);
+	RNA_def_property_ui_text(prop, "Smooth View", "The time to animate the view in miliseconds, zero to disable.");
+
+	prop= RNA_def_property(srna, "rotation_angle", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "pad_rot_angle");
+	RNA_def_property_range(prop, 0, 90);
+	RNA_def_property_ui_text(prop, "Rotation Angle", "The rotation step for numerical pad keys (2 4 6 8).");
+
+	/* 3D transform widget */
+	prop= RNA_def_property(srna, "use_transform_widget", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "tw_flag", 1);
+	RNA_def_property_ui_text(prop, "Use Transform Widget", "Use 3d transform manipulator.");
+
+	prop= RNA_def_property(srna, "transform_widget_size", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "tw_size");
+	RNA_def_property_range(prop, 2, 40);
+	RNA_def_property_ui_text(prop, "Transform Widget Size", "Diameter of widget, in 10 pixel units.");
+
+	prop= RNA_def_property(srna, "transform_widget_handle_size", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "tw_handlesize");
+	RNA_def_property_range(prop, 2, 40);
+	RNA_def_property_ui_text(prop, "Transform Widget Handle Size", "Size of widget handles as percentage of widget radius.");
+
+	prop= RNA_def_property(srna, "transform_widget_hotspot", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "tw_hotspot");
+	RNA_def_property_range(prop, 4, 40);
+	RNA_def_property_ui_text(prop, "Transform Widget Hotspot", "Hotspot in pixels for clicking widget handles.");
+
+	prop= RNA_def_property(srna, "object_center_size", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "obcenter_dia");
+	RNA_def_property_range(prop, 4, 10);
+	RNA_def_property_ui_text(prop, "Object Center Size", "Diameter in Pixels for Object/Lamp center display.");
+
+	prop= RNA_def_property(srna, "ndof_pan_speed", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "ndof_pan");
+	RNA_def_property_range(prop, 4, 10);
+	RNA_def_property_ui_text(prop, "NDof Pan Speed", "The overall panning speed of an NDOF device, as percent of standard.");
+
+	prop= RNA_def_property(srna, "ndof_rotate_speed", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "ndof_rotate");
+	RNA_def_property_range(prop, 4, 10);
+	RNA_def_property_ui_text(prop, "NDof Rotation Speed", "The overall rotation speed of an NDOF device, as percent of standard.");
+}
+
+static void rna_def_userdef_edit(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	static EnumPropertyItem auto_key_modes[] = {
+		{AUTOKEY_MODE_NORMAL, "ADD_REPLACE_KEYS", "Add/Replace Keys", ""},
+		{AUTOKEY_MODE_EDITKEYS, "REPLACE_KEYS", "Replace Keys", ""},
+		{0, NULL, NULL, NULL}};
+
+	static EnumPropertyItem new_ipo_curve_types[] = {
+		{IPO_CONST, "CONSTANT", "Constant", ""},
+		{IPO_LIN, "LINEAR", "Linear", ""},
+		{IPO_BEZ, "BEZIER", "Bezier", ""},
+		{0, NULL, NULL, NULL}};
+
+	/* Edit Methods */
+	prop= RNA_def_property(srna, "material_linked_object", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_MAT_ON_OB);
+	RNA_def_property_ui_text(prop, "Material Linked Object", "Toggle whether the material is linked to object data or the object block.");
+
+	prop= RNA_def_property(srna, "material_linked_obdata", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_MAT_ON_OB);
+	RNA_def_property_ui_text(prop, "Material Linked ObData", "Toggle whether the material is linked to object data or the object block.");
+
+	prop= RNA_def_property(srna, "enter_edit_mode", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_ADD_EDITMODE);
+	RNA_def_property_ui_text(prop, "Enter Edit Mode", "Enter Edit Mode automatically after adding a new object.");
+
+	prop= RNA_def_property(srna, "align_to_view", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_ADD_VIEWALIGNED);
+	RNA_def_property_ui_text(prop, "Align To View", "Align newly added objects facing the 3D View direction.");
+
+	prop= RNA_def_property(srna, "drag_immediately", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_DRAGIMMEDIATE);
+	RNA_def_property_ui_text(prop, "Drag Immediately", "Moving things with a mouse drag doesn't require a click to confirm (Best for tablet users).");
+
+	prop= RNA_def_property(srna, "undo_steps", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "undosteps");
+	RNA_def_property_range(prop, 0, 64);
+	RNA_def_property_ui_text(prop, "Undo Steps", "Number of undo steps available (smaller values conserve memory).");
+
+	prop= RNA_def_property(srna, "undo_memory_limit", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "undomemory");
+	RNA_def_property_range(prop, 0, 32767);
+	RNA_def_property_ui_text(prop, "Undo Memory Size", "Maximum memory usage in megabytes (0 means unlimited).");
+
+	prop= RNA_def_property(srna, "global_undo", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_GLOBALUNDO);
+	RNA_def_property_ui_text(prop, "Global Undo", "Global undo works by keeping a full copy of the file itself in memory, so takes extra memory.");
+
+	prop= RNA_def_property(srna, "auto_keying_enable", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "autokey_mode", AUTOKEY_ON);
+	RNA_def_property_ui_text(prop, "Auto Keying Enable", "Automatic keyframe insertion for Objects and Bones.");
+
+	prop= RNA_def_property(srna, "auto_keying_mode", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_items(prop, auto_key_modes);
+	RNA_def_property_enum_funcs(prop, "rna_userdef_autokeymode_get", "rna_userdef_autokeymode_set");
+	RNA_def_property_ui_text(prop, "Auto Keying Mode", "Mode of automatic keyframe insertion for Objects and Bones.");
+
+	prop= RNA_def_property(srna, "auto_keyframe_insert_available", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_INSERTAVAIL);
+	RNA_def_property_ui_text(prop, "Auto Keyframe Insert Available", "Automatic keyframe insertion in available curves.");
+
+	prop= RNA_def_property(srna, "auto_keyframe_insert_needed", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_INSERTNEEDED);
+	RNA_def_property_ui_text(prop, "Auto Keyframe Insert Needed", "Automatic keyframe insertion only when keyframe needed.");
+
+	prop= RNA_def_property(srna, "use_visual_keying", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_AUTOMATKEY);
+	RNA_def_property_ui_text(prop, "Use Visual Keying", "Use Visual keying automatically for constrained objects.");
+
+	prop= RNA_def_property(srna, "new_ipo_curve_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_items(prop, new_ipo_curve_types);
+	RNA_def_property_enum_sdna(prop, NULL, "ipo_new");
+	RNA_def_property_ui_text(prop, "New Ipo Curve Type", "");
+
+	prop= RNA_def_property(srna, "grease_pencil_manhattan_distance", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "gp_manhattendist");
+	RNA_def_property_range(prop, 0, 100);
+	RNA_def_property_ui_text(prop, "Grease Pencil Manhattan Distance", "Pixels moved by mouse per axis when drawing stroke.");
+
+	prop= RNA_def_property(srna, "grease_pencil_euclidean_distance", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "gp_euclideandist");
+	RNA_def_property_range(prop, 0, 100);
+	RNA_def_property_ui_text(prop, "Grease Pencil Euclidean Distance", "Distance moved by mouse when drawing stroke (in pixels) to include.");
+
+	prop= RNA_def_property(srna, "grease_pencil_smooth_stroke", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "gp_settings", GP_PAINT_DOSMOOTH);
+	RNA_def_property_ui_text(prop, "Grease Pencil Smooth Stroke", "Smooth the final stroke.");
+
+#if 0
+	prop= RNA_def_property(srna, "grease_pencil_simplify_stroke", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "gp_settings", GP_PAINT_DOSIMPLIFY);
+	RNA_def_property_ui_text(prop, "Grease Pencil Simplify Stroke", "Simplify the final stroke.");
+#endif
+
+	prop= RNA_def_property(srna, "grease_pencil_eraser_radius", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "gp_eraser");
+	RNA_def_property_range(prop, 0, 100);
+	RNA_def_property_ui_text(prop, "Grease Pencil Eraser Radius", "Radius of eraser 'brush'.");
+
+	prop= RNA_def_property(srna, "duplicate_mesh", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_MESH);
+	RNA_def_property_ui_text(prop, "Duplicate Mesh", "Causes mesh data to be duplicated with Shift+D.");
+
+	prop= RNA_def_property(srna, "duplicate_surface", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_SURF);
+	RNA_def_property_ui_text(prop, "Duplicate Surface", "Causes surface data to be duplicated with Shift+D.");
+	
+	prop= RNA_def_property(srna, "duplicate_curve", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_CURVE);
+	RNA_def_property_ui_text(prop, "Duplicate Curve", "Causes curve data to be duplicated with Shift+D.");
+
+	prop= RNA_def_property(srna, "duplicate_text", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_FONT);
+	RNA_def_property_ui_text(prop, "Duplicate Text", "Causes text data to be duplicated with Shift+D.");
+
+	prop= RNA_def_property(srna, "duplicate_metaball", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_MBALL);
+	RNA_def_property_ui_text(prop, "Duplicate Metaball", "Causes metaball data to be duplicated with Shift+D.");
+	
+	prop= RNA_def_property(srna, "duplicate_armature", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_ARM);
+	RNA_def_property_ui_text(prop, "Duplicate Armature", "Causes armature data to be duplicated with Shift+D.");
+
+	prop= RNA_def_property(srna, "duplicate_lamp", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_LAMP);
+	RNA_def_property_ui_text(prop, "Duplicate Lamp", "Causes lamp data to be duplicated with Shift+D.");
+
+	prop= RNA_def_property(srna, "duplicate_Material", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_MAT);
+	RNA_def_property_ui_text(prop, "Duplicate Material", "Causes material data to be duplicated with Shift+D.");
+
+	prop= RNA_def_property(srna, "duplicate_texture", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_TEX);
+	RNA_def_property_ui_text(prop, "Duplicate Texture", "Causes texture data to be duplicated with Shift+D.");
+	
+	prop= RNA_def_property(srna, "duplicate_ipo", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_IPO);
+	RNA_def_property_ui_text(prop, "Duplicate Ipo", "Causes ipo data to be duplicated with Shift+D.");
+
+	prop= RNA_def_property(srna, "duplicate_action", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_ACT);
+	RNA_def_property_ui_text(prop, "Duplicate Action", "Causes actions to be duplicated with Shift+D.");
+}
+
+static void rna_def_userdef_language(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	/* hardcoded here, could become dynamic somehow */
+	static EnumPropertyItem language_items[] = {
+		{0, "ENGLISH", "English", ""},
+		{1, "JAPANESE", "Japanese", ""},
+		{2, "DUTCH", "Dutch", ""},
+		{3, "ITALIAN", "Italian", ""},
+		{4, "GERMAN", "German", ""},
+		{5, "FINNISH", "Finnish", ""},
+		{6, "SWEDISH", "Swedish", ""},
+		{7, "FRENCH", "French", ""},
+		{8, "SPANISH", "Spanish", ""},
+		{9, "CATALAN", "Catalan", ""},
+		{10, "CZECH", "Czech", ""},
+		{11, "BRAZILIAN_PORTUGUESE", "Brazilian Portuguese", ""},
+		{12, "SIMPLIFIED_CHINESE", "Simplified Chinese", ""},
+		{13, "RUSSIAN", "Russian", ""},
+		{14, "CROATIAN", "Croatian", ""},
+		{15, "SERBIAN", "Serbian", ""},
+		{16, "UKRAINIAN", "Ukrainian", ""},
+		{17, "POLISH", "Polish", ""},
+		{18, "ROMANIAN", "Romanian", ""},
+		{19, "ARABIC", "Arabic", ""},
+		{20, "BULGARIAN", "Bulgarian", ""},
+		{21, "GREEK", "Greek", ""},
+		{22, "KOREAN", "Korean", ""},
+		{0, NULL, NULL, NULL}};
+
+	prop= RNA_def_property(srna, "international_fonts", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_DOTRANSLATE);
+	RNA_def_property_ui_text(prop, "International Fonts", "Use international fonts.");
+
+	prop= RNA_def_property(srna, "font_size", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "fontsize");
+	RNA_def_property_range(prop, 8, 16);
+	RNA_def_property_ui_text(prop, "Font Size", "International font size (points).");
+
+	prop= RNA_def_property(srna, "font_filename", PROP_STRING, PROP_FILEPATH);
+	RNA_def_property_string_sdna(prop, NULL, "fontname");
+	RNA_def_property_ui_text(prop, "Font Filename", "International font filename.");
+
+	/* Language Selection */
+
+	prop= RNA_def_property(srna, "language", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_items(prop, language_items);
+	RNA_def_property_ui_text(prop, "Language", "Language use for translation.");
+
+	prop= RNA_def_property(srna, "translate_tooltips", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_TR_TOOLTIPS);
+	RNA_def_property_ui_text(prop, "Translate Tooltips", "Translate Tooltips.");
+
+	prop= RNA_def_property(srna, "translate_buttons", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_TR_BUTTONS);
+	RNA_def_property_ui_text(prop, "Translate Buttons", "Translate button labels.");
+
+	prop= RNA_def_property(srna, "translate_toolbox", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_TR_MENUS);
+	RNA_def_property_ui_text(prop, "Translate Toolbox", "Translate toolbox menu.");
+
+	prop= RNA_def_property(srna, "use_textured_fonts", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_USETEXTUREFONT);
+	RNA_def_property_ui_text(prop, "Use Textured Fonts", "Use textures for drawing international fonts.");
+}
+
+static void rna_def_userdef_autosave(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	/* Autosave  */
+
+	prop= RNA_def_property(srna, "save_version", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "versions");
+	RNA_def_property_range(prop, 0, 32);
+	RNA_def_property_ui_text(prop, "Save Versions", "The number of old versions to maintain in the current directory, when manually saving.");
 
 	prop= RNA_def_property(srna, "auto_save_temporary_files", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_AUTOSAVE);
 	RNA_def_property_ui_text(prop, "Auto Save Temporary Files", "Automatic saving of temporary files.");
+
+	prop= RNA_def_property(srna, "auto_save_time", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "savetime");
+	RNA_def_property_range(prop, 0, 32);
+	RNA_def_property_ui_text(prop, "Auto Save Time", "The time (in minutes) to wait between automatic temporary saves.");
+
+	prop= RNA_def_property(srna, "recent_files", PROP_INT, PROP_NONE);
+	RNA_def_property_range(prop, 0, 30);
+	RNA_def_property_ui_text(prop, "Recent Files", "Maximum number of recently opened files to remember.");
+
+	prop= RNA_def_property(srna, "save_preview_images", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_SAVE_PREVIEWS);
+	RNA_def_property_ui_text(prop, "Save Preview Images", "Enables automatic saving of preview images in the .blend file.");
+}
+
+static void rna_def_userdef_system(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	static EnumPropertyItem gl_texture_clamp_items[] = {
+		{0, "GL_CLAMP_OFF", "GL Texture Clamp Off", ""},
+		{8192, "GL_CLAMP_8192", "GL Texture Clamp 8192", ""},
+		{4096, "GL_CLAMP_4096", "GL Texture Clamp 4096", ""},
+		{2048, "GL_CLAMP_2048", "GL Texture Clamp 2048", ""},
+		{1024, "GL_CLAMP_1024", "GL Texture Clamp 1024", ""},
+		{512, "GL_CLAMP_512", "GL Texture Clamp 512", ""},
+		{256, "GL_CLAMP_256", "GL Texture Clamp 256", ""},
+		{128, "GL_CLAMP_128", "GL Texture Clamp 128", ""},
+		{0, NULL, NULL, NULL}};
+
+	static EnumPropertyItem audio_mixing_samples_items[] = {
+		{256, "AUDIO_SAMPLES_256", "256", "Set audio mixing buffer size to 256 samples"},
+		{512, "AUDIO_SAMPLES_512", "512", "Set audio mixing buffer size to 512 samples"},
+		{1024, "AUDIO_SAMPLES_1024", "1024", "Set audio mixing buffer size to 1024 samples"},
+		{2048, "AUDIO_SAMPLES_2048", "2048", "Set audio mixing buffer size to 2048 samples"},
+		{0, NULL, NULL, NULL}};
+
+	/* System & OpenGL */
+
+	prop= RNA_def_property(srna, "solid_lights", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_sdna(prop, NULL, "light", "");
+	RNA_def_property_struct_type(prop, "UserSolidLight");
+	RNA_def_property_ui_text(prop, "Solid Lights", "Lights user to display objects in solid draw mode.");
+
+	prop= RNA_def_property(srna, "use_weight_color_range", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_CUSTOM_RANGE);
+	RNA_def_property_ui_text(prop, "Use Weight Color Range", "Enable color range used for weight visualization in weight painting mode.");
+
+	prop= RNA_def_property(srna, "weight_color_range", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "coba_weight");
+	RNA_def_property_struct_type(prop, "ColorRamp");
+	RNA_def_property_ui_text(prop, "Weight Color Range", "Color range used for weight visualization in weight painting mode.");
+
+	prop= RNA_def_property(srna, "enable_all_codecs", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ALLWINCODECS);
+	RNA_def_property_ui_text(prop, "Enable All Codecs", "Enables automatic saving of preview images in the .blend file (Windows only).");
+
+	prop= RNA_def_property(srna, "auto_run_python_scripts", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_DONT_DOSCRIPTLINKS);
+	RNA_def_property_ui_text(prop, "Auto Run Python Scripts", "Allow any .blend file to run scripts automatically (unsafe with blend files from an untrusted source).");
+
+	prop= RNA_def_property(srna, "emulate_numpad", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_NONUMPAD);
+	RNA_def_property_ui_text(prop, "Emulate Numpad", "Causes the 1 to 0 keys to act as the numpad (useful for laptops).");
+
+	prop= RNA_def_property(srna, "prefetch_frames", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "prefetchframes");
+	RNA_def_property_range(prop, 0, 500);
+	RNA_def_property_ui_text(prop, "Prefetch Frames", "Number of frames to render ahead during playback.");
+
+	prop= RNA_def_property(srna, "memory_cache_limit", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "memcachelimit");
+	RNA_def_property_range(prop, 0, (sizeof(void *) ==8)? 1024*16: 1024); /* 32 bit 2 GB, 64 bit 16 GB */
+	RNA_def_property_ui_text(prop, "Memory Cache Limit", "Memory cache limit in sequencer (megabytes).");
+
+	prop= RNA_def_property(srna, "frame_server_port", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "frameserverport");
+	RNA_def_property_range(prop, 0, 32727);
+	RNA_def_property_ui_text(prop, "Frame Server Port", "Frameserver Port for Framserver-Rendering.");
+
+	prop= RNA_def_property(srna, "game_sound", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags", USER_DISABLE_SOUND);
+	RNA_def_property_ui_text(prop, "Game Sound", "Enables sounds to be played in games.");
+
+	prop= RNA_def_property(srna, "filter_file_extensions", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_FILTERFILEEXTS);
+	RNA_def_property_ui_text(prop, "Filter File Extensions", "Display only files with extensions in the image select window.");
+
+	prop= RNA_def_property(srna, "hide_dot_files_datablocks", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_HIDE_DOT);
+	RNA_def_property_ui_text(prop, "Hide Dot Files/Datablocks", "Hide files/datablocks that start with a dot(.*)");
+
+	prop= RNA_def_property(srna, "clip_alpha", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "glalphaclip");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Clip Alpha", "Clip alpha below this threshold in the 3d textured view.");
+	
+	prop= RNA_def_property(srna, "use_mipmaps", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags", USER_DISABLE_MIPMAP);
+	RNA_def_property_ui_text(prop, "Use Mipmaps", "Scale textures for the 3d View (looks nicer but uses more memory and slows image reloading.)");
+
+	prop= RNA_def_property(srna, "gl_texture_limit", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "glreslimit");
+	RNA_def_property_enum_items(prop, gl_texture_clamp_items);
+	RNA_def_property_ui_text(prop, "GL Texture Limit", "Limit the texture size to save graphics memory.");
+
+	prop= RNA_def_property(srna, "texture_time_out", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "textimeout");
+	RNA_def_property_range(prop, 0, 3600);
+	RNA_def_property_ui_text(prop, "Texture Time Out", "Time since last access of a GL texture in seconds after which it is freed. (Set to 0 to keep textures allocated.)");
+
+	prop= RNA_def_property(srna, "texture_collection_rate", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "texcollectrate");
+	RNA_def_property_range(prop, 1, 3600);
+	RNA_def_property_ui_text(prop, "Texture Collection Rate", "Number of seconds between each run of the GL texture garbage collector.");
+
+	prop= RNA_def_property(srna, "audio_mixing_buffer", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "mixbufsize");
+	RNA_def_property_enum_items(prop, audio_mixing_samples_items);
+	RNA_def_property_ui_text(prop, "Audio Mixing Buffer", "Sets the number of samples used by the audio mixing buffer.");
+
+#if 0
+	prop= RNA_def_property(srna, "verse_master", PROP_STRING, PROP_NONE);
+	RNA_def_property_string_sdna(prop, NULL, "versemaster");
+	RNA_def_property_ui_text(prop, "Verse Master", "The Verse Master-server IP");
+
+	prop= RNA_def_property(srna, "verse_username", PROP_STRING, PROP_NONE);
+	RNA_def_property_string_sdna(prop, NULL, "verseuser");
+	RNA_def_property_ui_text(prop, "Verse Username", "The Verse user name");
+#endif
+}
+
+static void rna_def_userdef_filepaths(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	prop= RNA_def_property(srna, "use_relative_paths", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_RELPATHS);
+	RNA_def_property_ui_text(prop, "Use Relative Paths", "Default relative path option for the file selector.");
+
+	prop= RNA_def_property(srna, "compress_file", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_FILECOMPRESS);
+	RNA_def_property_ui_text(prop, "Compress File", "Enable file compression when saving .blend files.");
+
+	prop= RNA_def_property(srna, "yafray_export_directory", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_sdna(prop, NULL, "yfexportdir");
+	RNA_def_property_ui_text(prop, "Yafray Export Directory", "The default directory for yafray xml export (must exist!).");
+
+	prop= RNA_def_property(srna, "fonts_directory", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_sdna(prop, NULL, "fontdir");
+	RNA_def_property_ui_text(prop, "Fonts Directory", "The default directory to search for loading fonts.");
+
+	prop= RNA_def_property(srna, "textures_directory", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_sdna(prop, NULL, "textudir");
+	RNA_def_property_ui_text(prop, "Textures Directory", "The default directory to search for textures.");
+
+	prop= RNA_def_property(srna, "texture_plugin_directory", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_sdna(prop, NULL, "plugtexdir");
+	RNA_def_property_ui_text(prop, "Texture Plugin Directory", "The default directory to search for texture plugins.");
+
+	prop= RNA_def_property(srna, "sequence_plugin_directory", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_sdna(prop, NULL, "plugseqdir");
+	RNA_def_property_ui_text(prop, "Sequence Plugin Directory", "The default directory to search for sequence plugins.");
+
+	prop= RNA_def_property(srna, "render_output_directory", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_sdna(prop, NULL, "renderdir");
+	RNA_def_property_ui_text(prop, "Render Output Directory", "The default directory for rendering output.");
+
+	prop= RNA_def_property(srna, "python_scripts_directory", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_sdna(prop, NULL, "pythondir");
+	RNA_def_property_ui_text(prop, "Python Scripts Directory", "The default directory to search for Python scripts (resets python module search path: sys.path).");
+
+	prop= RNA_def_property(srna, "sounds_directory", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_sdna(prop, NULL, "sounddir");
+	RNA_def_property_ui_text(prop, "Sounds Directory", "The default directory to search for sounds.");
+
+	prop= RNA_def_property(srna, "temporary_directory", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_sdna(prop, NULL, "tempdir");
+	RNA_def_property_ui_text(prop, "Temporary Directory", "The directory for storing temporary save files.");
 }
 
 void RNA_def_userdef(BlenderRNA *brna)
 {
-	rna_def_userdef(brna);
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	static EnumPropertyItem user_pref_sections[] = {
+		{0, "VIEW_CONTROLS", "View & Controls", ""},
+		{1, "EDIT_METHODS", "Edit Methods", ""},
+		{2, "LANGUAGE_COLORS", "Language & Colors", ""},
+		{3, "AUTO_SAVE", "Auto Save", ""},
+		{4, "SYSTEM_OPENGL", "System & OpenGL", ""},
+		{5, "FILE_PATHS", "File Paths", ""},
+		{6, "THEMES", "Themes", ""},
+		{0, NULL, NULL, NULL}};
+
+	rna_def_userdef_dothemes(brna);
+	rna_def_userdef_solidlight(brna);
+
+	srna= RNA_def_struct(brna, "UserPreferences", NULL);
+	RNA_def_struct_sdna(srna, "UserDef");
+	RNA_def_struct_ui_text(srna, "User Preferences", "Global user preferences.");
+
+	prop= RNA_def_property(srna, "active_section", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "userpref");
+	RNA_def_property_enum_items(prop, user_pref_sections);
+	RNA_def_property_ui_text(prop, "Active Section", "Active section of the user preferences shown in the user interface.");
+
+	prop= RNA_def_property(srna, "themes", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_sdna(prop, NULL, "themes", NULL);
+	RNA_def_property_struct_type(prop, "Theme");
+	RNA_def_property_ui_text(prop, "Themes", "");
+	
+	rna_def_userdef_view(srna);
+	rna_def_userdef_edit(srna);
+	rna_def_userdef_language(srna);
+	rna_def_userdef_autosave(srna);
+	rna_def_userdef_system(srna);
+	rna_def_userdef_filepaths(srna);
 }
 
 #endif