Done #19

Added theme support for this