Everything working, now to theme support