Fixes & Theme changes