More Changes and adjustment, vey much a work in progress
Merge branch 'master' of https://github.com/andyba45/theme.git