diff --git a/cmake b/cmake
index 9af4598..feb8b2d 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 9af459839edc19107e57fb9685fe8f571092d2df
+Subproject commit feb8b2d63f74e1bece7de1aa17127b5c1d6851cd
diff --git a/common b/common
index f982a4b..0561da2 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit f982a4b426fb42a51bd17c5d421836ba31145038
+Subproject commit 0561da240fc4d0221c1ad727fa4ecd71b31782b0
diff --git a/prefPane/Base.lproj/ID_updater.xib b/prefPane/Base.lproj/ID_updater.xib
index 57d024e..f748f98 100644
--- a/prefPane/Base.lproj/ID_updater.xib
+++ b/prefPane/Base.lproj/ID_updater.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment version="101100" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15505"/>
+        <deployment version="101300" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -23,6 +23,7 @@
                 <outlet property="serverMessage" destination="MAY-6K-YHD" id="X53-EK-jvu"/>
                 <outlet property="speed" destination="bF9-le-rWP" id="GPx-pb-m9K"/>
                 <outlet property="status" destination="h0C-rH-CbD" id="enH-EU-o5Z"/>
+                <outlet property="uninstall" destination="G5V-JI-U6d" id="xFd-je-aUC"/>
                 <outlet property="updates" destination="XOS-WI-hKa" id="UbE-Ol-PN5"/>
                 <outlet property="versionInfo" destination="hng-hr-Q6P" id="j8a-YU-5MX"/>
             </connections>
@@ -33,7 +34,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="176" y="715" width="668" height="560"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
             <value key="minSize" type="size" width="224.66399999999999" height="10"/>
             <view key="contentView" id="6">
                 <rect key="frame" x="0.0" y="0.0" width="668" height="560"/>
@@ -54,7 +55,7 @@
                         <rect key="frame" x="159" y="517" width="492" height="24"/>
                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="KvA-QX-YeT">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
+                            <font key="font" metaFont="menu"/>
                             <menu key="menu" title="OtherViews" id="Kq2-Mx-1ek">
                                 <items>
                                     <menuItem title="Once a day" id="47t-6c-CcN"/>
@@ -251,17 +252,31 @@
                             </tabViewItem>
                         </tabViewItems>
                     </tabView>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="G5V-JI-U6d">
+                        <rect key="frame" x="370" y="13" width="93" height="32"/>
+                        <buttonCell key="cell" type="push" title="Uninstall" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="1qX-oi-EkK">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="uninstall:" target="-2" id="8pQ-kh-kRQ"/>
+                        </connections>
+                    </button>
                 </subviews>
                 <constraints>
+                    <constraint firstItem="G5V-JI-U6d" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="0yx-r1-7kh"/>
                     <constraint firstItem="gjX-vk-sxE" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="0zV-u5-Yhn"/>
                     <constraint firstItem="iyT-on-LMW" firstAttribute="top" secondItem="Pu2-oW-CuQ" secondAttribute="bottom" constant="20" id="6sQ-QG-QO0"/>
                     <constraint firstAttribute="bottom" secondItem="iyT-on-LMW" secondAttribute="bottom" constant="20" symbolic="YES" id="7e5-Tj-mms"/>
                     <constraint firstItem="W8k-o0-JBm" firstAttribute="trailing" secondItem="Pu2-oW-CuQ" secondAttribute="trailing" id="Bvd-dA-utk"/>
                     <constraint firstItem="Pu2-oW-CuQ" firstAttribute="trailing" secondItem="iyT-on-LMW" secondAttribute="trailing" id="EV0-sI-hhq"/>
+                    <constraint firstItem="iyT-on-LMW" firstAttribute="leading" secondItem="G5V-JI-U6d" secondAttribute="trailing" constant="12" symbolic="YES" id="EbG-Pc-c8F"/>
                     <constraint firstItem="Pu2-oW-CuQ" firstAttribute="top" secondItem="gjX-vk-sxE" secondAttribute="bottom" constant="11" id="JRe-25-S2N"/>
                     <constraint firstAttribute="trailing" secondItem="W8k-o0-JBm" secondAttribute="trailing" constant="20" symbolic="YES" id="MMe-wY-yqM"/>
                     <constraint firstItem="W8k-o0-JBm" firstAttribute="leading" secondItem="gjX-vk-sxE" secondAttribute="trailing" constant="8" symbolic="YES" id="Pd3-hk-ucc"/>
                     <constraint firstItem="W8k-o0-JBm" firstAttribute="top" secondItem="6" secondAttribute="top" constant="20" symbolic="YES" id="T0x-yk-OgO"/>
+                    <constraint firstItem="iyT-on-LMW" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="a27-Wg-SMI"/>
+                    <constraint firstItem="G5V-JI-U6d" firstAttribute="baseline" secondItem="iyT-on-LMW" secondAttribute="baseline" id="aX9-ix-6R1"/>
                     <constraint firstItem="gjX-vk-sxE" firstAttribute="top" secondItem="6" secondAttribute="top" constant="22" id="bBu-FF-yOJ"/>
                     <constraint firstItem="gjX-vk-sxE" firstAttribute="centerY" secondItem="W8k-o0-JBm" secondAttribute="centerY" id="es6-x5-cFC"/>
                     <constraint firstItem="gjX-vk-sxE" firstAttribute="leading" secondItem="Pu2-oW-CuQ" secondAttribute="leading" id="hDY-Eh-MDq"/>
diff --git a/prefPane/id-updater.m b/prefPane/id-updater.m
index 1fc4652..bc0b914 100644
--- a/prefPane/id-updater.m
+++ b/prefPane/id-updater.m
@@ -40,6 +40,7 @@ @interface ID_updater : NSPreferencePane <UpdateDelegate, NSURLSessionDownloadDe
     IBOutlet NSTextField *speed;
     IBOutlet NSProgressIndicator *progress;
     IBOutlet NSButton *install;
+    IBOutlet NSButton *uninstall;
     IBOutlet NSTextField *info;
     IBOutlet NSTabViewItem *updates;
     IBOutlet NSTabViewItem *versionInfo;
@@ -79,6 +80,7 @@ - (void)mainViewDidLoad {
     installedLabel.stringValue = NSLocalizedString(installedLabel.stringValue, nil);
     availableLabel.stringValue = NSLocalizedString(availableLabel.stringValue, nil);
     install.title = NSLocalizedString(install.title, nil);
+    uninstall.hidden = ![NSFileManager.defaultManager fileExistsAtPath:@"/usr/local/bin/open-eid-uninstall.sh"];
     for (int i = 0; i < changeSchedule.numberOfItems; ++i) {
         NSMenuItem *item = [changeSchedule itemAtIndex:i];
         item.title = NSLocalizedString(item.title, nil);
@@ -317,6 +319,23 @@ - (IBAction)installUpdate:(id)sender {
     lastRecvd = 0;
     timer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(timer:) userInfo:nil repeats:YES];
 }
+- (IBAction)uninstall:(id)sender {
+
+    AuthorizationRef authorizationRef;
+    OSStatus status = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &authorizationRef);
+
+    // Run the tool using the authorization reference
+    const char *tool = "/usr/local/bin/open-eid-uninstall.sh";
+    char *args[] = {NULL};
+    FILE *pipe = NULL;
+    status = AuthorizationExecuteWithPrivileges(authorizationRef, tool, kAuthorizationFlagDefaults, args, &pipe);
+    if (status == EXIT_SUCCESS) {
+        NSFileHandle *fileOut = [[NSFileHandle alloc] initWithFileDescriptor:fileno(pipe) closeOnDealloc:YES];
+        NSData *data = [fileOut readDataToEndOfFile];
+        [fileOut closeFile];
+        NSLog (@"Returned:\n%@", [[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding]);
+    }
+}
 
 - (void)timer:(NSTimer*)timer {
     speed.stringValue = [NSString stringWithFormat:@"%.2f KB/s", (progress.doubleValue - lastRecvd)/1000];