Fixes to allow more flexable themes, and trello updates