[WIP] Appearance fixes