More changes to the themes

Making the theme more presentable