diff --git a/nvim/lua/diagnostics.lua b/nvim/lua/diagnostics.lua
index 8bbfc18..754b5eb 100644
--- a/nvim/lua/diagnostics.lua
+++ b/nvim/lua/diagnostics.lua
@@ -1,14 +1,26 @@
-local colors = require("ayu.colors")
-colors.generate(true)
+local theme_colors = require("ayu.colors")
+theme_colors.generate(true)
 -- These are not apart of the Ayu color theme, however, I needed these
 -- colors while still fitting in with the rest
 local ayu_turquoise = "#5CCFE6"
 local ayu_dark_blue = "#3A7BD5"
+
+local colors = {
+    info = ayu_dark_blue,
+    hint = ayu_turquoise,
+    warning = theme_colors.warning,
+    error = theme_colors.error,
+}
+
 for _, highlight in ipairs({
-    { "DiagnosticUnderlineError", { undercurl = true, sp = colors.error } },
+    { "DiagnosticUnderlineInfo",  { undercurl = true, sp = colors.info } },
+    { "DiagnosticUnderlineHint",  { undercurl = true, sp = colors.hint } },
     { "DiagnosticUnderlineWarn",  { undercurl = true, sp = colors.warning } },
-    { "DiagnosticUnderlineHint",  { undercurl = true, sp = ayu_turquoise } },
-    { "DiagnosticUnderlineInfo",  { undercurl = true, sp = ayu_dark_blue } },
+    { "DiagnosticUnderlineError", { undercurl = true, sp = colors.error } },
+    { "DiagnosticInfo",           { fg = colors.info } },
+    { "DiagnosticHint",           { fg = colors.hint } },
+    { "DiagnosticWarn",           { fg = colors.warning } },
+    { "DiagnosticError",          { fg = colors.error } },
 }) do
     vim.api.nvim_set_hl(0, highlight[1], highlight[2])
 end
diff --git a/nvim/lua/plugs/lualine.lua b/nvim/lua/plugs/lualine.lua
index 62df061..502b6e1 100644
--- a/nvim/lua/plugs/lualine.lua
+++ b/nvim/lua/plugs/lualine.lua
@@ -31,7 +31,16 @@ return {
             },
             sections = {
                 lualine_a = { "mode" },
-                lualine_b = { "branch", resize_mode },
+                lualine_b = {
+                    "branch",
+                    {
+                        "diagnostics",
+                        sources = { "nvim_lsp", "nvim_diagnostic", },
+                        sections = { "error", "warn", "info", "hint" },
+                        update_in_insert = false,
+                    },
+                    resize_mode,
+                },
                 lualine_c = { "buffers" },
                 lualine_x = { "encoding", "fileformat", "filetype" },
                 lualine_y = { "progress" },