Updated themes loading and the default theme