fix for registering scripts.

- mesh_surface_sketch.py
- render_renderfarmfi.py
- space_view3d_align_tools.py
- object_cloud_gen.py

also move bl_addon_info to the top for faster parsing.

32 files changed, 410 insertions, 488 deletions

diff --git a/add_curve_aceous_galore.py b/add_curve_aceous_galore.py
index e466fb53..ed03576d 100644
--- a/add_curve_aceous_galore.py
+++ b/add_curve_aceous_galore.py
@@ -16,7 +16,6 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-
 bl_addon_info = {
     'name': 'Add Curve: Curveaceous Galore!',
     'author': 'Jimmy Hazevoet, testscreenings',
diff --git a/add_curve_torus_knots.py b/add_curve_torus_knots.py
index 0a79b5a6..3d66e8ba 100644
--- a/add_curve_torus_knots.py
+++ b/add_curve_torus_knots.py
@@ -18,18 +18,16 @@
 
 
 bl_addon_info = {
-    'name': 'Add Curve: Torus Knots',
-    'author': 'testscreenings',
-    'version': '0.1',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Add > Curve',
-    'description': 'Adds many types of knots',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Curve/Torus_Knot',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=22403&group_id=153&atid=469',
-    'category': 'Add Curve'}
+    "name": "Add Curve: Torus Knots",
+    "author": "testscreenings",
+    "version": "0.1",
+    "blender": (2, 5, 3),
+    "location": "View3D > Add > Curve",
+    "description": "Adds many types of knots",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Curve/Torus_Knot",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22403&group_id=153&atid=469",
+    "category": "Add Curve"}
     
     
 ##------------------------------------------------------------
diff --git a/add_mesh_3d_function_surface.py b/add_mesh_3d_function_surface.py
index a8db8d36..e6fa89a8 100644
--- a/add_mesh_3d_function_surface.py
+++ b/add_mesh_3d_function_surface.py
@@ -16,6 +16,18 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+bl_addon_info = {
+    "name": "Add Mesh: 3D Function Surfaces",
+    "author": "Buerbaum Martin (Pontiac)",
+    "version": "0.3.5",
+    "blender": (2, 5, 3),
+    "location": "View3D > Add > Mesh > Z Function Surface & XYZ Function Surface",
+    "description": "Create Objects using Math Formulas",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Add_Mesh/Add_3d_Function_Surface",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21444&group_id=153&atid=469",
+    "category": "Add Mesh"}
+
 """
 Z Function Surface
 
@@ -81,25 +93,9 @@ v0.1 - Initial revision.
 More Links:
 http://gitorious.org/blender-scripts/blender-3d-function-surface
 http://blenderartists.org/forum/showthread.php?t=179043
-
 """
 
 
-bl_addon_info = {
-    'name': 'Add Mesh: 3D Function Surfaces',
-    'author': 'Buerbaum Martin (Pontiac)',
-    'version': '0.3.5',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Add > Mesh > Z Function Surface &' \
-        ' XYZ Function Surface',
-    'description': 'Create Objects using Math Formulas',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Add_Mesh/Add_3d_Function_Surface',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21444&group_id=153&atid=469',
-    'category': 'Add Mesh'}
-
 import bpy
 from mathutils import *
 from math import *
diff --git a/add_mesh_BoltFactory/__init__.py b/add_mesh_BoltFactory/__init__.py
index 7492ce38..d81d5d80 100644
--- a/add_mesh_BoltFactory/__init__.py
+++ b/add_mesh_BoltFactory/__init__.py
@@ -16,16 +16,15 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-
 bl_addon_info = {
-    'name': 'Add Mesh: BoltFactory',
-    'author': 'Aaron Keith',
-    'version': '3.9',
-    'blender': (2, 5, 3),
-    'location': 'add Mesh',
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Add_Mesh/BoltFactory',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?func=detail&aid=22842&group_id=153&atid=468',
-    'category': 'Add Mesh'}
+    "name": "Add Mesh: BoltFactory",
+    "author": "Aaron Keith",
+    "version": "3.9",
+    "blender": (2, 5, 3),
+    "location": "add Mesh",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Add_Mesh/BoltFactory",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22842&group_id=153&atid=468",
+    "category": "Add Mesh"}
 
 import bpy
 
diff --git a/add_mesh_ant_landscape.py b/add_mesh_ant_landscape.py
index c7b986a4..5f4cc8ec 100644
--- a/add_mesh_ant_landscape.py
+++ b/add_mesh_ant_landscape.py
@@ -17,18 +17,16 @@
 # ##### END GPL LICENSE BLOCK #####
 
 bl_addon_info = {
-    'name': 'Add Mesh: ANT Landscape',
-    'author': 'Jimmy Hazevoet',
-    'version': '0.1.0 July-2010',
-    'blender': (2, 5, 3),
-    'location': 'Add Mesh menu',
-    'description': 'Adds a landscape primitive',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?' \
-        'func=detail&aid=23130&group_id=153&atid=469',
-    'category': 'Add Mesh'}
+    "name": "Add Mesh: ANT Landscape",
+    "author": "Jimmy Hazevoet",
+    "version": "0.1.0 July-2010",
+    "blender": (2, 5, 3),
+    "location": "Add Mesh menu",
+    "description": "Adds a landscape primitive",
+    "warning": "", # used for warning icon and text in addons panel
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=23130&group_id=153&atid=469",
+    "category": "Add Mesh"}
 
 # import modules
 import bpy
diff --git a/add_mesh_extras.py b/add_mesh_extras.py
index 27f37531..c76cfce0 100644
--- a/add_mesh_extras.py
+++ b/add_mesh_extras.py
@@ -17,18 +17,16 @@
 # ##### END GPL LICENSE BLOCK #####
 
 bl_addon_info = {
-    'name': 'Add Mesh: Extras',
-    'author': 'Pontiac, Fourmadmen, meta-androcto',
-    'version': '0.3',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Add > Mesh > Extras',
-    'description': 'Adds Star, Wedge, Sqorus & Spindle objects.',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Add_Mesh/Add_Extra',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=22457&group_id=153&atid=469',
-    'category': 'Add Mesh'}
+    "name": "Add Mesh: Extras",
+    "author": "Pontiac, Fourmadmen, meta-androcto",
+    "version": "0.3",
+    "blender": (2, 5, 3),
+    "location": "View3D > Add > Mesh > Extras",
+    "description": "Adds Star, Wedge, Sqorus & Spindle objects.",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Add_Mesh/Add_Extra",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22457&group_id=153&atid=469",
+    "category": "Add Mesh"}
 
 import bpy
 from mathutils import *
diff --git a/add_mesh_gears.py b/add_mesh_gears.py
index 9e1991ba..bbb5a6b6 100644
--- a/add_mesh_gears.py
+++ b/add_mesh_gears.py
@@ -19,6 +19,18 @@
 #
 # ***** END GPL LICENCE BLOCK *****
 
+bl_addon_info = {
+    "name": "Add Mesh: Gears",
+    "author": "Michel J. Anders (varkenvarken)",
+    "version": "2.4.1",
+    "blender": (2, 5, 3),
+    "location": "View3D > Add > Mesh > Gears ",
+    "description": "Adds a mesh Gear to the Add Mesh menu",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Add_Mesh/Add_Gear",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21732&group_id=153&atid=469",
+    "category": "Add Mesh"}
+
 """
 What was needed to port it from 2.49 -> 2.50 alpha 0?
 
@@ -50,20 +62,6 @@ The code to actually implement the AddGear() function is mostly copied from
 add_mesh_torus() (distributed with Blender).
 """
 
-bl_addon_info = {
-    'name': 'Add Mesh: Gears',
-    'author': 'Michel J. Anders (varkenvarken)',
-    'version': '2.4.1',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Add > Mesh > Gears ',
-    'description': 'Adds a mesh Gear to the Add Mesh menu',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Add_Mesh/Add_Gear',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21732&group_id=153&atid=469',
-    'category': 'Add Mesh'}
-
 import bpy
 import mathutils
 from math import *
diff --git a/add_mesh_gemstones.py b/add_mesh_gemstones.py
index ad0177e6..645f509d 100644
--- a/add_mesh_gemstones.py
+++ b/add_mesh_gemstones.py
@@ -16,25 +16,23 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+bl_addon_info = {
+    "name": "Add Mesh: Gemstones",
+    "author": "Pontiac, Fourmadmen, Dreampainter",
+    "version": "0.3",
+    "blender": (2, 5, 3),
+    "location": "View3D > Add > Mesh > Gemstones",
+    "description": "Adds various gemstone (Diamond & Gem) meshes.",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Add_Mesh/Add_Gemstones",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21432&group_id=153&atid=469",
+    "category": "Add Mesh"}
+
 import bpy
 from mathutils import *
 from math import *
 from bpy.props import *
 
-bl_addon_info = {
-    'name': 'Add Mesh: Gemstones',
-    'author': 'Pontiac, Fourmadmen, Dreampainter',
-    'version': '0.3',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Add > Mesh > Gemstones',
-    'description': 'Adds various gemstone (Diamond & Gem) meshes.',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Add_Mesh/Add_Gemstones',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21432&group_id=153&atid=469',
-    'category': 'Add Mesh'}
-
 # calculates the matrix for the new object
 # depending on user pref
 def align_matrix(context):
diff --git a/add_mesh_pipe_joint.py b/add_mesh_pipe_joint.py
index f0f17300..3ebbf5d1 100644
--- a/add_mesh_pipe_joint.py
+++ b/add_mesh_pipe_joint.py
@@ -16,6 +16,18 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+bl_addon_info = {
+    "name": "Add Mesh: Pipe Joints",
+    "author": "Buerbaum Martin (Pontiac)",
+    "version": "0.10.5",
+    "blender": (2, 5, 3),
+    "location": "View3D > Add > Mesh > Pipe Joint",
+    "description": "Adds 5 pipe Joint types to the Add Mesh menu",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Add_Mesh/Add_Pipe_Joints",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21443&group_id=153&atid=469",
+    "category": "Add Mesh"}
+
 """
 Pipe Joints
 This script lets the user create various types of pipe joints.
@@ -105,20 +117,6 @@ rotation_matrix = mathutils.RotationMatrix(-math.pi/2, 4, 'x')
 mesh.transform(rotation_matrix)
 """
 
-bl_addon_info = {
-    'name': 'Add Mesh: Pipe Joints',
-    'author': 'Buerbaum Martin (Pontiac)',
-    'version': '0.10.5',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Add > Mesh > Pipe Joint',
-    'description': 'Adds 5 pipe Joint types to the Add Mesh menu',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Add_Mesh/Add_Pipe_Joints',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21443&group_id=153&atid=469',
-    'category': 'Add Mesh'}
-
 import bpy
 import mathutils
 from math import *
diff --git a/add_mesh_solid.py b/add_mesh_solid.py
index d0418dc3..28dfd28f 100644
--- a/add_mesh_solid.py
+++ b/add_mesh_solid.py
@@ -17,20 +17,17 @@
 #
 # ***** END GPL LICENCE BLOCK *****
 
-
 bl_addon_info = {
-    'name': 'Add Mesh: Regular Solids',
-    'author': 'DreamPainter',
-    'version': '1',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Add > Mesh > Regular Solids',
-    'description': 'Add a Regular Solid mesh.',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Add_Mesh/Add_Solid',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=22405&group_id=153&atid=469',
-    'category': 'Add Mesh'}
+    "name": "Add Mesh: Regular Solids",
+    "author": "DreamPainter",
+    "version": "1",
+    "blender": (2, 5, 3),
+    "location": "View3D > Add > Mesh > Regular Solids",
+    "description": "Add a Regular Solid mesh.",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Add_Mesh/Add_Solid",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22405&group_id=153&atid=469",
+    "category": "Add Mesh"}
 
 
 import bpy
diff --git a/add_mesh_twisted_torus.py b/add_mesh_twisted_torus.py
index 525832ff..f27ff25f 100644
--- a/add_mesh_twisted_torus.py
+++ b/add_mesh_twisted_torus.py
@@ -20,29 +20,26 @@
 #
 # ***** END GPL LICENCE BLOCK *****
 
-"""
+bl_addon_info = {
+    "name": "Add Mesh: Twisted Torus",
+    "author": "Paulo_Gomes",
+    "version": "0.11",
+    "blender": (2, 5, 3),
+    "location": "View3D > Add > Mesh ",
+    "description": "Adds a mesh Twisted Torus to the Add Mesh menu",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Add_Mesh/Add_Twisted_Torus",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21622&group_id=153&atid=469",
+    "category": "Add Mesh"}
 
+"""
 Usage:
 
 * Launch from Add Mesh menu
 
 * Modify parameters as desired or keep defaults
-
 """
 
-bl_addon_info = {
-    'name': 'Add Mesh: Twisted Torus',
-    'author': 'Paulo_Gomes',
-    'version': '0.11',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Add > Mesh ',
-    'description': 'Adds a mesh Twisted Torus to the Add Mesh menu',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Add_Mesh/Add_Twisted_Torus',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21622&group_id=153&atid=469',
-    'category': 'Add Mesh'}
 
 import bpy
 from bpy.props import *
diff --git a/curve_simplify.py b/curve_simplify.py
index bd7e6464..6d76c325 100644
--- a/curve_simplify.py
+++ b/curve_simplify.py
@@ -16,25 +16,22 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+bl_addon_info = {
+    "name": "Curve: simplify curves",
+    "author": "testscreenings",
+    "version": "1",
+    "blender": (2, 5, 3),
+    "location": "Toolshelf > search > simplify curves",
+    "description": "This script simplifies 3D curves and fcurves",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Curve/Curve_Simplify",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22327&group_id=153&atid=468",
+    "category": "Add Curve"}
+
 """
 This script simplifies Curves.
 """
 
-bl_addon_info = {
-    'name': 'Curve: simplify curves',
-    'author': 'testscreenings',
-    'version': '1',
-    'blender': (2, 5, 3),
-    'location': 'Toolshelf > search > simplify curves',
-    'description': 'This script simplifies 3D curves and fcurves',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Curve/Curve_Simplify',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=22327&group_id=153&atid=468',
-    'category': 'Add Curve'}
-
-
 ####################################################
 import bpy
 from bpy.props import *
diff --git a/io_anim_camera.py b/io_anim_camera.py
index 6ffa237e..12e0daed 100644
--- a/io_anim_camera.py
+++ b/io_anim_camera.py
@@ -19,18 +19,16 @@
 # <pep8 compliant>
 
 bl_addon_info = {
-    'name': 'Export: Camera Animation',
-    'author': 'Campbell Barton',
-    'version': '0.1',
-    'blender': (2, 5, 3),
-    'location': 'File > Export > Camera Animation',
-    'description': 'Export Cameras & Markers',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/File_I-O/Camera_Animation',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=22835&group_id=153&atid=469',
-    'category': 'Import/Export'}
+    "name": "Export: Camera Animation",
+    "author": "Campbell Barton",
+    "version": "0.1",
+    "blender": (2, 5, 3),
+    "location": "File > Export > Camera Animation",
+    "description": "Export Cameras & Markers",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/File_I-O/Camera_Animation",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22835&group_id=153&atid=469",
+    "category": "Import/Export"}
 
 
 import bpy
diff --git a/io_export_directx_x.py b/io_export_directx_x.py
index d561ecc6..986dfa4d 100644
--- a/io_export_directx_x.py
+++ b/io_export_directx_x.py
@@ -16,19 +16,16 @@
 #  ***** GPL LICENSE BLOCK *****
 
 bl_addon_info = {
-    'name': 'Export: DirectX Model Format (.x)',
-    'author': 'Chris Foster (Kira Vakaan)',
-    'version': '1.4',
-    'blender': (2, 5, 3),
-    'location': 'File > Export',
-    'description': 'Export to the DirectX Model Format (.x)',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/File_I-O/DirectX_Exporter',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=22795&group_id=153&atid=469',
-    'category': 'Import/Export'}
-
+    "name": "Export: DirectX Model Format (.x)",
+    "author": "Chris Foster (Kira Vakaan)",
+    "version": "1.4",
+    "blender": (2, 5, 3),
+    "location": "File > Export",
+    "description": "Export to the DirectX Model Format (.x)",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/File_I-O/DirectX_Exporter",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22795&group_id=153&atid=469",
+    "category": "Import/Export"}
 
 import os
 from math import radians
diff --git a/io_export_unreal_psk_psa.py b/io_export_unreal_psk_psa.py
index 58f473c8..52c06ca0 100644
--- a/io_export_unreal_psk_psa.py
+++ b/io_export_unreal_psk_psa.py
@@ -15,8 +15,19 @@
  #  All rights reserved.
  #  ***** GPL LICENSE BLOCK *****
 
-"""
+bl_addon_info = {
+    "name": "Export Skeleletal Mesh/Animation Data",
+    "author": "Darknet/Optimus_P-Fat/Active_Trash/Sinsoft",
+    "version": "2.0",
+    "blender": (2, 5, 3),
+    "location": "File > Export > Skeletal Mesh/Animation Data (.psk/.psa)",
+    "description": "Export Unreal Engine (.psk)",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/File_I-O/Unreal_psk_psa",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21366&group_id=153&atid=469",
+    "category": "Import/Export"}
 
+"""
 -- Unreal Skeletal Mesh and Animation Export (.psk  and .psa) export script v0.0.1 --<br> 
 
 - NOTES:
@@ -64,22 +75,6 @@ Credit to:
 - http://sinsoft.com
 """
 
-
-bl_addon_info = {
-    'name': 'Export Skeleletal Mesh/Animation Data',
-    'author': 'Darknet/Optimus_P-Fat/Active_Trash/Sinsoft',
-    'version': '2.0',
-    'blender': (2, 5, 3),
-    'location': 'File > Export > Skeletal Mesh/Animation Data (.psk/.psa)',
-    'description': 'Export Unreal Engine (.psk)',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/File_I-O/Unreal_psk_psa',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21366&group_id=153&atid=469',
-    'category': 'Import/Export'}
-
-
 import os
 import time
 import datetime
diff --git a/io_import_images_as_planes.py b/io_import_images_as_planes.py
index 0cfbf3bc..81618c9b 100644
--- a/io_import_images_as_planes.py
+++ b/io_import_images_as_planes.py
@@ -16,6 +16,18 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+bl_addon_info = {
+    "name": "Import: Images as Planes",
+    "author": "Florian Meyer (testscreenings)",
+    "version": "0.7",
+    "blender": (2, 5, 3),
+    "location": "File > Import > Images as Planes",
+    "description": "Imports images and creates planes with the appropiate aspect ratio. The images are mapped to the planes.",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Add_Mesh/Planes_from_Images",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21751&group_id=153&atid=469",
+    "category": "Import/Export"}
+
 """
 This script imports images and creates Planes with them as textures.
 At the moment the naming for objects, materials, textures and meshes
@@ -47,22 +59,6 @@ after importing 236 images.
 It also has an option to translate pixeldimensions into Blenderunits.
 """
 
-bl_addon_info = {
-    'name': 'Import: Images as Planes',
-    'author': 'Florian Meyer (testscreenings)',
-    'version': '0.7',
-    'blender': (2, 5, 3),
-    'location': 'File > Import > Images as Planes',
-    'description': 'Imports images and creates planes' \
-        ' with the appropiate aspect ratio.' \
-        ' The images are mapped to the planes.',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Add_Mesh/Planes_from_Images',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21751&group_id=153&atid=469',
-    'category': 'Import/Export'}
-
 import bpy
 from bpy.props import *
 from os import listdir
diff --git a/io_import_scene_mhx.py b/io_import_scene_mhx.py
index 9a2f712f..f2a3934e 100644
--- a/io_import_scene_mhx.py
+++ b/io_import_scene_mhx.py
@@ -1,3 +1,33 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+bl_addon_info = {
+    "name": "Import MakeHuman (.mhx)",
+    "author": "Thomas Larsson",
+    "version": "0.9, Make Human Alpha 5",
+    "blender": (2, 5, 3),
+    "location": "File > Import",
+    "description": "Import files in the MakeHuman eXchange format (.mhx)",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/File_I-O/Make_Human",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21872&group_id=153&atid=469",
+    "category": "Import/Export"}
+
 """ 
 **Project Name:**	  MakeHuman
 
@@ -19,20 +49,6 @@ Version 0.9
 
 """
 
-bl_addon_info = {
-    'name': 'Import MakeHuman (.mhx)',
-    'author': 'Thomas Larsson',
-    'version': '0.9, Make Human Alpha 5',
-    'blender': (2, 5, 3),
-    'location': 'File > Import',
-    'description': 'Import files in the MakeHuman eXchange format (.mhx)',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/File_I-O/Make_Human',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21872&group_id=153&atid=469',
-    'category': 'Import/Export'}
-
 """
 Place this file in the .blender/scripts/addons dir
 You have to activated the script in the "Add-Ons" tab (user preferences).
diff --git a/io_import_scene_unreal_psk.py b/io_import_scene_unreal_psk.py
index 584622e2..47145e1f 100644
--- a/io_import_scene_unreal_psk.py
+++ b/io_import_scene_unreal_psk.py
@@ -1,16 +1,32 @@
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# ##### BEGIN GPL LICENSE BLOCK #####
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+bl_addon_info = {
+    "name": "Import: Unreal Skeleton Mesh(.psk)",
+    "author": "Darknet",
+    "version": "2.0",
+    "blender": (2, 5, 3),
+    "location": "File > Import ",
+    "description": "Import Unreal Engine (.psk)",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/File_I-O/Unreal_psk_psa",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21366&group_id=153&atid=469",
+    "category": "Import/Export"}
 
 """
 Version': '2.0' ported by Darknet
@@ -26,21 +42,6 @@ Imports a *psk file to a new mesh
 -Export Text Log From Current Location File (Bool )
 """
 
-bl_addon_info = {
-    'name': 'Import: Unreal Skeleton Mesh(.psk)',
-    'author': 'Darknet',
-    'version': '2.0',
-    'blender': (2, 5, 3),
-    'location': 'File > Import ',
-    'description': 'Import Unreal Engine (.psk)',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/'\
-        'Scripts/File_I-O/Unreal_psk_psa',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21366&group_id=153&atid=469',
-    'category': 'Import/Export'}
-
-
 import bpy
 import mathutils
 import os
diff --git a/io_mesh_raw/__init__.py b/io_mesh_raw/__init__.py
index f2f8124a..2e4cf72f 100644
--- a/io_mesh_raw/__init__.py
+++ b/io_mesh_raw/__init__.py
@@ -17,18 +17,16 @@
 # ##### END GPL LICENSE BLOCK #####
 
 bl_addon_info = {
-    'name': 'Import/Export: Raw mesh',
-    'author': 'Anthony D,Agostino (Scorpius), Aurel Wildfellner',
-    'version': '0.2',
-    'blender': (2, 5, 3),
-    'location': 'File > Import/Export > Raw faces ',
-    'description': 'Import Raw Faces (.raw format)',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/File_I-O/Raw_Mesh_IO',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21733&group_id=153&atid=469',
-    'category': 'Import/Export'}
+    "name": "Import/Export: Raw mesh",
+    "author": "Anthony D,Agostino (Scorpius), Aurel Wildfellner",
+    "version": "0.2",
+    "blender": (2, 5, 3),
+    "location": "File > Import/Export > Raw faces ",
+    "description": "Import Raw Faces (.raw format)",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/File_I-O/Raw_Mesh_IO",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21733&group_id=153&atid=469",
+    "category": "Import/Export"}
 
 import bpy
 
diff --git a/io_mesh_stl/__init__.py b/io_mesh_stl/__init__.py
index 6a0154e6..04297d2c 100644
--- a/io_mesh_stl/__init__.py
+++ b/io_mesh_stl/__init__.py
@@ -16,6 +16,20 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+bl_addon_info = {
+    "name": "Import/Export: STL format",
+    "author": "Guillaume Bouchard (Guillaum)",
+    "version": "1",
+    "blender": (2, 5, 3),
+    "location": "File > Import/Export > Stl",
+    "description": "Import/Export Stl files",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/File I-O/STL",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22837&group_id=153&atid=469",
+    "category": "Import/Export"}
+
+# @todo write the wiki page
+
 """
 Import/Export STL files (binary or ascii)
 
@@ -33,20 +47,6 @@ Export:
     - Export only one object (the selected one)
 """
 
-bl_addon_info = {
-    'name': 'Import/Export: STL format',
-    'author': 'Guillaume Bouchard (Guillaum)',
-    'version': '1',
-    'blender': (2, 5, 3),
-    'location': 'File > Import/Export > Stl',
-    'description': 'Import/Export Stl files',
-    'warning': '', # used for warning icon and text in addons panel
-     'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/File I-O/STL',  # @todo write the page
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?' \
-        'func=detail&aid=22837&group_id=153&atid=469',
-    'category': 'Import/Export'}
-
 import bpy
 from bpy.props import *
 
diff --git a/mesh_relax.py b/mesh_relax.py
index affcbf05..cc752105 100644
--- a/mesh_relax.py
+++ b/mesh_relax.py
@@ -21,8 +21,19 @@
 #
 # ***** END GPL LICENCE BLOCK *****
 
-"""
+bl_addon_info = {
+    "name": "Mesh: Relax",
+    "author": "Fabian Fricke",
+    "version": "1.1  2010/04/22",
+    "blender": (2, 5, 3),
+    "location": "View3D > Specials > Relax ",
+    "description": "Relax the selected verts while retaining the shape",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Modeling/Relax",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21421&group_id=153&atid=469",
+    "category": "Mesh"}
 
+"""
 Usage:
 
 Launch from "W-menu" or from "Mesh -> Vertices -> Relax"
@@ -31,25 +42,9 @@ Launch from "W-menu" or from "Mesh -> Vertices -> Relax"
 Additional links:
     Author Site: http://frigi.designdevil.de
     e-mail: frigi.f {at} gmail {dot} com
-
 """
 
 
-bl_addon_info = {
-    'name': 'Mesh: Relax',
-    'author': 'Fabian Fricke',
-    'version': '1.1  2010/04/22',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Specials > Relax ',
-    'description': 'Relax the selected verts while retaining the shape',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Modeling/Relax',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21421&group_id=153&atid=469',
-    'category': 'Mesh'}
-
-
 import bpy
 from bpy.props import IntProperty
 
diff --git a/mesh_surface_sketch.py b/mesh_surface_sketch.py
index adaf3cf2..5f0035f2 100644
--- a/mesh_surface_sketch.py
+++ b/mesh_surface_sketch.py
@@ -16,42 +16,29 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-
 bl_addon_info = {
-    'name': 'Mesh: Surface Sketch',
-    'author': 'Eclectiel',
-    'version': '0.8 Beta',
-    'blender': (2, 5, 3),
-    'location': 'View3D > EditMode > ToolShelf',
-    'description': 'Draw meshes and re-topologies with Grease Pencil',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Mesh/Surface_Sketch',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=22062&group_id=153&atid=469',
-    'category': 'Mesh'}
+    "name": "Mesh: Surface Sketch",
+    "author": "Eclectiel",
+    "version": "0.8 Beta",
+    "blender": (2, 5, 3),
+    "location": "View3D > EditMode > ToolShelf",
+    "description": "Draw meshes and re-topologies with Grease Pencil",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Mesh/Surface_Sketch",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22062&group_id=153&atid=469",
+    "category": "Mesh"}
 
 
 import bpy
 import math
 
 from math import *
+   
 
-
-bpy.types.Scene.IntProperty(attr = "SURFSK_edges_U", name = "Cross", description = "Number of edge rings crossing the strokes (perpendicular to strokes direction)", default = 10, min = 0, max = 100000)
-bpy.types.Scene.IntProperty(attr = "SURFSK_edges_V", name = "Follow", description = "Number of edge rings following the strokes (parallel to strokes direction)", default = 10, min = 0, max = 100000)
-bpy.types.Scene.IntProperty(attr = "SURFSK_precision", name = "Precision", description = "Precision level of the surface calculation", default = 4, min = 0, max = 100000)
-bpy.types.Scene.BoolProperty(attr = "SURFSK_keep_strokes", name = "Keep strokes", description = "Keeps the sketched strokes after adding the surface", default = False)
-
-
-
-
-class View3DPanel(bpy.types.Panel):
+class VIEW3D_PT_tools_SURF_SKETCH(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'TOOLS'
-    
 
-class VIEW3D_PT_tools_SURF_SKETCH(View3DPanel):
     bl_context = "mesh_edit"
     bl_label = "Surface Sketching"
     
@@ -796,12 +783,22 @@ class GPENCIL_OT_SURFSK_strokes_to_curves(bpy.types.Operator):
         return {"FINISHED"}
 
 
-def register(): 
+def register():
+    bpy.types.Scene.IntProperty(attr = "SURFSK_edges_U", name = "Cross", description = "Number of edge rings crossing the strokes (perpendicular to strokes direction)", default = 10, min = 0, max = 100000)
+    bpy.types.Scene.IntProperty(attr = "SURFSK_edges_V", name = "Follow", description = "Number of edge rings following the strokes (parallel to strokes direction)", default = 10, min = 0, max = 100000)
+    bpy.types.Scene.IntProperty(attr = "SURFSK_precision", name = "Precision", description = "Precision level of the surface calculation", default = 4, min = 0, max = 100000)
+    bpy.types.Scene.BoolProperty(attr = "SURFSK_keep_strokes", name = "Keep strokes", description = "Keeps the sketched strokes after adding the surface", default = False)
+
     keymap_item_add_surf = bpy.data.window_managers[0].active_keyconfig.keymaps["3D View"].items.add("GPENCIL_OT_SURFSK_add_surface","E","PRESS", key_modifier="D")
     keymap_item_stroke_to_curve = bpy.data.window_managers[0].active_keyconfig.keymaps["3D View"].items.add("GPENCIL_OT_SURFSK_strokes_to_curves","C","PRESS", key_modifier="D")
 
 
-def unregister(): 
+def unregister():
+    bpy.types.Scene.RemoveProperty("SURFSK_edges_U")
+    bpy.types.Scene.RemoveProperty("SURFSK_edges_V")
+    bpy.types.Scene.RemoveProperty("SURFSK_precision")
+    bpy.types.Scene.RemoveProperty("SURFSK_keep_strokes")
+
     km = bpy.data.window_managers[0].active_keyconfig.keymaps["3D View"]
     for kmi in km.items:
         if kmi.idname == 'wm.call_menu':
diff --git a/object_add_chain.py b/object_add_chain.py
index 22f45e79..5c766af4 100644
--- a/object_add_chain.py
+++ b/object_add_chain.py
@@ -16,21 +16,17 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-
 bl_addon_info = {
-    'name': 'Object: Add Chain',
-    'author': 'Brian Hinton (Nichod)',
-    'version': '0.1',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Add > Mesh > Chain',
-    'description': 'Adds Chain with curve guide for easy creation',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Object/Add_Chain',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=22203&group_id=153&atid=469',
-    'category': 'Object'}
-
+    "name": "Object: Add Chain",
+    "author": "Brian Hinton (Nichod)",
+    "version": "0.1",
+    "blender": (2, 5, 3),
+    "location": "View3D > Add > Mesh > Chain",
+    "description": "Adds Chain with curve guide for easy creation",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Object/Add_Chain",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22203&group_id=153&atid=469",
+    "category": "Object"}
 
 import bpy
 
diff --git a/object_cloud_gen.py b/object_cloud_gen.py
index 8f82eb9f..884ef55a 100644
--- a/object_cloud_gen.py
+++ b/object_cloud_gen.py
@@ -16,6 +16,18 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+bl_addon_info = {
+    "name": "Object: Cloud Generator",
+    "author": "Nick Keeline(nrk)",
+    "version": "0.7",
+    "blender": (2, 5, 3),
+    "location": "Tool Shelf ",
+    "description": "Creates Volumetric Clouds",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Object/Cloud_Gen",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22015&group_id=153&atid=469",
+    "category": "Object"}
+
 """
 Place this file in the .blender/scripts/addons dir
 You have to activated the script in the "Add-Ons" tab (user preferences).
@@ -32,22 +44,6 @@ Rev 0.6 added poll function to operator, fixing crash with no selected objects
 Rev 0.7 added particles option and Type of Cloud wanted selector
 """
 
-
-bl_addon_info = {
-    'name': 'Object: Cloud Generator',
-    'author': 'Nick Keeline(nrk)',
-    'version': '0.7',
-    'blender': (2, 5, 3),
-    'location': 'Tool Shelf ',
-    'description': 'Creates Volumetric Clouds',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Object/Cloud_Gen',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=22015&group_id=153&atid=469',
-    'category': 'Object'}
-
-
 import bpy
 import mathutils
 from math import *
@@ -256,12 +252,11 @@ def degenerateCloud(obj):
 
     return False
 
-class View3DPanel(bpy.types.Panel):
+
+class VIEW3D_PT_tools_cloud(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'TOOLS'
 
-
-class VIEW3D_PT_tools_cloud(View3DPanel):
     bl_label = "Cloud Generator"
     bl_context = "objectmode"
 
diff --git a/object_fracture/__init__.py b/object_fracture/__init__.py
index 449baeae..eb821452 100644
--- a/object_fracture/__init__.py
+++ b/object_fracture/__init__.py
@@ -17,19 +17,16 @@
 # ##### END GPL LICENSE BLOCK #####
 
 bl_addon_info = {
-    'name': 'Object: Fracture Tools',
-    'author': 'pildanovak',
-    'version': '2.0',
-    'blender': (2, 5, 3),
-    'location': 'Fracture tools (Search > Fracture Object & ,' \
-        'Add -> Fracture Helper Objects',
-    'description': 'Fractured Object, Bomb, Projectile, Recorder',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Object/Fracture',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21793&group_id=153&atid=469',
-    'category': 'Object'}
+    "name": "Object: Fracture Tools",
+    "author": "pildanovak",
+    "version": "2.0",
+    "blender": (2, 5, 3),
+    "location": "Fracture tools (Search > Fracture Object & Add -> Fracture Helper Objects",
+    "description": "Fractured Object, Bomb, Projectile, Recorder",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Object/Fracture",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21793&group_id=153&atid=469",
+    "category": "Object"}
 
 
 import bpy
diff --git a/render_povray/__init__.py b/render_povray/__init__.py
index 19e61aaf..3e939a4b 100644
--- a/render_povray/__init__.py
+++ b/render_povray/__init__.py
@@ -17,18 +17,16 @@
 # ##### END GPL LICENSE BLOCK #####
 
 bl_addon_info = {
-    'name': 'Render:PovRay',
-    'author': 'Campbell Barton',
-    'version': '0.1',
-    'blender': (2, 5, 4),
-    'location': 'Info Header (engine dropdown)',
-    'description': 'Basic povray integration for blender',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Render/PovRay',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=23145&group_id=153&atid=469',
-    'category': 'Render'}
+    "name": "Render:PovRay",
+    "author": "Campbell Barton",
+    "version": "0.1",
+    "blender": (2, 5, 4),
+    "location": "Info Header (engine dropdown)",
+    "description": "Basic povray integration for blender",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Render/PovRay",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=23145&group_id=153&atid=469",
+    "category": "Render"}
 
 try:
     init_data
diff --git a/render_renderfarmfi.py b/render_renderfarmfi.py
index 7937cff4..737611bd 100644
--- a/render_renderfarmfi.py
+++ b/render_renderfarmfi.py
@@ -15,9 +15,23 @@
 #  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # ##### END GPL LICENSE BLOCK #####
-#
-# Copyright 2009-2010 Laurea University of Applied Sciences
-# Authors: Nathan Letwory, Jesse Kaukonen
+
+bl_addon_info = {
+    "name": "Render: Renderfarm.fi",
+    "author": "Nathan Letwory <nathan@letworyinteractive.com>, Jesse Kaukonen <jesse.kaukonen@gmail.com>",
+    "version": "2",
+    "blender": (2, 5, 3),
+    "location": "Render > Engine > Renderfarm.fi",
+    "description": "Send .blend as session to http://www.renderfarm.fi to render",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Render/Renderfarm.fi",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22927&group_id=153&atid=469",
+    "category": "Render"}
+
+"""
+Copyright 2009-2010 Laurea University of Applied Sciences
+Authors: Nathan Letwory, Jesse Kaukonen
+"""
 
 import bpy
 import hashlib
@@ -26,25 +40,11 @@ import xmlrpc.client
 import math
 from os.path import abspath, isabs, join, isfile
 
-bpy.CURRENT_VERSION = 2
+bpy.CURRENT_VERSION = int(bl_addon_info["version"])
 bpy.found_newer_version = False
 bpy.up_to_date = False
 bpy.download_location = 'http://www.renderfarm.fi/blender'
 
-bl_addon_info = {
-    'name': 'Render: Renderfarm.fi',
-    'author': 'Nathan Letwory <nathan@letworyinteractive.com>, Jesse Kaukonen <jesse.kaukonen@gmail.com>',
-    'version': "2",
-    'blender': (2, 5, 3),
-    'location': 'Render > Engine > Renderfarm.fi',
-    'description': 'Send .blend as session to http://www.renderfarm.fi to render',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Render/Renderfarm.fi',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=22927&group_id=153&atid=469',
-    'category': 'Render'}
-
 bpy.errorMessages = {
     'missing_desc': 'You need to enter a title, short and long description',
     'missing_creds': 'You haven\'t entered your credentials yet'
@@ -62,19 +62,14 @@ bpy.errors = []
 bpy.ore_sessions = []
 bpy.queue_selected = -1
 
-def rnaType(rna_type):
-	bpy.types.register(rna_type)
-	return rna_type
-
 def renderEngine(render_engine):
     bpy.types.register(render_engine)
     return render_engine
 
-@rnaType
+
 class ORESession(bpy.types.IDPropertyGroup):
     pass
 
-@rnaType
 class ORESettings(bpy.types.IDPropertyGroup):
     pass
 
@@ -150,7 +145,7 @@ for member in dir(properties_object):
     except:    pass
 del properties_object
 
-class RenderButtonsPanel(bpy.types.Panel):
+class RenderButtonsPanel():
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
     bl_context = "render"
@@ -172,7 +167,7 @@ class RENDERFARM_MT_Session(bpy.types.Menu):
         layout.separator()
         layout.operator('ore.cancelled_sessions')
 
-class LOGIN_PT_RenderfarmFi(RenderButtonsPanel):
+class LOGIN_PT_RenderfarmFi(RenderButtonsPanel, bpy.types.Panel):
     bl_label = 'Login to Renderfarm.fi'
     COMPAT_ENGINES = set(['RENDERFARMFI_RENDER'])
     def draw(self, context):
@@ -192,7 +187,7 @@ class LOGIN_PT_RenderfarmFi(RenderButtonsPanel):
             layout.label(text='E-mail and password entered.', icon='INFO')
             layout.operator('ore.change_user')
 
-class CHECK_PT_RenderfarmFi(RenderButtonsPanel):
+class CHECK_PT_RenderfarmFi(RenderButtonsPanel, bpy.types.Panel):
     bl_label = 'Check for updates'
     COMPAT_ENGINES = set(['RENDERFARMFI_RENDER'])
 
@@ -207,7 +202,7 @@ class CHECK_PT_RenderfarmFi(RenderButtonsPanel):
                 layout.label(text='You have the latest version')
             layout.operator('ore.check_update')
 
-class SESSIONS_PT_RenderfarmFi(RenderButtonsPanel):
+class SESSIONS_PT_RenderfarmFi(RenderButtonsPanel, bpy.types.Panel):
     bl_label = 'Sessions'
     COMPAT_ENGINES = set(['RENDERFARMFI_RENDER'])
 
@@ -228,7 +223,7 @@ class SESSIONS_PT_RenderfarmFi(RenderButtonsPanel):
         if bpy.queue_selected == 3:
             layout.operator('ore.cancel_session')
 
-class RENDER_PT_RenderfarmFi(RenderButtonsPanel):
+class RENDER_PT_RenderfarmFi(RenderButtonsPanel, bpy.types.Panel):
     bl_label = "Scene Settings"
     COMPAT_ENGINES = set(['RENDERFARMFI_RENDER'])
 
diff --git a/space_view3d_align_tools.py b/space_view3d_align_tools.py
index 5ce7bdbb..31a04d11 100644
--- a/space_view3d_align_tools.py
+++ b/space_view3d_align_tools.py
@@ -19,34 +19,29 @@
 #
 # ***** END GPL LICENCE BLOCK *****
 
-"""Align Selected Objects"""
-
 bl_addon_info = {
-    'name': '3D View: Align Tools',
-    'author': 'Gabriel Beaudin (gabhead)',
-    'version': '0.1',
-    'blender': (2, 5, 3),
-    'location': 'Tool Shelf',
-    'description': 'Align selected objects to the active object',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/3D interaction/Align_Tools',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid==22389&group_id=153&atid=468',
-    'category': '3D View'}
+    "name": "3D View: Align Tools",
+    "author": "Gabriel Beaudin (gabhead)",
+    "version": "0.1",
+    "blender": (2, 5, 3),
+    "location": "Tool Shelf",
+    "description": "Align selected objects to the active object",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/3D interaction/Align_Tools",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid==22389&group_id=153&atid=468",
+    "category": "3D View"}
+
+"""Align Selected Objects"""
 
 import bpy
 
-##interface
-######################
-class View3DPanel(bpy.types.Panel):
+
+class AlignUi(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'TOOLS'
 
-class AlignUi(View3DPanel):
     bl_label = "Align Tools"
     bl_context = "objectmode"
-    
 
     def draw(self, context):
         layout = self.layout
@@ -95,13 +90,6 @@ class AlignUi(View3DPanel):
         col.operator("object.AlignObjectsScaleAll",text="All")
 
 
-        
-    
-##Ops
-##################
-
-## Def
-
 ##Align all
 def main(context):
     for i in bpy.context.selected_objects:
diff --git a/space_view3d_materials_utils.py b/space_view3d_materials_utils.py
index 5da32b01..0cbfa0dd 100644
--- a/space_view3d_materials_utils.py
+++ b/space_view3d_materials_utils.py
@@ -22,6 +22,18 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+bl_addon_info = {
+    "name": "3D View: Material Utils",
+    "author": "michaelw",
+    "version": "1.3",
+    "blender": (2, 5, 3),
+    "location": "View3D > Q key",
+    "description": "Menu of material tools (assign, select by etc)  in the 3D View",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/3D interaction/Materials Utils",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22140&group_id=153&atid=469",
+    "category": "3D View"}
+
 """
 This script has several functions and operators... grouped for convenience
 * assign material:
@@ -47,21 +59,6 @@ This script has several functions and operators... grouped for convenience
 """
 
 
-bl_addon_info = {
-    'name': '3D View: Material Utils',
-    'author': 'michaelw',
-    'version': '1.3',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Q key',
-    'description': 'Menu of material tools (assign, select by etc)  in the 3D View',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/3D interaction/Materials Utils',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=22140&group_id=153&atid=469',
-    'category': '3D View'}
-
-
 import bpy
 from bpy.props import*
 
diff --git a/space_view3d_panel_measure.py b/space_view3d_panel_measure.py
index f5b06862..5a7c2cec 100644
--- a/space_view3d_panel_measure.py
+++ b/space_view3d_panel_measure.py
@@ -16,6 +16,17 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+bl_addon_info = {
+    "name": "3D View: Measure Panel",
+    "author": "Buerbaum Martin (Pontiac)",
+    "version": "0.7",
+    "blender": (2, 5, 3),
+    "location": "View3D > Properties > Measure",
+    "description": "Measure distances between objects",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/3D_interaction/Panel_Measure",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=21445&group_id=153&atid=469",
+    "category": "3D View"}
 
 """
 Measure panel
@@ -153,24 +164,8 @@ See the other "todo" comments below.
 More links:
 http://gitorious.org/blender-scripts/blender-measure-panel-script
 http://blenderartists.org/forum/showthread.php?t=177800
-
 """
 
-bl_addon_info = {
-    'name': '3D View: Measure panel',
-    'author': 'Buerbaum Martin (Pontiac)',
-    'version': '0.7',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Properties > Measure',
-    'description': 'Measure distances between objects',
-    'warning': '',  # Used for warning icon and text in addons panel.
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/3D_interaction/Panel_Measure',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=21445&group_id=153&atid=469',
-    'category': '3D View'}
-
-
 import bpy
 from bpy.props import *
 from mathutils import Vector, Matrix
diff --git a/space_view3d_property_chart.py b/space_view3d_property_chart.py
index ca650676..10aeba9b 100644
--- a/space_view3d_property_chart.py
+++ b/space_view3d_property_chart.py
@@ -18,21 +18,19 @@
 #
 # ***** END GPL LICENCE BLOCK *****
 
-"""List properties of selected objects"""
-
 bl_addon_info = {
-    'name': '3D View: Object Property Chart',
-    'author': 'Campbell Barton (ideasman42)',
-    'version': '0.1',
-    'blender': (2, 5, 3),
-    'location': 'Tool Shelf',
-    'description': 'Edit arbitrary selected properties for objects of the same type',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/3D interaction/Object Property Chart',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?' \
-        'func=detail&aid=22701&group_id=153&atid=469',
-    'category': '3D View'}
+    "name": "3D View: Object Property Chart",
+    "author": "Campbell Barton (ideasman42)",
+    "version": "0.1",
+    "blender": (2, 5, 3),
+    "location": "Tool Shelf",
+    "description": "Edit arbitrary selected properties for objects of the same type",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/3D interaction/Object Property Chart",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22701&group_id=153&atid=469",
+    "category": "3D View"}
+
+"""List properties of selected objects"""
 
 import bpy
 
diff --git a/space_view3d_spacebar_menu.py b/space_view3d_spacebar_menu.py
index 50f49dff..921c90b0 100644
--- a/space_view3d_spacebar_menu.py
+++ b/space_view3d_spacebar_menu.py
@@ -22,6 +22,18 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+bl_addon_info = {
+    "name": "3D View: Dynamic Spacebar Menu",
+    "author": "JayDez, sim88, meta-androcto", "sam"
+    "version": "1.5",
+    "blender": (2, 5, 3),
+    "location": "View3D > Spacebar",
+    "description": "Context sensitive spacebar menu",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/3D_interaction/Dynamic_Spacebar_Menu",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=22060&group_id=153&atid=469",
+    "category": "3D View"}
+
 """
 Dynamic Menu
 This adds a the Dynamic Spacebar Menu in the View3D.
@@ -47,21 +59,6 @@ v0.1 through 0.9 - various tests/contributions by various people and scripts
     Scripts: 3D Cursor Menu, Original Dynamic Menu
 """
 
-
-bl_addon_info = {
-    'name': '3D View: Dynamic Spacebar Menu',
-    'author': 'JayDez, sim88, meta-androcto', 'sam'
-    'version': '1.5',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Spacebar',
-    'description': 'Context sensitive spacebar menu',
-    'warning': '', # used for warning icon and text in addons panel
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/3D_interaction/Dynamic_Spacebar_Menu',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=22060&group_id=153&atid=469',
-    'category': '3D View'}
-
 import bpy
 from bpy import *
 from mathutils import Vector, Matrix