Combine separate efforts for grid mixins into one, cleanup and reorganize
restore var to customizer
Merge commit 'a46003b8c7cc20bf4f72b7638a74643353ae047f'