diff --git a/oni-c.el b/oni-c.el
index 24be34e..33b4ab6 100644
--- a/oni-c.el
+++ b/oni-c.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.1212.220101
+;; Version: 2020.1212.220909
 ;; Package-Requires: (oni-flycheck oni-fci oni-lsp reformatter)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -52,8 +52,8 @@
               'display-fill-column-indicator-mode
             'fci-mode))
 
-(define-abbrev c-mode-abbrev-table "and" "&&")
-(define-abbrev c-mode-abbrev-table "or" "||")
+(define-abbrev c-mode-abbrev-table "and" "&&" nil :system t)
+(define-abbrev c-mode-abbrev-table "or" "||" nil :system t)
 
 ;;;###autoload(with-eval-after-load 'cc-mode (require 'oni-c))
 
diff --git a/oni-csharp/oni-csharp.el b/oni-csharp/oni-csharp.el
index 13bc1cc..de33eb6 100644
--- a/oni-csharp/oni-csharp.el
+++ b/oni-csharp/oni-csharp.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.1210.205218
+;; Version: 2020.1212.221001
 ;; Package-Requires: (csharp-mode oni-company oni-flycheck oni-yasnippet oni-hydra oni-fci oni-lsp smartparens)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -159,8 +159,8 @@ _cs_: Solution
 
 (define-key csharp-mode-map (kbd "C-c SPC") 'oni-csharp-hydra/body)
 
-(define-abbrev csharp-mode-abbrev-table "and" "&&")
-(define-abbrev csharp-mode-abbrev-table "or" "||")
+(define-abbrev csharp-mode-abbrev-table "and" "&&" nil :system t)
+(define-abbrev csharp-mode-abbrev-table "or" "||" nil :system t)
 
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.xaml\\'" . nxml-mode))
diff --git a/oni-java.el b/oni-java.el
index e1a995f..93704c6 100644
--- a/oni-java.el
+++ b/oni-java.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.1210.205100
+;; Version: 2020.1212.221032
 ;; Package-Requires: (oni-fci oni-data-dir oni-lsp oni-hydra lsp-java)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -83,8 +83,8 @@
 (define-key java-mode-map (kbd "C-c r") 'java-refactor-hydra/body)
 (define-key java-mode-map (kbd "C-c d") 'java-documentation-hydra/body)
 
-(define-abbrev java-mode-abbrev-table "and" "&&")
-(define-abbrev java-mode-abbrev-table "or" "||")
+(define-abbrev java-mode-abbrev-table "and" "&&" nil :system t)
+(define-abbrev java-mode-abbrev-table "or" "||" nil :system t)
 
 (add-to-list 'auto-insert-alist
              '("\\.java\\'"