             }
         }
 
-        former.append(sectionFormer: colorSection, generalSection)
+        former.append(sectionFormer: colorSection, turnOffSection)
     }
 
     override func didReceiveMemoryWarning() {

        let colorSection = SectionFormer(rowFormer: colorSelectionRow).set(headerViewFormer: createHeader(NSLocalizedString("SETTINGS_SEC_LIGHT", comment: "")))

        // -------------------------
        // General
        // -------------------------

        let doubleTapSwitchRow = SwitchRowFormer<FormSwitchCell>() {

            Settings.lockScreen = switched
        }

        var turnOffRows: [RowFormer]
        if Settings.timerEnable {
            turnOffRows = [doubleTapSwitchRow, timerEnableSwitchRow, timerDurationLabelRow, lockScreenSwitchRow]
        } else if Settings.doubleTap {
            turnOffRows = [doubleTapSwitchRow, timerEnableSwitchRow, lockScreenSwitchRow]
        } else {
            turnOffRows = [doubleTapSwitchRow, timerEnableSwitchRow]
        }
        let turnOffSection = SectionFormer(rowFormers: turnOffRows).set(headerViewFormer: createHeader(NSLocalizedString("SETTINGS_SEC_TURN_OFF", comment: "")))

        doubleTapSwitchRow.onSwitchChanged { [unowned self] switched in
            Settings.doubleTap = switched
