Fixed up theme
More themeage