use '' for enums rather then ""

39 files changed, 253 insertions, 253 deletions

diff --git a/release/io/engine_render_pov.py b/release/io/engine_render_pov.py
index 539f705a6ee..51aa26f7fb9 100644
--- a/release/io/engine_render_pov.py
+++ b/release/io/engine_render_pov.py
@@ -791,8 +791,8 @@ for member in dir(buttons_material):
 del buttons_material
 
 class RenderButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "scene"
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
 	
diff --git a/release/ui/buttons_data_armature.py b/release/ui/buttons_data_armature.py
index 9b640776a9e..3a1de0d5f0b 100644
--- a/release/ui/buttons_data_armature.py
+++ b/release/ui/buttons_data_armature.py
@@ -2,8 +2,8 @@
 import bpy
  
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
@@ -90,8 +90,8 @@ class DATA_PT_bone_groups(DataButtonsPanel):
 		
 		col = row.column(align=True)
 		col.active = (ob.proxy == None)
-		col.itemO("pose.group_add", icon="ICON_ZOOMIN", text="")
-		col.itemO("pose.group_remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("pose.group_add", icon='ICON_ZOOMIN', text="")
+		col.itemO("pose.group_remove", icon='ICON_ZOOMOUT', text="")
 		
 		group = pose.active_bone_group
 		if group:
diff --git a/release/ui/buttons_data_bone.py b/release/ui/buttons_data_bone.py
index 1eb09377892..17c9c2d89d9 100644
--- a/release/ui/buttons_data_bone.py
+++ b/release/ui/buttons_data_bone.py
@@ -2,8 +2,8 @@
 import bpy
  
 class BoneButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "bone"
 	
 	def poll(self, context):
@@ -20,7 +20,7 @@ class BONE_PT_context_bone(BoneButtonsPanel):
 			bone = context.edit_bone
 		
 		row = layout.row()
-		row.itemL(text="", icon="ICON_BONE_DATA")
+		row.itemL(text="", icon='ICON_BONE_DATA')
 		row.itemR(bone, "name", text="")
 
 class BONE_PT_transform(BoneButtonsPanel):
diff --git a/release/ui/buttons_data_camera.py b/release/ui/buttons_data_camera.py
index f2fa4207ec8..0480897d641 100644
--- a/release/ui/buttons_data_camera.py
+++ b/release/ui/buttons_data_camera.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 
 	def poll(self, context):
diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index 35d557afe32..92e414ba2f3 100644
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
@@ -80,13 +80,13 @@ class DATA_PT_geometry_curve(DataButtonsPanel):
 		sub.itemL(text="Modification:")
 		sub.itemR(curve, "width")
 		sub.itemR(curve, "extrude")
-		sub.itemR(curve, "taper_object", icon="ICON_OUTLINER_OB_CURVE")
+		sub.itemR(curve, "taper_object", icon='ICON_OUTLINER_OB_CURVE')
 		
 		sub = split.column()
 		sub.itemL(text="Bevel:")
 		sub.itemR(curve, "bevel_depth", text="Depth")
 		sub.itemR(curve, "bevel_resolution", text="Resolution")
-		sub.itemR(curve, "bevel_object", icon="ICON_OUTLINER_OB_CURVE")
+		sub.itemR(curve, "bevel_object", icon='ICON_OUTLINER_OB_CURVE')
 	
 class DATA_PT_pathanim(DataButtonsPanel):
 	__label__ = "Path Animation"
diff --git a/release/ui/buttons_data_empty.py b/release/ui/buttons_data_empty.py
index 2a2f51ed292..98c9b88e9f5 100644
--- a/release/ui/buttons_data_empty.py
+++ b/release/ui/buttons_data_empty.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py
index a00bb23d5b5..c1873d934c4 100644
--- a/release/ui/buttons_data_lamp.py
+++ b/release/ui/buttons_data_lamp.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
diff --git a/release/ui/buttons_data_lattice.py b/release/ui/buttons_data_lattice.py
index 5d8a07c7d44..5535f973b27 100644
--- a/release/ui/buttons_data_lattice.py
+++ b/release/ui/buttons_data_lattice.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
diff --git a/release/ui/buttons_data_mesh.py b/release/ui/buttons_data_mesh.py
index c7663be1923..c1311b32180 100644
--- a/release/ui/buttons_data_mesh.py
+++ b/release/ui/buttons_data_mesh.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
@@ -93,12 +93,12 @@ class DATA_PT_vertex_groups(DataButtonsPanel):
 		row.template_list(ob, "vertex_groups", ob, "active_vertex_group_index")
 
 		col = row.column(align=True)
-		col.itemO("object.vertex_group_add", icon="ICON_ZOOMIN", text="")
-		col.itemO("object.vertex_group_remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("object.vertex_group_add", icon='ICON_ZOOMIN', text="")
+		col.itemO("object.vertex_group_remove", icon='ICON_ZOOMOUT', text="")
 
-		col.itemO("object.vertex_group_copy", icon="ICON_BLANK1", text="")
+		col.itemO("object.vertex_group_copy", icon='ICON_BLANK1', text="")
 		if ob.data.users > 1:
-			col.itemO("object.vertex_group_copy_to_linked", icon="ICON_BLANK1", text="")
+			col.itemO("object.vertex_group_copy_to_linked", icon='ICON_BLANK1', text="")
 
 		group = ob.active_vertex_group
 		if group:
@@ -137,15 +137,15 @@ class DATA_PT_shape_keys(DataButtonsPanel):
 		col = row.column()
 
 		subcol = col.column(align=True)
-		subcol.itemO("object.shape_key_add", icon="ICON_ZOOMIN", text="")
-		subcol.itemO("object.shape_key_remove", icon="ICON_ZOOMOUT", text="")
+		subcol.itemO("object.shape_key_add", icon='ICON_ZOOMIN', text="")
+		subcol.itemO("object.shape_key_remove", icon='ICON_ZOOMOUT', text="")
 
 		if kb:
 			col.itemS()
 
 			subcol = col.column(align=True)
-			subcol.itemR(ob, "shape_key_lock", icon="ICON_UNPINNED", text="")
-			subcol.itemR(kb, "mute", icon="ICON_MUTE_IPO_ON", text="")
+			subcol.itemR(ob, "shape_key_lock", icon='ICON_UNPINNED', text="")
+			subcol.itemR(kb, "mute", icon='ICON_MUTE_IPO_ON', text="")
 
 			if key.relative:
 				row = layout.row()
@@ -197,8 +197,8 @@ class DATA_PT_uv_texture(DataButtonsPanel):
 		col.template_list(me, "uv_textures", me, "active_uv_texture_index", rows=2)
 
 		col = row.column(align=True)
-		col.itemO("mesh.uv_texture_add", icon="ICON_ZOOMIN", text="")
-		col.itemO("mesh.uv_texture_remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("mesh.uv_texture_add", icon='ICON_ZOOMIN', text="")
+		col.itemO("mesh.uv_texture_remove", icon='ICON_ZOOMOUT', text="")
 
 		lay = me.active_uv_texture
 		if lay:
@@ -218,8 +218,8 @@ class DATA_PT_vertex_colors(DataButtonsPanel):
 		col.template_list(me, "vertex_colors", me, "active_vertex_color_index", rows=2)
 
 		col = row.column(align=True)
-		col.itemO("mesh.vertex_color_add", icon="ICON_ZOOMIN", text="")
-		col.itemO("mesh.vertex_color_remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("mesh.vertex_color_add", icon='ICON_ZOOMIN', text="")
+		col.itemO("mesh.vertex_color_remove", icon='ICON_ZOOMOUT', text="")
 
 		lay = me.active_vertex_color
 		if lay:
diff --git a/release/ui/buttons_data_metaball.py b/release/ui/buttons_data_metaball.py
index e31c3d7fcd0..88c0066c67f 100644
--- a/release/ui/buttons_data_metaball.py
+++ b/release/ui/buttons_data_metaball.py
@@ -1,8 +1,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
diff --git a/release/ui/buttons_data_modifier.py b/release/ui/buttons_data_modifier.py
index f5af26f8746..9b2481b0195 100644
--- a/release/ui/buttons_data_modifier.py
+++ b/release/ui/buttons_data_modifier.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "modifier"
 	
 class DATA_PT_modifiers(DataButtonsPanel):
@@ -202,7 +202,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
 	def HOOK(self, layout, ob, md):
 		col = layout.column()
 		col.itemR(md, "object")
-		if md.object and md.object.type == "ARMATURE":
+		if md.object and md.object.type == 'ARMATURE':
 			layout.item_pointerR(md, "subtarget", md.object.data, "bones", text="Bone")
 		
 		layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py
index 754d6fcda39..62d4d0a4d21 100644
--- a/release/ui/buttons_data_text.py
+++ b/release/ui/buttons_data_text.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
diff --git a/release/ui/buttons_game.py b/release/ui/buttons_game.py
index 7334b453e91..e28e3fda2c6 100644
--- a/release/ui/buttons_game.py
+++ b/release/ui/buttons_game.py
@@ -2,8 +2,8 @@
 import bpy
  
 class PhysicsButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "physics"
 
 	def poll(self, context):
@@ -171,8 +171,8 @@ bpy.types.register(PHYSICS_PT_game_physics)
 bpy.types.register(PHYSICS_PT_game_collision_bounds)
 
 class SceneButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "scene"
 
 	def poll(self, context):
@@ -322,8 +322,8 @@ bpy.types.register(SCENE_PT_game_shading)
 bpy.types.register(SCENE_PT_game_performance)
 
 class WorldButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "world"
 
 	def poll(self, context):
diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index 73d28d6964c..eaba26c7e51 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -2,8 +2,8 @@
 import bpy
 
 class MaterialButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "material"
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
 
@@ -45,8 +45,8 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel):
 			row.template_list(ob, "materials", ob, "active_material_index", rows=2)
 
 			col = row.column(align=True)
-			col.itemO("object.material_slot_add", icon="ICON_ZOOMIN", text="")
-			col.itemO("object.material_slot_remove", icon="ICON_ZOOMOUT", text="")
+			col.itemO("object.material_slot_add", icon='ICON_ZOOMIN', text="")
+			col.itemO("object.material_slot_remove", icon='ICON_ZOOMOUT', text="")
 
 			if ob.mode == 'EDIT':
 				row = layout.row(align=True)
diff --git a/release/ui/buttons_object.py b/release/ui/buttons_object.py
index 6b6d583e2ca..af2c7cfb58a 100644
--- a/release/ui/buttons_object.py
+++ b/release/ui/buttons_object.py
@@ -2,8 +2,8 @@
 import bpy
 
 class ObjectButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "object"
 
 class OBJECT_PT_context_object(ObjectButtonsPanel):
@@ -15,7 +15,7 @@ class OBJECT_PT_context_object(ObjectButtonsPanel):
 		ob = context.object
 		
 		row = layout.row()
-		row.itemL(text="", icon="ICON_OBJECT_DATA")
+		row.itemL(text="", icon='ICON_OBJECT_DATA')
 		row.itemR(ob, "name", text="")
 
 class OBJECT_PT_transform(ObjectButtonsPanel):
@@ -79,7 +79,7 @@ class OBJECT_PT_groups(ObjectButtonsPanel):
 
 				row = col.box().row()
 				row.itemR(group, "name", text="")
-				row.itemO("object.group_remove", text="", icon="VICON_X")
+				row.itemO("object.group_remove", text="", icon='VICON_X')
 
 				split = col.box().split()
 				split.column().itemR(group, "layer", text="Dupli")
diff --git a/release/ui/buttons_object_constraint.py b/release/ui/buttons_object_constraint.py
index c67d6e40cfb..cdc18e3545c 100644
--- a/release/ui/buttons_object_constraint.py
+++ b/release/ui/buttons_object_constraint.py
@@ -2,8 +2,8 @@
 import bpy
 
 class ConstraintButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "constraint"
 
 	def draw_constraint(self, con):
@@ -39,7 +39,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
 		layout.itemR(con, "target") # XXX limiting settings for only 'curves' or some type of object
 		
 		if con.target and subtargets:
-			if con.target.type == "ARMATURE":
+			if con.target.type == 'ARMATURE':
 				layout.item_pointerR(con, "subtarget", con.target.data, "bones", text="Bone")
 				
 				if con.type == 'COPY_LOCATION':
@@ -478,7 +478,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
 		layout.itemR(con, "distance")
 		layout.itemR(con, "shrinkwrap_type")
 		
-		if con.shrinkwrap_type == "PROJECT":
+		if con.shrinkwrap_type == 'PROJECT':
 			row = layout.row(align=True)
 			row.itemR(con, "axis_x")
 			row.itemR(con, "axis_y")
diff --git a/release/ui/buttons_particle.py b/release/ui/buttons_particle.py
index 8bc84b734bf..0454f2a4023 100644
--- a/release/ui/buttons_particle.py
+++ b/release/ui/buttons_particle.py
@@ -11,8 +11,8 @@ def particle_panel_poll(context):
 	return psys.settings.type in ('EMITTER', 'REACTOR', 'HAIR')
 
 class ParticleButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "particle"
 
 	def poll(self, context):
@@ -35,8 +35,8 @@ class PARTICLE_PT_particles(ParticleButtonsPanel):
 			row.template_list(ob, "particle_systems", ob, "active_particle_system_index", rows=2)
 
 			col = row.column(align=True)
-			col.itemO("object.particle_system_add", icon="ICON_ZOOMIN", text="")
-			col.itemO("object.particle_system_remove", icon="ICON_ZOOMOUT", text="")
+			col.itemO("object.particle_system_add", icon='ICON_ZOOMIN', text="")
+			col.itemO("object.particle_system_remove", icon='ICON_ZOOMOUT', text="")
 
 		if psys:
 			part = psys.settings
@@ -156,8 +156,8 @@ class PARTICLE_PT_cache(ParticleButtonsPanel):
 		row = layout.row()
 		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2 )
 		col = row.column(align=True)
-		col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
-		col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
+		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
 		
 		row = layout.row()
 		row.itemL(text="File Name:")
@@ -400,12 +400,12 @@ class PARTICLE_PT_physics(ParticleButtonsPanel):
 			col = row.column()
 			subrow = col.row()
 			subcol = subrow.column(align=True)
-			subcol.itemO("particle.new_target", icon="ICON_ZOOMIN", text="")
-			subcol.itemO("particle.remove_target", icon="ICON_ZOOMOUT", text="")
+			subcol.itemO("particle.new_target", icon='ICON_ZOOMIN', text="")
+			subcol.itemO("particle.remove_target", icon='ICON_ZOOMOUT', text="")
 			subrow = col.row()
 			subcol = subrow.column(align=True)
-			subcol.itemO("particle.target_move_up", icon="VICON_MOVE_UP", text="")
-			subcol.itemO("particle.target_move_down", icon="VICON_MOVE_DOWN", text="")
+			subcol.itemO("particle.target_move_up", icon='VICON_MOVE_UP', text="")
+			subcol.itemO("particle.target_move_down", icon='VICON_MOVE_DOWN', text="")
 			
 			key = psys.active_particle_target
 			if key:
@@ -450,11 +450,11 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel):
 		#row.template_list(boids, "states", boids, "active_boid_state_index", compact="True")
 		#col = row.row()
 		#subrow = col.row(align=True)
-		#subrow.itemO("boid.boidstate_add", icon="ICON_ZOOMIN", text="")
-		#subrow.itemO("boid.boidstate_del", icon="ICON_ZOOMOUT", text="")
+		#subrow.itemO("boid.boidstate_add", icon='ICON_ZOOMIN', text="")
+		#subrow.itemO("boid.boidstate_del", icon='ICON_ZOOMOUT', text="")
 		#subrow = row.row(align=True)
-		#subrow.itemO("boid.boidstate_move_up", icon="VICON_MOVE_UP", text="")
-		#subrow.itemO("boid.boidstate_move_down", icon="VICON_MOVE_DOWN", text="")
+		#subrow.itemO("boid.boidstate_move_up", icon='VICON_MOVE_UP', text="")
+		#subrow.itemO("boid.boidstate_move_down", icon='VICON_MOVE_DOWN', text="")
 		
 		state = boids.active_boid_state
 		
@@ -473,12 +473,12 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel):
 		col = row.column()
 		subrow = col.row()
 		subcol = subrow.column(align=True)
-		subcol.item_menu_enumO("boid.boidrule_add", "type", icon="ICON_ZOOMIN", text="")
-		subcol.itemO("boid.boidrule_del", icon="ICON_ZOOMOUT", text="")
+		subcol.item_menu_enumO("boid.boidrule_add", "type", icon='ICON_ZOOMIN', text="")
+		subcol.itemO("boid.boidrule_del", icon='ICON_ZOOMOUT', text="")
 		subrow = col.row()
 		subcol = subrow.column(align=True)
-		subcol.itemO("boid.boidrule_move_up", icon="VICON_MOVE_UP", text="")
-		subcol.itemO("boid.boidrule_move_down", icon="VICON_MOVE_DOWN", text="")
+		subcol.itemO("boid.boidrule_move_up", icon='VICON_MOVE_UP', text="")
+		subcol.itemO("boid.boidrule_move_down", icon='VICON_MOVE_DOWN', text="")
 		
 		rule = state.active_boid_rule
 		
@@ -486,8 +486,8 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel):
 			row = layout.row()
 			row.itemR(rule, "name", text="")
 			#somebody make nice icons for boids here please! -jahka
-			row.itemR(rule, "in_air", icon="VICON_MOVE_UP", text="")
-			row.itemR(rule, "on_land", icon="VICON_MOVE_DOWN", text="")
+			row.itemR(rule, "in_air", icon='VICON_MOVE_UP', text="")
+			row.itemR(rule, "on_land", icon='VICON_MOVE_DOWN', text="")
 			
 			row = layout.row()
 
diff --git a/release/ui/buttons_physics_cloth.py b/release/ui/buttons_physics_cloth.py
index f34077c758a..6c499625685 100644
--- a/release/ui/buttons_physics_cloth.py
+++ b/release/ui/buttons_physics_cloth.py
@@ -2,8 +2,8 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "physics"
 
 	def poll(self, context):
@@ -93,8 +93,8 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel):
 		row = layout.row()
 		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
 		col = row.column(align=True)
-		col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
-		col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
+		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
 		
 		row = layout.row()
 		row.itemR(cache, "name")
diff --git a/release/ui/buttons_physics_field.py b/release/ui/buttons_physics_field.py
index fb29dd92833..3c68327ba79 100644
--- a/release/ui/buttons_physics_field.py
+++ b/release/ui/buttons_physics_field.py
@@ -2,8 +2,8 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "physics"
 
 	def poll(self, context):
@@ -146,15 +146,15 @@ class PHYSICS_PT_field(PhysicButtonsPanel):
 				sub.active = field.use_radial_max
 				sub.itemR(field, "radial_maximum", text="Distance")
 				
-		#if ob.type in "CURVE":
-			#if field.type == "GUIDE":
+		#if ob.type in 'CURVE':
+			#if field.type == 'GUIDE':
 				#colsub = col.column(align=True)
 			
-		#if field.type != "NONE":
+		#if field.type != 'NONE':
 			#layout.itemR(field, "strength")
 
-		#if field.type in ("HARMONIC", "SPHERICAL", "CHARGE", "LENNARDj"):
-			#if ob.type in ("MESH", "SURFACE", "FONT", "CURVE"):
+		#if field.type in ('HARMONIC', 'SPHERICAL', 'CHARGE', "LENNARDj"):
+			#if ob.type in ('MESH', 'SURFACE', 'FONT', 'CURVE'):
 				#layout.itemR(field, "surface")
 
 class PHYSICS_PT_collision(PhysicButtonsPanel):
diff --git a/release/ui/buttons_physics_fluid.py b/release/ui/buttons_physics_fluid.py
index 304d419b388..1d0a64c517a 100644
--- a/release/ui/buttons_physics_fluid.py
+++ b/release/ui/buttons_physics_fluid.py
@@ -2,8 +2,8 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "physics"
 
 	def poll(self, context):
diff --git a/release/ui/buttons_physics_smoke.py b/release/ui/buttons_physics_smoke.py
index d187e4c5901..5e1ec227080 100644
--- a/release/ui/buttons_physics_smoke.py
+++ b/release/ui/buttons_physics_smoke.py
@@ -7,8 +7,8 @@ def smoke_panel_enabled_low(smd):
 	return True
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "physics"
 
 	def poll(self, context):
@@ -144,8 +144,8 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel):
 			row = layout.row()
 			row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
 			col = row.column(align=True)
-			col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
-			col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+			col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
+			col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
 			
 			row = layout.row()
 			row.itemR(cache, "name")
@@ -239,8 +239,8 @@ class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
 			row = layout.row()
 			row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
 			col = row.column(align=True)
-			col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
-			col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+			col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
+			col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
 			
 			row = layout.row()
 			row.itemR(cache, "name")
diff --git a/release/ui/buttons_physics_softbody.py b/release/ui/buttons_physics_softbody.py
index 2613f9e8032..35c0c498436 100644
--- a/release/ui/buttons_physics_softbody.py
+++ b/release/ui/buttons_physics_softbody.py
@@ -2,8 +2,8 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "physics"
 
 	def poll(self, context):
@@ -68,8 +68,8 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel):
 		row = layout.row()
 		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
 		col = row.column(align=True)
-		col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
-		col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
+		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
 		
 		row = layout.row()
 		row.itemR(cache, "name")
diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index e9ee97468e8..08eee7ef43a 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -2,8 +2,8 @@
 import bpy
 
 class RenderButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "scene"
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
 	
@@ -41,8 +41,8 @@ class SCENE_PT_layers(RenderButtonsPanel):
 		row.template_list(rd, "layers", rd, "active_layer_index", rows=2)
 
 		col = row.column(align=True)
-		col.itemO("scene.render_layer_add", icon="ICON_ZOOMIN", text="")
-		col.itemO("scene.render_layer_remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("scene.render_layer_add", icon='ICON_ZOOMIN', text="")
+		col.itemO("scene.render_layer_remove", icon='ICON_ZOOMOUT', text="")
 
 		rl = rd.layers[rd.active_layer_index]
 
@@ -103,19 +103,19 @@ class SCENE_PT_layers(RenderButtonsPanel):
 		col.itemR(rl, "pass_diffuse")
 		row = col.row()
 		row.itemR(rl, "pass_specular")
-		row.itemR(rl, "pass_specular_exclude", text="", icon="ICON_X")
+		row.itemR(rl, "pass_specular_exclude", text="", icon='ICON_X')
 		row = col.row()
 		row.itemR(rl, "pass_shadow")
-		row.itemR(rl, "pass_shadow_exclude", text="", icon="ICON_X")
+		row.itemR(rl, "pass_shadow_exclude", text="", icon='ICON_X')
 		row = col.row()
 		row.itemR(rl, "pass_ao")
-		row.itemR(rl, "pass_ao_exclude", text="", icon="ICON_X")
+		row.itemR(rl, "pass_ao_exclude", text="", icon='ICON_X')
 		row = col.row()
 		row.itemR(rl, "pass_reflection")
-		row.itemR(rl, "pass_reflection_exclude", text="", icon="ICON_X")
+		row.itemR(rl, "pass_reflection_exclude", text="", icon='ICON_X')
 		row = col.row()
 		row.itemR(rl, "pass_refraction")
-		row.itemR(rl, "pass_refraction_exclude", text="", icon="ICON_X")
+		row.itemR(rl, "pass_refraction_exclude", text="", icon='ICON_X')
 
 class SCENE_PT_shading(RenderButtonsPanel):
 	__label__ = "Shading"
diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index 29e43981fd2..20b3c7bca3e 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -2,8 +2,8 @@
 import bpy
 
 class TextureButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "texture"
 	
 	def poll(self, context):
diff --git a/release/ui/buttons_world.py b/release/ui/buttons_world.py
index 599f45d160b..342adfaf4af 100644
--- a/release/ui/buttons_world.py
+++ b/release/ui/buttons_world.py
@@ -2,8 +2,8 @@
 import bpy
 
 class WorldButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "world"
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
 	
diff --git a/release/ui/space_buttons.py b/release/ui/space_buttons.py
index 3cf782e615f..aa89c06ea08 100644
--- a/release/ui/space_buttons.py
+++ b/release/ui/space_buttons.py
@@ -2,7 +2,7 @@
 import bpy
 
 class Buttons_HT_header(bpy.types.Header):
-	__space_type__ = "PROPERTIES"
+	__space_type__ = 'PROPERTIES'
 
 	def draw(self, context):
 		layout = self.layout
@@ -22,7 +22,7 @@ class Buttons_HT_header(bpy.types.Header):
 		row.itemR(scene, "current_frame")
 
 class Buttons_MT_view(bpy.types.Menu):
-	__space_type__ = "PROPERTIES"
+	__space_type__ = 'PROPERTIES'
 	__label__ = "View"
 
 	def draw(self, context):
diff --git a/release/ui/space_console.py b/release/ui/space_console.py
index 45cb2a856e1..f1038b5616a 100644
--- a/release/ui/space_console.py
+++ b/release/ui/space_console.py
@@ -5,7 +5,7 @@ import bpy_ops # XXX - should not need to do this
 del bpy_ops
 
 class CONSOLE_HT_header(bpy.types.Header):
-	__space_type__ = "CONSOLE"
+	__space_type__ = 'CONSOLE'
 
 	def draw(self, context):
 		sc = context.space_data
@@ -39,7 +39,7 @@ class CONSOLE_HT_header(bpy.types.Header):
 			row.itemO("console.report_replay")
 
 class CONSOLE_MT_console(bpy.types.Menu):
-	__space_type__ = "CONSOLE"
+	__space_type__ = 'CONSOLE'
 	__label__ = "Console"
 
 	def draw(self, context):
@@ -52,7 +52,7 @@ class CONSOLE_MT_console(bpy.types.Menu):
 		layout.itemO("console.paste")
 
 class CONSOLE_MT_report(bpy.types.Menu):
-	__space_type__ = "CONSOLE"
+	__space_type__ = 'CONSOLE'
 	__label__ = "Report"
 
 	def draw(self, context):
diff --git a/release/ui/space_filebrowser.py b/release/ui/space_filebrowser.py
index a37b89e8db4..f1ea5555787 100644
--- a/release/ui/space_filebrowser.py
+++ b/release/ui/space_filebrowser.py
@@ -2,7 +2,7 @@
 import bpy
 
 class FILEBROWSER_HT_header(bpy.types.Header):
-	__space_type__ = "FILE_BROWSER"
+	__space_type__ = 'FILE_BROWSER'
 
 	def draw(self, context):
 		layout = self.layout
diff --git a/release/ui/space_image.py b/release/ui/space_image.py
index 888b46e060e..aa43b14b974 100644
--- a/release/ui/space_image.py
+++ b/release/ui/space_image.py
@@ -2,7 +2,7 @@
 import bpy
 
 class IMAGE_MT_view(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "View"
 
 	def draw(self, context):
@@ -13,7 +13,7 @@ class IMAGE_MT_view(bpy.types.Menu):
 
 		show_uvedit = sima.show_uvedit
 
-		layout.itemO("image.properties", icon="ICON_MENU_PANEL")
+		layout.itemO("image.properties", icon='ICON_MENU_PANEL')
 
 		layout.itemS()
 
@@ -43,7 +43,7 @@ class IMAGE_MT_view(bpy.types.Menu):
 		layout.itemO("screen.screen_full_area")
 
 class IMAGE_MT_select(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -64,7 +64,7 @@ class IMAGE_MT_select(bpy.types.Menu):
 		layout.itemO("uv.select_linked")
 
 class IMAGE_MT_image(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "Image"
 
 	def draw(self, context):
@@ -85,7 +85,7 @@ class IMAGE_MT_image(bpy.types.Menu):
 			layout.itemO("image.save")
 			layout.itemO("image.save_as")
 
-			if ima.source == "SEQUENCE":
+			if ima.source == 'SEQUENCE':
 				layout.itemO("image.save_sequence")
 
 			if not show_render:
@@ -99,7 +99,7 @@ class IMAGE_MT_image(bpy.types.Menu):
 				# only for dirty && specific image types, perhaps
 				# this could be done in operator poll too
 				if ima.dirty:
-					if ima.source in ("FILE", "GENERATED") and ima.type != "MULTILAYER":
+					if ima.source in ('FILE', 'GENERATED') and ima.type != 'MULTILAYER':
 						layout.item_booleanO("image.pack", "as_png", True, text="Pack As PNG")
 
 			layout.itemS()
@@ -107,7 +107,7 @@ class IMAGE_MT_image(bpy.types.Menu):
 			layout.itemR(sima, "image_painting")
 
 class IMAGE_MT_uvs_showhide(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "Show/Hide Faces"
 
 	def draw(self, context):
@@ -118,7 +118,7 @@ class IMAGE_MT_uvs_showhide(bpy.types.Menu):
 		layout.item_booleanO("uv.hide", "unselected", True)
 
 class IMAGE_MT_uvs_transform(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "Transform"
 
 	def draw(self, context):
@@ -129,7 +129,7 @@ class IMAGE_MT_uvs_transform(bpy.types.Menu):
 		layout.item_enumO("tfm.transform", "mode", 'RESIZE')
 
 class IMAGE_MT_uvs_mirror(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "Mirror"
 
 	def draw(self, context):
@@ -139,7 +139,7 @@ class IMAGE_MT_uvs_mirror(bpy.types.Menu):
 		layout.item_enumO("uv.mirror", "axis", 'MIRROR_Y') # "Y Axis", M, 
 
 class IMAGE_MT_uvs_weldalign(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "Weld/Align"
 
 	def draw(self, context):
@@ -150,7 +150,7 @@ class IMAGE_MT_uvs_weldalign(bpy.types.Menu):
 
 
 class IMAGE_MT_uvs(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "UVs"
 
 	def draw(self, context):
@@ -192,7 +192,7 @@ class IMAGE_MT_uvs(bpy.types.Menu):
 		layout.itemM("IMAGE_MT_uvs_showhide")
 
 class IMAGE_HT_header(bpy.types.Header):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 
 	def draw(self, context):
 		sima = context.space_data
@@ -262,17 +262,17 @@ class IMAGE_HT_header(bpy.types.Header):
 			row.itemR(sima, "draw_channels", text="", expand=True)
 
 			row = layout.row(align=True)
-			if ima.type == "COMPOSITE":
-				row.itemO("image.record_composite", icon="ICON_REC")
-			if ima.type == "COMPOSITE" and ima.source in ("MOVIE", "SEQUENCE"):
-				row.itemO("image.play_composite", icon="ICON_PLAY")
+			if ima.type == 'COMPOSITE':
+				row.itemO("image.record_composite", icon='ICON_REC')
+			if ima.type == 'COMPOSITE' and ima.source in ('MOVIE', 'SEQUENCE'):
+				row.itemO("image.play_composite", icon='ICON_PLAY')
 		
 		if show_uvedit or sima.image_painting:
 			layout.itemR(sima, "update_automatically", text="")
 
 class IMAGE_PT_game_properties(bpy.types.Panel):
-	__space_type__ = "IMAGE_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'IMAGE_EDITOR'
+	__region_type__ = 'UI'
 	__label__ = "Game Properties"
 
 	def poll(self, context):
@@ -315,8 +315,8 @@ class IMAGE_PT_game_properties(bpy.types.Panel):
 			subrow.active = ima.tiles or ima.animated
 
 class IMAGE_PT_view_properties(bpy.types.Panel):
-	__space_type__ = "IMAGE_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'IMAGE_EDITOR'
+	__region_type__ = 'UI'
 	__label__ = "View Properties"
 
 	def poll(self, context):
diff --git a/release/ui/space_info.py b/release/ui/space_info.py
index 83eb2c75a2c..4188209e393 100644
--- a/release/ui/space_info.py
+++ b/release/ui/space_info.py
@@ -2,7 +2,7 @@
 import bpy
 
 class INFO_HT_header(bpy.types.Header):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 
 	def draw(self, context):
 		layout = self.layout
@@ -38,7 +38,7 @@ class INFO_HT_header(bpy.types.Header):
 		layout.itemL(text=scene.statistics())
 			
 class INFO_MT_file(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "File"
 
 	def draw(self, context):
@@ -74,14 +74,14 @@ class INFO_MT_file(bpy.types.Menu):
 		layout.itemO("wm.exit_blender", text="Quit")
 
 class INFO_MT_file_import(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "Import"
 
 	def draw(self, context):
 		layout = self.layout
 
 class INFO_MT_file_export(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "Export"
 
 	def draw(self, context):
@@ -90,7 +90,7 @@ class INFO_MT_file_export(bpy.types.Menu):
 		layout.itemO("export.ply", text="PLY")
 
 class INFO_MT_file_external_data(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "External Data"
 
 	def draw(self, context):
@@ -107,7 +107,7 @@ class INFO_MT_file_external_data(bpy.types.Menu):
 		layout.itemO("file.find_missing_files")
 
 class INFO_MT_add(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "Add"
 
 	def draw(self, context):
@@ -133,7 +133,7 @@ class INFO_MT_add(bpy.types.Menu):
 		layout.item_enumO("object.object_add", "type", 'LAMP', icon='ICON_OUTLINER_OB_LAMP')
 
 class INFO_MT_game(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "Game"
 
 	def draw(self, context):
@@ -151,7 +151,7 @@ class INFO_MT_game(bpy.types.Menu):
 		layout.itemR(gs, "deprecation_warnings")
 
 class INFO_MT_render(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "Render"
 
 	def draw(self, context):
@@ -167,7 +167,7 @@ class INFO_MT_render(bpy.types.Menu):
 		layout.itemO("screen.render_view_show")
 
 class INFO_MT_help(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "Help"
 
 	def draw(self, context):
diff --git a/release/ui/space_logic.py b/release/ui/space_logic.py
index 728e5e6307b..68ddceb8534 100644
--- a/release/ui/space_logic.py
+++ b/release/ui/space_logic.py
@@ -1,8 +1,8 @@
 import bpy
 
 class LOGIC_PT_properties(bpy.types.Panel):
-	__space_type__ = "LOGIC_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'LOGIC_EDITOR'
+	__region_type__ = 'UI'
 	__label__ = "Properties"
 
 	def poll(self, context):
diff --git a/release/ui/space_node.py b/release/ui/space_node.py
index fd5dd9e6ee7..875aca7fd82 100644
--- a/release/ui/space_node.py
+++ b/release/ui/space_node.py
@@ -2,7 +2,7 @@
 import bpy
 
 class NODE_HT_header(bpy.types.Header):
-	__space_type__ = "NODE_EDITOR"
+	__space_type__ = 'NODE_EDITOR'
 
 	def draw(self, context):
 		layout = self.layout
@@ -47,7 +47,7 @@ class NODE_HT_header(bpy.types.Header):
 			layout.itemR(snode, "backdrop")
 
 class NODE_MT_view(bpy.types.Menu):
-	__space_type__ = "NODE_EDITOR"
+	__space_type__ = 'NODE_EDITOR'
 	__label__ = "View"
 
 	def draw(self, context):
@@ -65,7 +65,7 @@ class NODE_MT_view(bpy.types.Menu):
 		layout.itemO("screen.screen_full_area")
 
 class NODE_MT_select(bpy.types.Menu):
-	__space_type__ = "NODE_EDITOR"
+	__space_type__ = 'NODE_EDITOR'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -80,7 +80,7 @@ class NODE_MT_select(bpy.types.Menu):
 		# layout.itemO("node.select_linked_to")
 
 class NODE_MT_node(bpy.types.Menu):
-	__space_type__ = "NODE_EDITOR"
+	__space_type__ = 'NODE_EDITOR'
 	__label__ = "Node"
 
 	def draw(self, context):
diff --git a/release/ui/space_outliner.py b/release/ui/space_outliner.py
index f55f4633a7b..522b620e29d 100644
--- a/release/ui/space_outliner.py
+++ b/release/ui/space_outliner.py
@@ -2,7 +2,7 @@
 import bpy
 
 class OUTLINER_HT_header(bpy.types.Header):
-	__space_type__ = "OUTLINER"
+	__space_type__ = 'OUTLINER'
 
 	def draw(self, context):
 		so = context.space_data
@@ -36,7 +36,7 @@ class OUTLINER_HT_header(bpy.types.Header):
 		
 
 class OUTLINER_MT_view(bpy.types.Menu):
-	__space_type__ = "OUTLINER"
+	__space_type__ = 'OUTLINER'
 	__label__ = "View"
 
 	def draw(self, context):
diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py
index 1edcf32d3b5..1498c37d761 100644
--- a/release/ui/space_sequencer.py
+++ b/release/ui/space_sequencer.py
@@ -7,7 +7,7 @@ def act_strip(context):
 
 # Header
 class SEQUENCER_HT_header(bpy.types.Header):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 
 	def draw(self, context):
 		layout = self.layout
@@ -38,7 +38,7 @@ class SEQUENCER_HT_header(bpy.types.Header):
 			layout.itemR(st, "display_channel", text="Channel")
 
 class SEQUENCER_MT_view(bpy.types.Menu):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 	__label__ = "View"
 	
 	def draw(self, context):
@@ -106,7 +106,7 @@ class SEQUENCER_MT_view(bpy.types.Menu):
 		"""
 
 class SEQUENCER_MT_select(bpy.types.Menu):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -127,7 +127,7 @@ class SEQUENCER_MT_select(bpy.types.Menu):
 		layout.itemO("sequencer.select_inverse")
 
 class SEQUENCER_MT_marker(bpy.types.Menu):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 	__label__ = "Marker (TODO)"
 
 	def draw(self, context):
@@ -146,7 +146,7 @@ class SEQUENCER_MT_marker(bpy.types.Menu):
 		#layout.itemO("sequencer.sound_strip_add", text="Transform Markers") # toggle, will be rna - (sseq->flag & SEQ_MARKER_TRANS)
 
 class SEQUENCER_MT_add(bpy.types.Menu):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 	__label__ = "Add"
 
 	def draw(self, context):
@@ -163,7 +163,7 @@ class SEQUENCER_MT_add(bpy.types.Menu):
 		layout.itemM("SEQUENCER_MT_add_effect")
 
 class SEQUENCER_MT_add_effect(bpy.types.Menu):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 	__label__ = "Effect Strip..."
 
 	def draw(self, context):
@@ -187,7 +187,7 @@ class SEQUENCER_MT_add_effect(bpy.types.Menu):
 		layout.item_enumO("sequencer.effect_strip_add", 'type', 'SPEED')
 
 class SEQUENCER_MT_strip(bpy.types.Menu):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 	__label__ = "Strip"
 
 	def draw(self, context):
@@ -254,15 +254,15 @@ class SEQUENCER_MT_strip(bpy.types.Menu):
 
 # Panels
 class SequencerButtonsPanel(bpy.types.Panel):
-	__space_type__ = "SEQUENCE_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'SEQUENCE_EDITOR'
+	__region_type__ = 'UI'
 
 	def poll(self, context):
 		return context.space_data.display_mode == 'SEQUENCER' and act_strip(context) != None
 		
 class SequencerButtonsPanel_Output(bpy.types.Panel):
-	__space_type__ = "SEQUENCE_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'SEQUENCE_EDITOR'
+	__region_type__ = 'UI'
 
 	def poll(self, context):
 		return context.space_data.display_mode != 'SEQUENCER'
diff --git a/release/ui/space_text.py b/release/ui/space_text.py
index 61e8d3489a5..7b7ec176b72 100644
--- a/release/ui/space_text.py
+++ b/release/ui/space_text.py
@@ -2,7 +2,7 @@
 import bpy
 
 class TEXT_HT_header(bpy.types.Header):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 
 	def draw(self, context):
 		st = context.space_data
@@ -45,8 +45,8 @@ class TEXT_HT_header(bpy.types.Header):
 					row.itemL(text="Text: Internal")
 
 class TEXT_PT_properties(bpy.types.Panel):
-	__space_type__ = "TEXT_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'TEXT_EDITOR'
+	__region_type__ = 'UI'
 	__label__ = "Properties"
 
 	def draw(self, context):
@@ -64,8 +64,8 @@ class TEXT_PT_properties(bpy.types.Panel):
 		flow.itemR(st, "tab_width")
 
 class TEXT_PT_find(bpy.types.Panel):
-	__space_type__ = "TEXT_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'TEXT_EDITOR'
+	__region_type__ = 'UI'
 	__label__ = "Find"
 
 	def draw(self, context):
@@ -95,7 +95,7 @@ class TEXT_PT_find(bpy.types.Panel):
 		row.itemR(st, "find_all", text="All")
 
 class TEXT_MT_text(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "Text"
 
 	def draw(self, context):
@@ -127,7 +127,7 @@ class TEXT_MT_text(bpy.types.Menu):
 
 		layout.itemS()
 
-		layout.itemO("text.properties", icon="ICON_MENU_PANEL")
+		layout.itemO("text.properties", icon='ICON_MENU_PANEL')
 		
 		#ifndef DISABLE_PYTHON
 		# XXX layout.column()
@@ -136,7 +136,7 @@ class TEXT_MT_text(bpy.types.Menu):
 		#endif
 
 class TEXT_MT_edit_view(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "View"
 
 	def draw(self, context):
@@ -146,7 +146,7 @@ class TEXT_MT_edit_view(bpy.types.Menu):
 		layout.item_enumO("text.move", "type", 'FILE_BOTTOM', text="Bottom of File")
 
 class TEXT_MT_edit_select(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -156,7 +156,7 @@ class TEXT_MT_edit_select(bpy.types.Menu):
 		layout.itemO("text.select_line")
 
 class TEXT_MT_edit_markers(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "Markers"
 
 	def draw(self, context):
@@ -167,7 +167,7 @@ class TEXT_MT_edit_markers(bpy.types.Menu):
 		layout.itemO("text.previous_marker")
 
 class TEXT_MT_format(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "Format"
 
 	def draw(self, context):
@@ -186,7 +186,7 @@ class TEXT_MT_format(bpy.types.Menu):
 		layout.item_menu_enumO("text.convert_whitespace", "type")
 
 class TEXT_MT_edit_to3d(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "Text To 3D Object"
 
 	def draw(self, context):
@@ -196,7 +196,7 @@ class TEXT_MT_edit_to3d(bpy.types.Menu):
 		layout.item_booleanO("text.to_3d_object", "split_lines", True, text="One Object Per Line");
 
 class TEXT_MT_edit(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "Edit"
 
 	def poll(self, context):
diff --git a/release/ui/space_time.py b/release/ui/space_time.py
index 17deb4c550f..bfa4d5b6485 100644
--- a/release/ui/space_time.py
+++ b/release/ui/space_time.py
@@ -2,7 +2,7 @@
 import bpy
 
 class TIME_HT_header(bpy.types.Header):
-	__space_type__ = "TIMELINE"
+	__space_type__ = 'TIMELINE'
 
 	def draw(self, context):
 		layout = self.layout
@@ -64,11 +64,11 @@ class TIME_HT_header(bpy.types.Header):
 		
 		row = layout.row(align=True)
 		row.item_pointerR(scene, "active_keying_set", scene, "keying_sets", text="")
-		row.itemO("anim.insert_keyframe", text="", icon="ICON_KEY_HLT")
-		row.itemO("anim.delete_keyframe", text="", icon="ICON_KEY_DEHLT")
+		row.itemO("anim.insert_keyframe", text="", icon='ICON_KEY_HLT')
+		row.itemO("anim.delete_keyframe", text="", icon='ICON_KEY_DEHLT')
 
 class TIME_MT_view(bpy.types.Menu):
-	__space_type__ = "TIMELINE"
+	__space_type__ = 'TIMELINE'
 	__label__ = "View"
 
 	def draw(self, context):
@@ -83,7 +83,7 @@ class TIME_MT_view(bpy.types.Menu):
 		layout.itemR(st, "only_selected")
 
 class TIME_MT_frame(bpy.types.Menu):
-	__space_type__ = "TIMELINE"
+	__space_type__ = 'TIMELINE'
 	__label__ = "Frame"
 
 	def draw(self, context):
@@ -101,7 +101,7 @@ class TIME_MT_frame(bpy.types.Menu):
 		layout.itemO("time.end_frame_set")
 
 class TIME_MT_playback(bpy.types.Menu):
-	__space_type__ = "TIMELINE"
+	__space_type__ = 'TIMELINE'
 	__label__ = "Playback"
 
 	def draw(self, context):
diff --git a/release/ui/space_userpref.py b/release/ui/space_userpref.py
index bd963c65cd0..acd3d3eb44b 100644
--- a/release/ui/space_userpref.py
+++ b/release/ui/space_userpref.py
@@ -2,21 +2,21 @@
 import bpy
 
 class USERPREF_HT_header(bpy.types.Header):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 
 	def draw(self, context):
 		layout = self.layout
 		layout.template_header(menus=False)
 			
 class USERPREF_MT_view(bpy.types.Menu):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = "View"
 
 	def draw(self, context):
 		layout = self.layout
 
 class USERPREF_PT_tabs(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__show_header__ = False
 
 	def draw(self, context):
@@ -27,7 +27,7 @@ class USERPREF_PT_tabs(bpy.types.Panel):
 		layout.itemR(userpref, "active_section", expand=True)
 
 class USERPREF_PT_view(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = "View"
 	__show_header__ = False
 
@@ -130,7 +130,7 @@ class USERPREF_PT_view(bpy.types.Panel):
 		sub1.itemR(view, "open_right_mouse_delay", text="Hold RMB")
 
 class USERPREF_PT_edit(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = "Edit"
 	__show_header__ = False
 
@@ -227,7 +227,7 @@ class USERPREF_PT_edit(bpy.types.Panel):
 		sub1.itemR(edit, "duplicate_action", text="Action")
 		
 class USERPREF_PT_system(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = "System"
 	__show_header__ = False
 
@@ -308,7 +308,7 @@ class USERPREF_PT_system(bpy.types.Panel):
 		sub1.itemR(system, "texture_collection_rate", text="Collection Rate")		
 		
 class USERPREF_PT_filepaths(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = "File Paths"
 	__show_header__ = False
 
@@ -370,7 +370,7 @@ class USERPREF_PT_filepaths(bpy.types.Panel):
 		sub3.itemR(paths, "auto_save_time")
 
 class USERPREF_PT_language(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = "Language"
 	__show_header__ = False
 
@@ -394,7 +394,7 @@ class USERPREF_PT_language(bpy.types.Panel):
 		col.itemR(lan, "use_textured_fonts")
 		
 class USERPREF_PT_bottombar(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = " "
 	__show_header__ = False
 
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index f9e185f44f2..8f37b34e3b4 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -4,7 +4,7 @@ import bpy
 # ********** Header **********
 
 class VIEW3D_HT_header(bpy.types.Header):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 
 	def draw(self, context):
 		layout = self.layout
@@ -47,14 +47,14 @@ class VIEW3D_HT_header(bpy.types.Header):
 # ********** View menus **********
 
 class VIEW3D_MT_view(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "View"
 
 	def draw(self, context):
 		layout = self.layout
 
-		layout.itemO("view3d.properties", icon="ICON_MENU_PANEL")
-		layout.itemO("view3d.toolbar", icon="ICON_MENU_PANEL")
+		layout.itemO("view3d.properties", icon='ICON_MENU_PANEL')
+		layout.itemO("view3d.toolbar", icon='ICON_MENU_PANEL')
 		
 		layout.itemS()
 		
@@ -101,7 +101,7 @@ class VIEW3D_MT_view(bpy.types.Menu):
 		layout.itemO("screen.screen_full_area", text="Toggle Full Screen")
 		
 class VIEW3D_MT_view_navigation(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Navigation"
 
 	def draw(self, context):
@@ -124,7 +124,7 @@ class VIEW3D_MT_view_navigation(bpy.types.Menu):
 # ********** Select menus, suffix from context.mode **********
 
 class VIEW3D_MT_select_OBJECT(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -142,7 +142,7 @@ class VIEW3D_MT_select_OBJECT(bpy.types.Menu):
 		layout.itemO("object.select_grouped", text="Select Grouped")
 
 class VIEW3D_MT_select_POSE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -172,7 +172,7 @@ class VIEW3D_MT_select_POSE(bpy.types.Menu):
 		props.direction = 'CHILD'
 
 class VIEW3D_MT_select_PARTICLE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -194,7 +194,7 @@ class VIEW3D_MT_select_PARTICLE(bpy.types.Menu):
 		layout.itemO("particle.select_less")
 
 class VIEW3D_MT_select_EDIT_MESH(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -238,7 +238,7 @@ class VIEW3D_MT_select_EDIT_MESH(bpy.types.Menu):
 		layout.itemO("mesh.region_to_loop")
 
 class VIEW3D_MT_select_EDIT_CURVE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -267,7 +267,7 @@ class VIEW3D_MT_select_EDIT_CURVE(bpy.types.Menu):
 		layout.itemO("curve.select_less")
 
 class VIEW3D_MT_select_EDIT_SURFACE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -293,7 +293,7 @@ class VIEW3D_MT_select_EDIT_SURFACE(bpy.types.Menu):
 		layout.itemO("curve.select_less")
 
 class VIEW3D_MT_select_EDIT_METABALL(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -311,7 +311,7 @@ class VIEW3D_MT_select_EDIT_METABALL(bpy.types.Menu):
 		layout.itemL(text="Random")
 
 class VIEW3D_MT_select_EDIT_LATTICE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -324,7 +324,7 @@ class VIEW3D_MT_select_EDIT_LATTICE(bpy.types.Menu):
 		layout.itemO("lattice.select_all_toggle", text="Select/Deselect All")
 
 class VIEW3D_MT_select_EDIT_ARMATURE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -353,7 +353,7 @@ class VIEW3D_MT_select_EDIT_ARMATURE(bpy.types.Menu):
 		props.direction = 'CHILD'
 
 class VIEW3D_MT_select_FACE(bpy.types.Menu):# XXX no matching enum
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -364,7 +364,7 @@ class VIEW3D_MT_select_FACE(bpy.types.Menu):# XXX no matching enum
 # ********** Object menu **********
 
 class VIEW3D_MT_object(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__context__ = "objectmode"
 	__label__ = "Object"
 
@@ -402,7 +402,7 @@ class VIEW3D_MT_object(bpy.types.Menu):
 		layout.itemM("VIEW3D_MT_object_show")
 		
 class VIEW3D_MT_object_clear(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Clear"
 
 	def draw(self, context):
@@ -414,7 +414,7 @@ class VIEW3D_MT_object_clear(bpy.types.Menu):
 		layout.itemO("object.origin_clear")
 		
 class VIEW3D_MT_object_snap(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Snap"
 
 	def draw(self, context):
@@ -431,7 +431,7 @@ class VIEW3D_MT_object_snap(bpy.types.Menu):
 		layout.itemO("view3d.snap_cursor_to_active")
 		
 class VIEW3D_MT_object_parent(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Parent"
 
 	def draw(self, context):
@@ -441,7 +441,7 @@ class VIEW3D_MT_object_parent(bpy.types.Menu):
 		layout.itemO("object.parent_clear")
 		
 class VIEW3D_MT_object_track(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Track"
 
 	def draw(self, context):
@@ -451,7 +451,7 @@ class VIEW3D_MT_object_track(bpy.types.Menu):
 		layout.itemO("object.track_clear")
 		
 class VIEW3D_MT_object_group(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Group"
 
 	def draw(self, context):
@@ -466,7 +466,7 @@ class VIEW3D_MT_object_group(bpy.types.Menu):
 		layout.itemO("group.objects_remove_active")
 		
 class VIEW3D_MT_object_constraints(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Constraints"
 
 	def draw(self, context):
@@ -476,7 +476,7 @@ class VIEW3D_MT_object_constraints(bpy.types.Menu):
 		layout.itemO("object.constraints_clear")
 		
 class VIEW3D_MT_object_show(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Show/Hide"
 
 	def draw(self, context):
@@ -489,7 +489,7 @@ class VIEW3D_MT_object_show(bpy.types.Menu):
 # ********** Vertex paint menu **********	
 	
 class VIEW3D_MT_vertex_paint(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Paint"
 
 	def draw(self, context):
@@ -504,7 +504,7 @@ class VIEW3D_MT_vertex_paint(bpy.types.Menu):
 # ********** Sculpt menu **********	
 	
 class VIEW3D_MT_sculpt(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Sculpt"
 
 	def draw(self, context):
@@ -540,7 +540,7 @@ class VIEW3D_MT_sculpt(bpy.types.Menu):
 # ********** Edit Menus, suffix from ob.type **********
 
 class VIEW3D_MT_edit_snap(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Snap"
 
 	def draw(self, context):
@@ -558,7 +558,7 @@ class VIEW3D_MT_edit_snap(bpy.types.Menu):
 
 # Edit MESH
 class VIEW3D_MT_edit_MESH(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Mesh"
 
 	def draw(self, context):
@@ -601,7 +601,7 @@ class VIEW3D_MT_edit_MESH(bpy.types.Menu):
 		layout.itemM("VIEW3D_MT_edit_MESH_showhide")
 
 class VIEW3D_MT_edit_MESH_vertices(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Vertices"
 
 	def draw(self, context):
@@ -618,7 +618,7 @@ class VIEW3D_MT_edit_MESH_vertices(bpy.types.Menu):
 		layout.itemO("mesh.remove_doubles")
 		
 class VIEW3D_MT_edit_MESH_edges(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Edges"
 
 	def draw(self, context):
@@ -644,7 +644,7 @@ class VIEW3D_MT_edit_MESH_edges(bpy.types.Menu):
 		layout.item_enumO("mesh.edge_rotate", "direction", 'CCW', text="Rotate Edge CCW")
 		
 class VIEW3D_MT_edit_MESH_faces(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Faces"
 
 	def draw(self, context):
@@ -666,7 +666,7 @@ class VIEW3D_MT_edit_MESH_faces(bpy.types.Menu):
 		layout.itemO("mesh.faces_shade_flat")
 
 class VIEW3D_MT_edit_MESH_normals(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Normals"
 
 	def draw(self, context):
@@ -680,7 +680,7 @@ class VIEW3D_MT_edit_MESH_normals(bpy.types.Menu):
 		layout.itemO("mesh.flip_normals")
 		
 class VIEW3D_MT_edit_MESH_showhide(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Show/Hide"
 
 	def draw(self, context):
@@ -724,13 +724,13 @@ def draw_CURVE(self, context):
 	layout.itemM("VIEW3D_MT_edit_CURVE_showhide")
 
 class VIEW3D_MT_edit_CURVE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Curve"
 
 	draw = draw_CURVE
 	
 class VIEW3D_MT_edit_CURVE_ctrlpoints(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Control Points"
 
 	def draw(self, context):
@@ -748,7 +748,7 @@ class VIEW3D_MT_edit_CURVE_ctrlpoints(bpy.types.Menu):
 			layout.item_menu_enumO("curve.handle_type_set", "type")
 		
 class VIEW3D_MT_edit_CURVE_segments(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Segments"
 
 	def draw(self, context):
@@ -758,7 +758,7 @@ class VIEW3D_MT_edit_CURVE_segments(bpy.types.Menu):
 		layout.itemO("curve.switch_direction")
 
 class VIEW3D_MT_edit_CURVE_showhide(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Show/Hide"
 
 	def draw(self, context):
@@ -770,14 +770,14 @@ class VIEW3D_MT_edit_CURVE_showhide(bpy.types.Menu):
 
 # Edit SURFACE
 class VIEW3D_MT_edit_SURFACE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Surface"
 
 	draw = draw_CURVE
 
 # Edit TEXT
 class VIEW3D_MT_edit_TEXT(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Text"
 
 	def draw(self, context):
@@ -790,7 +790,7 @@ class VIEW3D_MT_edit_TEXT(bpy.types.Menu):
 		layout.itemM("VIEW3D_MT_edit_TEXT_chars")
 
 class VIEW3D_MT_edit_TEXT_chars(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Special Characters"
 
 	def draw(self, context):
@@ -825,7 +825,7 @@ class VIEW3D_MT_edit_TEXT_chars(bpy.types.Menu):
 
 # Edit META
 class VIEW3D_MT_edit_META(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Metaball"
 
 	def draw(self, context):
@@ -855,7 +855,7 @@ class VIEW3D_MT_edit_META(bpy.types.Menu):
 		layout.itemM("VIEW3D_MT_edit_META_showhide")
 
 class VIEW3D_MT_edit_META_showhide(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Show/Hide"
 
 	def draw(self, context):
@@ -867,7 +867,7 @@ class VIEW3D_MT_edit_META_showhide(bpy.types.Menu):
 
 # Edit LATTICE
 class VIEW3D_MT_edit_LATTICE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Lattice"
 
 	def draw(self, context):
@@ -888,7 +888,7 @@ class VIEW3D_MT_edit_LATTICE(bpy.types.Menu):
 
 # Edit ARMATURE
 class VIEW3D_MT_edit_ARMATURE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Armature"
 
 	def draw(self, context):
@@ -944,7 +944,7 @@ class VIEW3D_MT_edit_ARMATURE(bpy.types.Menu):
 		layout.item_menu_enumO("armature.flags_set", "mode", text="Bone Settings")
 
 class VIEW3D_MT_edit_ARMATURE_parent(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Parent"
 
 	def draw(self, context):
@@ -954,7 +954,7 @@ class VIEW3D_MT_edit_ARMATURE_parent(bpy.types.Menu):
 		layout.itemO("armature.parent_clear")
 
 class VIEW3D_MT_edit_ARMATURE_roll(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Bone Roll"
 
 	def draw(self, context):
@@ -970,8 +970,8 @@ class VIEW3D_MT_edit_ARMATURE_roll(bpy.types.Menu):
 # ********** Panel **********
 
 class VIEW3D_PT_3dview_properties(bpy.types.Panel):
-	__space_type__ = "VIEW_3D"
-	__region_type__ = "UI"
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'UI'
 	__label__ = "View"
 
 	def poll(self, context):
@@ -1002,8 +1002,8 @@ class VIEW3D_PT_3dview_properties(bpy.types.Panel):
 		layout.column().itemR(scene, "cursor_location", text="3D Cursor:")
 		
 class VIEW3D_PT_3dview_display(bpy.types.Panel):
-	__space_type__ = "VIEW_3D"
-	__region_type__ = "UI"
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'UI'
 	__label__ = "Display"
 
 	def poll(self, context):
@@ -1034,8 +1034,8 @@ class VIEW3D_PT_3dview_display(bpy.types.Panel):
 		col.itemR(view, "box_clip")
 	
 class VIEW3D_PT_background_image(bpy.types.Panel):
-	__space_type__ = "VIEW_3D"
-	__region_type__ = "UI"
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'UI'
 	__label__ = "Background Image"
 	__default_closed__ = True
 
diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 254fb3fd560..bbca43279a7 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -2,8 +2,8 @@
 import bpy
 
 class View3DPanel(bpy.types.Panel):
-	__space_type__ = "VIEW_3D"
-	__region_type__ = "TOOLS"
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'TOOLS'
 
 # ********** default tools for objectmode ****************
 
@@ -262,8 +262,8 @@ class VIEW3D_PT_tools_posemode(View3DPanel):
 # ********** default tools for paint modes ****************
 
 class PaintPanel(bpy.types.Panel):
-	__space_type__ = "VIEW_3D"
-	__region_type__ = "TOOLS"
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'TOOLS'
 
 	def paint_settings(self, context):
 		ts = context.tool_settings