Added initial theme support