Correct module dependencies; accidentally deleted color theme files reverted
Merge remote-tracking branch 'origin/master'