Theme settings and fixes