Closed #105 - Fixed theme bug and built out a more robust solution for handling library themes and a default theme