Changed to dark colors
Merge branch 'dark-colors'

Conflicts:
	screen.css