Some fixes in editTheme