Updated Views to use correct theme