Expanding theme options, tweaking user roles

Some cleanup too