Index: sansview/default_categories.p
===================================================================
--- sansview/default_categories.p	(revision cb9f50d6a59b39417a968598d08657d534de4bd0)
+++ sansview/default_categories.p	(revision ea5fa581cac321a89f39dd537af704582947a6a9)
@@ -6,5 +6,5 @@
 p2
 tRp3
-S'Spherical Shapes'
+S'Shapes'
 p4
 (lp5
@@ -13,5 +13,5 @@
 I01
 tp7
-a(S'MassFractalModel'
+a(S'CoreShellCylinderModel'
 p8
 I01
@@ -21,572 +21,280 @@
 I01
 tp11
+a(S'LamellarFFHGModel'
+p12
+I01
+tp13
+a(S'FCCrystalModel'
+p14
+I01
+tp15
 a(S'FuzzySphereModel'
-p12
-I01
-tp13
+p16
+I01
+tp17
+a(S'FlexCylEllipXModel'
+p18
+I01
+tp19
 a(S'BCCrystalModel'
-p14
-I01
-tp15
+p20
+I01
+tp21
+a(S'EllipticalCylinderModel'
+p22
+I01
+tp23
+a(S'CSParallelepipedModel'
+p24
+I01
+tp25
+a(S'OnionExpShellModel'
+p26
+I01
+tp27
+a(S'VesicleModel'
+p28
+I01
+tp29
+a(S'MultiShellModel'
+p30
+I01
+tp31
+a(S'LamellarPCrystalModel'
+p32
+I01
+tp33
+a(S'RaspBerryModel'
+p34
+I01
+tp35
+a(S'CoreShellEllipsoidModel'
+p36
+I01
+tp37
+a(S'CappedCylinderModel'
+p38
+I01
+tp39
+a(S'SphericalSLDModel'
+p40
+I01
+tp41
+a(S'StackedDisksModel'
+p42
+I01
+tp43
+a(S'LamellarPSHGModel'
+p44
+I01
+tp45
+a(S'CoreShellBicelleModel'
+p46
+I01
+tp47
+a(S'LamellarPSModel'
+p48
+I01
+tp49
+a(S'EllipsoidModel'
+p50
+I01
+tp51
+a(S'SphereModel'
+p52
+I01
+tp53
+a(S'ParallelepipedModel'
+p54
+I01
+tp55
+a(S'TriaxialEllipsoidModel'
+p56
+I01
+tp57
+a(S'LamellarModel'
+p58
+I01
+tp59
+a(S'CylinderModel'
+p60
+I01
+tp61
+a(S'BarBellModel'
+p62
+I01
+tp63
+a(S'BinaryHSModel'
+p64
+I01
+tp65
+a(S'FlexibleCylinderModel'
+p66
+I01
+tp67
+a(S'HollowCylinderModel'
+p68
+I01
+tp69
 a(S'SCCrystalModel'
-p16
-I01
-tp17
+p70
+I01
+tp71
+a(S'LinearPearlsModel'
+p72
+I01
+tp73
+a(S'CoreShellModel'
+p74
+I01
+tp75
+asS'Structure Factor'
+p76
+(lp77
+(S'SquareWellStructure'
+p78
+I01
+tp79
+a(S'HayterMSAStructure'
+p80
+I01
+tp81
+a(S'HardsphereStructure'
+p82
+I01
+tp83
+a(S'StickyHSStructure'
+p84
+I01
+tp85
+asS'Shape-Independent'
+p86
+(lp87
+(S'TwoPowerLawModel'
+p88
+I01
+tp89
+a(S'GelFitModel'
+p90
+I01
+tp91
+a(S'PowerLawAbsModel'
+p92
+I01
+tp93
+a(S'PorodModel'
+p94
+I01
+tp95
+a(S'MassFractalModel'
+p96
+I01
+tp97
+a(S'TeubnerStreyModel'
+p98
+I01
+tp99
+a(S'BEPolyelectrolyte'
+p100
+I01
+tp101
+a(S'DebyeModel'
+p102
+I01
+tp103
 a(S'MassSurfaceFractal'
-p18
-I01
-tp19
+p104
+I01
+tp105
+a(S'Poly_GaussCoil'
+p106
+I01
+tp107
 a(S'Core2ndMomentModel'
-p20
-I01
-tp21
-a(S'OnionExpShellModel'
-p22
-I01
-tp23
-a(S'MultiShellModel'
-p24
-I01
-tp25
-a(S'SphereModel'
-p26
-I01
-tp27
+p108
+I01
+tp109
+a(S'RPA10Model'
+p110
+I01
+tp111
+a(S'TwoLorentzianModel'
+p112
+I01
+tp113
+a(S'UnifiedPowerRgModel'
+p114
+I01
+tp115
+a(S'PolymerExclVolume'
+p116
+I01
+tp117
 a(S'GuinierModel'
-p28
-I01
-tp29
-a(S'SphericalSLDModel'
-p30
-I01
-tp31
+p118
+I01
+tp119
 a(S'GuinierPorodModel'
-p32
-I01
-tp33
+p120
+I01
+tp121
+a(S'CorrLengthModel'
+p122
+I01
+tp123
+a(S'StarPolymer'
+p124
+I01
+tp125
 a(S'FractalModel'
-p34
-I01
-tp35
-a(S'VesicleModel'
-p36
-I01
-tp37
+p126
+I01
+tp127
+a(S'PeakLorentzModel'
+p128
+I01
+tp129
+a(S'BroadPeakModel'
+p130
+I01
+tp131
+a(S'PeakGaussModel'
+p132
+I01
+tp133
 a(S'FractalCoreShellModel'
-p38
-I01
-tp39
-a(S'FCCrystalModel'
-p40
-I01
-tp41
-a(S'BinaryHSModel'
-p42
-I01
-tp43
+p134
+I01
+tp135
+a(S'DABModel'
+p136
+I01
+tp137
 a(S'SurfaceFractalModel'
-p44
-I01
-tp45
-a(S'LinearPearlsModel'
-p46
-I01
-tp47
-a(S'RaspBerryModel'
-p48
-I01
-tp49
-a(S'CoreShellModel'
-p50
-I01
-tp51
-asS'Gels'
-p52
-(lp53
-(g6
-I01
-tp54
-a(S'TwoPowerLawModel'
-p55
-I01
-tp56
-a(g8
-I01
-tp57
-a(g18
-I01
-tp58
-a(S'TwoLorentzianModel'
-p59
-I01
-tp60
-a(S'UnifiedPowerRgModel'
-p61
-I01
-tp62
-a(g32
-I01
-tp63
-a(S'CorrLengthModel'
-p64
-I01
-tp65
-a(S'BroadPeakModel'
-p66
-I01
-tp67
-a(S'DABModel'
-p68
-I01
-tp69
-a(g44
-I01
-tp70
-a(g46
-I01
-tp71
+p138
+I01
+tp139
 a(S'GaussLorentzGelModel'
-p72
-I01
-tp73
-asS'Peaks'
-p74
-(lp75
-(g6
-I01
-tp76
-a(S'LamellarPCrystalModel'
-p77
-I01
-tp78
-a(g14
-I01
-tp79
-a(g16
-I01
-tp80
-a(g59
-I01
-tp81
-a(g22
-I01
-tp82
-a(g24
-I01
-tp83
-a(S'StackedDisksModel'
-p84
-I01
-tp85
-a(S'LamellarPSHGModel'
-p86
-I01
-tp87
-a(S'PeakLorentzModel'
-p88
-I01
-tp89
-a(g66
-I01
-tp90
-a(S'PeakGaussModel'
-p91
-I01
-tp92
-a(g40
-I01
-tp93
+p140
+I01
+tp141
 a(S'LorentzModel'
-p94
-I01
-tp95
-asS'Two-Phase'
-p96
-(lp97
-(S'PorodModel'
-p98
-I01
-tp99
-a(g8
-I01
-tp100
-a(g18
-I01
-tp101
-a(g64
-I01
-tp102
-a(g34
-I01
-tp103
-a(g66
-I01
-tp104
-a(g38
-I01
-tp105
-a(g68
-I01
-tp106
-a(g44
-I01
-tp107
-a(g72
-I01
-tp108
-asS'Polymers'
-p109
-(lp110
-(g6
-I01
-tp111
-a(S'BEPolyelectrolyte'
-p112
-I01
-tp113
-a(g77
-I01
-tp114
-a(S'DebyeModel'
-p115
-I01
-tp116
-a(g14
-I01
-tp117
-a(g16
-I01
-tp118
-a(S'RPA10Model'
-p119
-I01
-tp120
-a(S'FlexCylEllipXModel'
-p121
-I01
-tp122
-a(S'PolymerExclVolume'
-p123
-I01
-tp124
-a(g86
-I01
-tp125
-a(S'LamellarPSModel'
-p126
-I01
-tp127
-a(S'LamellarModel'
-p128
-I01
-tp129
-a(S'Poly_GaussCoil'
-p130
-I01
-tp131
-a(S'FlexibleCylinderModel'
-p132
-I01
-tp133
-a(S'LamellarFFHGModel'
-p134
-I01
-tp135
-a(g46
-I01
-tp136
-a(g72
-I01
-tp137
-asS'Empirical'
-p138
-(lp139
-(g55
-I01
-tp140
-a(g98
-I01
-tp141
-a(g61
-I01
-tp142
-a(g28
+p142
 I01
 tp143
-a(g32
-I01
-tp144
-a(g64
-I01
-tp145
-a(g66
-I01
-tp146
-a(S'LineModel'
-p147
-I01
-tp148
-asS'Particles'
-p149
-(lp150
-(g6
+asS'Uncategorized'
+p144
+(lp145
+(S'LineModel'
+p146
+I01
+tp147
+a(S'ReflectivityModel'
+p148
+I01
+tp149
+a(S'ReflectivityIIModel'
+p150
 I01
 tp151
-a(S'HollowCylinderModel'
-p152
-I01
-tp153
-a(g8
-I01
-tp154
-a(g10
-I01
-tp155
-a(S'CSParallelepipedModel'
-p156
-I01
-tp157
-a(S'ParallelepipedModel'
-p158
-I01
-tp159
-a(g12
-I01
-tp160
-a(g77
-I01
-tp161
-a(S'EllipticalCylinderModel'
-p162
-I01
-tp163
-a(g14
-I01
-tp164
-a(g16
-I01
-tp165
-a(g18
-I01
-tp166
-a(g20
-I01
-tp167
-a(g121
-I01
-tp168
-a(g22
-I01
-tp169
-a(g24
-I01
-tp170
-a(g26
-I01
-tp171
-a(S'CoreShellEllipsoidModel'
-p172
-I01
-tp173
-a(g28
-I01
-tp174
-a(S'CappedCylinderModel'
-p175
-I01
-tp176
-a(S'CylinderModel'
-p177
-I01
-tp178
-a(g30
-I01
-tp179
-a(g32
-I01
-tp180
-a(g84
-I01
-tp181
-a(g86
-I01
-tp182
-a(g34
-I01
-tp183
-a(S'CoreShellBicelleModel'
-p184
-I01
-tp185
-a(g126
-I01
-tp186
-a(S'EllipsoidModel'
-p187
-I01
-tp188
-a(g36
-I01
-tp189
-a(S'TriaxialEllipsoidModel'
-p190
-I01
-tp191
-a(g128
-I01
-tp192
-a(g38
-I01
-tp193
-a(S'BarBellModel'
-p194
-I01
-tp195
-a(g40
-I01
-tp196
-a(g42
-I01
-tp197
-a(g132
-I01
-tp198
-a(g134
-I01
-tp199
-a(g44
-I01
-tp200
-a(g46
-I01
-tp201
-a(g48
-I01
-tp202
-a(g50
-I01
-tp203
-asS'Non-Spherical Shapes'
-p204
-(lp205
-(g6
-I01
-tp206
-a(g152
-I01
-tp207
-a(g156
-I01
-tp208
-a(g158
-I01
-tp209
-a(g77
-I01
-tp210
-a(g162
-I01
-tp211
-a(g121
-I01
-tp212
-a(g172
-I01
-tp213
-a(g28
-I01
-tp214
-a(g175
-I01
-tp215
-a(g177
-I01
-tp216
-a(g32
-I01
-tp217
-a(g84
-I01
-tp218
-a(g86
-I01
-tp219
-a(g184
-I01
-tp220
-a(g126
-I01
-tp221
-a(g187
-I01
-tp222
-a(g190
-I01
-tp223
-a(g128
-I01
-tp224
-a(g194
-I01
-tp225
-a(g132
-I01
-tp226
-a(g134
-I01
-tp227
-a(g46
-I01
-tp228
-asS'Uncategorized'
-p229
-(lp230
-(S'GelFitModel'
-p231
-I01
-tp232
-a(S'CoreShellCylinderModel'
-p233
-I01
-tp234
-a(S'PowerLawAbsModel'
-p235
-I01
-tp236
-a(S'TeubnerStreyModel'
-p237
-I01
-tp238
-a(S'SquareWellStructure'
-p239
-I01
-tp240
-a(S'FractalO_Z'
-p241
-I01
-tp242
-a(S'HayterMSAStructure'
-p243
-I01
-tp244
-a(S'StarPolymer'
-p245
-I01
-tp246
-a(S'ReflectivityModel'
-p247
-I01
-tp248
-a(S'HardsphereStructure'
-p249
-I01
-tp250
-a(S'ReflectivityIIModel'
-p251
-I01
-tp252
-a(S'StickyHSStructure'
-p253
-I01
-tp254
 as.
Index: sansview/sansview.py
===================================================================
--- sansview/sansview.py	(revision df7a7e3fc9ea2f467d069e36f0552fc12e622178)
+++ sansview/sansview.py	(revision ea5fa581cac321a89f39dd537af704582947a6a9)
@@ -14,5 +14,6 @@
 logging.basicConfig(level=logging.INFO,
                     format='%(asctime)s %(levelname)s %(message)s',
-                    filename=os.path.join(os.path.expanduser("~"),'sasview.log'))
+                    filename=os.path.join(os.path.expanduser("~"),
+                                          'sasview.log'))
 
 import wx
@@ -103,17 +104,5 @@
             logging.error(sys.exc_value)  
 
-        # initialize category stuff
-        user_file = os.path.join(os.path.expanduser("~"),
-                                 'serialized_categories.p')
         
-        if not os.path.isfile(user_file): 
-            # either first time starting sansview or the
-            # user has deleted their category file
-            my_dir = os.path.dirname(os.path.abspath(__file__))
-            default_file = os.path.join(my_dir, '..',
-                                        'sansmodels',
-                                        'default_categories.p' )
-            copy(default_file, user_file)
-
             
         # Add welcome page
Index: sansview/setup_exe.py
===================================================================
--- sansview/setup_exe.py	(revision df7a7e3fc9ea2f467d069e36f0552fc12e622178)
+++ sansview/setup_exe.py	(revision ea5fa581cac321a89f39dd537af704582947a6a9)
@@ -32,5 +32,6 @@
         sys.argv.remove('--extrapath')
 except:
-    print "Error processing extra python path needed to build SasView\n  %s" % sys.exc_value
+    print "Error processing extra python path needed to build SasView\n  %s" % \
+                sys.exc_value
 
 from distutils.core import setup
@@ -259,4 +260,8 @@
 if os.path.isfile(f):
     data_files.append(('.', [f]))
+
+f = 'default_categories.p'
+if os.path.isfile(f):
+    data_files.append(('.', [f]))
     
 if os.path.isfile("BUILD_NUMBER"):
Index: sansview/setup_mac.py
===================================================================
--- sansview/setup_mac.py	(revision df7a7e3fc9ea2f467d069e36f0552fc12e622178)
+++ sansview/setup_mac.py	(revision ea5fa581cac321a89f39dd537af704582947a6a9)
@@ -54,5 +54,6 @@
 
 APP = ['sansview.py']
-DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py']
+DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py',
+               'default_categories.p']
 if os.path.isfile("BUILD_NUMBER"):
     DATA_FILES.append("BUILD_NUMBER")
@@ -92,9 +93,4 @@
 
 EXTENSIONS_LIST = find_extension()
-
-#initialize category stuff
-from sans.guiframe.CategoryInstaller import CategoryInstaller
-CategoryInstaller.check_install()
-
 
  
