Enhancements and further code cleaning
Inverted theme as per milestone 1