revert some changes and start work on new colour scheme