Not bad ideas, but I think you need to work out what you mean by themed. If it's just decor, then it doesn't really impact on the hm's, but would we really want to watch them have a kitchen stacked with food in the name of gluttony, for example?

Maximum hardship on hm's should always be the priority, with threats remaining as such, and not a twice daily occurrence.