fixed some bugs, added light theme