diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index 67e431eae..b562f8768 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -86,7 +86,8 @@
           (delete-char 2))))
     (sp-local-pair
      '(js2-mode typescript-mode rjsx-mode rust-mode c-mode c++-mode objc-mode
-       java-mode php-mode css-mode scss-mode less-css-mode stylus-mode)
+       csharp-mode java-mode php-mode css-mode scss-mode less-css-mode
+       stylus-mode)
      "/*" "*/"
      :actions '(insert)
      :post-handlers '(("| " "SPC") ("|\n*/[i][d-2]" "RET") (+default-expand-doc-comment-block "*")))
diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el
index 5ba7960d7..cb20b4ed7 100644
--- a/modules/lang/csharp/config.el
+++ b/modules/lang/csharp/config.el
@@ -14,24 +14,29 @@
   (add-hook! csharp-mode
     (add-hook 'kill-buffer-hook #'omnisharp-stop-server nil t))
 
+  (set-electric! 'csharp-mode :chars '(?\n ?\}))
   (set-company-backend! 'csharp-mode 'company-omnisharp)
-
+  (set-rotate-patterns! 'csharp-mode
+    :symbols '(("public" "protected" "private")
+               ("class" "struct")))
   (set-lookup-handlers! 'csharp-mode
     :definition #'omnisharp-go-to-definition
     :references #'omnisharp-find-usages
     :documentation #'omnisharp-current-type-documentation)
 
+  (sp-local-pair 'csharp-mode "<" ">"
+                 :when '(+csharp-sp-point-in-type-p)
+                 :post-handlers '(("| " "SPC")))
+
   (map! :localleader
         :map omnisharp-mode-map
         "b" #'omnisharp-recompile
-
         (:prefix "r"
           "i"  #'omnisharp-fix-code-issue-at-point
           "u"  #'omnisharp-fix-usings
           "r"  #'omnisharp-rename
           "a"  #'omnisharp-show-last-auto-complete-result
           "o"  #'omnisharp-show-overloads-at-point)
-
         (:prefix "f"
           "u"  #'omnisharp-find-usages
           "i"  #'omnisharp-find-implementations
@@ -42,7 +47,6 @@
           "r"  #'omnisharp-navigate-to-region
           "ti" #'omnisharp-current-type-information
           "td" #'omnisharp-current-type-documentation)
-
         (:prefix "t"
           "r" (λ! (omnisharp-unit-test "fixture"))
           "s" (λ! (omnisharp-unit-test "single"))