diff --git a/CMakeLists.txt b/CMakeLists.txt
index 745eb8b..43498cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@
 SET(RING_VERSION_NAME "Samuel de Champlain (${RING_VERSION})")
 
 MESSAGE(${RING_VERSION_NAME})
-SET(PROJ_COPYRIGHT " © 2015 Savoir-faire Linux \n GPLv3 https://www.gnu.org/copyleft/gpl.html")
+SET(PROJ_COPYRIGHT " © 2015-2016 Savoir-faire Linux \n GPLv3 https://www.gnu.org/copyleft/gpl.html")
 
 ADD_DEFINITIONS("-std=c++11 -fobjc-arc")
 
@@ -139,6 +139,7 @@
    src/main.mm
    src/AppDelegate.mm
    src/AppDelegate.h
+   src/Constants.h
    src/delegates/ImageManipulationDelegate.mm
    src/delegates/ImageManipulationDelegate.h)
 
diff --git a/src/AccAdvancedVC.h b/src/AccAdvancedVC.h
index 0bf4ac5..f6b132d 100644
--- a/src/AccAdvancedVC.h
+++ b/src/AccAdvancedVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,18 +15,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
+
 #import <Cocoa/Cocoa.h>
 
 #import <account.h>
diff --git a/src/AccAdvancedVC.mm b/src/AccAdvancedVC.mm
index 97d806e..2c4b38a 100644
--- a/src/AccAdvancedVC.mm
+++ b/src/AccAdvancedVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 #define REGISTRATION_TAG 0
 #define LOCALPORT_TAG 1
diff --git a/src/AccAudioVC.h b/src/AccAudioVC.h
index 1434fc8..d871ded 100644
--- a/src/AccAudioVC.h
+++ b/src/AccAudioVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,20 +15,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
-#ifndef ACCAUDIOVC_H
-#define ACCAUDIOVC_H
 
 #import <Cocoa/Cocoa.h>
 
@@ -38,6 +25,4 @@
 
 @interface AccAudioVC : NSViewController <NSOutlineViewDelegate>
 
-@end
-
-#endif // ACCAUDIOVC_H
\ No newline at end of file
+@end
\ No newline at end of file
diff --git a/src/AccAudioVC.mm b/src/AccAudioVC.mm
index eeda1e9..b386247 100644
--- a/src/AccAudioVC.mm
+++ b/src/AccAudioVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 #define COLUMNID_STATE   @"AudioStateColumn"
 #define COLUMNID_CODECS   @"AudioCodecsColumn"
diff --git a/src/AccGeneralVC.h b/src/AccGeneralVC.h
index ccde3e4..2a7ec82 100644
--- a/src/AccGeneralVC.h
+++ b/src/AccGeneralVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,20 +15,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
-#ifndef ACCGENERALVC_H
-#define ACCGENERALVC_H
 
 #import <Cocoa/Cocoa.h>
 
@@ -39,5 +26,3 @@
 }
 
 @end
-
-#endif // ACCGENERALVC_H
\ No newline at end of file
diff --git a/src/AccGeneralVC.mm b/src/AccGeneralVC.mm
index 18a7049..d5862fb 100644
--- a/src/AccGeneralVC.mm
+++ b/src/AccGeneralVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 #define ALIAS_TAG 0
 #define HOSTNAME_TAG 1
diff --git a/src/AccRingVC.h b/src/AccRingVC.h
index 67f03e0..f6b56b1 100644
--- a/src/AccRingVC.h
+++ b/src/AccRingVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,20 +15,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
-#ifndef ACCRINGVC_H
-#define ACCRINGVC_H
 
 #import <Cocoa/Cocoa.h>
 
@@ -36,6 +23,4 @@
 
 @interface AccRingVC : NSViewController <NSTextFieldDelegate>
 
-@end
-
-#endif // ACCRINGVC_H
+@end
\ No newline at end of file
diff --git a/src/AccRingVC.mm b/src/AccRingVC.mm
index 4de4378..d7ed122 100644
--- a/src/AccRingVC.mm
+++ b/src/AccRingVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 #define ALIAS_TAG 0
 #define HOSTNAME_TAG 1
diff --git a/src/AccSecurityVC.h b/src/AccSecurityVC.h
index 3fa4615..b77b6ee 100644
--- a/src/AccSecurityVC.h
+++ b/src/AccSecurityVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -16,6 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  */
+
 #import <Cocoa/Cocoa.h>
 
 @interface AccSecurityVC : NSViewController<NSMenuDelegate, NSPathControlDelegate, NSOpenSavePanelDelegate>
diff --git a/src/AccSecurityVC.mm b/src/AccSecurityVC.mm
index e8d794c..d1e7321 100644
--- a/src/AccSecurityVC.mm
+++ b/src/AccSecurityVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/AccVideoVC.h b/src/AccVideoVC.h
index aade71c..1cc0cb1 100644
--- a/src/AccVideoVC.h
+++ b/src/AccVideoVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,20 +15,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
-#ifndef ACCVIDEOVC_H
-#define ACCVIDEOVC_H
 
 #import <Cocoa/Cocoa.h>
 
@@ -36,6 +23,4 @@
 
 @interface AccVideoVC : NSViewController <NSOutlineViewDelegate>
 
-@end
-
-#endif // ACCVIDEOVC_H
\ No newline at end of file
+@end
\ No newline at end of file
diff --git a/src/AccVideoVC.mm b/src/AccVideoVC.mm
index c148256..3ff97a9 100644
--- a/src/AccVideoVC.mm
+++ b/src/AccVideoVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 #define COLUMNID_STATE   @"VideoStateColumn"
 #define COLUMNID_CODECS   @"VideoCodecsColumn"
diff --git a/src/AccountsVC.h b/src/AccountsVC.h
index 5a9fe5c..ed64a79 100644
--- a/src/AccountsVC.h
+++ b/src/AccountsVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,18 +15,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
+
 #import <Cocoa/Cocoa.h>
 
 @interface AccountsVC : NSViewController <NSOutlineViewDelegate, NSMenuDelegate>
diff --git a/src/AccountsVC.mm b/src/AccountsVC.mm
index 43594f3..84b4ca6 100644
--- a/src/AccountsVC.mm
+++ b/src/AccountsVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #define COLUMNID_ENABLE @"EnableColumn"
diff --git a/src/AppDelegate.h b/src/AppDelegate.h
index a0b6053..790f7c4 100644
--- a/src/AppDelegate.h
+++ b/src/AppDelegate.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,20 +15,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
-#ifndef APPDELEGATE_H
-#define APPDELEGATE_H
 
 #import <AppKit/NSApplication.h> // NSApplicationDelegate
 
@@ -41,5 +28,3 @@
 - (void) showMainWindow;
 
 @end
-
-#endif // APPDELEGATE_H
diff --git a/src/AppDelegate.mm b/src/AppDelegate.mm
index a20c063..96f5294 100644
--- a/src/AppDelegate.mm
+++ b/src/AppDelegate.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/AudioPrefsVC.h b/src/AudioPrefsVC.h
index 024d955..40cff3b 100644
--- a/src/AudioPrefsVC.h
+++ b/src/AudioPrefsVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,20 +15,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
-#ifndef AUDIOPREFSVC_H
-#define AUDIOPREFSVC_H
 
 #import <Cocoa/Cocoa.h>
 
@@ -37,5 +24,3 @@
 }
 
 @end
-
-#endif // AUDIOPREFSVC_H
diff --git a/src/AudioPrefsVC.mm b/src/AudioPrefsVC.mm
index 67c5f2b..17c3a1f 100644
--- a/src/AudioPrefsVC.mm
+++ b/src/AudioPrefsVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 #import "AudioPrefsVC.h"
 
diff --git a/src/BrokerVC.h b/src/BrokerVC.h
index aaf21b7..f2e1add 100644
--- a/src/BrokerVC.h
+++ b/src/BrokerVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/BrokerVC.mm b/src/BrokerVC.mm
index 52c555f..ad99110 100644
--- a/src/BrokerVC.mm
+++ b/src/BrokerVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/CertificateWC.h b/src/CertificateWC.h
index ea45bfb..ee09850 100644
--- a/src/CertificateWC.h
+++ b/src/CertificateWC.h
@@ -1,10 +1,21 @@
-//
-//  CertificateWC.h
-//  Ring
-//
-//  Created by Alexandre Lision on 2015-04-28.
-//
-//
+/*
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+ *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+ */
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/src/CertificateWC.mm b/src/CertificateWC.mm
index 8d76a60..181d498 100644
--- a/src/CertificateWC.mm
+++ b/src/CertificateWC.mm
@@ -1,10 +1,21 @@
-//
-//  CertificateWC.m
-//  Ring
-//
-//  Created by Alexandre Lision on 2015-04-28.
-//
-//
+/*
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+ *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+ */
 
 #import "CertificateWC.h"
 
diff --git a/src/ChatVC.h b/src/ChatVC.h
index 46bf802..17f63c6 100644
--- a/src/ChatVC.h
+++ b/src/ChatVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 #import <Cocoa/Cocoa.h>
 
diff --git a/src/ChatVC.mm b/src/ChatVC.mm
index b09314a..c3712ab 100644
--- a/src/ChatVC.mm
+++ b/src/ChatVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #import "ChatVC.h"
diff --git a/src/Constants.h b/src/Constants.h
index a119562..f353bf4 100644
--- a/src/Constants.h
+++ b/src/Constants.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/src/CurrentCallVC.h b/src/CurrentCallVC.h
index c74e4d2..5a3dc3d 100644
--- a/src/CurrentCallVC.h
+++ b/src/CurrentCallVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  */
 
+
 #import <Cocoa/Cocoa.h>
 
 #import "views/CallView.h"
diff --git a/src/CurrentCallVC.mm b/src/CurrentCallVC.mm
index 220d317..21ec62e 100644
--- a/src/CurrentCallVC.mm
+++ b/src/CurrentCallVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/GeneralPrefsVC.h b/src/GeneralPrefsVC.h
index cffd689..0954432 100644
--- a/src/GeneralPrefsVC.h
+++ b/src/GeneralPrefsVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,25 +15,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
-#ifndef GENERALPREFSVC_H
-#define GENERALPREFSVC_H
+
 
 #import <Cocoa/Cocoa.h>
 
 @interface GeneralPrefsVC : NSViewController
 
-@end
-
-#endif // GENERALPREFSVC_H
\ No newline at end of file
+@end
\ No newline at end of file
diff --git a/src/GeneralPrefsVC.mm b/src/GeneralPrefsVC.mm
index faf6124..30c72bc 100644
--- a/src/GeneralPrefsVC.mm
+++ b/src/GeneralPrefsVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 #import "GeneralPrefsVC.h"
 
diff --git a/src/HistoryVC.h b/src/HistoryVC.h
index bea2f33..b353ddc 100644
--- a/src/HistoryVC.h
+++ b/src/HistoryVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  */
+
+
 #import <Cocoa/Cocoa.h>
+
 #import "views/RingOutlineView.h"
 
 @interface HistoryVC : NSViewController <NSOutlineViewDelegate, ContextMenuDelegate>
diff --git a/src/HistoryVC.mm b/src/HistoryVC.mm
index 76d685c..66a6d9d 100644
--- a/src/HistoryVC.mm
+++ b/src/HistoryVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/PersonLinkerVC.h b/src/PersonLinkerVC.h
index a05e88e..2240a21 100644
--- a/src/PersonLinkerVC.h
+++ b/src/PersonLinkerVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  */
 
+
 #import <Cocoa/Cocoa.h>
 
 @protocol ContactLinkedDelegate;
diff --git a/src/PersonLinkerVC.mm b/src/PersonLinkerVC.mm
index 24ce583..707c88a 100644
--- a/src/PersonLinkerVC.mm
+++ b/src/PersonLinkerVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/PersonsVC.h b/src/PersonsVC.h
index 9120d6f..7f3b854 100644
--- a/src/PersonsVC.h
+++ b/src/PersonsVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  */
-
 #import <Cocoa/Cocoa.h>
 
 @interface PersonsVC : NSViewController <NSOutlineViewDelegate>
diff --git a/src/PersonsVC.mm b/src/PersonsVC.mm
index 730b43d..db5aa2c 100644
--- a/src/PersonsVC.mm
+++ b/src/PersonsVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/PreferencesWC.h b/src/PreferencesWC.h
index 09065e9..9c0368e 100644
--- a/src/PreferencesWC.h
+++ b/src/PreferencesWC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/PreferencesWC.mm b/src/PreferencesWC.mm
index c32e96a..c1c0f1e 100644
--- a/src/PreferencesWC.mm
+++ b/src/PreferencesWC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/QNSTreeController.h b/src/QNSTreeController.h
index 9b53889..4a82f48 100644
--- a/src/QNSTreeController.h
+++ b/src/QNSTreeController.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/QNSTreeController.mm b/src/QNSTreeController.mm
index d632207..63943eb 100644
--- a/src/QNSTreeController.mm
+++ b/src/QNSTreeController.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/RingWindowController.h b/src/RingWindowController.h
index 2354b98..0200b31 100644
--- a/src/RingWindowController.h
+++ b/src/RingWindowController.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm
index ae715be..8addce9 100644
--- a/src/RingWindowController.mm
+++ b/src/RingWindowController.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/RingWizardWC.h b/src/RingWizardWC.h
index 0947a4c..885e314 100644
--- a/src/RingWizardWC.h
+++ b/src/RingWizardWC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/RingWizardWC.mm b/src/RingWizardWC.mm
index 2aa7ca8..abd5d3e 100644
--- a/src/RingWizardWC.mm
+++ b/src/RingWizardWC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/SmartViewVC.h b/src/SmartViewVC.h
index 8e2d988..6c66a9e 100644
--- a/src/SmartViewVC.h
+++ b/src/SmartViewVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/SmartViewVC.mm b/src/SmartViewVC.mm
index 539c949..77cf1eb 100644
--- a/src/SmartViewVC.mm
+++ b/src/SmartViewVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/VideoPrefsVC.h b/src/VideoPrefsVC.h
index 8a85304..421b302 100644
--- a/src/VideoPrefsVC.h
+++ b/src/VideoPrefsVC.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,20 +15,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
-#ifndef RING_VIDEOPREFSVC_H
-#define RING_VIDEOPREFSVC_H
+
 
 #import <Cocoa/Cocoa.h>
 
@@ -36,6 +24,4 @@
 
 }
 
-@end
-
-#endif // RING_VIDEOPREFSVC_H
+@end
\ No newline at end of file
diff --git a/src/VideoPrefsVC.mm b/src/VideoPrefsVC.mm
index c99f4ac..e401cfa 100644
--- a/src/VideoPrefsVC.mm
+++ b/src/VideoPrefsVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 #import "VideoPrefsVC.h"
 
diff --git a/src/backends/AddressBookBackend.h b/src/backends/AddressBookBackend.h
index dd81233..7b23c8d 100644
--- a/src/backends/AddressBookBackend.h
+++ b/src/backends/AddressBookBackend.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/backends/AddressBookBackend.mm b/src/backends/AddressBookBackend.mm
index 443ed1a..a6fd90c 100644
--- a/src/backends/AddressBookBackend.mm
+++ b/src/backends/AddressBookBackend.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/delegates/ImageManipulationDelegate.h b/src/delegates/ImageManipulationDelegate.h
index a9f243e..7dad661 100644
--- a/src/delegates/ImageManipulationDelegate.h
+++ b/src/delegates/ImageManipulationDelegate.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/delegates/ImageManipulationDelegate.mm b/src/delegates/ImageManipulationDelegate.mm
index 491a242..2f9ac02 100644
--- a/src/delegates/ImageManipulationDelegate.mm
+++ b/src/delegates/ImageManipulationDelegate.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/main.mm b/src/main.mm
index 867e228..76b083d 100644
--- a/src/main.mm
+++ b/src/main.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/views/CallView.h b/src/views/CallView.h
index eac0984..27423d7 100644
--- a/src/views/CallView.h
+++ b/src/views/CallView.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 #import <Cocoa/Cocoa.h>
 
diff --git a/src/views/CallView.mm b/src/views/CallView.mm
index 49ad679..d04b73f 100644
--- a/src/views/CallView.mm
+++ b/src/views/CallView.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #import "CallView.h"
diff --git a/src/views/ContextualTableCellView.h b/src/views/ContextualTableCellView.h
index 39ed095..60a8823 100644
--- a/src/views/ContextualTableCellView.h
+++ b/src/views/ContextualTableCellView.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/views/ContextualTableCellView.mm b/src/views/ContextualTableCellView.mm
index 730ff63..91cab96 100644
--- a/src/views/ContextualTableCellView.mm
+++ b/src/views/ContextualTableCellView.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/views/IconButton.h b/src/views/IconButton.h
index ae22b35..3e1dd4e 100644
--- a/src/views/IconButton.h
+++ b/src/views/IconButton.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/views/IconButton.mm b/src/views/IconButton.mm
index 93c0e29..59db443 100644
--- a/src/views/IconButton.mm
+++ b/src/views/IconButton.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/views/NSColor+RingTheme.h b/src/views/NSColor+RingTheme.h
index 8c2f306..35f58ab 100644
--- a/src/views/NSColor+RingTheme.h
+++ b/src/views/NSColor+RingTheme.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/views/NSColor+RingTheme.mm b/src/views/NSColor+RingTheme.mm
index e6b1a4b..bf1f256 100644
--- a/src/views/NSColor+RingTheme.mm
+++ b/src/views/NSColor+RingTheme.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/views/RingIDField.h b/src/views/RingIDField.h
index e0746cd..77ff7ef 100644
--- a/src/views/RingIDField.h
+++ b/src/views/RingIDField.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #import <Cocoa/Cocoa.h>
diff --git a/src/views/RingIDField.mm b/src/views/RingIDField.mm
index 864100b..6a7960e 100644
--- a/src/views/RingIDField.mm
+++ b/src/views/RingIDField.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #import "RingIDField.h"
diff --git a/src/views/RingOutlineView.h b/src/views/RingOutlineView.h
index 1ed277c..a50bf5b 100644
--- a/src/views/RingOutlineView.h
+++ b/src/views/RingOutlineView.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/views/RingOutlineView.mm b/src/views/RingOutlineView.mm
index 7e9c567..5c9ad1b 100644
--- a/src/views/RingOutlineView.mm
+++ b/src/views/RingOutlineView.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify