Fixed some themeing