diff --git a/nvim/after/plugin/surround.lua b/nvim/after/plugin/surround.lua
new file mode 100644
index 0000000..72d236b
--- /dev/null
+++ b/nvim/after/plugin/surround.lua
@@ -0,0 +1,7 @@
+-- nvim-surround – https://github.com/kylechui/nvim-surround
+local status_ok, surround = pcall(require, "nvim-surround")
+if not status_ok then
+	return
+end
+
+surround.setup()
diff --git a/nvim/lua/kogakure/plugins.lua b/nvim/lua/kogakure/plugins.lua
index 46d73d9..13b095b 100644
--- a/nvim/lua/kogakure/plugins.lua
+++ b/nvim/lua/kogakure/plugins.lua
@@ -155,7 +155,7 @@ return packer.startup(function(use)
 	use("tpope/vim-speeddating") -- Increase dates, times, etc.
 	use("rstacruz/vim-xtract") -- Extract code into new file
 	use("tpope/vim-repeat") -- Repeat plugins
-	use("tpope/vim-surround") -- Replace, add, remove surroundings
+	use("kylechui/nvim-surround") -- Surround selections, stylishly
 	use("wuelnerdotexe/vim-astro") -- Astro support
 	use("MunifTanjim/prettier.nvim") -- Prettier
 	use("untitled-ai/jupyter_ascending.vim") -- Interact with jupyter_ascending
@@ -172,6 +172,7 @@ return packer.startup(function(use)
 	use("kana/vim-textobj-user")
 	use("michaeljsmith/vim-indent-object") -- ai, ii, aI, iI
 	use("whatyouhide/vim-textobj-xmlattr") -- ax, ix
+	use("nvim-treesitter/nvim-treesitter-textobjects") -- Syntax aware text-objects
 
 	-- Custom Motions
 	use("christoomey/vim-sort-motion") -- gs