diff --git a/app/widget_maker.go b/app/widget_maker.go
index bfb08612..6de24bd6 100644
--- a/app/widget_maker.go
+++ b/app/widget_maker.go
@@ -3,6 +3,7 @@ package app
 import (
 	"github.com/olebedev/config"
 	"github.com/rivo/tview"
+	"github.com/wtfutil/wtf/modules/azuredevops"
 	"github.com/wtfutil/wtf/modules/bamboohr"
 	"github.com/wtfutil/wtf/modules/bargraph"
 	"github.com/wtfutil/wtf/modules/circleci"
@@ -14,7 +15,6 @@ import (
 	"github.com/wtfutil/wtf/modules/datadog"
 	"github.com/wtfutil/wtf/modules/digitalclock"
 	"github.com/wtfutil/wtf/modules/docker"
-	"github.com/wtfutil/wtf/modules/azuredevops"
 	"github.com/wtfutil/wtf/modules/feedreader"
 	"github.com/wtfutil/wtf/modules/gcal"
 	"github.com/wtfutil/wtf/modules/gerrit"
@@ -80,6 +80,9 @@ func MakeWidget(
 	case "arpansagovau":
 		settings := arpansagovau.NewSettingsFromYAML(moduleName, moduleConfig, config)
 		widget = arpansagovau.NewWidget(app, settings)
+	case "azuredevops":
+		settings := azuredevops.NewSettingsFromYAML(moduleName, moduleConfig, config)
+		widget = azuredevops.NewWidget(app, pages, settings)
 	case "bamboohr":
 		settings := bamboohr.NewSettingsFromYAML(moduleName, moduleConfig, config)
 		widget = bamboohr.NewWidget(app, settings)
@@ -113,9 +116,6 @@ func MakeWidget(
 	case "docker":
 		settings := docker.NewSettingsFromYAML(moduleName, moduleConfig, config)
 		widget = docker.NewWidget(app, pages, settings)
-	case "azuredevops":
-		settings := azuredevops.NewSettingsFromYAML(moduleName, moduleConfig, config)
-		widget = azuredevops.NewWidget(app, pages, settings)
 	case "feedreader":
 		settings := feedreader.NewSettingsFromYAML(moduleName, moduleConfig, config)
 		widget = feedreader.NewWidget(app, pages, settings)
diff --git a/modules/azuredevops/settings.go b/modules/azuredevops/settings.go
index ceada4eb..f56b33cc 100644
--- a/modules/azuredevops/settings.go
+++ b/modules/azuredevops/settings.go
@@ -1,6 +1,8 @@
 package azuredevops
 
 import (
+	"os"
+
 	"github.com/olebedev/config"
 	"github.com/wtfutil/wtf/cfg"
 )
@@ -9,10 +11,11 @@ const defaultTitle = "azuredevops"
 
 // Settings defines the configuration options for this module
 type Settings struct {
-	common      *cfg.Common
+	common *cfg.Common
+
 	labelColor  string
-	apiToken    string
-	orgURL      string
+	apiToken    string `help:"Your Azure DevOps Access Token."`
+	orgURL      string `help:"Your Azure DevOps organization URL."`
 	projectName string
 	maxRows     int
 }
@@ -20,11 +23,12 @@ type Settings struct {
 // NewSettingsFromYAML creates and returns an instance of Settings with configuration options populated
 func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 	settings := Settings{
-		common:      cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig),
+		common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig),
+
 		labelColor:  ymlConfig.UString("labelColor", "white"),
-		apiToken:    ymlConfig.UString("apiToken", "api token not specified"),
-		orgURL:      ymlConfig.UString("orgURL", "org url not specified"),
-		projectName: ymlConfig.UString("projectName", "project name not specified"),
+		apiToken:    ymlConfig.UString("apiToken", os.Getenv("WTF_AZURE DEVOPS_API_TOKEN")),
+		orgURL:      ymlConfig.UString("orgURL", os.Getenv("WTF_AZURE_DEVOPS_ORG_URL")),
+		projectName: ymlConfig.UString("projectName", os.Getenv("WTF_AZURE_DEVOPS_PROJECT_NAME")),
 		maxRows:     ymlConfig.UInt("maxRows", 3),
 	}
 
diff --git a/modules/gitter/settings.go b/modules/gitter/settings.go
index 12127b3d..8814a567 100644
--- a/modules/gitter/settings.go
+++ b/modules/gitter/settings.go
@@ -12,7 +12,7 @@ const defaultTitle = "Gitter"
 type Settings struct {
 	common *cfg.Common
 
-	apiToken         string `help:"Your GitterPersonal Access Token."`
+	apiToken         string `help:"Your Gitter Personal Access Token."`
 	numberOfMessages int    `help:"Maximum number of (newest) messages to be displayed. Default is 10" optional:"true"`
 	roomURI          string `help:"The room you want to display." values:"Example: wtfutil/Lobby"`
 }