Adding theme support