diff --git a/Application/AppController.m b/Application/AppController.m
index 93ee46535..f9899c907 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -343,16 +343,16 @@
     [userDefaultsValuesDict setObject:fontSize forKey:@"fontSize"];
 	
 	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:35] forKey:@"hotKeyPlayKeyCode"];
-	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSControlKeyMask|NSCommandKeyMask)] forKey:@"hotKeyPlayModifiers"];
+	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSEventModifierFlagControl|NSEventModifierFlagCommand)] forKey:@"hotKeyPlayModifiers"];
 	
 	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:45] forKey:@"hotKeyNextKeyCode"];
-	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSControlKeyMask|NSCommandKeyMask)] forKey:@"hotKeyNextModifiers"];
+	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSEventModifierFlagControl|NSEventModifierFlagCommand)] forKey:@"hotKeyNextModifiers"];
 	
 	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:15] forKey:@"hotKeyPreviousKeyCode"];
-	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSControlKeyMask|NSCommandKeyMask)] forKey:@"hotKeyPreviousModifiers"];
+	[userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSEventModifierFlagControl|NSEventModifierFlagCommand)] forKey:@"hotKeyPreviousModifiers"];
     
     [userDefaultsValuesDict setObject:[NSNumber numberWithInt:8] forKey:@"hotKeySpamKeyCode"];
-    [userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSControlKeyMask|NSCommandKeyMask)] forKey:@"hotKeySpamModifiers"];
+    [userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSEventModifierFlagControl|NSEventModifierFlagCommand)] forKey:@"hotKeySpamModifiers"];
 
     NSString * feedURLdefault = @"https://f.losno.co/cog/mercury.xml";
     NSString * feedURLbroken = @"https://kode54.net/cog/stable.xml";
diff --git a/Frameworks/NDHotKey/NDHotKey/NDKeyboardLayout.m b/Frameworks/NDHotKey/NDHotKey/NDKeyboardLayout.m
index fe5dd7928..e12266dfd 100644
--- a/Frameworks/NDHotKey/NDHotKey/NDKeyboardLayout.m
+++ b/Frameworks/NDHotKey/NDHotKey/NDKeyboardLayout.m
@@ -179,16 +179,16 @@ static NSUInteger _characterForModifierFlags( unichar aBuff[kBufferSize], UInt32
 {
 	NSUInteger		thePos = 0;
 	memset( aBuff, 0, kBufferSize );
-	if(aModifierFlags & NSControlKeyMask)
+	if(aModifierFlags & NSEventModifierFlagControl)
 		aBuff[thePos++] = kControlUnicode;
 	
-	if(aModifierFlags & NSAlternateKeyMask)
+	if(aModifierFlags & NSEventModifierFlagOption)
 		aBuff[thePos++] = kOptionUnicode;
 	
-	if(aModifierFlags & NSShiftKeyMask)
+	if(aModifierFlags & NSEventModifierFlagShift)
 		aBuff[thePos++] = kShiftUnicode;
 	
-	if(aModifierFlags & NSCommandKeyMask)
+	if(aModifierFlags & NSEventModifierFlagCommand)
 		aBuff[thePos++] = kCommandUnicode;
 	return thePos;
 }
@@ -201,16 +201,16 @@ NSUInteger NDCocoaModifierFlagsForCarbonModifierFlags( NSUInteger aModifierFlags
 	NSUInteger	theCocoaModifierFlags = 0;
 	
 	if(aModifierFlags & shiftKey)
-		theCocoaModifierFlags |= NSShiftKeyMask;
+		theCocoaModifierFlags |= NSEventModifierFlagShift;
 	
 	if(aModifierFlags & controlKey)
-		theCocoaModifierFlags |= NSControlKeyMask;
+		theCocoaModifierFlags |= NSEventModifierFlagControl;
 	
 	if(aModifierFlags & optionKey)
-		theCocoaModifierFlags |= NSAlternateKeyMask;
+		theCocoaModifierFlags |= NSEventModifierFlagOption;
 	
 	if(aModifierFlags & cmdKey)
-		theCocoaModifierFlags |= NSCommandKeyMask;
+		theCocoaModifierFlags |= NSEventModifierFlagCommand;
 	
 	return theCocoaModifierFlags;
 }