theme fixes
merge resolved