Catch up your colors branch. Also, deletes the strange subproject you have for no reason.

Be careful to check if this overrides any of your work (particularly in html/css files). Python file changes should merge fine.