--- a/cadMousePro-daemon/src/CLIParser.h	Tue Jun 09 16:10:20 2020 +0200
+++ b/cadMousePro-daemon/src/CLIParser.h	Tue Jun 09 16:12:00 2020 +0200
@@ -49,6 +49,8 @@
 	static const std::wstring OPTION_FREQUENCY;
 	static const std::wstring OPTION_SMART_SCROLLING;
 	static const std::wstring OPTION_LIFT_OFF_DETECTION;
+	static const std::wstring OPTION_REMAP_WHEEL_PRESS;
+	static const std::wstring OPTION_REMAP_GESTURE_BUTTON;
 	static const std::wstring OPTION_DAEMON;
 
 	CLIConfiguration parse(const std::vector<std::wstring>& arguments) {
@@ -63,6 +65,10 @@
 				c.cadMouseConfig.setSmartScrolling(parseBoolean(readNext(arguments, i)));
 			} else if (option == OPTION_LIFT_OFF_DETECTION) {
 				c.cadMouseConfig.setLiftOffDetection(parseBoolean(readNext(arguments, i)));
+			} else if (option == OPTION_REMAP_WHEEL_PRESS) {
+				c.cadMouseConfig.setWheelPressRemapped(parseBoolean(readNext(arguments, i)));
+			} else if (option == OPTION_REMAP_GESTURE_BUTTON) {
+				c.cadMouseConfig.setRemapGestureButton(parseBoolean(readNext(arguments, i)));
 			} else if (option == OPTION_DAEMON) {
 				c.daemon = parseBoolean(readNext(arguments, i));
 			} else throw CLIException(L"Unsupported CLI option: " + option, CLI::EXIT_CODE_BAD_CLI_ARGUMENTS);
@@ -79,4 +85,6 @@
 const std::wstring CLIParser::OPTION_FREQUENCY = L"--frequency";
 const std::wstring CLIParser::OPTION_SMART_SCROLLING = L"--smart-scrolling";
 const std::wstring CLIParser::OPTION_LIFT_OFF_DETECTION = L"--lift-off-detection";
+const std::wstring CLIParser::OPTION_REMAP_WHEEL_PRESS = L"--remap-wheel-press";
+const std::wstring CLIParser::OPTION_REMAP_GESTURE_BUTTON = L"--remap-gesture-button";
 const std::wstring CLIParser::OPTION_DAEMON = L"--daemon";