fixing some bugs, adding additional themes