moved base theme css
renamed android to android2
further work
added options