Moved themes activity to main code base
Tweaked version strings to better support multiple builds of same base version