[ADDED] 1337 Color Scheme
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes.json