Merge settings fixes #33
Removed leftover statement
Merge pull request #34 from Label305/hotfix_default-colors

Merge settings fixes #33