Added basic theme support