Color scheme changes and many updates