Patch Changes #1212 7f9d5a00 Thanks @silesky! - Refactor settings #1212 7f9d5a00 Thanks @silesky! - Update types / variable names