diff --git a/config/automatrop/roles/vim/templates/pluginlist.j2 b/config/automatrop/roles/vim/templates/pluginlist.j2
index 926c1fb..3725f9f 100644
--- a/config/automatrop/roles/vim/templates/pluginlist.j2
+++ b/config/automatrop/roles/vim/templates/pluginlist.j2
@@ -35,6 +35,7 @@ source ~/.config/vim/theme.vim
 
 " Search/replace
 {{ use_plugin('abolish') }}
+{{ use_plugin('easy_align') }}
 
 " Sourounding pairs
 {{ use_plugin('surround') }}
@@ -70,6 +71,9 @@ source ~/.config/vim/theme.vim
 {% if variant == 'nvim' %}
 {{ use_plugin('treesitter') }}
 {{ use_plugin('ts-rainbow') }}
+{# TODO
+{{ use_plugin('indent-blankline') }}
+#}
 {% endif %}
 
 " Snippets
diff --git a/config/automatrop/roles/vim/templates/plugins/indent-blankline.j2 b/config/automatrop/roles/vim/templates/plugins/indent-blankline.j2
new file mode 100644
index 0000000..138e4b1
--- /dev/null
+++ b/config/automatrop/roles/vim/templates/plugins/indent-blankline.j2
@@ -0,0 +1,3 @@
+{# Show ident lines #}
+{{ add_source('lukas-reineke/indent-blankline.nvim') -}}
+let g:indent_blankline_char_highlight_list = ['Error', 'Function']
diff --git a/config/automatrop/roles/vim/templates/plugins/nvim_lspconfig.j2 b/config/automatrop/roles/vim/templates/plugins/nvim_lspconfig.j2
index 53ff5fe..fe1c7bb 100644
--- a/config/automatrop/roles/vim/templates/plugins/nvim_lspconfig.j2
+++ b/config/automatrop/roles/vim/templates/plugins/nvim_lspconfig.j2
@@ -42,7 +42,10 @@ end
 -- map buffer local keybindings when the language server attaches
 local servers = {
 {% if 'python' in dev_stuffs %}
-    "pyls",
+    "pylsp",
+{% endif %}
+{% if 'php' in dev_stuffs %}
+    "phpactor", -- Install this one manually https://phpactor.readthedocs.io/en/master/usage/standalone.html#global-installation
 {% endif %}
 }
 for _, lsp in ipairs(servers) do
diff --git a/config/automatrop/roles/vim/templates/plugins/telescope.j2 b/config/automatrop/roles/vim/templates/plugins/telescope.j2
index ce3ab0e..9caa37b 100644
--- a/config/automatrop/roles/vim/templates/plugins/telescope.j2
+++ b/config/automatrop/roles/vim/templates/plugins/telescope.j2
@@ -18,9 +18,9 @@ noremap gc <cmd>Telescope commands<cr>
 noremap gr <cmd>Telescope lsp_references<cr>
 noremap ga <cmd>Telescope lsp_code_actions<cr>
 vnoremap ga <cmd>Telescope lsp_range_code_actions<cr>
-noremap gq <cmd>Telescope lsp_document_diagnostics<cr>
+noremap ge <cmd>Telescope lsp_document_diagnostics<cr>
 noremap gE <cmd>Telescope lsp_workspace_diagnostics<cr>
-noremap ge <cmd>Telescope lsp_definitions<cr>
+noremap gd <cmd>Telescope lsp_definitions<cr>
 
 lua << EOF
 require('telescope').setup{
diff --git a/config/automatrop/roles/vim/templates/plugins/ts-rainbow.j2 b/config/automatrop/roles/vim/templates/plugins/ts-rainbow.j2
index 2fdb6ed..4663f6e 100644
--- a/config/automatrop/roles/vim/templates/plugins/ts-rainbow.j2
+++ b/config/automatrop/roles/vim/templates/plugins/ts-rainbow.j2
@@ -1,5 +1,5 @@
 {# Randomly color parentheses pairs #}
-{{add_source('p00f/nvim-ts-rainbow')-}}
+{{ add_source('p00f/nvim-ts-rainbow') -}}
 lua << EOF
 require'nvim-treesitter.configs'.setup {
   rainbow = {