Restructuring theme
More customization, adding fields