Fixed bugs with theme inclusion in themes list.