forked from CringeStudios/element-desktop

And also 1) revert an accidental commit to the main config file, and 2) port over some forgotten things to the main config file
And also 1) revert an accidental commit to the main config file, and 2) port over some forgotten things to the main config file