Adding basic theme support