added theme to calculation