Theme fix

fixes #1999 
fixes #2003