Dungeons and Themes refactor

- Changed some stuff