More unification of menuelements and fix for screensing theme