diff --git a/Adios/Base.lproj/Main.storyboard b/Adios/Base.lproj/Main.storyboard
index 7035775..195b211 100644
--- a/Adios/Base.lproj/Main.storyboard
+++ b/Adios/Base.lproj/Main.storyboard
@@ -150,7 +150,7 @@
                                     <color key="titleColor" red="1" green="0.092578096040000002" blue="0.1144802766" alpha="1" colorSpace="calibratedRGB"/>
                                 </state>
                                 <connections>
-                                    <segue destination="tpk-3K-YbC" kind="presentation" modalPresentationStyle="fullScreen" id="6O9-GB-Ua1"/>
+                                    <segue destination="tpk-3K-YbC" kind="presentation" identifier="Configure" modalPresentationStyle="fullScreen" id="6O9-GB-Ua1"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oA2-iG-BeH">
@@ -568,37 +568,21 @@
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <adBannerView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="UWz-yo-kDc">
-                                <rect key="frame" x="140" y="64" width="320" height="66"/>
-                                <animations/>
-                            </adBannerView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Adios only blocks ads in Safari." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RDL-dT-8Vn">
-                                <rect key="frame" x="20" y="138" width="560" height="21"/>
-                                <animations/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                         </subviews>
                         <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="mr5-3n-M3H" firstAttribute="centerY" secondItem="IDT-IG-KeP" secondAttribute="centerY" id="7C7-Vd-sd8"/>
-                            <constraint firstItem="UWz-yo-kDc" firstAttribute="top" secondItem="2XB-zV-dnC" secondAttribute="bottom" id="8Q0-Sc-9nP"/>
                             <constraint firstItem="mr5-3n-M3H" firstAttribute="top" secondItem="6dn-G5-BNs" secondAttribute="bottom" constant="8" symbolic="YES" id="AhL-J9-M06"/>
-                            <constraint firstItem="RDL-dT-8Vn" firstAttribute="trailing" secondItem="IDT-IG-KeP" secondAttribute="trailingMargin" id="C59-ob-3gQ"/>
                             <constraint firstItem="odv-RL-0jb" firstAttribute="top" secondItem="wr2-JY-l7W" secondAttribute="bottom" constant="8" id="D7p-LS-68N"/>
                             <constraint firstAttribute="trailingMargin" secondItem="lTm-fY-aCV" secondAttribute="trailing" constant="-20" id="J7C-PO-S9e"/>
                             <constraint firstItem="mr5-3n-M3H" firstAttribute="trailing" secondItem="IDT-IG-KeP" secondAttribute="trailingMargin" id="KFl-l1-tVV"/>
                             <constraint firstItem="6dn-G5-BNs" firstAttribute="leading" secondItem="IDT-IG-KeP" secondAttribute="leadingMargin" id="KKl-Xw-qJh"/>
-                            <constraint firstItem="RDL-dT-8Vn" firstAttribute="leading" secondItem="IDT-IG-KeP" secondAttribute="leadingMargin" id="Lqs-dJ-bWh"/>
                             <constraint firstItem="lTm-fY-aCV" firstAttribute="leading" secondItem="IDT-IG-KeP" secondAttribute="leadingMargin" constant="-20" id="Ng0-O7-C17"/>
                             <constraint firstItem="wr2-JY-l7W" firstAttribute="trailing" secondItem="IDT-IG-KeP" secondAttribute="trailingMargin" id="Pjf-36-DfQ"/>
-                            <constraint firstItem="UWz-yo-kDc" firstAttribute="centerX" secondItem="IDT-IG-KeP" secondAttribute="centerX" id="QPm-jb-nDH"/>
                             <constraint firstItem="mr5-3n-M3H" firstAttribute="leading" secondItem="IDT-IG-KeP" secondAttribute="leadingMargin" id="Zlk-2U-uGa"/>
                             <constraint firstItem="odv-RL-0jb" firstAttribute="trailing" secondItem="IDT-IG-KeP" secondAttribute="trailingMargin" id="cJq-oJ-ObF"/>
-                            <constraint firstItem="RDL-dT-8Vn" firstAttribute="top" secondItem="UWz-yo-kDc" secondAttribute="bottom" constant="8" id="hzJ-Oq-24I"/>
                             <constraint firstItem="6dn-G5-BNs" firstAttribute="trailing" secondItem="IDT-IG-KeP" secondAttribute="trailingMargin" id="md2-HF-0mN"/>
                             <constraint firstItem="odv-RL-0jb" firstAttribute="leading" secondItem="IDT-IG-KeP" secondAttribute="leadingMargin" id="pk0-Ee-fwj"/>
                             <constraint firstItem="wr2-JY-l7W" firstAttribute="top" secondItem="mr5-3n-M3H" secondAttribute="bottom" constant="8" id="prW-sY-IrV"/>
@@ -608,9 +592,6 @@
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Two more things..." id="h6n-Me-BAw"/>
-                    <connections>
-                        <outlet property="adBanner" destination="UWz-yo-kDc" id="NPH-tv-axz"/>
-                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="fMs-cY-FgJ" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
diff --git a/Adios/Info.plist b/Adios/Info.plist
index 472f1e0..bbbf348 100644
--- a/Adios/Info.plist
+++ b/Adios/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1</string>
+	<string>5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>107</string>
+	<string>117</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
diff --git a/Adios/ListsManager.swift b/Adios/ListsManager.swift
index da6c80b..8523ad2 100644
--- a/Adios/ListsManager.swift
+++ b/Adios/ListsManager.swift
@@ -78,6 +78,58 @@ public class ListsManager {
         }
     }
     
+    public class func getRealListFromCountry(country: String) -> String? {
+        switch country {
+        case "Arabic region":
+            return "EasyList_Arabic"
+        case "Bulgaria":
+            return "EasyList_Bulgaria"
+        case "China":
+            return "EasyList_China"
+        case "Czech and Slovak Rep.":
+            return "EasyList_Czechoslovakia"
+        case "Denmark":
+            return "List_Danish"
+        case "France":
+            return "EasyList_France"
+        case "Estonia":
+            return "List_Estonia"
+        case "Germany":
+            return "EasyList_Germany"
+        case "Greece":
+            return "EasyList_Greece"
+        case "Hungary":
+            return "List_Hungary"
+        case "Iceland":
+            return "EasyList_Iceland"
+        case "Indonesia":
+            return "EasyList_Indonesia"
+        case "Italy":
+            return "EasyList_Italy"
+        case "Israel":
+            return "EasyList_Hebrew"
+        case "Japan":
+            return "List_Japan"
+        case "Latvia":
+            return "EasyList_Latvia"
+        case "Netherlands":
+            return "EasyList_Dutch"
+        case "Poland":
+            return "EasyList_Poland"
+        case "Romania":
+            return "EasyList_Romania"
+        case "Russia":
+            return "EasyList_Russia"
+        case "United Kingdom":
+            return "List_England"
+        case "U.S.A":
+            return "EasyList"
+        default:
+            return nil
+        }
+    }
+
+    
     public class func removeFollowedListsData() {
         if let groupUrl = NSFileManager.defaultManager().containerURLForSecurityApplicationGroupIdentifier("group.AG.Adios") {
             if let groupPath = groupUrl.path {
diff --git a/Adios/MainListViewController.swift b/Adios/MainListViewController.swift
index 752e4a9..91bd932 100644
--- a/Adios/MainListViewController.swift
+++ b/Adios/MainListViewController.swift
@@ -18,7 +18,7 @@ class MainListViewController: UIViewController, UIPickerViewDataSource, UIPicker
         // Do any additional setup after loading the view, typically from a nib.
         mainListPickerView.dataSource = self
         mainListPickerView.delegate = self
-        mainListPickerView.selectRow(onboardManager.getMainListPosition(), inComponent: 0, animated: false)
+        mainListPickerView.selectRow(onboardManager.getUserCountryPosition(), inComponent: 0, animated: false)
     }
     
     override func didReceiveMemoryWarning() {
@@ -31,14 +31,14 @@ class MainListViewController: UIViewController, UIPickerViewDataSource, UIPicker
     }
     
     func pickerView(pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
-        return onboardManager.getMainLists().count
+        return onboardManager.getCountries().count
     }
     
     func pickerView(pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
-        return onboardManager.getMainLists()[row]
+        return onboardManager.getCountries()[row]
     }
     
     func pickerView(pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
-        onboardManager.mainList = onboardManager.getMainLists()[row]
+        onboardManager.mainCountry = onboardManager.getCountries()[row]
     }
 }
diff --git a/Adios/OnboardManager.swift b/Adios/OnboardManager.swift
index 2823782..0304011 100644
--- a/Adios/OnboardManager.swift
+++ b/Adios/OnboardManager.swift
@@ -9,41 +9,42 @@
 import Foundation
 
 class OnboardManager {
-    var mainList: String? {
+    var mainCountry: String? {
         get {
-            if let list = NSUserDefaults.standardUserDefaults().stringForKey("tempMainList") {
-                return list
+            if let country = NSUserDefaults.standardUserDefaults().stringForKey("mainCountry") {
+                return country
             } else {
-                return getLogicCountry()
+                return getCountryFromLocalizedCountry(getLogicLocalizedCountry())
             }
         }
         set {
             if newValue != nil {
-                NSUserDefaults.standardUserDefaults().setValue(newValue, forKey: "tempMainList")
+                NSUserDefaults.standardUserDefaults().setValue(getCountryFromLocalizedCountry(newValue!), forKey: "mainCountry")
             } else {
-                NSUserDefaults.standardUserDefaults().setValue(getLogicCountry(), forKey: "tempMainList")
+                NSUserDefaults.standardUserDefaults().setValue(getCountryFromLocalizedCountry(getLogicLocalizedCountry()), forKey: "mainCountry")
             }
         }
     }
-    var secondList: String? {
+    var secondCountry: String? {
         get {
-            if let list = NSUserDefaults.standardUserDefaults().stringForKey("tempSecondList") {
-                if list == mainList {
-                    return "No"
+            if let country = NSUserDefaults.standardUserDefaults().stringForKey("secondCountry") {
+                if country == "No" {
+                    return NSLocalizedString("No", comment: "Just the word 'no'")
+                } else if country == mainCountry {
+                    return NSLocalizedString("No", comment: "Just the word 'no'")
                 } else {
-                    return list
+                    return country
                 }
             } else {
-                return "No"
+                return NSLocalizedString("No", comment: "Just the word 'no'")
             }
         }
         set {
-            if newValue != nil {
-                NSUserDefaults.standardUserDefaults().setValue(newValue, forKey: "tempSecondList")
+            if newValue != nil && newValue != "No" && newValue != NSLocalizedString("No", comment: "Just the word 'no'") {
+                NSUserDefaults.standardUserDefaults().setValue(getCountryFromLocalizedCountry(newValue!), forKey: "secondCountry")
             } else {
-                NSUserDefaults.standardUserDefaults().setValue("No", forKey: "tempSecondList")
+                NSUserDefaults.standardUserDefaults().setValue("No", forKey: "secondCountry")
             }
-            
         }
     }
     var blockAdblockWarnings: Bool {
@@ -71,192 +72,140 @@ class OnboardManager {
         }
     }
     
-    private let lists = ["Arabic region 🇪🇬", "Bulgaria 🇧🇬", "China 🇨🇳", "Czech and Slovak Rep. 🇸🇰", "Denmark 🇩🇰", "France 🇫🇷", "Estonia 🇪🇪", "Germany 🇩🇪", "Greece 🇬🇷", "Hungary 🇭🇺", "Iceland 🇮🇸", "Indonesia 🇮🇩", "Italy 🇮🇹", "Israel 🇮🇱", "Japan 🇯🇵", "Latvia 🇱🇻", "Netherlands 🇳🇱", "Poland 🇵🇱", "Romania 🇷🇴", "Russia 🇷🇺", "United Kingdom 🇬🇧", "U.S.A 🇺🇸"]
+    func getCountries() -> [String] {
+        let countries = [localized("Arabic region"), localized("Bulgaria"), localized("China"), localized("Czech and Slovak Rep."), localized("Denmark"), localized("France"), localized("Estonia"), localized("Germany"), localized("Greece"), localized("Hungary"), localized("Iceland"), localized("Indonesia"), localized("Italy"), localized("Israel"), localized("Japan"), localized("Latvia"), localized("Netherlands"), localized("Poland"), localized("Romania"), localized("Russia"), localized("United Kingdom"), localized("U.S.A")].sort()
+        return countries
+    }
+    
+    func localized(country: String) -> String {
+        return NSLocalizedString(country, comment: "Country")
+    }
     
-    func getLogicCountry() -> String {
+    func getLogicLocalizedCountry() -> String {
         switch NSLocale.currentLocale().objectForKey(NSLocaleCountryCode) as! String {
         case "EG", "SA":
-            return "Arabic region 🇪🇬"
+            return localized("Arabic region")
         case "BG":
-            return "Bulgaria 🇧🇬"
+            return localized("Bulgaria")
         case "CN":
-            return "China 🇨🇳"
+            return localized("China")
         case "CZ", "SK":
-            return "Czech and Slovak Rep. 🇸🇰"
+            return localized("Czech and Slovak Rep.")
         case "DK":
-            return "Denmark 🇩🇰"
+            return localized("Denmark")
         case "FR":
-            return "France 🇫🇷"
+            return localized("France")
         case "EE":
-            return "Estonia 🇪🇪"
+            return localized("Estonia")
         case "DE":
-            return "Germany 🇩🇪"
+            return localized("Germany")
         case "GR":
-            return "Greece 🇬🇷"
+            return localized("Greece")
         case "HU":
-            return "Hungary 🇭🇺"
+            return localized("Hungary")
         case "IS":
-            return "Iceland 🇮🇸"
+            return localized("Iceland")
         case "ID":
-            return "Indonesia 🇮🇩"
+            return localized("Indonesia")
         case "IT":
-            return "Italy 🇮🇹"
+            return localized("Italy")
         case "IL":
-            return "Israel 🇮🇱"
+            return localized("Israel")
         case "JP":
-            return "Japan 🇯🇵"
+            return localized("Japan")
         case "LV":
-            return "Latvia 🇱🇻"
+            return localized("Latvia")
         case "NL":
-            return "Netherlands 🇳🇱"
+            return localized("Netherlands")
         case "PL":
-            return "Poland 🇵🇱"
+            return localized("Poland")
         case "RO":
-            return "Romania 🇷🇴"
+            return localized("Romania")
         case "RU":
-            return "Russia 🇷🇺"
+            return localized("Russia")
         case "GB":
-            return "United Kingdom 🇬🇧"
-        default:
-            return "U.S.A 🇺🇸"
-        }
-    }
-    
-    func getRealList(flag: String) -> String? {
-        switch flag {
-        case "🇪🇬":
-            return "EasyList_Arabic"
-        case "🇧🇬":
-            return "EasyList_Bulgaria"
-        case "🇨🇳":
-            return "EasyList_China"
-        case "🇸🇰":
-            return "EasyList_Czechoslovakia"
-        case "🇩🇰":
-            return "List_Danish"
-        case "🇫🇷":
-            return "EasyList_France"
-        case "🇪🇪":
-            return "List_Estonia"
-        case "🇩🇪":
-            return "EasyList_Germany"
-        case "🇬🇷":
-            return "EasyList_Greece"
-        case "🇭🇺":
-            return "List_Hungary"
-        case "🇮🇸":
-            return "EasyList_Iceland"
-        case "🇮🇩":
-            return "EasyList_Indonesia"
-        case "🇮🇹":
-            return "EasyList_Italy"
-        case "🇮🇱":
-            return "EasyList_Hebrew"
-        case "🇯🇵":
-            return "List_Japan"
-        case "🇱🇻":
-            return "EasyList_Latvia"
-        case "🇳🇱":
-            return "EasyList_Dutch"
-        case "🇵🇱":
-            return "EasyList_Poland"
-        case "🇷🇴":
-            return "EasyList_Romania"
-        case "🇷🇺":
-            return "EasyList_Russia"
-        case "🇬🇧":
-            return "List_England"
-        case "🇺🇸":
-            return "EasyList"
+            return localized("United Kingdom")
         default:
-            return nil
+            return localized("U.S.A")
         }
     }
     
-    func getCountryFromList(list: String) -> String? {
-        switch list {
-        case "EasyList_Arabic":
-            return "Arabic region 🇪🇬"
-        case "EasyList_Bulgaria":
-            return "Bulgaria 🇧🇬"
-        case "EasyList_China":
-            return "China 🇨🇳"
-        case "EasyList_Czechoslovakia":
-            return "Czech and Slovak Rep. 🇸🇰"
-        case "List_Danish":
-            return "Denmark 🇩🇰"
-        case "EasyList_France":
-            return "France 🇫🇷"
-        case "List_Estonia":
-            return "Estonia 🇪🇪"
-        case "EasyList_Germany":
-            return "Germany 🇩🇪"
-        case "EasyList_Greece":
-            return "Greece 🇬🇷"
-        case "List_Hungary":
-            return "Hungary 🇭🇺"
-        case "EasyList_Iceland":
-            return "Iceland 🇮🇸"
-        case "EasyList_Indonesia":
-            return "Indonesia 🇮🇩"
-        case "EasyList_Italy":
-            return "Italy 🇮🇹"
-        case "EasyList_Hebrew":
-            return "Israel 🇮🇱"
-        case "List_Japan":
-            return "Japan 🇯🇵"
-        case "EasyList_Latvia":
-            return "Latvia 🇱🇻"
-        case "EasyList_Dutch":
-            return "Netherlands 🇳🇱"
-        case "EasyList_Poland":
-            return "Poland 🇵🇱"
-        case "EasyList_Romania":
-            return "Romania 🇷🇴"
-        case "EasyList_Russia":
-            return "Russia 🇷🇺"
-        case "List_England":
-            return "United Kingdom 🇬🇧"
-        case "EasyList":
-            return "U.S.A 🇺🇸"
+    func getCountryFromLocalizedCountry(localizedCountry: String) -> String? {
+        switch localizedCountry {
+        case localized("Arabic region"):
+            return "Arabic region"
+        case localized("Bulgaria"):
+            return "Bulgaria"
+        case localized("China"):
+            return "China"
+        case localized("Czech and Slovak Rep."):
+            return "Czech and Slovak Rep."
+        case localized("Denmark"):
+            return "Denmark"
+        case localized("France"):
+            return "France"
+        case localized("Estonia"):
+            return "Estonia"
+        case localized("Germany"):
+            return "Germany"
+        case localized("Greece"):
+            return "Greece"
+        case localized("Hungary"):
+            return "Hungary"
+        case localized("Iceland"):
+            return "Iceland"
+        case localized("Indonesia"):
+            return "Indonesia"
+        case localized("Italy"):
+            return "Italy"
+        case localized("Israel"):
+            return "Israel"
+        case localized("Japan"):
+            return "Japan"
+        case localized("Latvia"):
+            return "Latvia"
+        case localized("Netherlands"):
+            return "Netherlands"
+        case localized("Poland"):
+            return "Poland"
+        case localized("Romania"):
+            return "Romania"
+        case localized("Russia"):
+            return "Russia"
+        case localized("United Kingdom"):
+            return "United Kingdom"
+        case localized("U.S.A"):
+            return "U.S.A"
         default:
             return nil
         }
     }
     
-    func getMainLists() -> [String] {
-        return lists
+    func getUserCountryPosition() -> Int {
+        return getCountries().indexOf(localized(mainCountry!))!
     }
     
-    func getMainListPosition() -> Int {
-        return lists.indexOf(mainList!)!
-    }
-    
-    func getSecondLists() -> [String] {
-        var secondLists = lists
-        secondLists.removeAtIndex(secondLists.indexOf(mainList!)!)
-        secondLists.insert("No", atIndex: 0)
+    func getSecondaryCountries() -> [String] {
+        var secondLists = getCountries()
+        secondLists.removeAtIndex(secondLists.indexOf(localized(mainCountry!))!)
+        secondLists.insert(NSLocalizedString("No", comment: "Just the word 'no'"), atIndex: 0)
         return secondLists
     }
     
     func getSecondListPosition() -> Int {
-        return getSecondLists().indexOf(secondList!)!
+        return getSecondaryCountries().indexOf(localized(secondCountry!))!
     }
     
     func getRealListsFromChoices() -> [String] {
         var realLists: [String] = []
         
-        let mainListFlag = mainList!.substringFromIndex(mainList!.endIndex.predecessor())
-        if let realMainList = getRealList(mainListFlag) {
+        if let realMainList = ListsManager.getRealListFromCountry(mainCountry!) {
             realLists.append(realMainList)
         }
         
-        if secondList! != "No" {
-            if secondList != mainList {
-                let secondListFlag = secondList!.substringFromIndex(secondList!.endIndex.predecessor())
-                if let realSecondList = getRealList(secondListFlag) {
-                    realLists.append(realSecondList)
-                }
+        if let realSecondList = ListsManager.getRealListFromCountry(secondCountry!) {
+            if realSecondList != realLists.first {
+                realLists.append(realSecondList)
             }
         }
         
@@ -274,8 +223,8 @@ class OnboardManager {
     }
     
     func reset() {
-        mainList = nil
-        secondList = nil
+        mainCountry = nil
+        secondCountry = nil
         blockAdblockWarnings = true
         antisocial = true
         privacy = true
diff --git a/Adios/SecondListViewController.swift b/Adios/SecondListViewController.swift
index 3cd8f60..4b0d1b2 100644
--- a/Adios/SecondListViewController.swift
+++ b/Adios/SecondListViewController.swift
@@ -31,14 +31,14 @@ class SecondListViewController: UIViewController, UIPickerViewDataSource, UIPick
     }
     
     func pickerView(pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
-        return onboardManager.getSecondLists().count
+        return onboardManager.getSecondaryCountries().count
     }
     
     func pickerView(pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
-        return onboardManager.getSecondLists()[row]
+        return onboardManager.getSecondaryCountries()[row]
     }
     
     func pickerView(pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
-        onboardManager.secondList = onboardManager.getSecondLists()[row]
+        onboardManager.secondCountry = onboardManager.getSecondaryCountries()[row]
     }
 }
diff --git a/Adios/SimpleConfigurationViewController.swift b/Adios/SimpleConfigurationViewController.swift
index afa5a81..c615474 100644
--- a/Adios/SimpleConfigurationViewController.swift
+++ b/Adios/SimpleConfigurationViewController.swift
@@ -1,5 +1,5 @@
 //
-//  MainListViewController.swift
+//  SimpleConfigurationViewController.swift
 //  Adios
 //
 //  Created by Armand Grillet on 17/08/2015.
@@ -18,10 +18,11 @@ class SimpleConfigurationViewController: UIViewController, UIPickerViewDataSourc
         // Do any additional setup after loading the view, typically from a nib.
         countryPickerView.dataSource = self
         countryPickerView.delegate = self
-        countryPickerView.selectRow(onboardManager.getMainListPosition(), inComponent: 0, animated: false)
+        countryPickerView.selectRow(onboardManager.getUserCountryPosition(), inComponent: 0, animated: false)
         
         // Standard configuration.
-        onboardManager.secondList = "U.S.A 🇺🇸"
+        onboardManager.secondCountry = NSLocalizedString("U.S.A", comment: "Country")
+        onboardManager.antisocial = false
         onboardManager.blockAdblockWarnings = true
         onboardManager.privacy = true
     }
@@ -40,14 +41,14 @@ class SimpleConfigurationViewController: UIViewController, UIPickerViewDataSourc
     }
     
     func pickerView(pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
-        return onboardManager.getMainLists().count
+        return onboardManager.getCountries().count
     }
     
     func pickerView(pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
-        return onboardManager.getMainLists()[row]
+        return onboardManager.getCountries()[row]
     }
     
     func pickerView(pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
-        onboardManager.mainList = onboardManager.getMainLists()[row]
+        onboardManager.mainCountry = onboardManager.getCountries()[row]
     }
 }
diff --git a/Adios/TwoMoreThingsViewController.swift b/Adios/TwoMoreThingsViewController.swift
index e4f6b74..8611766 100644
--- a/Adios/TwoMoreThingsViewController.swift
+++ b/Adios/TwoMoreThingsViewController.swift
@@ -6,16 +6,15 @@
 //  Copyright © 2015 Armand Grillet. All rights reserved.
 //
 
-import iAd
 import UIKit
 
 class TwoMoreThingsViewController: UIViewController {
     
-    @IBOutlet weak var adBanner: ADBannerView!
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do any additional setup after loading the view, typically from a nib.
+        let onBoardManager = OnboardManager()
+        print(onBoardManager.getRealListsFromChoices())
     }
     
     override func didReceiveMemoryWarning() {
diff --git a/Adios/en.lproj/Localizable.strings b/Adios/en.lproj/Localizable.strings
index 31c59a1..39c3e38 100644
--- a/Adios/en.lproj/Localizable.strings
+++ b/Adios/en.lproj/Localizable.strings
@@ -20,4 +20,27 @@
 "Adios needs to download some ad filters, please activate your data connection" = "Adios needs to download some ad filters, please activate your data connection";
 "Something went wrong!" = "Something went wrong!";
 "Downloading the lists..." = "Downloading the lists...";
-"Applying the rules..." = "Applying the rules...";
\ No newline at end of file
+"Applying the rules..." = "Applying the rules...";
+"Arabic region" = "Arabic region 🇪🇬";
+"Bulgaria" = "Bulgaria 🇧🇬";
+"China" = "China 🇨🇳";
+"Czech and Slovak Rep." = "Czech and Slovak Rep. 🇸🇰";
+"Denmark" = "Denmark 🇩🇰";
+"France" = "France 🇫🇷";
+"Estonia" = "Estonia 🇪🇪";
+"Germany" = "Germany 🇩🇪";
+"Greece" = "Greece 🇬🇷";
+"Hungary" = "Hungary 🇭🇺";
+"Iceland" = "Iceland 🇮🇸";
+"Indonesia" = "Indonesia 🇮🇩";
+"Italy" = "Italy 🇮🇹";
+"Israel" = "Israel 🇮🇱";
+"Japan" = "Japan 🇯🇵";
+"Latvia" = "Latvia 🇱🇻";
+"Netherlands" = "Netherlands 🇳🇱";
+"Poland" = "Poland 🇵🇱";
+"Romania" = "Romania 🇷🇴";
+"Russia" = "Russia 🇷🇺";
+"United Kingdom" = "United Kingdom 🇬🇧";
+"U.S.A" = "U.S.A 🇺🇸";
+"No" = "No";
\ No newline at end of file
diff --git a/Adios/fr.lproj/Localizable.strings b/Adios/fr.lproj/Localizable.strings
index d08490b..873003e 100644
--- a/Adios/fr.lproj/Localizable.strings
+++ b/Adios/fr.lproj/Localizable.strings
@@ -20,4 +20,27 @@
 "Adios needs to download some ad filters, please activate your data connection" = "Adios a besoin de télécharger des filtres anti-pub, veuillez activer votre connection Internet";
 "Something went wrong!" = "Un problème est survenu !";
 "Downloading the lists..." = "Téléchargement des listes...";
-"Applying the rules..." = "Chargement des règles...";
\ No newline at end of file
+"Applying the rules..." = "Chargement des règles...";
+"Arabic region" = "Région arabe 🇪🇬";
+"Bulgaria" = "Bulgarie 🇧🇬";
+"China" = "Chine 🇨🇳";
+"Czech and Slovak Rep." = "Rép. tchèque et Slovaquie 🇸🇰";
+"Denmark" = "Danemark 🇩🇰";
+"France" = "France 🇫🇷";
+"Estonia" = "Éstonie 🇪🇪";
+"Germany" = "Allemagne 🇩🇪";
+"Greece" = "Grèce 🇬🇷";
+"Hungary" = "Hongrie 🇭🇺";
+"Iceland" = "Icelande 🇮🇸";
+"Indonesia" = "Indonésie 🇮🇩";
+"Italy" = "Italie 🇮🇹";
+"Israel" = "Israël 🇮🇱";
+"Japan" = "Japon 🇯🇵";
+"Latvia" = "Lettonie 🇱🇻";
+"Netherlands" = "Pays Bas 🇳🇱";
+"Poland" = "Pologne 🇵🇱";
+"Romania" = "Roumanie 🇷🇴";
+"Russia" = "Russie 🇷🇺";
+"United Kingdom" = "Royaume-Uni 🇬🇧";
+"U.S.A" = "États-Unis 🇺🇸";
+"No" = "Non";
\ No newline at end of file
diff --git a/Adios/fr.lproj/Main.strings b/Adios/fr.lproj/Main.strings
index 161c2ff..0676237 100644
--- a/Adios/fr.lproj/Main.strings
+++ b/Adios/fr.lproj/Main.strings
@@ -119,7 +119,7 @@
 "oA2-iG-BeH.normalTitle" = "Date";
 
 /* Class = "UILabel"; text = "Adios does background updates to keep the ad filters updated, please do not force-quit Adios once it is configured"; ObjectID = "odv-RL-0jb"; */
-"odv-RL-0jb.text" = "Adios fait des mises à jour régulières pour bloquer les pubs les plus récentes, laissez Adios en arrière-plan une fois configuré.";
+"odv-RL-0jb.text" = "Adios fait des mises à jour régulières pour bloquer de nouvelles pubs, laissez Adios en arrière-plan une fois configuré.";
 
 /* Class = "UIViewController"; title = "Help"; ObjectID = "q7o-K2-NRX"; */
 "q7o-K2-NRX.title" = "Aide";
diff --git a/BaseContentBlocker/Info.plist b/BaseContentBlocker/Info.plist
index 495a904..cacaa25 100644
--- a/BaseContentBlocker/Info.plist
+++ b/BaseContentBlocker/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1</string>
+	<string>5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>107</string>
+	<string>117</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ContentBlocker/Info.plist b/ContentBlocker/Info.plist
index 592298d..4bdee94 100644
--- a/ContentBlocker/Info.plist
+++ b/ContentBlocker/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1</string>
+	<string>5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>107</string>
+	<string>117</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>