Color scheme changes, minors fixes