diff --git a/.emacs b/.emacs
index f838cea..f023f0c 100644
--- a/.emacs
+++ b/.emacs
@@ -426,7 +426,33 @@
 	(magit-credential-cache-daemon-socket nil)
 	)
 
+
+(use-package yasnippet
+	:delight yas-minor-mode
+	:bind ( :map yas-minor-mode-map
+		      ("TAB" . nil)
+		      )
+	)
+
+
+(use-package yasnippet-snippets
+	:after yasnippet
+	)
+
+(use-package yasnippet-licenses
+	:straight (yasnippet-licenses
+		          :type git
+		          :host github
+		          :repo "atuleu/yasnippet-licenses"
+		          :files (:defaults "*.el" "snippets")
+		          )
+	:after yasnippet
+	)
+
+
+
 (use-package company
+	:after yasnippet
 	:delight
 	:bind ( ("M-TAB" . company-complete) )
 	:init
@@ -575,28 +601,6 @@
 	(add-to-list 'auto-mode-alist '("\\.pio$" . poly-pio-mode))
 	)
 
-(use-package yasnippet
-	:delight yas-minor-mode
-	:config
-	:bind ( :map yas-minor-mode-map
-		      ("TAB" . nil)
-		      )
-	)
-
-
-(use-package yasnippet-snippets
-	:after yasnippet
-	)
-
-(use-package yasnippet-licenses
-	:straight (yasnippet-licenses
-		          :type git
-		          :host github
-		          :repo "atuleu/yasnippet-licenses"
-		          :files (:defaults "*.el" "snippets")
-		          )
-	:after yasnippet
-	)
 
 (use-package projectile
 	:bind ( :map projectile-mode-map
@@ -681,25 +685,25 @@
 		)
 	)
 
-(use-package polymode
-	:config
-	(define-hostmode poly-pio-hostmode
-		:mode 'asm-mode)
+;; (use-package polymode
+;; 	:config
+;; 	(define-hostmode poly-pio-hostmode
+;; 		:mode 'asm-mode)
 
-	(define-innermode poly-pio-c-innermode
-		:mode 'c-mode
-		:head-matcher "^% c-sdk {$"
-		:tail-matcher "^%}$"
-		:head-mode 'host
-		:tail-mode 'host)
+;; 	(define-innermode poly-pio-c-innermode
+;; 		:mode 'c-mode
+;; 		:head-matcher "^% c-sdk {$"
+;; 		:tail-matcher "^%}$"
+;; 		:head-mode 'host
+;; 		:tail-mode 'host)
 
-	(define-polymode poly-pio-mode
-		:hostmode 'poly-pio-hostmode
-		:innermodes '(poly-pio-c-innermode))
+;; 	(define-polymode poly-pio-mode
+;; 		:hostmode 'poly-pio-hostmode
+;; 		:innermodes '(poly-pio-c-innermode))
 
-	(add-to-list 'auto-mode-alist '("\\.pio$" . poly-pio-mode))
+;; 	(add-to-list 'auto-mode-alist '("\\.pio$" . poly-pio-mode))
 
-	)
+;; 	)
 
 
 (use-package vterm)