Adding theme support
Adding GWT and GA output