misc changes
misc updates
converted theme system to json