Minor changes

Theme supports and minor changes