Reduced time taken processing theme by half