Adding theme support

Working on theme support.