diff --git a/.golangci.yml b/.golangci.yml
index 9a431ab5..bf87eb3a 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -10,11 +10,11 @@ linters-settings:
     simplify: true
   goimports:
     local-prefixes: github.com/mattermost/mattermost-plugin-todo
-  golint:
-    min-confidence: 0
   govet:
     check-shadowing: true
     enable-all: true
+    disable:
+      - fieldalignment
   misspell:
     locale: US
 
@@ -22,27 +22,23 @@ linters:
   disable-all: true
   enable:
     - bodyclose
-    - deadcode
     - errcheck
     - goconst
     - gocritic
     - gofmt
     - goimports
-    - golint
     - gosec
     - gosimple
     - govet
     - ineffassign
-    - interfacer
     - misspell
     - nakedret
+    - revive
     - staticcheck
-    - structcheck
     - stylecheck
     - typecheck
     - unconvert
     - unused
-    - varcheck
     - whitespace
 
 issues:
diff --git a/go.mod b/go.mod
index e4c646b7..7eff6657 100644
--- a/go.mod
+++ b/go.mod
@@ -7,4 +7,5 @@ require (
 	github.com/mattermost/mattermost-server/v5 v5.3.2-0.20200804063212-d4dac31b042a
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.6.1
+	golang.org/x/sys v0.1.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 8674288c..d0273d3e 100644
--- a/go.sum
+++ b/go.sum
@@ -716,8 +716,9 @@ golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/plugin.json b/plugin.json
index 78853aaa..d384397d 100644
--- a/plugin.json
+++ b/plugin.json
@@ -4,8 +4,8 @@
     "description": "This plugin makes it easy to keep track of Todo issues and get daily reminders.",
     "homepage_url": "https://github.com/mattermost/mattermost-plugin-todo",
     "support_url": "https://github.com/mattermost/mattermost-plugin-todo/issues",
-    "release_notes_url": "https://github.com/mattermost/mattermost-plugin-todo/releases/tag/v0.6.0",
-    "version": "0.6.0",
+    "release_notes_url": "https://github.com/mattermost/mattermost-plugin-todo/releases/tag/v0.6.1",
+    "version": "0.6.1",
     "min_server_version": "6.5.0",
     "server": {
         "executables": {
diff --git a/server/manifest.go b/server/manifest.go
index ffb45bea..1e123722 100644
--- a/server/manifest.go
+++ b/server/manifest.go
@@ -17,8 +17,8 @@ const manifestStr = `
   "description": "This plugin makes it easy to keep track of Todo issues and get daily reminders.",
   "homepage_url": "https://github.com/mattermost/mattermost-plugin-todo",
   "support_url": "https://github.com/mattermost/mattermost-plugin-todo/issues",
-  "release_notes_url": "https://github.com/mattermost/mattermost-plugin-todo/releases/tag/v0.6.0",
-  "version": "0.6.0",
+  "release_notes_url": "https://github.com/mattermost/mattermost-plugin-todo/releases/tag/v0.6.1",
+  "version": "0.6.1",
   "min_server_version": "6.5.0",
   "server": {
     "executables": {
diff --git a/webapp/src/manifest.js b/webapp/src/manifest.js
index 0b50644a..d24b2bae 100644
--- a/webapp/src/manifest.js
+++ b/webapp/src/manifest.js
@@ -7,8 +7,8 @@ const manifest = JSON.parse(`
     "description": "This plugin makes it easy to keep track of Todo issues and get daily reminders.",
     "homepage_url": "https://github.com/mattermost/mattermost-plugin-todo",
     "support_url": "https://github.com/mattermost/mattermost-plugin-todo/issues",
-    "release_notes_url": "https://github.com/mattermost/mattermost-plugin-todo/releases/tag/v0.6.0",
-    "version": "0.6.0",
+    "release_notes_url": "https://github.com/mattermost/mattermost-plugin-todo/releases/tag/v0.6.1",
+    "version": "0.6.1",
     "min_server_version": "6.5.0",
     "server": {
         "executables": {
diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js
index d54bfdae..f3ea2e76 100644
--- a/webapp/webpack.config.js
+++ b/webapp/webpack.config.js
@@ -81,6 +81,7 @@ module.exports = {
     },
     externals: {
         react: 'React',
+        'react-dom': 'ReactDOM',
         redux: 'Redux',
         'react-redux': 'ReactRedux',
         'prop-types': 'PropTypes',