Added caching of legacy capabilities
Merge branch 'master' into plugins
Only overwrite preferences with theme when them loaded, not on startup
Merge branch 'master' into plugins