Switched color and background
Merge branch 'dark-color-scheme'

Conflicts:
	style.css