Added dark/light themes; more Guava integration