diff --git a/setup.iss b/setup.iss
index 1386af6..4047454 100644
--- a/setup.iss
+++ b/setup.iss
@@ -57,39 +57,39 @@ Source: "ocx\*"; \
 
 ; Roboto                     ToDo: Loop in code to install all fonts into folder
 Source: "fonts\Roboto\Roboto-Black.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Roboto-Black";
+  FontInstall: "Roboto-Black"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Roboto\Roboto-BlackItalic.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Roboto-BlackItalic"; 
+  FontInstall: "Roboto-BlackItalic"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Roboto\Roboto-Bold.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Roboto-Bold"; 
+  FontInstall: "Roboto-Bold"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Roboto\Roboto-BoldItalic.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Roboto-BoldItalic"; 
+  FontInstall: "Roboto-BoldItalic"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Roboto\Roboto-Italic.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Roboto-Italic"; 
+  FontInstall: "Roboto-Italic"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Roboto\Roboto-Light.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Roboto-Light"; 
+  FontInstall: "Roboto-Light"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Roboto\Roboto-LightItalic.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Roboto-LightItalic"; 
+  FontInstall: "Roboto-LightItalic"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Roboto\Roboto-Medium.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Roboto-Medium"; 
+  FontInstall: "Roboto-Medium"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Roboto\Roboto-MediumItalic.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Roboto-MediumItalic"; 
+  FontInstall: "Roboto-MediumItalic"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Roboto\Roboto-Regular.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Roboto-Regular"; 
+  FontInstall: "Roboto-Regular"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Roboto\Roboto-Thin.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Roboto-Thin"; 
+  FontInstall: "Roboto-Thin"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Roboto\Roboto-ThinItalic.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Roboto-ThinItalic"; 
+  FontInstall: "Roboto-ThinItalic"; Flags: onlyifdoesntexist uninsneveruninstall
 
 ; Poppins
 Source: "fonts\Poppins\Poppins-Regular.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Poppins-Regular.ttf"; 
+  FontInstall: "Poppins-Regular.ttf"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Poppins\Poppins-Thin.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Poppins-Thin"; 
+  FontInstall: "Poppins-Thin"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Poppins\Poppins-Bold.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Poppins-Bold"; 
+  FontInstall: "Poppins-Bold"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "fonts\Poppins\Poppins-Italic.ttf"; DestDir: "{commonfonts}"; \
-  FontInstall: "Poppins-Italic"; 
+  FontInstall: "Poppins-Italic"; Flags: onlyifdoesntexist uninsneveruninstall
 
 ; Codes
 Source: "fonts\Code128B.ttf"; DestDir: "{commonfonts}"; \