Actually fixed multiple themes this time