Revert "few theme fixes"

This reverts commit c94115e67483935ccba33a2097c7acfe8c406bb7.
Revert "Revert "few theme fixes""

This reverts commit 156ddb062be4ff13e33a9d71c8c0a705edc6b728.