theme: fixed theme issues