decent design of theme, plus some renaming