Fixed button contrast issues, resolves #93 and resolves #94
Merge pull request #138 from herrweis/master

Fixed button contrast issues, resolves #93 and resolves #94