diff --git a/.gitignore b/.gitignore
index 0a4cee6..9728bb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,3 +161,4 @@ Resources.zip
 *.pdb
 obj/Release/Connect.Modules.AccountRegistration.xml
 *.cache
+Resources.zip.manifest
diff --git a/Templates/Connect/Email.Admin.txt b/Templates/Connect/Email.Admin.txt
deleted file mode 100644
index 6517be1..0000000
--- a/Templates/Connect/Email.Admin.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-
-<p>A user has registered an account on the website <a href="[PORTALURL]"><strong>[PORTALNAME]</strong></a>.</p>
-<p>The registration mode of the portal is set to <strong><i>[REGISTRATIONMODE]</i></strong>, so the following action is necessary:</p>
-<ul>
-    <li>[ADMINACTION]</li>
-</ul>
-<h2>Details about the account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Name:</td><td>[FIRSTNAME] [LASTNAME]</td>
-    </tr>  
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-    
-
diff --git a/Templates/Connect/Email.User.Private.txt b/Templates/Connect/Email.User.Private.txt
deleted file mode 100644
index b12d917..0000000
--- a/Templates/Connect/Email.User.Private.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully. In order to log on to your account you will have to wait until we have verified your account details and activate your account. This may take up to 24 hours and you will receive another notification e-mail as soon as this process has been finished.</p>
-
-<p>For now it is already adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>         
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<p style="padding-top:20px;">
-    Once we have activated your account you can use the following link to manage your account details:
-</p>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-    
-
diff --git a/Templates/Connect/Email.User.Verified.txt b/Templates/Connect/Email.User.Verified.txt
deleted file mode 100644
index 5855d7f..0000000
--- a/Templates/Connect/Email.User.Verified.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-This is the default template:
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully. To finalize the activation of the account we require you to verify your e-mail address. This is to prevent automated systems to register accounts on our website and we're trying to make that last step as easy as possible for you. Simply click on the link below and your account will be activated instantly. In case you will be asked of a verification code while logging on to the website you can also enter the key provided below.</p>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[VERIFYURL]">Click to activate Account</a>
-</div>
-
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr> 
-    <tr>
-        <td>Verification Code:</td><td>[VERIFICATIONCODE]</td>
-    </tr>         
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<p style="padding-top:20px;">
-    Once your account is activated you can use the following link to manage your account details:
-</p>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-    
-
diff --git a/Templates/Connect/Email.User.txt b/Templates/Connect/Email.User.txt
deleted file mode 100644
index 7904a7b..0000000
--- a/Templates/Connect/Email.User.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
\ No newline at end of file
diff --git a/Templates/Connect/Form.txt b/Templates/Connect/Form.txt
deleted file mode 100644
index b3a8272..0000000
--- a/Templates/Connect/Form.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-<div id="ConnectRegisterForm" class="dnnForm dnnClear">
-
-    <ul id="ConnectRegisterFormTabs" runat="Server" class="dnnAdminTabNav dnnClear">
-        <li><a href="#dvFormTemplate" class="connect_RegisterTabLink">[RESX:LOGIN:CreateAccountTab]</a></li>
-        <li><a href="#dvLoginTemplate" class="connect_LoginTabLink">[RESX:LOGIN:LoginTab]</a></li>
-    </ul>
-
-	<div id="dvFormTemplate" class="connect_register">
-		
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:Username:HideRequired]
-		  [CTL:USER:Username]
-		  [REQUIRED:USER:Username]
-		</div>
-		
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:Email:HideRequired]
-		  [CTL:USER:Email]
-		  [REQUIRED:USER:Email]
-		</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:Firstname:HideRequired]
-		  [CTL:USER:Firstname]
-		  [REQUIRED:USER:Firstname]
-		</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:Lastname:HideRequired]
-		  [CTL:USER:Lastname]
-		  [REQUIRED:USER:Lastname]
-		</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:Password1:HideRequired]
-		  [CTL:USER:Password1]
-		  [REQUIRED:USER:Password1]
-		</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:Password2:HideRequired]
-		  [CTL:USER:Password2]
-		  [REQUIRED:USER:Password2]
-		</div>
-
-		<ul class="dnnActions">
-		  <li>[CTL:UPDATEBUTTON:CreateAccount]</li>
-		</ul>
-
-	</div>
-
-		<div id="dvLoginTemplate" class="connect_login">
-
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:LOGIN:Username]
-		  [CTL:LOGIN:Username]
-		</div>
-		
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:LOGIN:Password]
-		  [CTL:LOGIN:Password]
-		</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:LOGIN:Remember]
-		  [CTL:LOGIN:Remember]
-		</div>
-		
-		<ul class="dnnActions">
-		  <li>[CTL:LOGINBUTTON:Login]</li>
-		  <li>[CTL:LOSTPASSWORDBUTTON:LostPassword]</li>
-		</ul>
-						
-
-	</div>
-</div>
-
-<script language="javascript" type="text/javascript">
-/*globals jQuery, window, Sys */
-(function ($, Sys) {
-
-    function setupFormSettings() {
-        $('#ConnectRegisterForm').dnnTabs();
-		$('.connect_LoginTabLink').click(function () {
-			$('#dvLoginTemplate > input.dnnPrimaryAction').focus();
-		});
-		$('.connect_RegisterTabLink').click(function () {
-			$('#dvFormTemplate > input.dnnPrimaryAction').focus();
-		});
-    }
-
-    $(document).ready(function () {
-        setupFormSettings();
-        Sys.WebForms.PageRequestManager.getInstance().add_endRequest(function () {
-            setupFormSettings();
-        });
-    });
-
-} (jQuery, window.Sys));
-</script>
\ No newline at end of file