WTF-400 Move name and configKey values from widget to settings

modules/bamboohr/settings.go

@@ -7,20 +7,23 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
-type Settings struct {
-	Common *cfg.Common
+const configKey = "bamboohr"
 
-	APIKey    string
-	Subdomain string
+type Settings struct {
+	common *cfg.Common
+
+	apiKey    string
+	subdomain string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.bamboohr")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		Common:    cfg.NewCommonSettingsFromYAML(ymlConfig),
-		APIKey:    localConfig.UString("apiKey", os.Getenv("WTF_BAMBOO_HR_TOKEN")),
-		Subdomain: localConfig.UString("subdomain", os.Getenv("WTF_BAMBOO_HR_SUBDOMAIN")),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+
+		apiKey:    localConfig.UString("apiKey", os.Getenv("WTF_BAMBOO_HR_TOKEN")),
+		subdomain: localConfig.UString("subdomain", os.Getenv("WTF_BAMBOO_HR_SUBDOMAIN")),
 	}
 
 	return &settings

modules/bamboohr/widget.go

@@ -17,7 +17,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "BambooHR", "bamboohr", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings: settings,
 	}
@@ -30,8 +30,8 @@ func NewWidget(app *tview.Application, settings *Settings) *Widget {
 func (widget *Widget) Refresh() {
 	client := NewClient(
 		APIURI,
-		widget.settings.APIKey,
-		widget.settings.Subdomain,
+		widget.settings.apiKey,
+		widget.settings.subdomain,
 	)
 
 	todayItems := client.Away(

modules/circleci/settings.go

@@ -7,17 +7,20 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "circleci"
+
 type Settings struct {
-	Common *cfg.Common
+	common *cfg.Common
 
 	apiKey string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.circleci")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		Common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+
 		apiKey: localConfig.UString("apiKey", os.Getenv("WTF_CIRCLE_API_KEY")),
 	}
 

modules/circleci/widget.go

@@ -16,7 +16,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "CircleCI", "circleci", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 		Client:     NewClient(settings.apiKey),
 
 		settings: settings,

modules/clocks/setting.go

@@ -6,6 +6,8 @@ import (
 	"github.com/wtfutil/wtf/wtf"
 )
 
+const configKey = "clocks"
+
 type colors struct {
 	rows struct {
 		even string
@@ -23,11 +25,11 @@ type Settings struct {
 	sort       string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.clocks")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		dateFormat: localConfig.UString("dateFormat", wtf.SimpleDateFormat),
 		timeFormat: localConfig.UString("timeFormat", wtf.SimpleTimeFormat),

modules/clocks/widget.go

@@ -19,7 +19,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "World Clocks", "clocks", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings:   settings,
 		dateFormat: settings.dateFormat,

modules/cmdrunner/settings.go

@@ -6,6 +6,8 @@ import (
 	"github.com/wtfutil/wtf/wtf"
 )
 
+const configKey = "cmdrunner"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -13,11 +15,11 @@ type Settings struct {
 	cmd  string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.cmdrunner")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		args: wtf.ToStrs(localConfig.UList("args")),
 		cmd:  localConfig.UString("cmd"),

modules/cmdrunner/widget.go

@@ -20,7 +20,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "CmdRunner", "cmdrunner", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		args:     settings.args,
 		cmd:      settings.cmd,

modules/cryptoexchanges/bittrex/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "bittrex"
+
 type colors struct {
 	base struct {
 		name        string
@@ -24,11 +26,11 @@ type Settings struct {
 	summary map[string]interface{}
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.bittrex")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 	}
 
 	settings.colors.base.name = localConfig.UString("colors.base.name")

modules/cryptoexchanges/bittrex/widget.go

@@ -27,7 +27,7 @@ type Widget struct {
 // NewWidget Make new instance of widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "Bittrex", "bittrex", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings:    settings,
 		summaryList: summaryList{},

modules/cryptoexchanges/blockfolio/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "blockfolio"
+
 type colors struct {
 	name  string
 	grows string
@@ -19,11 +21,11 @@ type Settings struct {
 	displayHoldings bool
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.blockfolio")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		deviceToken:     localConfig.UString("device_token"),
 		displayHoldings: localConfig.UBool("displayHoldings", true),

modules/cryptoexchanges/blockfolio/widget.go

@@ -20,7 +20,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "Blockfolio", "blockfolio", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		device_token: settings.deviceToken,
 		settings:     settings,

modules/cryptoexchanges/cryptolive/price/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "price"
+
 type colors struct {
 	from struct {
 		name        string
@@ -34,14 +36,14 @@ type Settings struct {
 	top        map[string]interface{}
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.cryptolive")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	currencies, _ := localConfig.Map("currencies")
 	top, _ := localConfig.Map("top")
 
 	settings := Settings{
-		common:     cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common:     cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 		currencies: currencies,
 		top:        top,
 	}

modules/cryptoexchanges/cryptolive/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/modules/cryptoexchanges/cryptolive/toplist"
 )
 
+const configKey = "cryptolive"
+
 type colors struct {
 	from struct {
 		name        string
@@ -31,7 +33,8 @@ type colors struct {
 
 type Settings struct {
 	colors
-	common     *cfg.Common
+	common *cfg.Common
+
 	currencies map[string]interface{}
 	top        map[string]interface{}
 
@@ -39,19 +42,20 @@ type Settings struct {
 	toplistSettings *toplist.Settings
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.cryptolive")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	currencies, _ := localConfig.Map("currencies")
 	top, _ := localConfig.Map("top")
 
 	settings := Settings{
-		common:     cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+
 		currencies: currencies,
 		top:        top,
 
-		priceSettings:   price.NewSettingsFromYAML(ymlConfig),
-		toplistSettings: toplist.NewSettingsFromYAML(ymlConfig),
+		priceSettings:   price.NewSettingsFromYAML(name, ymlConfig),
+		toplistSettings: toplist.NewSettingsFromYAML(name, ymlConfig),
 	}
 
 	settings.colors.from.name = localConfig.UString("colors.from.name")

modules/cryptoexchanges/cryptolive/toplist/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "toplist"
+
 type colors struct {
 	from struct {
 		name        string
@@ -34,14 +36,14 @@ type Settings struct {
 	top        map[string]interface{}
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.cryptolive")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	currencies, _ := localConfig.Map("currencies")
 	top, _ := localConfig.Map("top")
 
 	settings := Settings{
-		common:     cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common:     cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 		currencies: currencies,
 		top:        top,
 	}

modules/cryptoexchanges/cryptolive/widget.go

@@ -22,7 +22,7 @@ type Widget struct {
 // NewWidget Make new instance of widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "CryptoLive", "cryptolive", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		priceWidget:   price.NewWidget(settings.priceSettings),
 		toplistWidget: toplist.NewWidget(settings.toplistSettings),

modules/datadog/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "datadog"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -15,11 +17,12 @@ type Settings struct {
 	tags           []interface{}
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.datadog")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common:         cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+
 		apiKey:         localConfig.UString("apiKey", os.Getenv("WTF_DATADOG_API_KEY")),
 		applicationKey: localConfig.UString("applicationKey", os.Getenv("WTF_DATADOG_APPLICATION_KEY")),
 		tags:           localConfig.UList("monitors.tags"),

modules/datadog/widget.go

@@ -16,7 +16,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "Datadog", "datadog", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings: settings,
 	}

modules/gcal/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "gcal"
+
 type colors struct {
 	day         string
 	description string
@@ -30,11 +32,11 @@ type Settings struct {
 	withLocation          bool
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.gcal")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		conflictIcon:          localConfig.UString("conflictIcon", "🚨"),
 		currentIcon:           localConfig.UString("currentIcon", "🔸"),

modules/gcal/widget.go

@@ -20,7 +20,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "Calendar", "gcal", true),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		app:      app,
 		ch:       make(chan struct{}),

modules/gerrit/settings.go

@@ -14,6 +14,8 @@ type colors struct {
 	}
 }
 
+const configKey = "gerrit"
+
 type Settings struct {
 	colors
 	common *cfg.Common
@@ -25,11 +27,11 @@ type Settings struct {
 	verifyServerCertificate bool
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.gerrit")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		domain:                  localConfig.UString("domain", ""),
 		password:                localConfig.UString("password", os.Getenv("WTF_GERRIT_PASSWORD")),

modules/gerrit/widget.go

@@ -49,7 +49,7 @@ var (
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "Gerrit", "gerrit", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		Idx:      0,
 		settings: settings,

modules/git/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "git"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -14,11 +16,11 @@ type Settings struct {
 	repositories []interface{}
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.git")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		commitCount:  localConfig.UInt("commitCount", 10),
 		commitFormat: localConfig.UString("commitFormat", "[forestgreen]%h [white]%s [grey]%an on %cd[white]"),

modules/git/widget.go

@@ -43,7 +43,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	widget := Widget{
 		HelpfulWidget:     wtf.NewHelpfulWidget(app, pages, HelpText),
 		MultiSourceWidget: wtf.NewMultiSourceWidget("git", "repository", "repositories"),
-		TextWidget:        wtf.NewTextWidget(app, "Git", "git", true),
+		TextWidget:        wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		app:      app,
 		pages:    pages,

modules/github/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "github"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -18,11 +20,11 @@ type Settings struct {
 	username     string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.github")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiKey:       localConfig.UString("apiKey", os.Getenv("WTF_GITHUB_TOKEN")),
 		baseURL:      localConfig.UString("baseURL", os.Getenv("WTF_GITHUB_BASE_URL")),

modules/github/widget.go

@@ -32,7 +32,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "GitHub", "github", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		Idx:      0,
 		settings: settings,

modules/gitlab/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "gitlab"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -16,11 +18,11 @@ type Settings struct {
 	username string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.gitlab")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiKey:   localConfig.UString("apiKey", os.Getenv("WTF_GITLAB_TOKEN")),
 		domain:   localConfig.UString("domain"),

modules/gitlab/widget.go

@@ -39,7 +39,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "Gitlab", "gitlab", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		Idx:      0,
 		gitlab:   gitlab,

modules/gitter/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "gitter"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -15,11 +17,11 @@ type Settings struct {
 	roomURI          string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.gitter")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiToken:         localConfig.UString("apiToken", os.Getenv("WTF_GITTER_API_TOKEN")),
 		numberOfMessages: localConfig.UInt("numberOfMessages", 10),

modules/gitter/widget.go

@@ -32,7 +32,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "Gitter", "gitter", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		settings: settings,
 	}

modules/gspreadsheets/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "gspreadsheets"
+
 type colors struct {
 	values string
 }
@@ -19,11 +21,11 @@ type Settings struct {
 	sheetID       string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.gspreadsheets")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		cellNames:  localConfig.UList("cells.names"),
 		secretFile: localConfig.UString("secretFile"),

modules/gspreadsheets/widget.go

@@ -16,7 +16,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "Google Spreadsheets", "gspreadsheets", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings: settings,
 	}

modules/hackernews/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "hackernews"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -12,11 +14,11 @@ type Settings struct {
 	storyType       string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.hackernews")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		numberOfStories: localConfig.UInt("numberOfStories", 10),
 		storyType:       localConfig.UString("storyType", "top"),

modules/hackernews/widget.go

@@ -38,7 +38,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "Hacker News", "hackernews", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		settings: settings,
 	}

modules/ipaddresses/ipapi/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "ipapi"
+
 type colors struct {
 	name  string
 	value string
@@ -15,11 +17,11 @@ type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.ipapi")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 	}
 
 	settings.colors.name = localConfig.UString("colors.name", "red")

modules/ipaddresses/ipapi/widget.go

@@ -38,7 +38,7 @@ type ipinfo struct {
 // NewWidget constructor
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "IPInfo", "ipapi", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings: settings,
 	}

modules/ipaddresses/ipinfo/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "ipinfo"
+
 type colors struct {
 	name  string
 	value string
@@ -15,11 +17,11 @@ type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.ipinfo")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 	}
 
 	settings.colors.name = localConfig.UString("colors.name", "red")

modules/ipaddresses/ipinfo/widget.go

@@ -31,7 +31,7 @@ type ipinfo struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "IPInfo", "ipinfo", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings: settings,
 	}

modules/jenkins/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "jenkins"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -17,11 +19,11 @@ type Settings struct {
 	verifyServerCertificate bool
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.jenkins")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiKey:                  localConfig.UString("apiKey", os.Getenv("WTF_JENKINS_API_KEY")),
 		successBallColor:        localConfig.UString("successBallColor", "blue"),

modules/jenkins/widget.go

@@ -35,7 +35,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "Jenkins", "jenkins", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		settings: settings,
 	}

modules/jira/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "jira"
+
 type colors struct {
 	rows struct {
 		even string
@@ -27,11 +29,11 @@ type Settings struct {
 	verifyServerCertificate bool
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.jira")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiKey:                  localConfig.UString("apiKey", os.Getenv("WTF_JIRA_API_KEY")),
 		domain:                  localConfig.UString("domain"),

modules/jira/widget.go

@@ -34,7 +34,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "Jira", "jira", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		settings: settings,
 	}

modules/mercurial/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "mercurial"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -13,11 +15,11 @@ type Settings struct {
 	repositories []interface{}
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.mercurial")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		commitCount:  localConfig.UInt("commitCount", 10),
 		commitFormat: localConfig.UString("commitFormat", "[forestgreen]{rev}:{phase} [white]{desc|firstline|strip} [grey]{author|person} {date|age}[white]"),

modules/mercurial/widget.go

@@ -37,8 +37,8 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget:     wtf.NewHelpfulWidget(app, pages, HelpText),
-		MultiSourceWidget: wtf.NewMultiSourceWidget("mercurial", "repository", "repositories"),
-		TextWidget:        wtf.NewTextWidget(app, "Mercurial", "mercurial", true),
+		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.ConfigKey, "repository", "repositories"),
+		TextWidget:        wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		app:      app,
 		pages:    pages,

modules/nbascore/settings.go

@@ -5,13 +5,15 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "nbascore"
+
 type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 	}
 
 	return &settings

modules/nbascore/widget.go

@@ -33,7 +33,7 @@ var offset = 0
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "NBA Score", "nbascore", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		settings: settings,
 	}

modules/newrelic/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "newrelic"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -15,11 +17,11 @@ type Settings struct {
 	deployCount   int
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.newrelic")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiKey:        localConfig.UString("apiKey", os.Getenv("WTF_NEW_RELIC_API_KEY")),
 		applicationID: localConfig.UInt("applicationID"),

modules/newrelic/widget.go

@@ -17,7 +17,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "New Relic", "newrelic", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings: settings,
 	}

modules/opsgenie/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "opsgenie"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -16,11 +18,11 @@ type Settings struct {
 	scheduleIdentifierType string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.opsgenie")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiKey:                 localConfig.UString("apiKey", os.Getenv("WTF_OPS_GENIE_API_KEY")),
 		displayEmpty:           localConfig.UBool("displayEmpty", true),

modules/opsgenie/widget.go

@@ -16,7 +16,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "OpsGenie", "opsgenie", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings: settings,
 	}

modules/pagerduty/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "pagerduty"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -16,11 +18,11 @@ type Settings struct {
 	showSchedules    bool
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.pagerduty")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiKey:           localConfig.UString("apiKey", os.Getenv("WTF_PAGERDUTY_API_KEY")),
 		escalationFilter: localConfig.UList("escalationFilter"),

modules/pagerduty/widget.go

@@ -17,7 +17,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "PagerDuty", "pagerduty", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings: settings,
 	}

modules/power/settings.go

@@ -5,15 +5,17 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "power"
+
 type Settings struct {
 	common *cfg.Common
 
 	filePath string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 	}
 
 	return &settings

modules/power/widget.go

@@ -16,7 +16,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "Power", "power", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		Battery:  NewBattery(),
 		settings: settings,

modules/resourceusage/settings.go

@@ -5,13 +5,15 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "resourceusage"
+
 type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 	}
 
 	return &settings

modules/resourceusage/widget.go

@@ -24,7 +24,7 @@ type Widget struct {
 // NewWidget Make new instance of widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		BarGraph: wtf.NewBarGraph(app, "Resource Usage", "resourceusage", false),
+		BarGraph: wtf.NewBarGraph(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings: settings,
 	}

modules/rollbar/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "rollbar"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -16,11 +18,11 @@ type Settings struct {
 	projectOwner   string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.rollbar")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		accessToken:    localConfig.UString("accessToken"),
 		activeOnly:     localConfig.UBool("activeOnly", false),

modules/rollbar/widget.go

@@ -35,7 +35,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "Rollbar", "rollbar", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		settings: settings,
 	}

modules/security/settings.go

@@ -5,13 +5,15 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "security"
+
 type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 	}
 
 	return &settings

modules/security/widget.go

@@ -16,7 +16,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "Security", "security", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings: settings,
 	}

modules/spotify/settings.go

@@ -5,13 +5,15 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "spotify"
+
 type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 	}
 
 	return &settings

modules/spotify/widget.go

@@ -30,7 +30,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	spotifyClient := spotigopher.NewClient()
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "Spotify", "spotify", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		Info:          spotigopher.Info{},
 		SpotifyClient: spotifyClient,

modules/spotifyweb/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "spotifyweb"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -15,11 +17,11 @@ type Settings struct {
 	secretKey    string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.spotifyweb")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		callbackPort: localConfig.UString("callbackPort", "8080"),
 		clientID:     localConfig.UString("clientID", os.Getenv("SPOTIFY_ID")),

modules/spotifyweb/widget.go

@@ -93,7 +93,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "SpotifyWeb", "spotifyweb", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		Info:        Info{},
 		client:      client,

modules/status/settings.go

@@ -5,13 +5,15 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "status"
+
 type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 	}
 
 	return &settings

modules/status/widget.go

@@ -14,7 +14,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "Status", "status", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		CurrentIcon: 0,
 		settings:    settings,

modules/system/settings.go

@@ -5,13 +5,15 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "system"
+
 type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 	}
 
 	return &settings

modules/system/widget.go

@@ -19,7 +19,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, date, version string, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "System", "system", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		Date:     date,
 		settings: settings,

modules/textfile/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "textfile"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -13,11 +15,11 @@ type Settings struct {
 	formatStyle string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.textfile")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		filePaths:   localConfig.UList("filePaths"),
 		format:      localConfig.UBool("format", false),

modules/textfile/widget.go

@@ -41,8 +41,8 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget:     wtf.NewHelpfulWidget(app, pages, HelpText),
-		MultiSourceWidget: wtf.NewMultiSourceWidget("textfile", "filePath", "filePaths"),
-		TextWidget:        wtf.NewTextWidget(app, "TextFile", "textfile", true),
+		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.ConfigKey, "filePath", "filePaths"),
+		TextWidget:        wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		settings: settings,
 	}

modules/todo/settings.go

@@ -5,17 +5,19 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "todo"
+
 type Settings struct {
 	common *cfg.Common
 
 	filePath string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.todo")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		filePath: localConfig.UString("filename"),
 	}

modules/todo/widget.go

@@ -49,7 +49,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "Todo", "todo", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		app:      app,
 		settings: settings,

modules/todoist/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "todoist"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -14,11 +16,11 @@ type Settings struct {
 	projects []interface{}
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.todoist")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiKey:   localConfig.UString("apiKey", os.Getenv("WTF_TODOIST_TOKEN")),
 		projects: localConfig.UList("projects"),

modules/todoist/widget.go

@@ -37,7 +37,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "Todoist", "todoist", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		settings: settings,
 	}

modules/travisci/settings.go

@@ -7,18 +7,20 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "travisci"
+
 type Settings struct {
-	Common *cfg.Common
+	common *cfg.Common
 
 	apiKey string
 	pro    bool
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.travisci")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		Common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiKey: localConfig.UString("apiKey", os.Getenv("WTF_TRAVIS_API_TOKEN")),
 		pro:    localConfig.UBool("pro", false),

modules/travisci/widget.go

@@ -34,7 +34,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "TravisCI", "travisci", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		settings: settings,
 	}

modules/trello/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "trello"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -17,11 +19,11 @@ type Settings struct {
 	username    string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.trello")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		accessToken: localConfig.UString("accessToken", os.Getenv("WTF_TRELLO_ACCESS_TOKEN")),
 		apiKey:      localConfig.UString("apiKey", os.Getenv("WTF_TRELLO_APP_KEY")),

modules/trello/widget.go

@@ -16,7 +16,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "Trello", "trello", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings: settings,
 	}

modules/twitter/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "twitter"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -15,11 +17,11 @@ type Settings struct {
 	screenNames []interface{}
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.twitter")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		bearerToken: localConfig.UString("bearerToken", os.Getenv("WTF_TWITTER_BEARER_TOKEN")),
 		count:       localConfig.UInt("count", 5),

modules/twitter/widget.go

@@ -36,8 +36,8 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget:     wtf.NewHelpfulWidget(app, pages, HelpText),
-		MultiSourceWidget: wtf.NewMultiSourceWidget("twitter", "screenName", "screenNames"),
-		TextWidget:        wtf.NewTextWidget(app, "Twitter", "twitter", true),
+		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.ConfigKey, "screenName", "screenNames"),
+		TextWidget:        wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		idx:      0,
 		settings: settings,

modules/unknown/settings.go

@@ -5,13 +5,15 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "unkown"
+
 type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 	}
 
 	return &settings

modules/victorops/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "victorops"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -15,11 +17,11 @@ type Settings struct {
 	team   string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.victorops")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiID:  localConfig.UString("apiID", os.Getenv("WTF_VICTOROPS_API_ID")),
 		apiKey: localConfig.UString("apiKey", os.Getenv("WTF_VICTOROPS_API_KEY")),

modules/victorops/widget.go

@@ -27,7 +27,7 @@ type Widget struct {
 // NewWidget creates a new widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "VictorOps - OnCall", "victorops", true),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 	}
 
 	widget.View.SetScrollable(true)

modules/weatherservices/prettyweather/settings.go

@@ -5,6 +5,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "prettyweather"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -14,11 +16,11 @@ type Settings struct {
 	language string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.prettyweather")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		city:     localConfig.UString("city", "Barcelona"),
 		language: localConfig.UString("language", "en"),

modules/weatherservices/prettyweather/widget.go

@@ -18,7 +18,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "Pretty Weather", "prettyweather", false),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, false),
 
 		settings: settings,
 	}

modules/weatherservices/weather/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "weather"
+
 type colors struct {
 	current string
 }
@@ -21,11 +23,11 @@ type Settings struct {
 	tempUnit string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.weather")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiKey:   localConfig.UString("apiKey", os.Getenv("WTF_OWM_API_KEY")),
 		cityIDs:  localConfig.UList("cityids"),

modules/weatherservices/weather/widget.go

@@ -33,7 +33,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
-		TextWidget:    wtf.NewTextWidget(app, "Weather", "weather", true),
+		TextWidget:    wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		Idx:      0,
 		settings: settings,

modules/zendesk/settings.go

@@ -7,6 +7,8 @@ import (
 	"github.com/wtfutil/wtf/cfg"
 )
 
+const configKey = "zendesk"
+
 type Settings struct {
 	common *cfg.Common
 
@@ -16,11 +18,11 @@ type Settings struct {
 	username  string
 }
 
-func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods.zendesk")
+func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
 
 		apiKey:    localConfig.UString("apiKey", os.Getenv("ZENDESK_API")),
 		status:    localConfig.UString("status"),

modules/zendesk/widget.go

@@ -19,7 +19,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: wtf.NewTextWidget(app, "Zendesk", "zendesk", true),
+		TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
 
 		settings: settings,
 	}