Add better support for overriding system views and themes