point main site at berry theme
fix conflict in main class
header adjustments