Time passes by

As time passes by, a lot of edits are made to "configuration" files. We mass merge them here.