fixes and new theme