Fixes theme issues