Merge some more items.  Try to fix the 'date' issue
Revert to more basic theme to get things working