fixes to flowtype and theme inclusion