Paper theme+tweaks
Fix merge