more improvements to self theme