Merge remote-tracking branch 'jon/jmtd/monochrome_theme'