Fixed small freezing issue on loadup, fixed colors.
Merge pull request #162 from BJLTomr/master

Fixed freezing issues