moved everything back to theme except for the images so easier to update and manage