themes resolution problems fixed