diff --git a/src/main.cpp b/src/main.cpp
index 5de3dc6..f9809a6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,14 +17,14 @@
 #include "defaults.h"
 
 // Module connection pins (ESP GPIO-Nums)
-#define CLK 2
-#define DIO_FAC_1_7SEG 0
-#define DIO_FAC_2_7SEG 5
-#define DIO_FAC_3_7SEG 4
+#define CLK 16
+#define DIO_FAC_1_7SEG 14
+#define DIO_FAC_2_7SEG 12
+#define DIO_FAC_3_7SEG 13
 
-#define DIO_FAC_1_TRG 12
-#define DIO_FAC_2_TRG 13
-#define DIO_FAC_3_TRG 14
+#define DIO_FAC_1_TRG 0
+#define DIO_FAC_2_TRG 2
+#define DIO_FAC_3_TRG 15
 
 enum Factions
 {
@@ -260,7 +260,7 @@ void inputGetterTicker_callback()
 {
   activeFaction = NONE;
 
-  if (digitalRead(DIO_FAC_1_TRG) + digitalRead(DIO_FAC_2_TRG) + digitalRead(DIO_FAC_3_TRG) < 2)
+  if (digitalRead(DIO_FAC_1_TRG) + digitalRead(DIO_FAC_2_TRG) + !digitalRead(DIO_FAC_3_TRG) < 2)
   {
     Serial.println("ERROR: More than one Flag active");
     return;
@@ -272,7 +272,7 @@ void inputGetterTicker_callback()
   if (digitalRead(DIO_FAC_2_TRG) == LOW)
     activeFaction = FACTION_2;
 
-  if (digitalRead(DIO_FAC_3_TRG) == LOW)
+  if (digitalRead(DIO_FAC_3_TRG) == HIGH)
     activeFaction = FACTION_3;
 }
 
@@ -280,7 +280,7 @@ void setup()
 {
   pinMode(DIO_FAC_1_TRG, INPUT_PULLUP);
   pinMode(DIO_FAC_2_TRG, INPUT_PULLUP);
-  pinMode(DIO_FAC_3_TRG, INPUT_PULLUP);
+  pinMode(DIO_FAC_3_TRG, INPUT);
 
   Serial.begin(9600);
   Serial.print("\n\n\n");