Minor refactoring.
Use compat theme.
Fixed lint problems.