Theme fixes
D entry
Theme fixes