Production version theme 1.0

From beta to production version.
Cleaned up code