lotsa changes
working on theme