adding theme and some more changes