diff --git a/MoppApp/MoppApp/DefaultsHelper.swift b/MoppApp/MoppApp/DefaultsHelper.swift
index cf8821d4f..9914df9d3 100644
--- a/MoppApp/MoppApp/DefaultsHelper.swift
+++ b/MoppApp/MoppApp/DefaultsHelper.swift
@@ -80,7 +80,6 @@ fileprivate let kSivaAccessState = "kSivaAccessState"
 fileprivate let kSivaUrl = "kSivaUrl"
 fileprivate let kSivaFileCertName = "kSivaFileCertName"
 fileprivate let kProxySetting = "kProxySetting"
-fileprivate let kIsProxyForSSLEnabled = "kIsProxyForSSLEnabled"
 fileprivate let kProxyHost = "kProxyHost"
 fileprivate let kProxyPort = "kProxyPort"
 fileprivate let kProxyUsername = "kProxyUsername"
@@ -93,8 +92,7 @@ class DefaultsHelper
                 kFirstStartKey: true,
                 kSettingsDefaultSwitchKey: true,
                 kMobileIdRememberMeKey: true,
-                kSmartIdRememberMeKey: true,
-                kIsProxyForSSLEnabled: true
+                kSmartIdRememberMeKey: true
             ]
         )
     }
@@ -364,15 +362,6 @@ class DefaultsHelper
         }
     }
     
-    class var isProxyForSSLEnabled: Bool {
-        set {
-            UserDefaults.standard.set(newValue, forKey: kIsProxyForSSLEnabled)
-        }
-        get {
-            return UserDefaults.standard.bool(forKey: kIsProxyForSSLEnabled)
-        }
-    }
-    
     class var proxyHost: String? {
         set {
             UserDefaults.standard.set(newValue, forKey: kProxyHost)
diff --git a/MoppApp/MoppApp/LocalizationKeys.swift b/MoppApp/MoppApp/LocalizationKeys.swift
index b61237e9e..429238cc3 100644
--- a/MoppApp/MoppApp/LocalizationKeys.swift
+++ b/MoppApp/MoppApp/LocalizationKeys.swift
@@ -324,7 +324,6 @@ enum LocKey : String
     case settingsProxyPort = "settings-proxy-port"
     case settingsProxyUsername = "settings-proxy-username"
     case settingsProxyPassword = "settings-proxy-password"
-    case settingsProxyAllowSSL = "settings-proxy-allow-ssl"
     case settingsSivaDefaultAccessTitle = "settings-siva-default-access-title"
     case settingsSivaDefaultManualAccessTitle = "settings-siva-default-manual-access-title"
     case settingsSivaDefaultCertificateTitle = "settings-siva-default-certificate-title"
@@ -496,6 +495,7 @@ enum LocKey : String
     case voiceControlRoleCountry = "voice-control-role-country";
     case voiceControlRoleZip = "voice-control-role-zip";
     case voiceControlRoleAndAddress = "voice-control-role-and-address";
+    case voiceControlSivaCategory = "voice-control-siva-category";
     case voiceControlSivaService = "voice-control-siva-service";
     case voiceControlSivaDefaultAccess = "voice-control-siva-default-access";
     case voiceControlSivaManualAccess = "voice-control-siva-manual-access";
diff --git a/MoppApp/MoppApp/ManualProxy.swift b/MoppApp/MoppApp/ManualProxy.swift
index d15b295a1..81e2f213a 100644
--- a/MoppApp/MoppApp/ManualProxy.swift
+++ b/MoppApp/MoppApp/ManualProxy.swift
@@ -32,12 +32,11 @@ public class ManualProxy {
             host: DefaultsHelper.proxyHost ?? "",
             port: DefaultsHelper.proxyPort,
             username: DefaultsHelper.proxyUsername ?? "",
-            password: KeychainUtil.retrieve(key: proxyPasswordKey) ?? "",
-            isSSLEnabled: DefaultsHelper.isProxyForSSLEnabled)
+            password: KeychainUtil.retrieve(key: proxyPasswordKey) ?? "")
     }
     
     public static func getMoppLibProxyConfiguration() -> MoppLibProxyConfiguration {
         let manualProxy = ManualProxy.getManualProxyConfiguration()
-        return MoppLibProxyConfiguration(configuration: manualProxy.host, port: NSNumber(value: manualProxy.port), username: manualProxy.username, password: manualProxy.password, issslenabled: manualProxy.isSSLEnabled)
+        return MoppLibProxyConfiguration(configuration: manualProxy.host, port: NSNumber(value: manualProxy.port), username: manualProxy.username, password: manualProxy.password)
     }
 }
diff --git a/MoppApp/MoppApp/ProxyViewController.swift b/MoppApp/MoppApp/ProxyViewController.swift
index 8d861dd07..23b28029f 100644
--- a/MoppApp/MoppApp/ProxyViewController.swift
+++ b/MoppApp/MoppApp/ProxyViewController.swift
@@ -22,10 +22,47 @@
  */
 
 import UIKit
+import SkSigningLib
 
-class ProxyViewController: MoppViewController {
-
-    @IBOutlet weak var tableView: UITableView!
+class ProxyViewController: MoppViewController, UITextFieldDelegate {
+    
+    @IBOutlet weak var scrollView: UIScrollView!
+    
+    @IBOutlet weak var proxyTitle: ScaledLabel!
+    @IBOutlet weak var dismissButton: ScaledButton!
+    
+    @IBOutlet weak var useNoProxyStackView: UIStackView!
+    @IBOutlet weak var useSystemProxyStackView: UIStackView!
+    @IBOutlet weak var useManualProxyStackView: UIStackView!
+    
+    @IBOutlet weak var useNoProxyView: UIView!
+    @IBOutlet weak var useSystemProxyView: UIView!
+    @IBOutlet weak var useManualProxyView: UIView!
+    
+    @IBOutlet weak var useNoProxyRadioButton: RadioButton!
+    @IBOutlet weak var useSystemProxyRadioButton: RadioButton!
+    @IBOutlet weak var useManualProxyRadioButton: RadioButton!
+    
+    @IBOutlet weak var useNoProxyLabel: ScaledLabel!
+    @IBOutlet weak var useSystemProxyLabel: ScaledLabel!
+    @IBOutlet weak var useManualProxyLabel: ScaledLabel!
+    
+    @IBOutlet weak var hostLabel: ScaledLabel!
+    @IBOutlet weak var hostTextField: SettingsTextField!
+    
+    @IBOutlet weak var portLabel: ScaledLabel!
+    @IBOutlet weak var portTextField: SettingsTextField!
+    @IBOutlet weak var portErrorLabel: ScaledLabel!
+    
+    @IBOutlet weak var usernameLabel: ScaledLabel!
+    @IBOutlet weak var usernameTextField: SettingsTextField!
+    
+    @IBOutlet weak var passwordLabel: ScaledLabel!
+    @IBOutlet weak var passwordTextField: SettingsTextField!
+    
+    @IBAction func dismissView(_ sender: ScaledButton) {
+        dismiss(animated: true)
+    }
     
     var currentlyEditingCell: IndexPath?
     var currentlyEditingField: UITextField?
@@ -51,71 +88,290 @@ class ProxyViewController: MoppViewController {
     }
     
     override func keyboardWillShow(notification: NSNotification) {
-        tableView.setContentOffset(CGPoint(x: 0, y: (currentlyEditingField?.frame.origin.y ?? 0)), animated: true)
+//        tableView.setContentOffset(CGPoint(x: 0, y: (currentlyEditingField?.frame.origin.y ?? 0)), animated: true)
     }
     
     override func keyboardWillHide(notification: NSNotification) {
-        tableView.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
+//        tableView.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
     }
-}
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
 
-extension ProxyViewController: UITableViewDelegate, UITableViewDataSource {
-    func numberOfSections(in tableView: UITableView) -> Int {
-        return sections.count
+        hostTextField.delegate = self
+        portTextField.delegate = self
+        usernameTextField.delegate = self
+        passwordTextField.delegate = self
+        
+        dismissButton.setTitle(L(.closeButton))
+        
+        useNoProxyLabel.text = L(.settingsProxyNoProxy)
+        useSystemProxyLabel.text = L(.settingsProxyUseSystem)
+        useManualProxyLabel.text = L(.settingsProxyUseManual)
+        
+        presentDismissButton(hostTextField)
+        presentDismissButton(portTextField)
+        presentDismissButton(usernameTextField)
+        presentDismissButton(passwordTextField)
+        
+        setBorder(hostTextField)
+        setBorder(portTextField)
+        setBorder(usernameTextField)
+        setBorder(passwordTextField)
+        
+        hostTextField.isAccessibilityElement = true
+        portTextField.isAccessibilityElement = true
+        usernameTextField.isAccessibilityElement = true
+        passwordTextField.isAccessibilityElement = true
+        
+        hostTextField.accessibilityLabel = L(.settingsProxyHost)
+        portTextField.accessibilityLabel = L(.settingsProxyPort)
+        usernameTextField.accessibilityLabel = L(.settingsProxyUsername)
+        passwordTextField.accessibilityLabel = L(.settingsProxyPassword)
+        
+        hostTextField.accessibilityUserInputLabels = [L(.voiceControlProxyHost)]
+        portTextField.accessibilityUserInputLabels = [L(.voiceControlProxyPort)]
+        usernameTextField.accessibilityUserInputLabels = [L(.voiceControlProxyUsername)]
+        passwordTextField.accessibilityUserInputLabels = [L(.voiceControlProxyPassword)]
+        
+        useNoProxyView.accessibilityUserInputLabels = [L(.voiceControlProxyNoProxy)]
+        useSystemProxyView.accessibilityUserInputLabels = [L(.voiceControlProxySystemProxy)]
+        useManualProxyView.accessibilityUserInputLabels = [L(.voiceControlProxyManualProxy)]
+        
+        guard let dismissButton = dismissButton, let proxyUITitle = proxyTitle, let noProxyUIView = useNoProxyStackView, let systemProxyUIView = useSystemProxyStackView, let manualProxyUIView = useManualProxyStackView, let hostUITextField: UITextField = hostTextField, let portUITextField = portTextField, let usernameUITextField = usernameTextField, let passwordUITextField = passwordTextField else {
+            printLog("Unable to get proxyTitle, useNoProxyView, useSystemProxyView, useManualProxyView, hostTextField, portTextField, usernameTextField, passwordTextField")
+            return
+        }
+        
+        if UIAccessibility.isVoiceOverRunning {
+            self.accessibilityElements = [proxyUITitle, dismissButton, noProxyUIView, systemProxyUIView, manualProxyUIView, hostUITextField, portUITextField, usernameUITextField, passwordUITextField]
+        }
+        
+        updateUI()
+    }
+    
+    func setAccessibilityElementsInStackView(stackView: UIStackView, isAccessibilityElement: Bool) {
+        for subview in stackView.arrangedSubviews {
+            subview.isAccessibilityElement = isAccessibilityElement
+        }
     }
     
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section_: Int) -> Int {
-        switch sections[section_] {
-        case .header:
-            return 1
-        case .fields:
-            return fields.count
+    
+    func handleProxySetting(proxySetting: ProxySetting) {
+        switch proxySetting {
+        case .noProxy:
+            self.useNoProxyRadioButton.setSelectedState(state: true)
+            self.useSystemProxyRadioButton.setSelectedState(state: false)
+            self.useManualProxyRadioButton.setSelectedState(state: false)
+            
+            DefaultsHelper.proxySetting = .noProxy
+            
+            self.hostTextField.isEnabled = false
+            self.portTextField.isEnabled = false
+            self.usernameTextField.isEnabled = false
+            self.passwordTextField.isEnabled = false
+            
+            self.hostTextField.textColor = .lightGray
+            self.portTextField.textColor = .lightGray
+            self.usernameTextField.textColor = .lightGray
+            self.passwordTextField.textColor = .lightGray
+            
+        case .systemProxy:
+            self.useNoProxyRadioButton.setSelectedState(state: false)
+            self.useSystemProxyRadioButton.setSelectedState(state: true)
+            self.useManualProxyRadioButton.setSelectedState(state: false)
+            
+            DefaultsHelper.proxySetting = .systemProxy
+            
+            self.hostTextField.isEnabled = false
+            self.portTextField.isEnabled = false
+            self.usernameTextField.isEnabled = false
+            self.passwordTextField.isEnabled = false
+            
+            self.hostTextField.textColor = .lightGray
+            self.portTextField.textColor = .lightGray
+            self.usernameTextField.textColor = .lightGray
+            self.passwordTextField.textColor = .lightGray
+            
+        case .manualProxy:
+            self.useNoProxyRadioButton.setSelectedState(state: false)
+            self.useSystemProxyRadioButton.setSelectedState(state: false)
+            self.useManualProxyRadioButton.setSelectedState(state: true)
+            
+            DefaultsHelper.proxySetting = .manualProxy
+            
+            self.hostTextField.isEnabled = true
+            self.portTextField.isEnabled = true
+            self.usernameTextField.isEnabled = true
+            self.passwordTextField.isEnabled = true
+            
+            self.hostTextField.textColor = .black
+            self.portTextField.textColor = .black
+            self.usernameTextField.textColor = .black
+            self.passwordTextField.textColor = .black
         }
     }
     
-    func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
-        return UITableView.automaticDimension
-    }
-    
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        tableView.estimatedRowHeight = 44
-        return UITableView.automaticDimension
-    }
-    
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        switch sections[indexPath.section] {
-        case .header:
-            let headerCell = tableView.dequeueReusableCell(withType: SettingsHeaderCell.self, for: indexPath)!
-            headerCell.delegate = self
-            headerCell.populate(with: " ")
-            headerCell.titleLabel.isAccessibilityElement = false
-            return headerCell
-        case .fields:
-            let field = fields[indexPath.row]
-            switch field {
-            case .proxy:
-                let proxyCell = tableView.dequeueReusableCell(withType: SettingsProxyCell.self, for: indexPath)!
-                proxyCell.topViewController = getTopViewController()
-                proxyCell.delegate = self
-                proxyCell.populate()
-                return proxyCell
+    @objc func handleState(_ sender: ProxyChoiceTapGestureRecognizer) {
+        handleProxySetting(proxySetting: sender.proxySetting)
+    }
+    
+    func updateUI() {
+        DispatchQueue.main.async {
+
+//            self.proxyChoicesStackView.isAccessibilityElement = false
+            
+//            self.setAccessibilityElementsInStackView(stackView: self.proxyChoicesStackView, isAccessibilityElement: true)
+            
+            let savedProxySetting = DefaultsHelper.proxySetting
+            self.useNoProxyRadioButton.setSelectedState(state: savedProxySetting == .noProxy)
+            self.useSystemProxyRadioButton.setSelectedState(state: savedProxySetting == .systemProxy)
+            self.useManualProxyRadioButton.setSelectedState(state: savedProxySetting == .manualProxy)
+            
+            self.hostTextField.text = DefaultsHelper.proxyHost
+            self.portTextField.text = String(DefaultsHelper.proxyPort)
+            self.usernameTextField.text = DefaultsHelper.proxyUsername
+            self.passwordTextField.text = KeychainUtil.retrieve(key: proxyPasswordKey) ?? ""
+            
+            // Detect which RadioButton was clicked
+            if !(self.useNoProxyView.gestureRecognizers?.contains(where: { $0 is ProxyChoiceTapGestureRecognizer }) ?? false) {
+                
+                let tapGesture = ProxyChoiceTapGestureRecognizer(target: self, action: #selector(self.handleState(_:)))
+                tapGesture.proxySetting = .noProxy
+                self.useNoProxyView.addGestureRecognizer(tapGesture)
+                self.useNoProxyView.isUserInteractionEnabled = true
+            }
+            
+            if !(self.useSystemProxyView.gestureRecognizers?.contains(where: { $0 is ProxyChoiceTapGestureRecognizer }) ?? false) {
+                
+                let tapGesture = ProxyChoiceTapGestureRecognizer(target: self, action: #selector(self.handleState(_:)))
+                tapGesture.proxySetting = .systemProxy
+                self.useSystemProxyView.addGestureRecognizer(tapGesture)
+                self.useSystemProxyView.isUserInteractionEnabled = true
             }
+            
+            if !(self.useManualProxyView.gestureRecognizers?.contains(where: { $0 is ProxyChoiceTapGestureRecognizer }) ?? false) {
+                let tapGesture = ProxyChoiceTapGestureRecognizer(target: self, action: #selector(self.handleState(_:)))
+                tapGesture.proxySetting = .manualProxy
+                self.useManualProxyView.addGestureRecognizer(tapGesture)
+                self.useManualProxyView.isUserInteractionEnabled = true
+            }
+            
+            if let number = Int(self.portTextField.text ?? ""), self.isPortNumberValid(portNumber: number) {
+                self.portErrorLabel.isHidden = true
+            } else {
+                self.portErrorLabel.isHidden = false
+            }
+            
+            self.useNoProxyView.isAccessibilityElement = true
+            self.useSystemProxyView.isAccessibilityElement = true
+            self.useManualProxyView.isAccessibilityElement = true
+            
+            self.useNoProxyView.accessibilityLabel = L(.settingsProxyNoProxy)
+            self.useSystemProxyView.accessibilityLabel = L(.settingsProxyUseSystem)
+            self.useManualProxyView.accessibilityLabel = L(.settingsProxyUseManual)
+            
+            self.proxyTitle.text = L(.settingsProxyTitle)
+            
+            self.useNoProxyLabel.text = L(.settingsProxyNoProxy)
+            self.useSystemProxyLabel.text = L(.settingsProxyUseSystem)
+            self.useManualProxyLabel.text = L(.settingsProxyUseManual)
+            
+            self.hostLabel.text = L(.settingsProxyHost)
+            self.portLabel.text = L(.settingsProxyPort)
+            self.usernameLabel.text = L(.settingsProxyUsername)
+            self.passwordLabel.text = L(.settingsProxyPassword)
+            
+            self.handleProxySetting(proxySetting: savedProxySetting)
         }
     }
     
-    @objc func editingChanged(sender: UITextField) {
-        let text = sender.text ?? String()
-        if (text.count > 11) {
-            sender.deleteBackward()
+    func presentDismissButton(_ textField: SettingsTextField) {
+        textField.moppPresentDismissButton()
+    }
+    
+    func setBorder(_ textField: SettingsTextField) {
+        textField.layer.borderColor = UIColor.moppContentLine.cgColor
+        textField.layer.borderWidth = 1
+    }
+    
+    func isPortNumberValid(portNumber: Int) -> Bool {
+        return (1...65535).contains(portNumber)
+    }
+    
+    deinit {
+        let savedProxySetting = DefaultsHelper.proxySetting
+        if savedProxySetting == .noProxy || savedProxySetting == .systemProxy {
+            DefaultsHelper.proxyHost = ""
+            DefaultsHelper.proxyPort = 80
+            DefaultsHelper.proxyUsername = ""
+            KeychainUtil.remove(key: proxyPasswordKey)
         }
+        printLog("Deinit SettingsProxyCell")
     }
+    
+    
+    
+    
 }
 
-extension ProxyViewController: SettingsHeaderCellDelegate {
-    func didDismissSettings() {
-        dismiss(animated: true, completion: nil)
-    }
-}
+//extension ProxyViewController: UITableViewDelegate, UITableViewDataSource {
+//    func numberOfSections(in tableView: UITableView) -> Int {
+//        return sections.count
+//    }
+//    
+//    func tableView(_ tableView: UITableView, numberOfRowsInSection section_: Int) -> Int {
+//        switch sections[section_] {
+//        case .header:
+//            return 1
+//        case .fields:
+//            return fields.count
+//        }
+//    }
+//    
+//    func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
+//        return UITableView.automaticDimension
+//    }
+//    
+//    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+//        tableView.estimatedRowHeight = 44
+//        return UITableView.automaticDimension
+//    }
+//    
+//    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+//        switch sections[indexPath.section] {
+//        case .header:
+//            let headerCell = tableView.dequeueReusableCell(withType: SettingsHeaderCell.self, for: indexPath)!
+//            headerCell.delegate = self
+//            headerCell.populate(with: " ")
+//            headerCell.titleLabel.isAccessibilityElement = false
+//            return headerCell
+//        case .fields:
+//            let field = fields[indexPath.row]
+//            switch field {
+//            case .proxy:
+//                let proxyCell = tableView.dequeueReusableCell(withType: SettingsProxyCell.self, for: indexPath)!
+//                proxyCell.topViewController = getTopViewController()
+//                proxyCell.delegate = self
+//                proxyCell.populate()
+//                return proxyCell
+//            }
+//        }
+//    }
+//    
+//    @objc func editingChanged(sender: UITextField) {
+//        let text = sender.text ?? String()
+//        if (text.count > 11) {
+//            sender.deleteBackward()
+//        }
+//    }
+//}
+
+//extension ProxyViewController: SettingsHeaderCellDelegate {
+//    func didDismissSettings() {
+//        dismiss(animated: true, completion: nil)
+//    }
+//}
 
 extension ProxyViewController: SettingsCellDelegate {
     func didStartEditingField(_ field: SigningCategoryViewController.FieldId, _ textField: UITextField) {
diff --git a/MoppApp/MoppApp/Settings.storyboard b/MoppApp/MoppApp/Settings.storyboard
index cdc782e56..c63912dad 100644
--- a/MoppApp/MoppApp/Settings.storyboard
+++ b/MoppApp/MoppApp/Settings.storyboard
@@ -354,7 +354,7 @@
                                                     </connections>
                                                 </button>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Signing" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L1n-Zk-qYP" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                    <rect key="frame" x="68" y="19" width="239" height="25"/>
+                                                    <rect key="frame" x="68" y="19" width="239" height="24.5"/>
                                                     <accessibility key="accessibilityConfiguration">
                                                         <accessibilityTraits key="traits" staticText="YES" header="YES"/>
                                                     </accessibility>
@@ -429,7 +429,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Riigikood ja telefoninumber" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Z7D-ta-nx1" customClass="SettingsTextField" customModule="MoppApp" customModuleProvider="target">
-                                                    <rect key="frame" x="16" y="33" width="343" height="55"/>
+                                                    <rect key="frame" x="16" y="32.5" width="343" height="55"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="55" id="L44-FB-3Jm"/>
                                                     </constraints>
@@ -643,8 +643,10 @@
                                         </tableViewCellContentView>
                                         <connections>
                                             <outlet property="addCertificateButton" destination="cFb-hX-TwM" id="27o-P6-PK9"/>
+                                            <outlet property="addCertificateView" destination="sWS-au-FW0" id="Gm5-kO-VB6"/>
                                             <outlet property="issuedToLabel" destination="voq-iF-93i" id="s2J-Go-vUW"/>
                                             <outlet property="showCertificateButton" destination="wv3-Pr-pcK" id="Z0S-K8-gWd"/>
+                                            <outlet property="showCertificateView" destination="Ymv-dq-7s9" id="cH9-3B-qZD"/>
                                             <outlet property="titleLabel" destination="7Ie-ku-FHx" id="sdF-vp-TJS"/>
                                             <outlet property="tsaCertButtonsStackView" destination="78j-1y-gDa" id="MUN-3a-7ez"/>
                                             <outlet property="tsaCertLabelStackView" destination="zJd-sR-fMw" id="iw7-hZ-idv"/>
@@ -657,11 +659,11 @@
                                         <rect key="frame" x="0.0" y="720" width="375" height="44.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="yL6-qI-X4y" id="aUH-yJ-MbO">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="SuL-cB-x1x">
-                                                    <rect key="frame" x="16" y="0.0" width="339" height="45"/>
+                                                    <rect key="frame" x="16" y="0.0" width="339" height="44.5"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Use Default Title Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.10000000149011612" translatesAutoresizingMaskIntoConstraints="NO" id="zXA-MT-z1o" userLabel="Use Default Title Label" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
                                                             <rect key="frame" x="0.0" y="13.5" width="151.5" height="17.5"/>
@@ -785,10 +787,11 @@
                                         </tableViewCellContentView>
                                         <connections>
                                             <outlet property="accessToSivaButton" destination="eN9-Zy-JX7" id="CI3-Sx-hvL"/>
+                                            <outlet property="accessToSivaView" destination="0Bd-xr-R9R" id="s2l-oa-pIe"/>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="ProxyCategoryCell" rowHeight="91" id="ARu-Em-l81" customClass="ProxyCategoryCell" customModule="MoppApp" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="898.5" width="375" height="91"/>
+                                        <rect key="frame" x="0.0" y="946.5" width="375" height="91"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ARu-Em-l81" id="Svf-VH-gwP">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="91"/>
@@ -855,10 +858,10 @@
                                         <rect key="frame" x="0.0" y="0.0" width="305" height="557"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jFM-GL-q92" userLabel="ContentView">
-                                                <rect key="frame" x="0.0" y="0.0" width="305" height="557"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="305" height="573"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RvG-jV-rQd">
-                                                        <rect key="frame" x="16" y="20" width="273" height="537"/>
+                                                        <rect key="frame" x="16" y="20" width="273" height="553"/>
                                                         <subviews>
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="buA-aM-pT8">
                                                                 <rect key="frame" x="0.0" y="0.0" width="273" height="41"/>
@@ -1119,14 +1122,14 @@
                                                                 </subviews>
                                                             </stackView>
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hIc-7v-ev5">
-                                                                <rect key="frame" x="0.0" y="533" width="273" height="5"/>
+                                                                <rect key="frame" x="0.0" y="533" width="273" height="0.0"/>
                                                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                             </view>
                                                         </subviews>
                                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                         <constraints>
                                                             <constraint firstItem="TAN-8G-AdX" firstAttribute="leading" secondItem="RvG-jV-rQd" secondAttribute="leading" id="24g-Wp-poe"/>
-                                                            <constraint firstAttribute="bottom" secondItem="hIc-7v-ev5" secondAttribute="bottom" constant="-1" id="6eE-bB-qnP"/>
+                                                            <constraint firstAttribute="bottom" secondItem="hIc-7v-ev5" secondAttribute="bottom" constant="20" id="6eE-bB-qnP"/>
                                                             <constraint firstItem="ASi-WE-Qem" firstAttribute="top" secondItem="nZu-Qq-NW2" secondAttribute="bottom" constant="20" id="BGc-xL-flw"/>
                                                             <constraint firstItem="buA-aM-pT8" firstAttribute="leading" secondItem="RvG-jV-rQd" secondAttribute="leading" id="BnZ-fm-Dir"/>
                                                             <constraint firstAttribute="trailing" secondItem="hIc-7v-ev5" secondAttribute="trailing" id="MDB-d9-lw7"/>
@@ -1184,11 +1187,13 @@
                     </view>
                     <connections>
                         <outlet property="addCertificateButton" destination="gKn-rI-2Ez" id="8MB-S0-Ekn"/>
+                        <outlet property="addCertificateView" destination="mbX-HF-CPZ" id="ab6-Ld-5o7"/>
                         <outlet property="certificateStackView" destination="ASi-WE-Qem" id="1xa-fL-ieb"/>
                         <outlet property="dismissButton" destination="xFo-aA-XAx" id="lRi-xH-ZR0"/>
                         <outlet property="issuedToLabel" destination="Jdh-rJ-Aio" id="Apg-jJ-u97"/>
                         <outlet property="scrollView" destination="FWS-nn-f5v" id="EtO-Ya-R6l"/>
                         <outlet property="showCertificateButton" destination="trs-js-YpG" id="MIe-Uk-bpo"/>
+                        <outlet property="showCertificateView" destination="Oqa-rv-d25" id="pK8-XY-SrL"/>
                         <outlet property="signatureValidationTitle" destination="nPK-Qv-jTV" id="NQ7-de-h8l"/>
                         <outlet property="sivaUrlTextField" destination="nZu-Qq-NW2" id="P4A-Li-Wyg"/>
                         <outlet property="useDefaultAccessLabel" destination="VSd-6G-kfW" id="Ews-rV-43t"/>
@@ -1207,482 +1212,6 @@
             </objects>
             <point key="canvasLocation" x="2477.5999999999999" y="-1376.7616191904049"/>
         </scene>
-        <!--Proxy View Controller-->
-        <scene sceneID="PWe-ZJ-cbi">
-            <objects>
-                <viewController storyboardIdentifier="ProxyViewController" id="l9s-br-m11" customClass="ProxyViewController" customModule="MoppApp" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="9u2-4V-bgL">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wp3-ni-L4Z">
-                                <rect key="frame" x="35" y="133.5" width="306" height="400"/>
-                                <subviews>
-                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="9ni-gT-4A8">
-                                        <rect key="frame" x="0.0" y="0.0" width="306" height="400"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <prototypes>
-                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="SettingsHeaderCell" rowHeight="70" id="3qr-8c-b2D" customClass="SettingsHeaderCell" customModule="MoppApp" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="50" width="306" height="70"/>
-                                                <autoresizingMask key="autoresizingMask"/>
-                                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3qr-8c-b2D" id="lsF-4Z-H1t">
-                                                    <rect key="frame" x="0.0" y="0.0" width="306" height="70"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <subviews>
-                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aK1-rc-wIZ">
-                                                            <rect key="frame" x="246" y="11" width="44" height="44"/>
-                                                            <constraints>
-                                                                <constraint firstAttribute="height" constant="44" id="VDV-gI-17q"/>
-                                                                <constraint firstAttribute="width" constant="44" id="vxP-Y5-B99"/>
-                                                            </constraints>
-                                                            <color key="tintColor" name="MoppTitle"/>
-                                                            <state key="normal" image="DismissPopup"/>
-                                                            <connections>
-                                                                <action selector="dismissAction" destination="3qr-8c-b2D" eventType="touchUpInside" id="ve1-ey-n5v"/>
-                                                            </connections>
-                                                        </button>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Settings" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ToC-MC-0WJ" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                            <rect key="frame" x="68" y="19" width="170" height="24.5"/>
-                                                            <accessibility key="accessibilityConfiguration">
-                                                                <accessibilityTraits key="traits" staticText="YES" header="YES"/>
-                                                            </accessibility>
-                                                            <fontDescription key="fontDescription" name="Roboto-Bold" family="Roboto" pointSize="21"/>
-                                                            <color key="textColor" name="MoppTitle"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                    </subviews>
-                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                    <constraints>
-                                                        <constraint firstItem="ToC-MC-0WJ" firstAttribute="trailing" secondItem="lsF-4Z-H1t" secondAttribute="trailingMargin" constant="-52" id="5RI-Yp-VdV"/>
-                                                        <constraint firstAttribute="bottomMargin" relation="greaterThanOrEqual" secondItem="ToC-MC-0WJ" secondAttribute="bottom" constant="4" id="6j6-WH-oji"/>
-                                                        <constraint firstItem="ToC-MC-0WJ" firstAttribute="leading" secondItem="lsF-4Z-H1t" secondAttribute="leadingMargin" constant="52" id="8Ry-pk-apb"/>
-                                                        <constraint firstAttribute="trailingMargin" secondItem="aK1-rc-wIZ" secondAttribute="trailing" id="LR6-ew-cgK"/>
-                                                        <constraint firstItem="ToC-MC-0WJ" firstAttribute="top" secondItem="lsF-4Z-H1t" secondAttribute="topMargin" constant="8" id="QCk-4u-nEU"/>
-                                                        <constraint firstItem="aK1-rc-wIZ" firstAttribute="top" secondItem="lsF-4Z-H1t" secondAttribute="topMargin" id="c4t-wt-lsX"/>
-                                                    </constraints>
-                                                </tableViewCellContentView>
-                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                <connections>
-                                                    <outlet property="dismissButton" destination="aK1-rc-wIZ" id="bDb-Hj-b8Q"/>
-                                                    <outlet property="titleLabel" destination="ToC-MC-0WJ" id="0pX-ro-MeO"/>
-                                                </connections>
-                                            </tableViewCell>
-                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SettingsProxyCell" id="nCX-OJ-SsY" customClass="SettingsProxyCell" customModule="MoppApp" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="120" width="306" height="782"/>
-                                                <autoresizingMask key="autoresizingMask"/>
-                                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="nCX-OJ-SsY" id="NOv-Hk-gQ0">
-                                                    <rect key="frame" x="0.0" y="0.0" width="306" height="782"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <subviews>
-                                                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="7Nj-qK-otF">
-                                                            <rect key="frame" x="16" y="0.0" width="274" height="782"/>
-                                                            <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Proxy" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yzw-8h-bVl" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="274" height="20.5"/>
-                                                                    <accessibility key="accessibilityConfiguration">
-                                                                        <accessibilityTraits key="traits" staticText="YES" header="YES"/>
-                                                                    </accessibility>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                    <color key="textColor" name="MoppLabel"/>
-                                                                    <nil key="highlightedColor"/>
-                                                                </label>
-                                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="RhP-AD-eLt">
-                                                                    <rect key="frame" x="0.0" y="40.5" width="274" height="180"/>
-                                                                    <subviews>
-                                                                        <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="0nk-PZ-Vuh">
-                                                                            <rect key="frame" x="0.0" y="0.0" width="274" height="50"/>
-                                                                            <subviews>
-                                                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8vx-QQ-WSe">
-                                                                                    <rect key="frame" x="0.0" y="0.0" width="274" height="50"/>
-                                                                                    <subviews>
-                                                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FOf-vD-I2B">
-                                                                                            <rect key="frame" x="0.0" y="0.0" width="24" height="50"/>
-                                                                                            <subviews>
-                                                                                                <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9NR-y4-wM2" customClass="RadioButton" customModule="MoppApp" customModuleProvider="target">
-                                                                                                    <rect key="frame" x="0.0" y="0.0" width="24" height="50"/>
-                                                                                                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                                                                                    <accessibility key="accessibilityConfiguration">
-                                                                                                        <accessibilityTraits key="traits" button="YES"/>
-                                                                                                        <bool key="isElement" value="YES"/>
-                                                                                                    </accessibility>
-                                                                                                    <constraints>
-                                                                                                        <constraint firstAttribute="width" constant="24" id="wTf-Ps-PEO"/>
-                                                                                                    </constraints>
-                                                                                                </view>
-                                                                                            </subviews>
-                                                                                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                                                                            <accessibility key="accessibilityConfiguration">
-                                                                                                <accessibilityTraits key="traits" button="YES"/>
-                                                                                                <bool key="isElement" value="YES"/>
-                                                                                            </accessibility>
-                                                                                            <constraints>
-                                                                                                <constraint firstItem="9NR-y4-wM2" firstAttribute="leading" secondItem="FOf-vD-I2B" secondAttribute="leading" id="FZU-8H-6lE"/>
-                                                                                                <constraint firstAttribute="width" constant="24" id="LUc-9P-Rs7"/>
-                                                                                                <constraint firstAttribute="bottom" secondItem="9NR-y4-wM2" secondAttribute="bottom" id="MR8-iQ-BLY"/>
-                                                                                                <constraint firstAttribute="trailing" secondItem="9NR-y4-wM2" secondAttribute="trailing" id="bo0-SC-KrS"/>
-                                                                                                <constraint firstItem="9NR-y4-wM2" firstAttribute="top" secondItem="FOf-vD-I2B" secondAttribute="top" id="iiJ-DO-zJJ"/>
-                                                                                            </constraints>
-                                                                                        </view>
-                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="noProxy" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GIV-MD-Y1D" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                                                            <rect key="frame" x="36" y="0.0" width="238" height="50"/>
-                                                                                            <accessibility key="accessibilityConfiguration">
-                                                                                                <accessibilityTraits key="traits" button="YES" staticText="YES"/>
-                                                                                            </accessibility>
-                                                                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                                                            <color key="textColor" name="MoppLabel"/>
-                                                                                            <nil key="highlightedColor"/>
-                                                                                        </label>
-                                                                                    </subviews>
-                                                                                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                                                                    <accessibility key="accessibilityConfiguration">
-                                                                                        <accessibilityTraits key="traits" button="YES"/>
-                                                                                        <bool key="isElement" value="YES"/>
-                                                                                    </accessibility>
-                                                                                    <gestureRecognizers/>
-                                                                                    <constraints>
-                                                                                        <constraint firstItem="FOf-vD-I2B" firstAttribute="top" secondItem="8vx-QQ-WSe" secondAttribute="top" id="1fC-OY-tm6"/>
-                                                                                        <constraint firstItem="GIV-MD-Y1D" firstAttribute="leading" secondItem="FOf-vD-I2B" secondAttribute="trailing" constant="12" id="OK4-Ze-6ax"/>
-                                                                                        <constraint firstAttribute="bottom" secondItem="GIV-MD-Y1D" secondAttribute="bottom" id="XJk-Au-Xnn"/>
-                                                                                        <constraint firstAttribute="trailing" secondItem="GIV-MD-Y1D" secondAttribute="trailing" id="XZh-Ll-cmu"/>
-                                                                                        <constraint firstItem="GIV-MD-Y1D" firstAttribute="top" secondItem="8vx-QQ-WSe" secondAttribute="top" id="a3C-3U-yZz"/>
-                                                                                        <constraint firstItem="FOf-vD-I2B" firstAttribute="leading" secondItem="8vx-QQ-WSe" secondAttribute="leading" id="nAE-zW-08u"/>
-                                                                                        <constraint firstAttribute="bottom" secondItem="FOf-vD-I2B" secondAttribute="bottom" id="vYz-ly-s7O"/>
-                                                                                    </constraints>
-                                                                                </view>
-                                                                            </subviews>
-                                                                        </stackView>
-                                                                        <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Ydf-j4-RRA">
-                                                                            <rect key="frame" x="0.0" y="65" width="274" height="50"/>
-                                                                            <subviews>
-                                                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i5j-TH-MHr">
-                                                                                    <rect key="frame" x="0.0" y="0.0" width="274" height="50"/>
-                                                                                    <subviews>
-                                                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wCR-ep-6Be">
-                                                                                            <rect key="frame" x="0.0" y="0.0" width="24" height="50"/>
-                                                                                            <subviews>
-                                                                                                <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nZt-nx-w4X" customClass="RadioButton" customModule="MoppApp" customModuleProvider="target">
-                                                                                                    <rect key="frame" x="0.0" y="0.0" width="24" height="50"/>
-                                                                                                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                                                                                    <accessibility key="accessibilityConfiguration">
-                                                                                                        <accessibilityTraits key="traits" button="YES"/>
-                                                                                                        <bool key="isElement" value="YES"/>
-                                                                                                    </accessibility>
-                                                                                                    <constraints>
-                                                                                                        <constraint firstAttribute="width" constant="24" id="kPb-5M-TPk"/>
-                                                                                                    </constraints>
-                                                                                                </view>
-                                                                                            </subviews>
-                                                                                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                                                                            <accessibility key="accessibilityConfiguration">
-                                                                                                <accessibilityTraits key="traits" button="YES"/>
-                                                                                                <bool key="isElement" value="YES"/>
-                                                                                            </accessibility>
-                                                                                            <constraints>
-                                                                                                <constraint firstAttribute="trailing" secondItem="nZt-nx-w4X" secondAttribute="trailing" id="J8V-SG-B6E"/>
-                                                                                                <constraint firstItem="nZt-nx-w4X" firstAttribute="top" secondItem="wCR-ep-6Be" secondAttribute="top" id="Lbo-gC-00M"/>
-                                                                                                <constraint firstAttribute="bottom" secondItem="nZt-nx-w4X" secondAttribute="bottom" id="Vuw-8B-d5H"/>
-                                                                                                <constraint firstAttribute="width" constant="24" id="jt3-Vh-eDS"/>
-                                                                                                <constraint firstItem="nZt-nx-w4X" firstAttribute="leading" secondItem="wCR-ep-6Be" secondAttribute="leading" id="mig-RY-ecl"/>
-                                                                                            </constraints>
-                                                                                        </view>
-                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="useSystemProxy" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eXS-pZ-qlp" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                                                            <rect key="frame" x="36" y="0.0" width="238" height="50"/>
-                                                                                            <accessibility key="accessibilityConfiguration">
-                                                                                                <accessibilityTraits key="traits" button="YES" staticText="YES"/>
-                                                                                            </accessibility>
-                                                                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                                                            <color key="textColor" name="MoppLabel"/>
-                                                                                            <nil key="highlightedColor"/>
-                                                                                        </label>
-                                                                                    </subviews>
-                                                                                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                                                                    <accessibility key="accessibilityConfiguration">
-                                                                                        <accessibilityTraits key="traits" button="YES"/>
-                                                                                        <bool key="isElement" value="YES"/>
-                                                                                    </accessibility>
-                                                                                    <gestureRecognizers/>
-                                                                                    <constraints>
-                                                                                        <constraint firstItem="eXS-pZ-qlp" firstAttribute="leading" secondItem="wCR-ep-6Be" secondAttribute="trailing" constant="12" id="9FN-cz-O9Q"/>
-                                                                                        <constraint firstAttribute="trailing" secondItem="eXS-pZ-qlp" secondAttribute="trailing" id="ZZ4-nt-jSc"/>
-                                                                                        <constraint firstItem="eXS-pZ-qlp" firstAttribute="top" secondItem="i5j-TH-MHr" secondAttribute="top" id="hI7-Gs-REa"/>
-                                                                                        <constraint firstItem="wCR-ep-6Be" firstAttribute="leading" secondItem="i5j-TH-MHr" secondAttribute="leading" id="huH-Wl-DwX"/>
-                                                                                        <constraint firstItem="wCR-ep-6Be" firstAttribute="top" secondItem="i5j-TH-MHr" secondAttribute="top" id="iyU-sS-5Bb"/>
-                                                                                        <constraint firstAttribute="bottom" secondItem="eXS-pZ-qlp" secondAttribute="bottom" id="qBr-Vp-8aJ"/>
-                                                                                        <constraint firstAttribute="bottom" secondItem="wCR-ep-6Be" secondAttribute="bottom" id="wcS-Qa-9Ne"/>
-                                                                                    </constraints>
-                                                                                </view>
-                                                                            </subviews>
-                                                                        </stackView>
-                                                                        <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="g3m-7b-QT2">
-                                                                            <rect key="frame" x="0.0" y="130" width="274" height="50"/>
-                                                                            <subviews>
-                                                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SGG-oF-wY9">
-                                                                                    <rect key="frame" x="0.0" y="0.0" width="274" height="50"/>
-                                                                                    <subviews>
-                                                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="khT-kF-a6y">
-                                                                                            <rect key="frame" x="0.0" y="0.0" width="24" height="50"/>
-                                                                                            <subviews>
-                                                                                                <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GJv-fe-4CA" customClass="RadioButton" customModule="MoppApp" customModuleProvider="target">
-                                                                                                    <rect key="frame" x="0.0" y="0.0" width="24" height="50"/>
-                                                                                                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                                                                                    <accessibility key="accessibilityConfiguration">
-                                                                                                        <accessibilityTraits key="traits" button="YES"/>
-                                                                                                        <bool key="isElement" value="YES"/>
-                                                                                                    </accessibility>
-                                                                                                    <constraints>
-                                                                                                        <constraint firstAttribute="width" constant="24" id="8P7-QW-Sx0"/>
-                                                                                                    </constraints>
-                                                                                                </view>
-                                                                                            </subviews>
-                                                                                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                                                                            <accessibility key="accessibilityConfiguration">
-                                                                                                <accessibilityTraits key="traits" button="YES"/>
-                                                                                                <bool key="isElement" value="YES"/>
-                                                                                            </accessibility>
-                                                                                            <constraints>
-                                                                                                <constraint firstAttribute="trailing" secondItem="GJv-fe-4CA" secondAttribute="trailing" id="2lb-LD-BB4"/>
-                                                                                                <constraint firstItem="GJv-fe-4CA" firstAttribute="leading" secondItem="khT-kF-a6y" secondAttribute="leading" id="6vd-I7-hjC"/>
-                                                                                                <constraint firstItem="GJv-fe-4CA" firstAttribute="top" secondItem="khT-kF-a6y" secondAttribute="top" id="H5f-mk-50S"/>
-                                                                                                <constraint firstAttribute="bottom" secondItem="GJv-fe-4CA" secondAttribute="bottom" id="LHE-gJ-LPa"/>
-                                                                                                <constraint firstAttribute="width" constant="24" id="mbH-0C-cdy"/>
-                                                                                            </constraints>
-                                                                                        </view>
-                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="useManualProxy" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ySi-Rp-c9e" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                                                            <rect key="frame" x="36" y="0.0" width="238" height="50"/>
-                                                                                            <accessibility key="accessibilityConfiguration">
-                                                                                                <accessibilityTraits key="traits" button="YES" staticText="YES"/>
-                                                                                            </accessibility>
-                                                                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                                                            <color key="textColor" name="MoppLabel"/>
-                                                                                            <nil key="highlightedColor"/>
-                                                                                        </label>
-                                                                                    </subviews>
-                                                                                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                                                                    <accessibility key="accessibilityConfiguration">
-                                                                                        <accessibilityTraits key="traits" button="YES"/>
-                                                                                        <bool key="isElement" value="YES"/>
-                                                                                    </accessibility>
-                                                                                    <gestureRecognizers/>
-                                                                                    <constraints>
-                                                                                        <constraint firstItem="ySi-Rp-c9e" firstAttribute="top" secondItem="SGG-oF-wY9" secondAttribute="top" id="1cG-yB-Pa3"/>
-                                                                                        <constraint firstAttribute="trailing" secondItem="ySi-Rp-c9e" secondAttribute="trailing" id="4fY-XY-laR"/>
-                                                                                        <constraint firstAttribute="bottom" secondItem="ySi-Rp-c9e" secondAttribute="bottom" id="57G-Lj-1Ut"/>
-                                                                                        <constraint firstItem="ySi-Rp-c9e" firstAttribute="leading" secondItem="khT-kF-a6y" secondAttribute="trailing" constant="12" id="EPl-5F-t89"/>
-                                                                                        <constraint firstItem="khT-kF-a6y" firstAttribute="leading" secondItem="SGG-oF-wY9" secondAttribute="leading" id="g3t-ML-CKB"/>
-                                                                                        <constraint firstAttribute="bottom" secondItem="khT-kF-a6y" secondAttribute="bottom" id="wIT-TQ-SIm"/>
-                                                                                        <constraint firstItem="khT-kF-a6y" firstAttribute="top" secondItem="SGG-oF-wY9" secondAttribute="top" id="xY8-k5-oo3"/>
-                                                                                    </constraints>
-                                                                                </view>
-                                                                            </subviews>
-                                                                        </stackView>
-                                                                    </subviews>
-                                                                </stackView>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Host" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8UZ-l5-53M" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="240.5" width="274" height="18"/>
-                                                                    <accessibility key="accessibilityConfiguration">
-                                                                        <bool key="isElement" value="NO"/>
-                                                                    </accessibility>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                                    <color key="textColor" name="MoppLabel"/>
-                                                                    <nil key="highlightedColor"/>
-                                                                </label>
-                                                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="sAX-EK-nxA" customClass="SettingsTextField" customModule="MoppApp" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="278.5" width="274" height="55"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="55" id="2I5-Pt-w9H"/>
-                                                                    </constraints>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                                    <textInputTraits key="textInputTraits"/>
-                                                                </textField>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Port" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Agc-yX-QHO" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="353.5" width="274" height="18"/>
-                                                                    <accessibility key="accessibilityConfiguration">
-                                                                        <bool key="isElement" value="NO"/>
-                                                                    </accessibility>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                                    <color key="textColor" name="MoppLabel"/>
-                                                                    <nil key="highlightedColor"/>
-                                                                </label>
-                                                                <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4Zw-pM-rZy" customClass="SettingsTextField" customModule="MoppApp" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="391.5" width="274" height="55"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="55" id="KPJ-1E-NKE"/>
-                                                                    </constraints>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                                    <textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
-                                                                </textField>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Min 1, max 65535" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8zS-pX-IG7" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="466.5" width="274" height="14.5"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                                                    <color key="textColor" name="MoppError"/>
-                                                                    <nil key="highlightedColor"/>
-                                                                </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mkr-4w-DVi" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="501" width="274" height="18"/>
-                                                                    <accessibility key="accessibilityConfiguration">
-                                                                        <bool key="isElement" value="NO"/>
-                                                                    </accessibility>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                                    <color key="textColor" name="MoppLabel"/>
-                                                                    <nil key="highlightedColor"/>
-                                                                </label>
-                                                                <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="I6S-G1-Owg" customClass="SettingsTextField" customModule="MoppApp" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="539" width="274" height="55"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="55" id="Pvh-aP-RyM"/>
-                                                                    </constraints>
-                                                                    <color key="textColor" name="MoppLabel"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                                    <textInputTraits key="textInputTraits"/>
-                                                                </textField>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Password" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yfY-Ml-Rky" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="614" width="274" height="18"/>
-                                                                    <accessibility key="accessibilityConfiguration">
-                                                                        <bool key="isElement" value="NO"/>
-                                                                    </accessibility>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                                    <color key="textColor" name="MoppLabel"/>
-                                                                    <nil key="highlightedColor"/>
-                                                                </label>
-                                                                <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="q6h-N1-OOj" customClass="SettingsTextField" customModule="MoppApp" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="652" width="274" height="55"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="55" id="BPV-Lp-M1R"/>
-                                                                    </constraints>
-                                                                    <color key="textColor" name="MoppLabel"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                                    <textInputTraits key="textInputTraits" secureTextEntry="YES"/>
-                                                                </textField>
-                                                                <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="gbK-QS-hZj">
-                                                                    <rect key="frame" x="0.0" y="727" width="274" height="55"/>
-                                                                    <subviews>
-                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Enable proxy for SSL connections." textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="f2R-O3-rct" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                                            <rect key="frame" x="0.0" y="10" width="215" height="35"/>
-                                                                            <accessibility key="accessibilityConfiguration">
-                                                                                <bool key="isElement" value="NO"/>
-                                                                            </accessibility>
-                                                                            <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
-                                                                            <color key="textColor" name="MoppLabel"/>
-                                                                            <nil key="highlightedColor"/>
-                                                                        </label>
-                                                                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="751" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fPo-SF-t69" customClass="SwitchButton" customModule="MoppApp" customModuleProvider="target">
-                                                                            <rect key="frame" x="225" y="12" width="51" height="31"/>
-                                                                            <connections>
-                                                                                <action selector="toggleProxySSL:" destination="nCX-OJ-SsY" eventType="valueChanged" id="pwR-OX-L9E"/>
-                                                                            </connections>
-                                                                        </switch>
-                                                                    </subviews>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="55" id="u9Q-nF-2LU"/>
-                                                                    </constraints>
-                                                                </stackView>
-                                                            </subviews>
-                                                            <constraints>
-                                                                <constraint firstItem="8zS-pX-IG7" firstAttribute="top" secondItem="4Zw-pM-rZy" secondAttribute="bottom" constant="5" id="0Hx-k5-a9O"/>
-                                                                <constraint firstItem="gbK-QS-hZj" firstAttribute="top" secondItem="q6h-N1-OOj" secondAttribute="bottom" constant="20" id="1yw-NM-A32"/>
-                                                                <constraint firstItem="4Zw-pM-rZy" firstAttribute="leading" secondItem="7Nj-qK-otF" secondAttribute="leading" id="4Gc-Ys-yN3"/>
-                                                                <constraint firstItem="8UZ-l5-53M" firstAttribute="leading" secondItem="7Nj-qK-otF" secondAttribute="leading" id="4OC-Je-7vr"/>
-                                                                <constraint firstAttribute="trailing" secondItem="Agc-yX-QHO" secondAttribute="trailing" id="6x4-Dy-kVL"/>
-                                                                <constraint firstAttribute="trailing" secondItem="yfY-Ml-Rky" secondAttribute="trailing" id="8ov-KY-G9z"/>
-                                                                <constraint firstItem="yfY-Ml-Rky" firstAttribute="leading" secondItem="7Nj-qK-otF" secondAttribute="leading" id="8tf-Qw-3hf"/>
-                                                                <constraint firstItem="8zS-pX-IG7" firstAttribute="leading" secondItem="7Nj-qK-otF" secondAttribute="leading" id="9KK-3E-XQq"/>
-                                                                <constraint firstItem="sAX-EK-nxA" firstAttribute="leading" secondItem="7Nj-qK-otF" secondAttribute="leading" id="ASt-Fi-ox7"/>
-                                                                <constraint firstAttribute="trailing" secondItem="gbK-QS-hZj" secondAttribute="trailing" id="DRi-rF-YIv"/>
-                                                                <constraint firstItem="4Zw-pM-rZy" firstAttribute="top" secondItem="Agc-yX-QHO" secondAttribute="bottom" constant="5" id="F9l-kw-iQD"/>
-                                                                <constraint firstItem="I6S-G1-Owg" firstAttribute="top" secondItem="Mkr-4w-DVi" secondAttribute="bottom" constant="5" id="Fye-LF-MN3"/>
-                                                                <constraint firstItem="q6h-N1-OOj" firstAttribute="leading" secondItem="7Nj-qK-otF" secondAttribute="leading" id="Gjs-20-F4e"/>
-                                                                <constraint firstItem="gbK-QS-hZj" firstAttribute="leading" secondItem="7Nj-qK-otF" secondAttribute="leading" id="KVt-hN-qnQ"/>
-                                                                <constraint firstAttribute="trailing" secondItem="I6S-G1-Owg" secondAttribute="trailing" id="NUW-Ya-16w"/>
-                                                                <constraint firstAttribute="trailing" secondItem="q6h-N1-OOj" secondAttribute="trailing" id="OMo-f3-IeM"/>
-                                                                <constraint firstItem="q6h-N1-OOj" firstAttribute="top" secondItem="yfY-Ml-Rky" secondAttribute="bottom" constant="5" id="Opz-EP-qUM"/>
-                                                                <constraint firstItem="yzw-8h-bVl" firstAttribute="top" secondItem="7Nj-qK-otF" secondAttribute="top" id="QF5-3X-KyM"/>
-                                                                <constraint firstItem="Mkr-4w-DVi" firstAttribute="top" secondItem="8zS-pX-IG7" secondAttribute="bottom" constant="20" id="Te2-pB-7Gz"/>
-                                                                <constraint firstItem="RhP-AD-eLt" firstAttribute="leading" secondItem="7Nj-qK-otF" secondAttribute="leading" id="VPT-bG-5lm"/>
-                                                                <constraint firstAttribute="trailing" secondItem="Mkr-4w-DVi" secondAttribute="trailing" id="Vc6-HR-b2A"/>
-                                                                <constraint firstItem="Agc-yX-QHO" firstAttribute="leading" secondItem="7Nj-qK-otF" secondAttribute="leading" id="h27-p4-Hhh"/>
-                                                                <constraint firstAttribute="trailing" secondItem="4Zw-pM-rZy" secondAttribute="trailing" id="jCR-T4-VlO"/>
-                                                                <constraint firstAttribute="trailing" secondItem="8UZ-l5-53M" secondAttribute="trailing" id="jFN-e3-kZ8"/>
-                                                                <constraint firstItem="yzw-8h-bVl" firstAttribute="leading" secondItem="7Nj-qK-otF" secondAttribute="leading" id="kI2-nq-j9b"/>
-                                                                <constraint firstAttribute="trailing" secondItem="yzw-8h-bVl" secondAttribute="trailing" id="lt8-u7-bf4"/>
-                                                                <constraint firstAttribute="trailing" secondItem="sAX-EK-nxA" secondAttribute="trailing" id="qZx-Ns-7Gi"/>
-                                                                <constraint firstItem="I6S-G1-Owg" firstAttribute="leading" secondItem="7Nj-qK-otF" secondAttribute="leading" id="voA-wu-gxL"/>
-                                                                <constraint firstAttribute="trailing" secondItem="8zS-pX-IG7" secondAttribute="trailing" id="wXF-Ji-HoU"/>
-                                                                <constraint firstAttribute="trailing" secondItem="RhP-AD-eLt" secondAttribute="trailing" id="wjG-ha-cYJ"/>
-                                                                <constraint firstAttribute="bottom" secondItem="gbK-QS-hZj" secondAttribute="bottom" constant="20" id="yOF-oL-ED8"/>
-                                                                <constraint firstItem="Mkr-4w-DVi" firstAttribute="leading" secondItem="7Nj-qK-otF" secondAttribute="leading" id="yjz-90-T6y"/>
-                                                                <constraint firstItem="sAX-EK-nxA" firstAttribute="top" secondItem="8UZ-l5-53M" secondAttribute="bottom" constant="5" id="z0g-ut-X0v"/>
-                                                            </constraints>
-                                                        </stackView>
-                                                    </subviews>
-                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="trailing" secondItem="7Nj-qK-otF" secondAttribute="trailing" constant="16" id="7SW-lS-xMu"/>
-                                                        <constraint firstItem="7Nj-qK-otF" firstAttribute="top" secondItem="NOv-Hk-gQ0" secondAttribute="top" id="D2K-k9-4bZ"/>
-                                                        <constraint firstAttribute="bottom" secondItem="7Nj-qK-otF" secondAttribute="bottom" id="Lhp-S2-Mul"/>
-                                                        <constraint firstItem="7Nj-qK-otF" firstAttribute="leading" secondItem="NOv-Hk-gQ0" secondAttribute="leading" constant="16" id="k4y-FW-pxc"/>
-                                                    </constraints>
-                                                </tableViewCellContentView>
-                                                <connections>
-                                                    <outlet property="enableSSLButton" destination="fPo-SF-t69" id="mhQ-Pt-rKD"/>
-                                                    <outlet property="enableSSLStackView" destination="gbK-QS-hZj" id="beF-fl-bTp"/>
-                                                    <outlet property="enableSSLTitle" destination="f2R-O3-rct" id="V5o-Wx-hO9"/>
-                                                    <outlet property="hostTextField" destination="sAX-EK-nxA" id="q14-NC-FPM"/>
-                                                    <outlet property="hostTitle" destination="8UZ-l5-53M" id="b5D-rT-557"/>
-                                                    <outlet property="manualProxyStackView" destination="g3m-7b-QT2" id="JcS-Rg-AfV"/>
-                                                    <outlet property="manualProxyTitle" destination="ySi-Rp-c9e" id="OVJ-r6-4q3"/>
-                                                    <outlet property="manualProxyView" destination="SGG-oF-wY9" id="aBH-PE-MFD"/>
-                                                    <outlet property="noProxyRadioButton" destination="9NR-y4-wM2" id="2ee-vC-aK9"/>
-                                                    <outlet property="noProxyStackView" destination="0nk-PZ-Vuh" id="yhn-JI-pKO"/>
-                                                    <outlet property="noProxyTitle" destination="GIV-MD-Y1D" id="idd-0K-kNu"/>
-                                                    <outlet property="noProxyView" destination="8vx-QQ-WSe" id="9bD-g9-J7i"/>
-                                                    <outlet property="passwordTextField" destination="q6h-N1-OOj" id="T0g-A1-YaU"/>
-                                                    <outlet property="passwordTitle" destination="yfY-Ml-Rky" id="79n-vI-Ap5"/>
-                                                    <outlet property="portNumberError" destination="8zS-pX-IG7" id="cRZ-0Q-FJP"/>
-                                                    <outlet property="portTextField" destination="4Zw-pM-rZy" id="laJ-oA-0RM"/>
-                                                    <outlet property="portTitle" destination="Agc-yX-QHO" id="Ubc-ar-fla"/>
-                                                    <outlet property="proxyChoicesStackView" destination="RhP-AD-eLt" id="cPN-88-2ad"/>
-                                                    <outlet property="proxyTitle" destination="yzw-8h-bVl" id="hOd-Jc-Glm"/>
-                                                    <outlet property="systemProxyStackView" destination="Ydf-j4-RRA" id="PhR-ZJ-jGA"/>
-                                                    <outlet property="systemProxyTitle" destination="eXS-pZ-qlp" id="pnx-Lk-wck"/>
-                                                    <outlet property="systemProxyView" destination="i5j-TH-MHr" id="Vjk-cm-pmi"/>
-                                                    <outlet property="useManualProxyRadioButton" destination="GJv-fe-4CA" id="qFl-Ia-H5J"/>
-                                                    <outlet property="useSystemProxyRadioButton" destination="nZt-nx-w4X" id="H3P-D5-luf"/>
-                                                    <outlet property="usernameTextField" destination="I6S-G1-Owg" id="ZYd-uf-Vzx"/>
-                                                    <outlet property="usernameTitle" destination="Mkr-4w-DVi" id="c7Q-TX-TM6"/>
-                                                </connections>
-                                            </tableViewCell>
-                                        </prototypes>
-                                        <connections>
-                                            <outlet property="dataSource" destination="l9s-br-m11" id="iIS-cT-6zC"/>
-                                            <outlet property="delegate" destination="l9s-br-m11" id="NDl-fM-iB6"/>
-                                        </connections>
-                                    </tableView>
-                                </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <constraints>
-                                    <constraint firstAttribute="bottom" secondItem="9ni-gT-4A8" secondAttribute="bottom" id="3oq-yU-aaA"/>
-                                    <constraint firstItem="9ni-gT-4A8" firstAttribute="leading" secondItem="Wp3-ni-L4Z" secondAttribute="leading" id="Ify-FI-ZgT"/>
-                                    <constraint firstAttribute="height" constant="400" id="WZJ-AU-Csu"/>
-                                    <constraint firstItem="9ni-gT-4A8" firstAttribute="top" secondItem="Wp3-ni-L4Z" secondAttribute="top" id="fPf-3i-82A"/>
-                                    <constraint firstAttribute="trailing" secondItem="9ni-gT-4A8" secondAttribute="trailing" id="oEY-0C-ByQ"/>
-                                </constraints>
-                            </view>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="Umm-9c-FhZ"/>
-                        <constraints>
-                            <constraint firstItem="Wp3-ni-L4Z" firstAttribute="centerY" secondItem="9u2-4V-bgL" secondAttribute="centerY" id="4LY-lG-gTm"/>
-                            <constraint firstItem="Wp3-ni-L4Z" firstAttribute="leading" secondItem="Umm-9c-FhZ" secondAttribute="leading" constant="35" id="Djh-dd-r4J"/>
-                            <constraint firstItem="Umm-9c-FhZ" firstAttribute="trailing" secondItem="Wp3-ni-L4Z" secondAttribute="trailing" constant="34" id="hS7-HQ-5Gb"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="tableView" destination="9ni-gT-4A8" id="bKp-yg-SFV"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="6e9-9s-04G" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3152.8000000000002" y="-1377.6611694152925"/>
-        </scene>
         <!--Diagnostics View Controller-->
         <scene sceneID="i9o-Sy-8lJ">
             <objects>
@@ -2159,6 +1688,440 @@
             </objects>
             <point key="canvasLocation" x="1789.5999999999999" y="-157.87106446776613"/>
         </scene>
+        <!--Proxy View Controller-->
+        <scene sceneID="0Pi-Jb-LvK">
+            <objects>
+                <viewController storyboardIdentifier="ProxyViewController" id="XgN-ks-WOK" customClass="ProxyViewController" customModule="MoppApp" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="8HT-A6-dNF">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="1500"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HEC-ZS-Umu">
+                                <rect key="frame" x="35" y="65" width="305" height="1390"/>
+                                <subviews>
+                                    <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1eO-rv-feK">
+                                        <rect key="frame" x="0.0" y="0.0" width="305" height="1390"/>
+                                        <subviews>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sEx-cL-4L9" userLabel="ContentView">
+                                                <rect key="frame" x="0.0" y="0.0" width="305" height="918.5"/>
+                                                <subviews>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iiw-YR-wVb">
+                                                        <rect key="frame" x="16" y="20" width="273" height="898.5"/>
+                                                        <subviews>
+                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yaL-UI-neS">
+                                                                <rect key="frame" x="0.0" y="0.0" width="273" height="25"/>
+                                                                <subviews>
+                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Proxy" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="37i-OR-Wdv" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                                        <rect key="frame" x="0.0" y="0.0" width="209" height="25"/>
+                                                                        <accessibility key="accessibilityConfiguration">
+                                                                            <accessibilityTraits key="traits" staticText="YES" header="YES"/>
+                                                                        </accessibility>
+                                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                        <color key="textColor" name="MoppText"/>
+                                                                        <nil key="highlightedColor"/>
+                                                                    </label>
+                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="x9y-Gk-0gs" customClass="ScaledButton" customModule="MoppApp" customModuleProvider="target">
+                                                                        <rect key="frame" x="229" y="0.0" width="44" height="25"/>
+                                                                        <constraints>
+                                                                            <constraint firstAttribute="width" constant="44" id="Bt9-eA-YXt"/>
+                                                                        </constraints>
+                                                                        <color key="tintColor" name="MoppTitle"/>
+                                                                        <state key="normal" image="DismissPopup"/>
+                                                                        <connections>
+                                                                            <action selector="dismissView:" destination="XgN-ks-WOK" eventType="touchUpInside" id="6MZ-3f-U2Q"/>
+                                                                        </connections>
+                                                                    </button>
+                                                                </subviews>
+                                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="bottom" secondItem="x9y-Gk-0gs" secondAttribute="bottom" id="DE8-Wv-euh"/>
+                                                                    <constraint firstItem="x9y-Gk-0gs" firstAttribute="leading" secondItem="37i-OR-Wdv" secondAttribute="trailing" constant="20" id="Dy5-ce-Z4k"/>
+                                                                    <constraint firstItem="37i-OR-Wdv" firstAttribute="leading" secondItem="yaL-UI-neS" secondAttribute="leading" id="JUh-Bm-7rG"/>
+                                                                    <constraint firstItem="x9y-Gk-0gs" firstAttribute="top" secondItem="yaL-UI-neS" secondAttribute="top" id="Otj-k5-7Bu"/>
+                                                                    <constraint firstItem="37i-OR-Wdv" firstAttribute="top" secondItem="yaL-UI-neS" secondAttribute="top" id="R8R-mY-Hl0"/>
+                                                                    <constraint firstAttribute="bottom" secondItem="37i-OR-Wdv" secondAttribute="bottom" id="TDA-sV-WMH"/>
+                                                                    <constraint firstAttribute="trailing" secondItem="x9y-Gk-0gs" secondAttribute="trailing" id="xyg-q6-I4b"/>
+                                                                </constraints>
+                                                            </view>
+                                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="9J6-UU-DzM">
+                                                                <rect key="frame" x="0.0" y="45" width="273" height="375"/>
+                                                                <subviews>
+                                                                    <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="rMv-2O-FmS">
+                                                                        <rect key="frame" x="0.0" y="0.0" width="273" height="115"/>
+                                                                        <subviews>
+                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Bm-Sm-MVO">
+                                                                                <rect key="frame" x="0.0" y="0.0" width="273" height="115"/>
+                                                                                <subviews>
+                                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zhh-Pi-XX0">
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="24" height="115"/>
+                                                                                        <subviews>
+                                                                                            <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hmo-hm-vw7" customClass="RadioButton" customModule="MoppApp" customModuleProvider="target">
+                                                                                                <rect key="frame" x="0.0" y="0.0" width="24" height="115"/>
+                                                                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                                                <accessibility key="accessibilityConfiguration">
+                                                                                                    <accessibilityTraits key="traits" button="YES"/>
+                                                                                                    <bool key="isElement" value="YES"/>
+                                                                                                </accessibility>
+                                                                                            </view>
+                                                                                        </subviews>
+                                                                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                                        <accessibility key="accessibilityConfiguration">
+                                                                                            <accessibilityTraits key="traits" button="YES"/>
+                                                                                            <bool key="isElement" value="YES"/>
+                                                                                        </accessibility>
+                                                                                        <constraints>
+                                                                                            <constraint firstAttribute="width" constant="24" id="1t9-XC-xsO"/>
+                                                                                            <constraint firstItem="Hmo-hm-vw7" firstAttribute="leading" secondItem="Zhh-Pi-XX0" secondAttribute="leading" id="6q2-92-7bM"/>
+                                                                                            <constraint firstAttribute="bottom" secondItem="Hmo-hm-vw7" secondAttribute="bottom" id="Nzs-bb-N13"/>
+                                                                                            <constraint firstItem="Hmo-hm-vw7" firstAttribute="top" secondItem="Zhh-Pi-XX0" secondAttribute="top" id="jiS-m7-ojp"/>
+                                                                                            <constraint firstAttribute="trailing" secondItem="Hmo-hm-vw7" secondAttribute="trailing" id="thS-10-ppK"/>
+                                                                                        </constraints>
+                                                                                    </view>
+                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="noProxy" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sYE-Av-SP0" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                                                        <rect key="frame" x="36" y="0.0" width="237" height="115"/>
+                                                                                        <accessibility key="accessibilityConfiguration">
+                                                                                            <accessibilityTraits key="traits" button="YES" staticText="YES"/>
+                                                                                        </accessibility>
+                                                                                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                                                        <color key="textColor" name="MoppText"/>
+                                                                                        <nil key="highlightedColor"/>
+                                                                                    </label>
+                                                                                </subviews>
+                                                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                                <accessibility key="accessibilityConfiguration">
+                                                                                    <accessibilityTraits key="traits" button="YES"/>
+                                                                                    <bool key="isElement" value="YES"/>
+                                                                                </accessibility>
+                                                                                <gestureRecognizers/>
+                                                                                <constraints>
+                                                                                    <constraint firstAttribute="bottom" secondItem="Zhh-Pi-XX0" secondAttribute="bottom" id="FFo-JR-QSU"/>
+                                                                                    <constraint firstItem="Zhh-Pi-XX0" firstAttribute="top" secondItem="7Bm-Sm-MVO" secondAttribute="top" id="LPT-vT-vwi"/>
+                                                                                    <constraint firstAttribute="bottom" secondItem="sYE-Av-SP0" secondAttribute="bottom" id="SGd-Ln-foC"/>
+                                                                                    <constraint firstItem="Zhh-Pi-XX0" firstAttribute="leading" secondItem="7Bm-Sm-MVO" secondAttribute="leading" id="WIj-Ev-U3k"/>
+                                                                                    <constraint firstAttribute="trailing" secondItem="sYE-Av-SP0" secondAttribute="trailing" id="a0a-Ch-ESi"/>
+                                                                                    <constraint firstItem="sYE-Av-SP0" firstAttribute="top" secondItem="7Bm-Sm-MVO" secondAttribute="top" id="ooQ-pE-bkH"/>
+                                                                                    <constraint firstItem="sYE-Av-SP0" firstAttribute="leading" secondItem="Zhh-Pi-XX0" secondAttribute="trailing" constant="12" id="r1s-PD-SbB"/>
+                                                                                </constraints>
+                                                                            </view>
+                                                                        </subviews>
+                                                                    </stackView>
+                                                                    <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="cnT-HJ-Myz">
+                                                                        <rect key="frame" x="0.0" y="130" width="273" height="115"/>
+                                                                        <subviews>
+                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tL2-5m-lo5">
+                                                                                <rect key="frame" x="0.0" y="0.0" width="273" height="115"/>
+                                                                                <subviews>
+                                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6yJ-K2-Ijj">
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="24" height="115"/>
+                                                                                        <subviews>
+                                                                                            <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="deM-kG-bOY" customClass="RadioButton" customModule="MoppApp" customModuleProvider="target">
+                                                                                                <rect key="frame" x="0.0" y="0.0" width="24" height="115"/>
+                                                                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                                                <accessibility key="accessibilityConfiguration">
+                                                                                                    <accessibilityTraits key="traits" button="YES"/>
+                                                                                                    <bool key="isElement" value="YES"/>
+                                                                                                </accessibility>
+                                                                                            </view>
+                                                                                        </subviews>
+                                                                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                                        <accessibility key="accessibilityConfiguration">
+                                                                                            <accessibilityTraits key="traits" button="YES"/>
+                                                                                            <bool key="isElement" value="YES"/>
+                                                                                        </accessibility>
+                                                                                        <constraints>
+                                                                                            <constraint firstAttribute="bottom" secondItem="deM-kG-bOY" secondAttribute="bottom" id="3YL-uv-AaY"/>
+                                                                                            <constraint firstAttribute="width" constant="24" id="Jcb-Mw-FgS"/>
+                                                                                            <constraint firstItem="deM-kG-bOY" firstAttribute="top" secondItem="6yJ-K2-Ijj" secondAttribute="top" id="LCd-Cj-8G4"/>
+                                                                                            <constraint firstAttribute="trailing" secondItem="deM-kG-bOY" secondAttribute="trailing" id="bUx-cp-Vlr"/>
+                                                                                            <constraint firstItem="deM-kG-bOY" firstAttribute="leading" secondItem="6yJ-K2-Ijj" secondAttribute="leading" id="tSr-Uu-anQ"/>
+                                                                                        </constraints>
+                                                                                    </view>
+                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="useSystemProxy" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j1v-IN-0qc" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                                                        <rect key="frame" x="36" y="0.0" width="237" height="115"/>
+                                                                                        <accessibility key="accessibilityConfiguration">
+                                                                                            <accessibilityTraits key="traits" button="YES" staticText="YES"/>
+                                                                                        </accessibility>
+                                                                                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                                                        <color key="textColor" name="MoppText"/>
+                                                                                        <nil key="highlightedColor"/>
+                                                                                    </label>
+                                                                                </subviews>
+                                                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                                <accessibility key="accessibilityConfiguration">
+                                                                                    <accessibilityTraits key="traits" button="YES"/>
+                                                                                    <bool key="isElement" value="YES"/>
+                                                                                </accessibility>
+                                                                                <gestureRecognizers/>
+                                                                                <constraints>
+                                                                                    <constraint firstItem="j1v-IN-0qc" firstAttribute="leading" secondItem="6yJ-K2-Ijj" secondAttribute="trailing" constant="12" id="5h3-VV-NeN"/>
+                                                                                    <constraint firstItem="j1v-IN-0qc" firstAttribute="top" secondItem="tL2-5m-lo5" secondAttribute="top" id="7cK-0r-eD7"/>
+                                                                                    <constraint firstAttribute="trailing" secondItem="j1v-IN-0qc" secondAttribute="trailing" id="Ml3-J9-pj9"/>
+                                                                                    <constraint firstItem="6yJ-K2-Ijj" firstAttribute="top" secondItem="tL2-5m-lo5" secondAttribute="top" id="exc-Xw-lbo"/>
+                                                                                    <constraint firstItem="6yJ-K2-Ijj" firstAttribute="leading" secondItem="tL2-5m-lo5" secondAttribute="leading" id="g0e-jp-Oco"/>
+                                                                                    <constraint firstAttribute="bottom" secondItem="j1v-IN-0qc" secondAttribute="bottom" id="n2B-9V-9Mf"/>
+                                                                                    <constraint firstAttribute="bottom" secondItem="6yJ-K2-Ijj" secondAttribute="bottom" id="yT0-0F-QwQ"/>
+                                                                                </constraints>
+                                                                            </view>
+                                                                        </subviews>
+                                                                    </stackView>
+                                                                    <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="v1z-sx-XOn">
+                                                                        <rect key="frame" x="0.0" y="260" width="273" height="115"/>
+                                                                        <subviews>
+                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="983-cw-cne">
+                                                                                <rect key="frame" x="0.0" y="0.0" width="273" height="115"/>
+                                                                                <subviews>
+                                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GRx-7R-2dn">
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="24" height="115"/>
+                                                                                        <subviews>
+                                                                                            <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pgC-DY-O3M" customClass="RadioButton" customModule="MoppApp" customModuleProvider="target">
+                                                                                                <rect key="frame" x="0.0" y="0.0" width="24" height="115"/>
+                                                                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                                                <accessibility key="accessibilityConfiguration">
+                                                                                                    <accessibilityTraits key="traits" button="YES"/>
+                                                                                                    <bool key="isElement" value="YES"/>
+                                                                                                </accessibility>
+                                                                                            </view>
+                                                                                        </subviews>
+                                                                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                                        <accessibility key="accessibilityConfiguration">
+                                                                                            <accessibilityTraits key="traits" button="YES"/>
+                                                                                            <bool key="isElement" value="YES"/>
+                                                                                        </accessibility>
+                                                                                        <constraints>
+                                                                                            <constraint firstAttribute="bottom" secondItem="pgC-DY-O3M" secondAttribute="bottom" id="2GD-MU-j1d"/>
+                                                                                            <constraint firstItem="pgC-DY-O3M" firstAttribute="leading" secondItem="GRx-7R-2dn" secondAttribute="leading" id="Elu-oR-Ak2"/>
+                                                                                            <constraint firstAttribute="trailing" secondItem="pgC-DY-O3M" secondAttribute="trailing" id="QxD-JJ-z02"/>
+                                                                                            <constraint firstAttribute="width" constant="24" id="tx1-ab-XI4"/>
+                                                                                            <constraint firstItem="pgC-DY-O3M" firstAttribute="top" secondItem="GRx-7R-2dn" secondAttribute="top" id="wCD-BB-5zs"/>
+                                                                                        </constraints>
+                                                                                    </view>
+                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="useManualProxy" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iLg-zA-yfe" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                                                        <rect key="frame" x="36" y="0.0" width="237" height="115"/>
+                                                                                        <accessibility key="accessibilityConfiguration">
+                                                                                            <accessibilityTraits key="traits" button="YES" staticText="YES"/>
+                                                                                        </accessibility>
+                                                                                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                                                        <color key="textColor" name="MoppText"/>
+                                                                                        <nil key="highlightedColor"/>
+                                                                                    </label>
+                                                                                </subviews>
+                                                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                                <accessibility key="accessibilityConfiguration">
+                                                                                    <accessibilityTraits key="traits" button="YES"/>
+                                                                                    <bool key="isElement" value="YES"/>
+                                                                                </accessibility>
+                                                                                <gestureRecognizers/>
+                                                                                <constraints>
+                                                                                    <constraint firstAttribute="bottom" secondItem="iLg-zA-yfe" secondAttribute="bottom" id="93e-BV-3js"/>
+                                                                                    <constraint firstItem="iLg-zA-yfe" firstAttribute="leading" secondItem="GRx-7R-2dn" secondAttribute="trailing" constant="12" id="bQJ-E8-W1l"/>
+                                                                                    <constraint firstItem="iLg-zA-yfe" firstAttribute="top" secondItem="983-cw-cne" secondAttribute="top" id="fwK-vr-GFX"/>
+                                                                                    <constraint firstItem="GRx-7R-2dn" firstAttribute="leading" secondItem="983-cw-cne" secondAttribute="leading" id="kc5-Ye-9qV"/>
+                                                                                    <constraint firstAttribute="trailing" secondItem="iLg-zA-yfe" secondAttribute="trailing" id="nX1-Lb-DSb"/>
+                                                                                    <constraint firstAttribute="bottom" secondItem="GRx-7R-2dn" secondAttribute="bottom" id="t4n-6C-Yol"/>
+                                                                                    <constraint firstItem="GRx-7R-2dn" firstAttribute="top" secondItem="983-cw-cne" secondAttribute="top" id="xCL-XW-Xj8"/>
+                                                                                </constraints>
+                                                                            </view>
+                                                                        </subviews>
+                                                                    </stackView>
+                                                                </subviews>
+                                                            </stackView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Host" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DLI-rA-d8b" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="440" width="273" height="20"/>
+                                                                <accessibility key="accessibilityConfiguration">
+                                                                    <bool key="isElement" value="NO"/>
+                                                                </accessibility>
+                                                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="17"/>
+                                                                <color key="textColor" name="MoppText"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BIZ-Ev-Hc5" customClass="SettingsTextField" customModule="MoppApp" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="470" width="273" height="55"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="55" id="NWy-ZE-zoI"/>
+                                                                </constraints>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                <textInputTraits key="textInputTraits"/>
+                                                            </textField>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Port" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MgY-cJ-Qp0" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="545" width="273" height="20"/>
+                                                                <accessibility key="accessibilityConfiguration">
+                                                                    <bool key="isElement" value="NO"/>
+                                                                </accessibility>
+                                                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="17"/>
+                                                                <color key="textColor" name="MoppText"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="zX0-qq-jmO" customClass="SettingsTextField" customModule="MoppApp" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="575" width="273" height="55"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="55" id="Vzc-sX-Atb"/>
+                                                                </constraints>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                <textInputTraits key="textInputTraits"/>
+                                                            </textField>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="URi-bc-L8p" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="635" width="273" height="17.5"/>
+                                                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
+                                                                <color key="textColor" name="MoppError"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S7R-9w-LnW" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="667.5" width="273" height="20"/>
+                                                                <accessibility key="accessibilityConfiguration">
+                                                                    <bool key="isElement" value="NO"/>
+                                                                </accessibility>
+                                                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="17"/>
+                                                                <color key="textColor" name="MoppText"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="awC-RF-Mrr" customClass="SettingsTextField" customModule="MoppApp" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="697.5" width="273" height="55"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="55" id="Ecf-tv-Oio"/>
+                                                                </constraints>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                <textInputTraits key="textInputTraits"/>
+                                                            </textField>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Password" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yuA-9N-MjC" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="772.5" width="273" height="20"/>
+                                                                <accessibility key="accessibilityConfiguration">
+                                                                    <bool key="isElement" value="NO"/>
+                                                                </accessibility>
+                                                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="17"/>
+                                                                <color key="textColor" name="MoppText"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="k3b-wv-0rQ" customClass="SettingsTextField" customModule="MoppApp" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="802.5" width="273" height="55"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="55" id="774-bx-rgH"/>
+                                                                </constraints>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                <textInputTraits key="textInputTraits"/>
+                                                            </textField>
+                                                            <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1n5-wG-CU5">
+                                                                <rect key="frame" x="0.0" y="877.5" width="273" height="1"/>
+                                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                <accessibility key="accessibilityConfiguration">
+                                                                    <accessibilityTraits key="traits" notEnabled="YES"/>
+                                                                </accessibility>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="1" id="lGX-sO-Nxr"/>
+                                                                </constraints>
+                                                            </view>
+                                                        </subviews>
+                                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="trailing" secondItem="zX0-qq-jmO" secondAttribute="trailing" id="0BN-13-Ncv"/>
+                                                            <constraint firstItem="zX0-qq-jmO" firstAttribute="top" secondItem="MgY-cJ-Qp0" secondAttribute="bottom" constant="10" id="0jx-zS-SYl"/>
+                                                            <constraint firstItem="k3b-wv-0rQ" firstAttribute="leading" secondItem="iiw-YR-wVb" secondAttribute="leading" id="65u-pL-6pG"/>
+                                                            <constraint firstAttribute="trailing" secondItem="S7R-9w-LnW" secondAttribute="trailing" id="6eC-u5-gR2"/>
+                                                            <constraint firstItem="URi-bc-L8p" firstAttribute="leading" secondItem="iiw-YR-wVb" secondAttribute="leading" id="Eo4-gz-d9Z"/>
+                                                            <constraint firstItem="awC-RF-Mrr" firstAttribute="leading" secondItem="iiw-YR-wVb" secondAttribute="leading" id="GbT-cC-R9H"/>
+                                                            <constraint firstItem="BIZ-Ev-Hc5" firstAttribute="top" secondItem="DLI-rA-d8b" secondAttribute="bottom" constant="10" id="IWY-4w-Lsv"/>
+                                                            <constraint firstAttribute="trailing" secondItem="DLI-rA-d8b" secondAttribute="trailing" id="Isa-bv-QBq"/>
+                                                            <constraint firstItem="URi-bc-L8p" firstAttribute="top" secondItem="zX0-qq-jmO" secondAttribute="bottom" constant="5" id="JOz-Zh-xP9"/>
+                                                            <constraint firstItem="yuA-9N-MjC" firstAttribute="top" secondItem="awC-RF-Mrr" secondAttribute="bottom" constant="20" id="KFg-CV-TK6"/>
+                                                            <constraint firstItem="BIZ-Ev-Hc5" firstAttribute="leading" secondItem="iiw-YR-wVb" secondAttribute="leading" id="KJd-IB-r3y"/>
+                                                            <constraint firstItem="9J6-UU-DzM" firstAttribute="top" secondItem="yaL-UI-neS" secondAttribute="bottom" constant="20" id="Lz6-HQ-PLp"/>
+                                                            <constraint firstAttribute="trailing" secondItem="yuA-9N-MjC" secondAttribute="trailing" id="PoO-A4-sBD"/>
+                                                            <constraint firstItem="1n5-wG-CU5" firstAttribute="top" secondItem="k3b-wv-0rQ" secondAttribute="bottom" constant="20" id="QDw-cx-emV"/>
+                                                            <constraint firstAttribute="trailing" secondItem="yaL-UI-neS" secondAttribute="trailing" id="Rde-2N-LnJ"/>
+                                                            <constraint firstItem="yuA-9N-MjC" firstAttribute="leading" secondItem="iiw-YR-wVb" secondAttribute="leading" id="Tci-uf-O3v"/>
+                                                            <constraint firstAttribute="bottom" secondItem="1n5-wG-CU5" secondAttribute="bottom" constant="20" id="Thc-Ds-0r3"/>
+                                                            <constraint firstAttribute="trailing" secondItem="1n5-wG-CU5" secondAttribute="trailing" id="UEx-oZ-gc2"/>
+                                                            <constraint firstAttribute="trailing" secondItem="BIZ-Ev-Hc5" secondAttribute="trailing" id="V8M-mM-yUr"/>
+                                                            <constraint firstItem="S7R-9w-LnW" firstAttribute="top" secondItem="URi-bc-L8p" secondAttribute="bottom" constant="15" id="Z6m-5A-GOk"/>
+                                                            <constraint firstAttribute="trailing" secondItem="k3b-wv-0rQ" secondAttribute="trailing" id="al4-QI-Fia"/>
+                                                            <constraint firstItem="awC-RF-Mrr" firstAttribute="top" secondItem="S7R-9w-LnW" secondAttribute="bottom" constant="10" id="bOg-uC-SgW"/>
+                                                            <constraint firstItem="1n5-wG-CU5" firstAttribute="leading" secondItem="iiw-YR-wVb" secondAttribute="leading" id="j5W-IB-kfQ"/>
+                                                            <constraint firstItem="DLI-rA-d8b" firstAttribute="top" secondItem="9J6-UU-DzM" secondAttribute="bottom" constant="20" id="ksY-LT-Prs"/>
+                                                            <constraint firstItem="DLI-rA-d8b" firstAttribute="leading" secondItem="iiw-YR-wVb" secondAttribute="leading" id="lad-s2-erb"/>
+                                                            <constraint firstItem="yaL-UI-neS" firstAttribute="leading" secondItem="iiw-YR-wVb" secondAttribute="leading" id="mPp-iy-1j6"/>
+                                                            <constraint firstAttribute="trailing" secondItem="9J6-UU-DzM" secondAttribute="trailing" id="mUe-XN-YPI"/>
+                                                            <constraint firstItem="yaL-UI-neS" firstAttribute="top" secondItem="iiw-YR-wVb" secondAttribute="top" id="n29-gE-iJg"/>
+                                                            <constraint firstItem="MgY-cJ-Qp0" firstAttribute="leading" secondItem="iiw-YR-wVb" secondAttribute="leading" id="oCE-PT-NeY"/>
+                                                            <constraint firstItem="MgY-cJ-Qp0" firstAttribute="top" secondItem="BIZ-Ev-Hc5" secondAttribute="bottom" constant="20" id="psW-J8-oLQ"/>
+                                                            <constraint firstItem="9J6-UU-DzM" firstAttribute="leading" secondItem="iiw-YR-wVb" secondAttribute="leading" id="r0P-Hb-AdE"/>
+                                                            <constraint firstItem="zX0-qq-jmO" firstAttribute="leading" secondItem="iiw-YR-wVb" secondAttribute="leading" id="s1Q-DT-dO4"/>
+                                                            <constraint firstItem="S7R-9w-LnW" firstAttribute="leading" secondItem="iiw-YR-wVb" secondAttribute="leading" id="ska-8H-sYc"/>
+                                                            <constraint firstItem="k3b-wv-0rQ" firstAttribute="top" secondItem="yuA-9N-MjC" secondAttribute="bottom" constant="10" id="tbX-yE-c4Y"/>
+                                                            <constraint firstAttribute="trailing" secondItem="awC-RF-Mrr" secondAttribute="trailing" id="wXT-Nc-M8B"/>
+                                                            <constraint firstAttribute="trailing" secondItem="URi-bc-L8p" secondAttribute="trailing" id="wvq-Gx-nFG"/>
+                                                            <constraint firstAttribute="trailing" secondItem="MgY-cJ-Qp0" secondAttribute="trailing" id="zCh-fr-Ea8"/>
+                                                        </constraints>
+                                                    </view>
+                                                </subviews>
+                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                <constraints>
+                                                    <constraint firstItem="iiw-YR-wVb" firstAttribute="top" secondItem="sEx-cL-4L9" secondAttribute="top" constant="20" id="Aje-Yg-mjq"/>
+                                                    <constraint firstAttribute="bottom" secondItem="iiw-YR-wVb" secondAttribute="bottom" id="Pf0-Ic-qiZ"/>
+                                                    <constraint firstItem="iiw-YR-wVb" firstAttribute="leading" secondItem="sEx-cL-4L9" secondAttribute="leading" constant="16" id="cGt-zq-n28"/>
+                                                    <constraint firstAttribute="trailing" secondItem="iiw-YR-wVb" secondAttribute="trailing" constant="16" id="kbz-IP-kRm"/>
+                                                </constraints>
+                                            </view>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstItem="sEx-cL-4L9" firstAttribute="height" secondItem="1eO-rv-feK" secondAttribute="height" priority="250" id="8HI-r2-NpV"/>
+                                            <constraint firstAttribute="bottom" secondItem="sEx-cL-4L9" secondAttribute="bottom" id="HQe-xN-825"/>
+                                            <constraint firstItem="sEx-cL-4L9" firstAttribute="width" secondItem="1eO-rv-feK" secondAttribute="width" id="OkI-pL-eNl"/>
+                                            <constraint firstAttribute="trailing" secondItem="sEx-cL-4L9" secondAttribute="trailing" id="XEv-aS-CTP"/>
+                                            <constraint firstItem="sEx-cL-4L9" firstAttribute="leading" secondItem="1eO-rv-feK" secondAttribute="leading" id="l3J-yc-yEl"/>
+                                            <constraint firstItem="sEx-cL-4L9" firstAttribute="top" secondItem="1eO-rv-feK" secondAttribute="top" id="olU-Lk-pG4"/>
+                                        </constraints>
+                                        <viewLayoutGuide key="contentLayoutGuide" id="S84-xN-xTW"/>
+                                        <viewLayoutGuide key="frameLayoutGuide" id="kh2-ka-kdC"/>
+                                    </scrollView>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="bottom" secondItem="1eO-rv-feK" secondAttribute="bottom" id="9SJ-bG-mb6"/>
+                                    <constraint firstItem="1eO-rv-feK" firstAttribute="leading" secondItem="HEC-ZS-Umu" secondAttribute="leading" id="XDb-mb-VcI"/>
+                                    <constraint firstAttribute="trailing" secondItem="1eO-rv-feK" secondAttribute="trailing" id="gBj-5j-um6"/>
+                                    <constraint firstItem="1eO-rv-feK" firstAttribute="top" secondItem="HEC-ZS-Umu" secondAttribute="top" id="x48-k6-bwJ"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="FaW-xZ-bQd"/>
+                        <constraints>
+                            <constraint firstItem="FaW-xZ-bQd" firstAttribute="bottom" secondItem="HEC-ZS-Umu" secondAttribute="bottom" constant="45" id="77h-ae-wSK"/>
+                            <constraint firstItem="HEC-ZS-Umu" firstAttribute="leading" secondItem="FaW-xZ-bQd" secondAttribute="leading" constant="35" id="79m-ff-Fvj"/>
+                            <constraint firstItem="HEC-ZS-Umu" firstAttribute="top" secondItem="FaW-xZ-bQd" secondAttribute="top" constant="45" id="LFb-3C-Hf6"/>
+                            <constraint firstItem="FaW-xZ-bQd" firstAttribute="trailing" secondItem="HEC-ZS-Umu" secondAttribute="trailing" constant="35" id="YnE-kw-kD1"/>
+                        </constraints>
+                    </view>
+                    <size key="freeformSize" width="375" height="1500"/>
+                    <connections>
+                        <outlet property="dismissButton" destination="x9y-Gk-0gs" id="UM6-UZ-d1d"/>
+                        <outlet property="hostLabel" destination="DLI-rA-d8b" id="pQX-HA-Bet"/>
+                        <outlet property="hostTextField" destination="BIZ-Ev-Hc5" id="L95-XZ-PHh"/>
+                        <outlet property="passwordLabel" destination="yuA-9N-MjC" id="4Nz-mH-Jso"/>
+                        <outlet property="passwordTextField" destination="k3b-wv-0rQ" id="DUk-BM-TFm"/>
+                        <outlet property="portErrorLabel" destination="URi-bc-L8p" id="mTy-zg-guh"/>
+                        <outlet property="portLabel" destination="MgY-cJ-Qp0" id="knS-5l-Rpp"/>
+                        <outlet property="portTextField" destination="zX0-qq-jmO" id="H49-FB-erQ"/>
+                        <outlet property="proxyTitle" destination="37i-OR-Wdv" id="OFO-19-Zms"/>
+                        <outlet property="scrollView" destination="1eO-rv-feK" id="bh3-G0-UPn"/>
+                        <outlet property="useManualProxyLabel" destination="iLg-zA-yfe" id="wi5-DT-uuE"/>
+                        <outlet property="useManualProxyRadioButton" destination="pgC-DY-O3M" id="eqZ-5Z-Jhv"/>
+                        <outlet property="useManualProxyStackView" destination="v1z-sx-XOn" id="IFn-jg-lzF"/>
+                        <outlet property="useManualProxyView" destination="983-cw-cne" id="Odb-7F-V5Z"/>
+                        <outlet property="useNoProxyLabel" destination="sYE-Av-SP0" id="hfn-Q6-pnx"/>
+                        <outlet property="useNoProxyRadioButton" destination="Hmo-hm-vw7" id="PZM-0C-AFR"/>
+                        <outlet property="useNoProxyStackView" destination="rMv-2O-FmS" id="GgE-P4-ZKs"/>
+                        <outlet property="useNoProxyView" destination="7Bm-Sm-MVO" id="q80-uU-FDc"/>
+                        <outlet property="useSystemProxyLabel" destination="j1v-IN-0qc" id="7pl-SC-Du9"/>
+                        <outlet property="useSystemProxyRadioButton" destination="deM-kG-bOY" id="Zr9-6I-obo"/>
+                        <outlet property="useSystemProxyStackView" destination="cnT-HJ-Myz" id="zrb-iz-Jsu"/>
+                        <outlet property="useSystemProxyView" destination="tL2-5m-lo5" id="tS1-ke-VFy"/>
+                        <outlet property="usernameLabel" destination="S7R-9w-LnW" id="nRR-By-vq8"/>
+                        <outlet property="usernameTextField" destination="awC-RF-Mrr" id="fOz-kN-qEe"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="eps-lI-LAd" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3135" y="-1377"/>
+        </scene>
     </scenes>
     <resources>
         <image name="DismissPopup" width="25" height="25"/>
diff --git a/MoppApp/MoppApp/SettingsProxyCell.swift b/MoppApp/MoppApp/SettingsProxyCell.swift
index 19ff7dacf..7f4e64cb0 100644
--- a/MoppApp/MoppApp/SettingsProxyCell.swift
+++ b/MoppApp/MoppApp/SettingsProxyCell.swift
@@ -25,8 +25,6 @@ import UIKit
 import SkSigningLib
 
 class SettingsProxyCell: UITableViewCell {
-
-    private static let defaultEnableSSLWidth = CGFloat(150)
     
     @IBOutlet weak var proxyTitle: ScaledLabel!
     
@@ -58,19 +56,10 @@ class SettingsProxyCell: UITableViewCell {
     @IBOutlet weak var passwordTitle: ScaledLabel!
     @IBOutlet weak var passwordTextField: SettingsTextField!
     
-    @IBOutlet weak var enableSSLStackView: UIStackView!
-    @IBOutlet weak var enableSSLTitle: ScaledLabel!
-    @IBOutlet weak var enableSSLButton: SwitchButton!
-    
     weak var delegate: SettingsCellDelegate!
     
     weak var topViewController: UIViewController?
     
-    @IBAction func toggleProxySSL(_ sender: SwitchButton) {
-        DefaultsHelper.isProxyForSSLEnabled = sender.isOn
-        setSSLButtonVoiceLabel()
-    }
-    
     override func awakeFromNib() {
         hostTextField.delegate = self
         portTextField.delegate = self
@@ -109,16 +98,14 @@ class SettingsProxyCell: UITableViewCell {
         noProxyView.accessibilityUserInputLabels = [L(.voiceControlProxyNoProxy)]
         systemProxyView.accessibilityUserInputLabels = [L(.voiceControlProxySystemProxy)]
         manualProxyView.accessibilityUserInputLabels = [L(.voiceControlProxyManualProxy)]
-
-        setSSLButtonVoiceLabel()
         
-        guard let proxyUITitle = proxyTitle, let noProxyUIView = noProxyView, let systemProxyUIView = systemProxyView, let manualProxyUIView = manualProxyView, let hostUITextField: UITextField = hostTextField, let portUITextField = portTextField, let usernameUITextField = usernameTextField, let passwordUITextField = passwordTextField, let enableSSLUIButton = enableSSLButton else {
-            printLog("Unable to get proxyTitle, noProxyView, systemProxyView, manualProxyView, hostTextField, portTextField, usernameTextField, passwordTextField or enableSSLButton")
+        guard let proxyUITitle = proxyTitle, let noProxyUIView = noProxyView, let systemProxyUIView = systemProxyView, let manualProxyUIView = manualProxyView, let hostUITextField: UITextField = hostTextField, let portUITextField = portTextField, let usernameUITextField = usernameTextField, let passwordUITextField = passwordTextField else {
+            printLog("Unable to get proxyTitle, noProxyView, systemProxyView, manualProxyView, hostTextField, portTextField, usernameTextField, passwordTextField")
             return
         }
         
         if UIAccessibility.isVoiceOverRunning {
-            self.accessibilityElements = [proxyUITitle, noProxyUIView, systemProxyUIView, manualProxyUIView, hostUITextField, portUITextField, usernameUITextField, passwordUITextField, enableSSLUIButton]
+            self.accessibilityElements = [proxyUITitle, noProxyUIView, systemProxyUIView, manualProxyUIView, hostUITextField, portUITextField, usernameUITextField, passwordUITextField]
         }
         
         updateUI()
@@ -197,9 +184,6 @@ class SettingsProxyCell: UITableViewCell {
         DispatchQueue.main.async {
 
             self.proxyChoicesStackView.isAccessibilityElement = false
-            self.enableSSLStackView.isAccessibilityElement = false
-            
-            self.enableSSLButton.isAccessibilityElement = true
             
             self.setAccessibilityElementsInStackView(stackView: self.proxyChoicesStackView, isAccessibilityElement: true)
             
@@ -213,9 +197,6 @@ class SettingsProxyCell: UITableViewCell {
             self.usernameTextField.text = DefaultsHelper.proxyUsername
             self.passwordTextField.text = KeychainUtil.retrieve(key: proxyPasswordKey) ?? ""
             
-            self.enableSSLButton.isOn = DefaultsHelper.isProxyForSSLEnabled
-            self.enableSSLButton.accessibilityLabel = L(.settingsProxyAllowSSL)
-            
             // Detect which RadioButton was clicked
             if !(self.noProxyView.gestureRecognizers?.contains(where: { $0 is ProxyChoiceTapGestureRecognizer }) ?? false) {
                 
@@ -265,8 +246,6 @@ class SettingsProxyCell: UITableViewCell {
             self.usernameTitle.text = L(.settingsProxyUsername)
             self.passwordTitle.text = L(.settingsProxyPassword)
             
-            self.enableSSLTitle.text = L(.settingsProxyAllowSSL)
-            
             self.handleProxySetting(proxySetting: savedProxySetting)
         }
     }
@@ -284,10 +263,6 @@ class SettingsProxyCell: UITableViewCell {
         return (1...65535).contains(portNumber)
     }
     
-    func setSSLButtonVoiceLabel() {
-        enableSSLButton.accessibilityUserInputLabels = enableSSLButton.isOn ? [L(.voiceControlProxyDisallowSsl)] : [L(.settingsProxyAllowSSL)]
-    }
-    
     deinit {
         let savedProxySetting = DefaultsHelper.proxySetting
         if savedProxySetting == .noProxy || savedProxySetting == .systemProxy {
diff --git a/MoppApp/MoppApp/SettingsTSACertCell.swift b/MoppApp/MoppApp/SettingsTSACertCell.swift
index feda3a34d..68a68494a 100644
--- a/MoppApp/MoppApp/SettingsTSACertCell.swift
+++ b/MoppApp/MoppApp/SettingsTSACertCell.swift
@@ -43,6 +43,9 @@ class SettingsTSACertCell: UITableViewCell {
     @IBOutlet weak var addCertificateButton: ScaledLabel!
     @IBOutlet weak var showCertificateButton: ScaledLabel!
     
+    @IBOutlet weak var addCertificateView: UIView!
+    @IBOutlet weak var showCertificateView: UIView!
+    
     @objc func addCertificateButtonTapped() {
         let documentPicker: UIDocumentPickerViewController = {
             let allowedDocumentTypes = [UTType.x509Certificate]
@@ -112,6 +115,8 @@ class SettingsTSACertCell: UITableViewCell {
             self.addCertificateButton.resetLabelProperties()
             self.addCertificateButton.isAccessibilityElement = true
             
+            self.addCertificateView.accessibilityUserInputLabels = [L(.settingsTimestampCertAddCertificateButton)]
+            
             self.showCertificateButton.text = L(.settingsTimestampCertShowCertificateButton)
             self.showCertificateButton.accessibilityLabel = self.showCertificateButton.text?.lowercased()
             self.showCertificateButton.font = .moppMedium
@@ -120,6 +125,8 @@ class SettingsTSACertCell: UITableViewCell {
             self.showCertificateButton.resetLabelProperties()
             self.showCertificateButton.isAccessibilityElement = true
             
+            self.showCertificateView.accessibilityUserInputLabels = [L(.settingsTimestampCertShowCertificateButton)]
+            
             if self.addCertificateButton.gestureRecognizers == nil || self.addCertificateButton.gestureRecognizers?.isEmpty == true {
                 let tapGesture = UITapGestureRecognizer(target: self, action: #selector(self.addCertificateButtonTapped))
                 self.addCertificateButton.addGestureRecognizer(tapGesture)
diff --git a/MoppApp/MoppApp/SettingsViewController.swift b/MoppApp/MoppApp/SettingsViewController.swift
index c1d050c19..66137bb88 100644
--- a/MoppApp/MoppApp/SettingsViewController.swift
+++ b/MoppApp/MoppApp/SettingsViewController.swift
@@ -99,6 +99,7 @@ class SettingsViewController: MoppViewController {
         CertUtil.removeCertificate(folder: SettingsTSACertCell.tsaFileFolder, fileName: DefaultsHelper.tsaCertFileName ?? "")
         
         CertUtil.removeCertificate(folder: SivaCertViewController.sivaFileFolder, fileName: DefaultsHelper.sivaCertFileName ?? "")
+    }
 
     func resetTSA() {
         CertUtil.removeCertificate(folder: SettingsTSACertCell.tsaFileFolder, fileName: DefaultsHelper.tsaCertFileName ?? "")
@@ -106,7 +107,7 @@ class SettingsViewController: MoppViewController {
     }
 
     func resetSiva() {
-        CertUtil.removeCertificate(folder: SettingsSivaCertCell.sivaFileFolder, fileName: DefaultsHelper.sivaCertFileName ?? "")
+        CertUtil.removeCertificate(folder: SivaCertViewController.sivaFileFolder, fileName: DefaultsHelper.sivaCertFileName ?? "")
         DefaultsHelper.sivaCertFileName = ""
         DefaultsHelper.sivaAccessState = .defaultAccess
         DefaultsHelper.sivaUrl = Configuration.getConfiguration().SIVAURL
@@ -118,7 +119,6 @@ class SettingsViewController: MoppViewController {
         DefaultsHelper.proxyPort = 80
         DefaultsHelper.proxyUsername = ""
         KeychainUtil.remove(key: proxyPasswordKey)
-        DefaultsHelper.isProxyForSSLEnabled = true
     }
     
     deinit {
diff --git a/MoppApp/MoppApp/Signing/Siva/SivaCategoryCell.swift b/MoppApp/MoppApp/Signing/Siva/SivaCategoryCell.swift
index b10931659..51665f0e0 100644
--- a/MoppApp/MoppApp/Signing/Siva/SivaCategoryCell.swift
+++ b/MoppApp/MoppApp/Signing/Siva/SivaCategoryCell.swift
@@ -25,6 +25,7 @@ import UIKit
 
 class SivaCategoryCell: UITableViewCell {
     
+    @IBOutlet weak var accessToSivaView: UIView!
     @IBOutlet weak var accessToSivaButton: ScaledLabel!
     
     @objc func openAccessToSivaSettings() {
@@ -63,6 +64,8 @@ class SivaCategoryCell: UITableViewCell {
         self.accessToSivaButton.textColor = .systemBlue
         self.accessToSivaButton.isUserInteractionEnabled = true
         self.accessToSivaButton.resetLabelProperties()
+        
+        self.accessToSivaView.accessibilityUserInputLabels = [L(.voiceControlSivaCategory)]
     }
     
     private func openAccessToSivaView() {
diff --git a/MoppApp/MoppApp/Signing/SivaCertViewController.swift b/MoppApp/MoppApp/Signing/SivaCertViewController.swift
index 7c550cdbf..1e9976da5 100644
--- a/MoppApp/MoppApp/Signing/SivaCertViewController.swift
+++ b/MoppApp/MoppApp/Signing/SivaCertViewController.swift
@@ -57,7 +57,10 @@ class SivaCertViewController: MoppViewController {
     @IBOutlet weak var issuedToLabel: ScaledLabel!
     @IBOutlet weak var validUntilLabel: ScaledLabel!
 
+    @IBOutlet weak var addCertificateView: UIView!
     @IBOutlet weak var addCertificateButton: ScaledLabel!
+
+    @IBOutlet weak var showCertificateView: UIView!
     @IBOutlet weak var showCertificateButton: ScaledLabel!
 
     @IBAction func dismissView(_ sender: ScaledButton) {
@@ -257,6 +260,8 @@ class SivaCertViewController: MoppViewController {
             self.addCertificateButton.isUserInteractionEnabled = true
             self.addCertificateButton.resetLabelProperties()
             
+            self.addCertificateView.accessibilityUserInputLabels = [L(.settingsTimestampCertAddCertificateButton)]
+            
             self.showCertificateButton.text = L(.settingsTimestampCertShowCertificateButton)
             self.showCertificateButton.accessibilityLabel = self.showCertificateButton.text?.lowercased()
             self.showCertificateButton.font = .moppMedium
@@ -264,6 +269,8 @@ class SivaCertViewController: MoppViewController {
             self.showCertificateButton.isUserInteractionEnabled = true
             self.showCertificateButton.resetLabelProperties()
             
+            self.showCertificateView.accessibilityUserInputLabels = [L(.settingsTimestampCertShowCertificateButton)]
+            
             if self.addCertificateButton.gestureRecognizers == nil || self.addCertificateButton.gestureRecognizers?.isEmpty == true {
                 let tapGesture = UITapGestureRecognizer(target: self, action: #selector(self.addCertificate))
                 self.addCertificateButton.addGestureRecognizer(tapGesture)
diff --git a/MoppApp/MoppApp/en.lproj/Localizable.strings b/MoppApp/MoppApp/en.lproj/Localizable.strings
index 408300a8a..890f00337 100755
--- a/MoppApp/MoppApp/en.lproj/Localizable.strings
+++ b/MoppApp/MoppApp/en.lproj/Localizable.strings
@@ -391,7 +391,6 @@
 "settings-proxy-port" = "Port";
 "settings-proxy-username" = "Username";
 "settings-proxy-password" = "Password";
-"settings-proxy-allow-ssl" = "Enable proxy for SSL connections";
 "settings-reset-button" = "USE DEFAULT SETTINGS";
 "diagnostics-title" = "Diagnostics";
 "diagnostics-activate-one-time-logging" = "Enable one-time log generation";
@@ -539,6 +538,7 @@
 "voice-control-role-country" = "Country";
 "voice-control-role-zip" = "Zip";
 "voice-control-role-and-address" = "Role and address";
+"voice-control-siva-category" = "Access to Siva";
 "voice-control-siva-service" = "Edit Validation service";
 "voice-control-siva-default-access" = "Default validation access";
 "voice-control-siva-manual-access" = "Manual validation access";
diff --git a/MoppApp/MoppApp/et.lproj/Localizable.strings b/MoppApp/MoppApp/et.lproj/Localizable.strings
index 01f3fad28..cd24a064d 100755
--- a/MoppApp/MoppApp/et.lproj/Localizable.strings
+++ b/MoppApp/MoppApp/et.lproj/Localizable.strings
@@ -392,7 +392,6 @@
 "settings-proxy-port" = "Port";
 "settings-proxy-username" = "Kasutajanimi";
 "settings-proxy-password" = "Parool";
-"settings-proxy-allow-ssl" = "Luba proksi kasutamine SSL-ühenduste jaoks";
 "settings-reset-button" = "TAASTA ALGSEADED";
 "diagnostics-title" = "Diagnostika";
 "diagnostics-activate-one-time-logging" = "Aktiveeri ühekordne logifaili genereerimine";
@@ -539,6 +538,7 @@
 "voice-control-role-country" = "Country";
 "voice-control-role-zip" = "Zip";
 "voice-control-role-and-address" = "Role and address";
+"voice-control-siva-category" = "Access to Siva";
 "voice-control-siva-service" = "Edit Validation service";
 "voice-control-siva-default-access" = "Default validation access";
 "voice-control-siva-manual-access" = "Manual validation access";
diff --git a/MoppApp/MoppApp/ru.lproj/Localizable.strings b/MoppApp/MoppApp/ru.lproj/Localizable.strings
index 9eec98d14..2082febaf 100644
--- a/MoppApp/MoppApp/ru.lproj/Localizable.strings
+++ b/MoppApp/MoppApp/ru.lproj/Localizable.strings
@@ -389,7 +389,6 @@
 "settings-proxy-port" = "Порт";
 "settings-proxy-username" = "Имя пользователя";
 "settings-proxy-password" = "Пароль";
-"settings-proxy-allow-ssl" = "Включить прокси-сервер для подключения SSL";
 "settings-siva-default-access-title" = "Использовать доступ, назначенный по умолчанию";
 "settings-siva-default-manual-access-title" = "Использовать доступ, назначенный вручную";
 "settings-siva-default-certificate-title" = "Сертификат услуги валидации SiVa SSL";
@@ -540,6 +539,7 @@
 "voice-control-role-country" = "Country";
 "voice-control-role-zip" = "Zip";
 "voice-control-role-and-address" = "Role and address";
+"voice-control-siva-category" = "Access to Siva";
 "voice-control-siva-service" = "Edit Validation service";
 "voice-control-siva-default-access" = "Default validation access";
 "voice-control-siva-manual-access" = "Manual validation access";
diff --git a/MoppLib/MoppLib/MoppLibDigidocManager.mm b/MoppLib/MoppLib/MoppLibDigidocManager.mm
index 4362f5aa3..a81eebd3d 100644
--- a/MoppLib/MoppLib/MoppLibDigidocManager.mm
+++ b/MoppLib/MoppLib/MoppLibDigidocManager.mm
@@ -159,10 +159,6 @@
     virtual std::string proxyPass() const override {
         return std::string([proxyConfiguration.PASSWORD UTF8String]);
     }
-    
-    virtual bool proxyTunnelSSL() const override {
-        return proxyConfiguration.ISSSLENABLED;
-    }
 
     std::vector<digidoc::X509Cert> stringsToX509Certs(NSArray<NSString*> *certBundle) const {
         __block std::vector<digidoc::X509Cert> x509Certs;
diff --git a/MoppLib/MoppLib/PublicInterface/MoppLibProxyConfiguration.h b/MoppLib/MoppLib/PublicInterface/MoppLibProxyConfiguration.h
index 327ee4e8b..27d6290dc 100644
--- a/MoppLib/MoppLib/PublicInterface/MoppLibProxyConfiguration.h
+++ b/MoppLib/MoppLib/PublicInterface/MoppLibProxyConfiguration.h
@@ -29,8 +29,7 @@
 @property (nonatomic, strong) NSNumber *PORT;
 @property (nonatomic, strong) NSString *USERNAME;
 @property (nonatomic, strong) NSString *PASSWORD;
-@property (nonatomic, assign) BOOL *ISSSLENABLED;
 
-- (id) initWithConfiguration:(NSString *)HOST PORT:(NSNumber *)PORT USERNAME:(NSString *)USERNAME PASSWORD:(NSString *)PASSWORD ISSSLENABLED:(BOOL)ISSSLENABLED;
+- (id) initWithConfiguration:(NSString *)HOST PORT:(NSNumber *)PORT USERNAME:(NSString *)USERNAME PASSWORD:(NSString *)PASSWORD;
 
 @end
diff --git a/MoppLib/MoppLib/PublicInterface/MoppLibProxyConfiguration.m b/MoppLib/MoppLib/PublicInterface/MoppLibProxyConfiguration.m
index 511585862..e33cce08a 100644
--- a/MoppLib/MoppLib/PublicInterface/MoppLibProxyConfiguration.m
+++ b/MoppLib/MoppLib/PublicInterface/MoppLibProxyConfiguration.m
@@ -25,7 +25,7 @@
 
 @implementation MoppLibProxyConfiguration
 
-- (id) initWithConfiguration:(NSString *)HOST PORT:(NSNumber *)PORT USERNAME:(NSString *)USERNAME PASSWORD:(NSString *)PASSWORD {
+- (id)initWithConfiguration:(NSString *)HOST PORT:(NSNumber *)PORT USERNAME:(NSString *)USERNAME PASSWORD:(NSString *)PASSWORD {
     self = [super init];
     if (self) {
         self.HOST = HOST;
diff --git a/SkSigningLib/SkSigningLib/Utilities/Proxy/Proxy.swift b/SkSigningLib/SkSigningLib/Utilities/Proxy/Proxy.swift
index 85c7ecca2..ae896d804 100644
--- a/SkSigningLib/SkSigningLib/Utilities/Proxy/Proxy.swift
+++ b/SkSigningLib/SkSigningLib/Utilities/Proxy/Proxy.swift
@@ -28,13 +28,11 @@ public struct Proxy {
     public var port: Int
     public var username: String
     public var password: String
-    public var isSSLEnabled: Bool
     
-    public init(host: String, port: Int, username: String, password: String, isSSLEnabled: Bool) {
+    public init(host: String, port: Int, username: String, password: String) {
         self.host = host
         self.port = port
         self.username = username
         self.password = password
-        self.isSSLEnabled = isSSLEnabled
     }
 }
diff --git a/SkSigningLib/SkSigningLib/Utilities/Proxy/ProxyUtil.swift b/SkSigningLib/SkSigningLib/Utilities/Proxy/ProxyUtil.swift
index 25f5089ac..c214bb1f5 100644
--- a/SkSigningLib/SkSigningLib/Utilities/Proxy/ProxyUtil.swift
+++ b/SkSigningLib/SkSigningLib/Utilities/Proxy/ProxyUtil.swift
@@ -31,10 +31,10 @@ public enum ProxySetting: String, Codable {
 
 public class ProxyUtil {
     
-    public static func createProxyConfiguration(proxySetting: ProxySetting, proxyHost: String?, proxyPort: Int?, proxyUsername: String?, proxyPassword: String?, isProxySSLEnabled: Bool) -> [AnyHashable: Any]? {
+    public static func createProxyConfiguration(proxySetting: ProxySetting, proxyHost: String?, proxyPort: Int?, proxyUsername: String?, proxyPassword: String?) -> [AnyHashable: Any]? {
         
         // Use manual proxy settings
-        if proxySetting == .manualProxy, isProxySSLEnabled, let host = proxyHost, let port = proxyPort, !host.isEmpty, port > 0 {
+        if proxySetting == .manualProxy, let host = proxyHost, let port = proxyPort, !host.isEmpty, port > 0 {
             let proxyConfiguration: [AnyHashable : Any] = [
                 String(kCFNetworkProxiesHTTPEnable): 1,
                 String(kCFNetworkProxiesHTTPProxy): host,
@@ -50,7 +50,7 @@ public class ProxyUtil {
             return proxyConfiguration
         }
         // Check if system proxy settings exist. iOS automatically handles proxy configuration with system settings
-        else if proxySetting == .systemProxy, isProxySSLEnabled, let proxySettingsUnmanaged = CFNetworkCopySystemProxySettings() {
+        else if proxySetting == .systemProxy, let proxySettingsUnmanaged = CFNetworkCopySystemProxySettings() {
             let proxySettings = proxySettingsUnmanaged.takeRetainedValue() as? [AnyHashable : Any]
             if let systemHost = proxySettings?[kCFNetworkProxiesHTTPProxy] as? String, let systemPort = proxySettings?[kCFNetworkProxiesHTTPPort] as? Int, !systemHost.isEmpty && systemPort > 0 {
                 return nil
@@ -85,7 +85,7 @@ public class ProxyUtil {
     public static func configureURLSessionWithProxy(urlSessionConfiguration: inout URLSessionConfiguration, manualProxyConf: Proxy) {
         let proxyConfiguration = ProxyUtil.createProxyConfiguration(
             proxySetting: .manualProxy,
-            proxyHost: manualProxyConf.host, proxyPort: manualProxyConf.port, proxyUsername: manualProxyConf.username, proxyPassword: manualProxyConf.password, isProxySSLEnabled: manualProxyConf.isSSLEnabled)
+            proxyHost: manualProxyConf.host, proxyPort: manualProxyConf.port, proxyUsername: manualProxyConf.username, proxyPassword: manualProxyConf.password)
         
         if let proxyConf = proxyConfiguration {
             urlSessionConfiguration.connectionProxyDictionary = proxyConf