Re Do main theme files with my grid