Merge pull request #1 from pupunussi/master

Added a color theme, which doesn't make my eyes bleed
Moved color defenitions into a separate folder
Minor fix
Merge remote-tracking branch 'upstream/master'