diff --git a/EAPMethods/build/EAPMethod.props b/EAPMethods/build/EAPMethod.props
index 9c9315c..c140f8d 100644
--- a/EAPMethods/build/EAPMethod.props
+++ b/EAPMethods/build/EAPMethod.props
@@ -22,4 +22,7 @@
+
+
+
\ No newline at end of file
diff --git a/EAPMethods/build/EAPMethod_UI.props b/EAPMethods/build/EAPMethod_UI.props
index 3bc9316..75a3e8b 100644
--- a/EAPMethods/build/EAPMethod_UI.props
+++ b/EAPMethods/build/EAPMethod_UI.props
@@ -58,6 +58,9 @@
+
+
+
{d4b54856-be1f-4937-a8f7-495125be76be}
diff --git a/EAPMethods/build/EAPTTLS.vcxproj b/EAPMethods/build/EAPTTLS.vcxproj
index f371ec2..ec47f04 100644
--- a/EAPMethods/build/EAPTTLS.vcxproj
+++ b/EAPMethods/build/EAPTTLS.vcxproj
@@ -92,6 +92,9 @@
EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)
+
+ EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)
+
@@ -99,9 +102,6 @@
-
-
-
{b385ec2b-c3f4-48bb-9bac-8b996de7f754}
diff --git a/EAPMethods/build/EAPTTLS.vcxproj.filters b/EAPMethods/build/EAPTTLS.vcxproj.filters
index 4e76ff0..1db74dd 100644
--- a/EAPMethods/build/EAPTTLS.vcxproj.filters
+++ b/EAPMethods/build/EAPTTLS.vcxproj.filters
@@ -28,7 +28,7 @@
-
+
Resource Files
diff --git a/EAPMethods/build/EAPTTLS_UI.vcxproj b/EAPMethods/build/EAPTTLS_UI.vcxproj
index c74e17a..fdac601 100644
--- a/EAPMethods/build/EAPTTLS_UI.vcxproj
+++ b/EAPMethods/build/EAPTTLS_UI.vcxproj
@@ -92,6 +92,9 @@
EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)
+
+ EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)
+
@@ -99,9 +102,6 @@
-
-
-
{b385ec2b-c3f4-48bb-9bac-8b996de7f754}
diff --git a/EAPMethods/build/EAPTTLS_UI.vcxproj.filters b/EAPMethods/build/EAPTTLS_UI.vcxproj.filters
index b02d8d3..d88e2f5 100644
--- a/EAPMethods/build/EAPTTLS_UI.vcxproj.filters
+++ b/EAPMethods/build/EAPTTLS_UI.vcxproj.filters
@@ -32,7 +32,7 @@
-
+
Resource Files
diff --git a/EAPMethods/res/EAPTTLS.rc b/EAPMethods/res/EAPMethod.rc
similarity index 91%
rename from EAPMethods/res/EAPTTLS.rc
rename to EAPMethods/res/EAPMethod.rc
index 3246ddb..91f7c5d 100644
Binary files a/EAPMethods/res/EAPTTLS.rc and b/EAPMethods/res/EAPMethod.rc differ
diff --git a/EAPMethods/res/EAPTTLS_UI.rc b/EAPMethods/res/EAPMethod_UI.rc
similarity index 93%
rename from EAPMethods/res/EAPTTLS_UI.rc
rename to EAPMethods/res/EAPMethod_UI.rc
index c1bee20..2badf3f 100644
Binary files a/EAPMethods/res/EAPTTLS_UI.rc and b/EAPMethods/res/EAPMethod_UI.rc differ
diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp
index b062a2d..333a8f2 100644
--- a/EAPMethods/src/Main.cpp
+++ b/EAPMethods/src/Main.cpp
@@ -20,16 +20,11 @@
#include "StdAfx.h"
+#pragma comment(lib, "Ws2_32.lib")
+
using namespace std;
using namespace winstd;
-#pragma comment(lib, "Ws2_32.lib")
-
-#if EAPMETHOD_TYPE==21
-#define _EAPMETHOD_PEER eap::peer_ttls
-#else
-#error Unknown EAP Method type.
-#endif
_EAPMETHOD_PEER g_peer;
diff --git a/EAPMethods/src/Main_UI.cpp b/EAPMethods/src/Main_UI.cpp
index cfcaee5..af07e8f 100644
--- a/EAPMethods/src/Main_UI.cpp
+++ b/EAPMethods/src/Main_UI.cpp
@@ -26,12 +26,6 @@ using namespace std;
using namespace winstd;
-#if EAPMETHOD_TYPE==21
-#define _EAPMETHOD_PEER_UI eap::peer_ttls_ui
-#else
-#error Unknown EAP Method type.
-#endif
-
HANDLE g_act_ctx = NULL;
_EAPMETHOD_PEER_UI g_peer;
diff --git a/EAPMethods/src/StdAfx.h b/EAPMethods/src/StdAfx.h
index bdc3449..234a108 100644
--- a/EAPMethods/src/StdAfx.h
+++ b/EAPMethods/src/StdAfx.h
@@ -20,5 +20,10 @@
#pragma once
+#if EAPMETHOD_TYPE == 21
#include "../../lib/TTLS/include/Method.h"
#include "../../lib/TTLS/include/Module.h"
+#define _EAPMETHOD_PEER eap::peer_ttls
+#else
+#error Unknown EAP Method type.
+#endif
diff --git a/EAPMethods/src/StdAfx_UI.h b/EAPMethods/src/StdAfx_UI.h
index 70dc022..a2992f5 100644
--- a/EAPMethods/src/StdAfx_UI.h
+++ b/EAPMethods/src/StdAfx_UI.h
@@ -20,4 +20,9 @@
#pragma once
+#if EAPMETHOD_TYPE == 21
#include "../../lib/TTLS_UI/include/Module.h"
+#define _EAPMETHOD_PEER_UI eap::peer_ttls_ui
+#else
+#error Unknown EAP Method type.
+#endif