Fixing counter issue
Fixing issue with double parsing data store
Fixing locale test case
Adding first pass at theme task