v2.0.0-alpha.31

Trigger clean shutdown on Quit
v2.0.0-alpha.30
2026-04-04 22:22:41 -07:00 · 2021-02-21 20:38:14 +11:00 · 2021-02-21 20:37:42 +11:00 · 2021-02-21 19:28:07 +11:00 · 2021-02-21 19:26:20 +11:00 · 2021-02-21 16:36:56 +11:00
34 changed files with 1611 additions and 329 deletions
--- a/v2/cmd/wails/internal/commands/dev/dev.go
+++ b/v2/cmd/wails/internal/commands/dev/dev.go
@@ -5,12 +5,13 @@ import (
 	"io"
 	"os"
 	"os/signal"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"syscall"
 	"time"

-	"github.com/pkg/errors"
+	"github.com/wailsapp/wails/v2/internal/colour"

 	"github.com/fsnotify/fsnotify"
 	"github.com/leaanthony/clir"
@@ -20,6 +21,21 @@ import (
 	"github.com/wailsapp/wails/v2/pkg/commands/build"
 )

+func LogGreen(message string, args ...interface{}) {
+	text := fmt.Sprintf(message, args...)
+	println(colour.Green(text))
+}
+
+func LogRed(message string, args ...interface{}) {
+	text := fmt.Sprintf(message, args...)
+	println(colour.Red(text))
+}
+
+func LogDarkYellow(message string, args ...interface{}) {
+	text := fmt.Sprintf(message, args...)
+	println(colour.DarkYellow(text))
+}
+
 // AddSubcommand adds the `dev` command for the Wails application
 func AddSubcommand(app *clir.Cli, w io.Writer) error {

@@ -37,6 +53,13 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 	extensions := "go"
 	command.StringFlag("e", "Extensions to trigger rebuilds (comma separated) eg go,js,css,html", &extensions)

+	// extensions to trigger rebuilds
+	showWarnings := false
+	command.BoolFlag("w", "Show warnings", &showWarnings)
+
+	loglevel := ""
+	command.StringFlag("loglevel", "Loglevel to use - Trace, Debug, Info, Warning, Error", &loglevel)
+
 	command.Action(func() error {

 		// Create logger
@@ -52,7 +75,6 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		defer watcher.Close()

 		var debugBinaryProcess *process.Process = nil
-		var buildFrontend bool = false
 		var extensionsThatTriggerARebuild = strings.Split(extensions, ",")

 		// Setup signal handler
@@ -63,7 +85,10 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {

 		// Do initial build
 		logger.Println("Building application for development...")
-		debugBinaryProcess, err = restartApp(logger, "dev", ldflags, compilerCommand, debugBinaryProcess)
+		newProcess, err := restartApp(logger, "dev", ldflags, compilerCommand, debugBinaryProcess, loglevel)
+		if newProcess != nil {
+			debugBinaryProcess = newProcess
+		}
 		if err != nil {
 			return err
 		}
@@ -79,7 +104,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 						if err != nil {
 							logger.Fatal("%s", err.Error())
 						}
-						logger.Println("Watching directory: %s", event.Name)
+						LogGreen("[New Directory] Watching new directory: %s", event.Name)
 					}
 				}
 				return
@@ -88,33 +113,29 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 			// Check for file writes
 			if event.Op&fsnotify.Write == fsnotify.Write {

-				logger.Println("modified file: %s", event.Name)
 				var rebuild bool = false

 				// Iterate all file patterns
 				for _, pattern := range extensionsThatTriggerARebuild {
-					rebuild = strings.HasSuffix(event.Name, pattern)
-					if err != nil {
-						logger.Fatal(err.Error())
-					}
-					if rebuild {
-						// Only build frontend when the file isn't a Go file
-						buildFrontend = !strings.HasSuffix(event.Name, "go")
+					if strings.HasSuffix(event.Name, pattern) {
+						rebuild = true
 						break
 					}
 				}

 				if !rebuild {
-					logger.Println("Filename change: %s did not match extension list (%s)", event.Name, extensions)
+					if showWarnings {
+						LogDarkYellow("[File change] %s did not match extension list (%s)", event.Name, extensions)
+					}
 					return
 				}

-				logger.Println("Partial build triggered: %s updated", event.Name)
+				LogGreen("[Attempting rebuild] %s updated", event.Name)

 				// Do a rebuild

 				// Try and build the app
-				newBinaryProcess, err := restartApp(logger, "dev", ldflags, compilerCommand, debugBinaryProcess)
+				newBinaryProcess, err := restartApp(logger, "dev", ldflags, compilerCommand, debugBinaryProcess, loglevel)
 				if err != nil {
 					fmt.Printf("Error during build: %s", err.Error())
 					return
@@ -128,23 +149,28 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		})

 		// Get project dir
-		dir, err := os.Getwd()
+		projectDir, err := os.Getwd()
 		if err != nil {
 			return err
 		}

 		// Get all subdirectories
-		dirs, err := fs.GetSubdirectories(dir)
+		dirs, err := fs.GetSubdirectories(projectDir)
 		if err != nil {
 			return err
 		}

+		LogGreen("Watching (sub)/directory: %s", projectDir)
+
 		// Setup a watcher for non-node_modules directories
 		dirs.Each(func(dir string) {
 			if strings.Contains(dir, "node_modules") {
 				return
 			}
-			logger.Println("Watching directory: %s", dir)
+			// Ignore build directory
+			if strings.HasPrefix(dir, filepath.Join(projectDir, "build")) {
+				return
+			}
 			err = watcher.Add(dir)
 			if err != nil {
 				logger.Fatal(err.Error())
@@ -156,7 +182,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		for quit == false {
 			select {
 			case <-quitChannel:
-				println("Caught quit")
+				LogGreen("\nCaught quit")
 				// Notify debouncer to quit
 				debounceQuit <- true
 				quit = true
@@ -171,7 +197,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 			}
 		}

-		logger.Println("Development mode exited")
+		LogGreen("Development mode exited")

 		return nil
 	})
@@ -198,15 +224,15 @@ exit:
 	}
 }

-func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string, debugBinaryProcess *process.Process) (*process.Process, error) {
+func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string, debugBinaryProcess *process.Process, loglevel string) (*process.Process, error) {

 	appBinary, err := buildApp(logger, outputType, ldflags, compilerCommand)
 	println()
 	if err != nil {
-		logger.Fatal(err.Error())
-		return nil, errors.Wrap(err, "Build Failed:")
+		LogRed("Build error - continuing to run current version")
+		LogDarkYellow(err.Error())
+		return nil, nil
 	}
-	logger.Println("Build new binary: %s", appBinary)

 	// Kill existing binary if need be
 	if debugBinaryProcess != nil {
@@ -222,7 +248,7 @@ func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string,
 	// TODO: Generate `backend.js`

 	// Start up new binary
-	newProcess := process.NewProcess(logger, appBinary)
+	newProcess := process.NewProcess(logger, appBinary, "-loglevel", loglevel)
 	err = newProcess.Start()
 	if err != nil {
 		// Remove binary
@@ -239,7 +265,7 @@ func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string,
 func buildApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string) (string, error) {

 	// Create random output file
-	outputFile := fmt.Sprintf("debug-%d", time.Now().Unix())
+	outputFile := fmt.Sprintf("dev-%d", time.Now().Unix())

 	// Create BuildOptions
 	buildOptions := &build.Options{
--- a/v2/cmd/wails/internal/commands/update/update.go
+++ b/v2/cmd/wails/internal/commands/update/update.go
@@ -18,14 +18,14 @@ import (
 func AddSubcommand(app *clir.Cli, w io.Writer, currentVersion string) error {

 	command := app.NewSubCommand("update", "Update the Wails CLI")
-	command.LongDescription(`This command allows you to update your version of Wails.`)
+	command.LongDescription(`This command allows you to update your version of the Wails CLI.`)

 	// Setup flags
 	var prereleaseRequired bool
-	command.BoolFlag("pre", "Update to latest Prerelease", &prereleaseRequired)
+	command.BoolFlag("pre", "Update CLI to latest Prerelease", &prereleaseRequired)

 	var specificVersion string
-	command.StringFlag("version", "Install a specific version (Overrides other flags)", &specificVersion)
+	command.StringFlag("version", "Install a specific version (Overrides other flags) of the CLI", &specificVersion)

 	command.Action(func() error {

@@ -143,7 +143,7 @@ func updateToVersion(logger *clilogger.CLILogger, targetVersion *github.Semantic
 	}

 	fmt.Println()
-	logger.Print("Installing Wails " + desiredVersion + "...")
+	logger.Print("Installing Wails CLI " + desiredVersion + "...")

 	// Run command in non module directory
 	homeDir, err := os.UserHomeDir()
@@ -158,7 +158,7 @@ func updateToVersion(logger *clilogger.CLILogger, targetVersion *github.Semantic
 		return err
 	}
 	fmt.Println()
-	logger.Println("Wails updated to " + desiredVersion)
+	logger.Println("Wails CLI updated to " + desiredVersion)

 	return nil
 }
--- a/v2/cmd/wails/main.go
+++ b/v2/cmd/wails/main.go
@@ -1,8 +1,11 @@
 package main

 import (
+	"fmt"
 	"os"

+	"github.com/wailsapp/wails/v2/internal/colour"
+
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/update"

 	"github.com/leaanthony/clir"
@@ -19,12 +22,18 @@ func fatal(message string) {
 	os.Exit(1)
 }

+func banner(_ *clir.Cli) string {
+	return fmt.Sprintf("%s %s - Go/HTML Application Framework", colour.Yellow("Wails"), colour.DarkRed(version))
+}
+
 func main() {

 	var err error

 	app := clir.NewCli("Wails", "Go/HTML Application Framework", version)

+	app.SetBannerFunction(banner)
+
 	build.AddBuildSubcommand(app, os.Stdout)
 	err = initialise.AddSubcommand(app, os.Stdout)
 	if err != nil {
--- a/v2/cmd/wails/version.go
+++ b/v2/cmd/wails/version.go
@@ -1,3 +1,3 @@
 package main

-var version = "v2.0.0-alpha.26"
+var version = "v2.0.0-alpha.31"
--- a/v2/go.mod
+++ b/v2/go.mod
@@ -20,9 +20,9 @@ require (
 	github.com/tdewolff/minify v2.3.6+incompatible
 	github.com/tdewolff/parse v2.3.4+incompatible // indirect
 	github.com/tdewolff/test v1.0.6 // indirect
+	github.com/wzshiming/ctc v1.2.3
 	github.com/xyproto/xpm v1.2.1
 	golang.org/x/net v0.0.0-20200822124328-c89045814202
-	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
 	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c
 	golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82
 	nhooyr.io/websocket v1.8.6
--- a/v2/go.sum
+++ b/v2/go.sum
@@ -78,6 +78,10 @@ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+github.com/wzshiming/ctc v1.2.3 h1:q+hW3IQNsjIlOFBTGZZZeIXTElFM4grF4spW/errh/c=
+github.com/wzshiming/ctc v1.2.3/go.mod h1:2tVAtIY7SUyraSk0JxvwmONNPFL4ARavPuEsg5+KA28=
+github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae h1:tpXvBXC3hpQBDCc9OojJZCQMVRAbT3TTdUMP8WguXkY=
+github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae/go.mod h1:VTAq37rkGeV+WOybvZwjXiJOicICdpLCN8ifpISjK20=
 github.com/xyproto/xpm v1.2.1 h1:trdvGjjWBsOOKzBBUPT6JvaIQM3acJEEYfbxN7M96wg=
 github.com/xyproto/xpm v1.2.1/go.mod h1:cMnesLsD0PBXLgjDfTDEaKr8XyTFsnP1QycSqRw7BiY=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -92,11 +96,10 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
--- a/v2/internal/app/debug.go
+++ b/v2/internal/app/debug.go
@@ -4,8 +4,9 @@ package app

 import (
 	"flag"
-	"github.com/wailsapp/wails/v2/pkg/logger"
 	"strings"
+
+	"github.com/wailsapp/wails/v2/pkg/logger"
 )

 // Init initialises the application for a debug environment
@@ -19,10 +20,10 @@ func (a *App) Init() error {
 	}

 	// Set log levels
-	greeting := flag.String("loglevel", "debug", "Loglevel to use - Trace, Debug, Info, Warning, Error")
+	loglevel := flag.String("loglevel", "debug", "Loglevel to use - Trace, Debug, Info, Warning, Error")
 	flag.Parse()
-	if len(*greeting) > 0 {
-		switch strings.ToLower(*greeting) {
+	if len(*loglevel) > 0 {
+		switch strings.ToLower(*loglevel) {
 		case "trace":
 			a.logger.SetLogLevel(logger.TRACE)
 		case "info":
--- a/v2/internal/app/dev.go
+++ b/v2/internal/app/dev.go
@@ -4,11 +4,14 @@ package app

 import (
 	"context"
+	"flag"
+	"strings"
 	"sync"

 	"github.com/wailsapp/wails/v2/internal/bridge"
 	"github.com/wailsapp/wails/v2/internal/menumanager"

+	clilogger "github.com/wailsapp/wails/v2/pkg/logger"
 	"github.com/wailsapp/wails/v2/pkg/options"

 	"github.com/wailsapp/wails/v2/internal/binding"
@@ -66,7 +69,23 @@ func CreateApp(appoptions *options.App) (*App, error) {

 	// Set up logger
 	myLogger := logger.New(appoptions.Logger)
-	myLogger.SetLogLevel(appoptions.LogLevel)
+
+	loglevel := flag.String("loglevel", "debug", "Loglevel to use - Trace, Debug, Info, Warning, Error")
+	flag.Parse()
+	if len(*loglevel) > 0 {
+		switch strings.ToLower(*loglevel) {
+		case "trace":
+			myLogger.SetLogLevel(clilogger.TRACE)
+		case "info":
+			myLogger.SetLogLevel(clilogger.INFO)
+		case "warning":
+			myLogger.SetLogLevel(clilogger.WARNING)
+		case "error":
+			myLogger.SetLogLevel(clilogger.ERROR)
+		default:
+			myLogger.SetLogLevel(appoptions.LogLevel)
+		}
+	}

 	// Create the menu manager
 	menuManager := menumanager.NewManager()
@@ -212,7 +231,7 @@ func (a *App) Run() error {
 	// Generate backend.js
 	a.bindings.GenerateBackendJS()

-	err = a.bridge.Run(dispatcher, bindingDump, a.debug)
+	err = a.bridge.Run(dispatcher, a.menuManager, bindingDump, a.debug)
 	a.logger.Trace("Bridge.Run() exited")
 	if err != nil {
 		return err
--- a/v2/internal/binding/generate.go
+++ b/v2/internal/binding/generate.go
@@ -53,13 +53,34 @@ func (b *Bindings) GenerateBackendJS() {
 const backend = {`)
 	output.WriteString("\n")

-	for packageName, packages := range store {
+	var sortedPackageNames slicer.StringSlicer
+	for packageName := range store {
+		sortedPackageNames.Add(packageName)
+	}
+	sortedPackageNames.Sort()
+	sortedPackageNames.Each(func(packageName string) {
+		packages := store[packageName]
 		output.WriteString(fmt.Sprintf("  \"%s\": {", packageName))
 		output.WriteString("\n")
-		for structName, structs := range packages {
+		var sortedStructNames slicer.StringSlicer
+		for structName := range packages {
+			sortedStructNames.Add(structName)
+		}
+		sortedStructNames.Sort()
+
+		sortedStructNames.Each(func(structName string) {
+			structs := packages[structName]
 			output.WriteString(fmt.Sprintf("    \"%s\": {", structName))
 			output.WriteString("\n")
-			for methodName, methodDetails := range structs {
+
+			var sortedMethodNames slicer.StringSlicer
+			for methodName := range structs {
+				sortedMethodNames.Add(methodName)
+			}
+			sortedMethodNames.Sort()
+
+			sortedMethodNames.Each(func(methodName string) {
+				methodDetails := structs[methodName]
 				output.WriteString("      /**\n")
 				output.WriteString("       * " + methodName + "\n")
 				var args slicer.StringSlicer
@@ -89,13 +110,16 @@ const backend = {`)
 				output.WriteString("\n")
 				output.WriteString(fmt.Sprintf("      },"))
 				output.WriteString("\n")
-			}
+
+			})
+
 			output.WriteString(fmt.Sprintf("    }"))
 			output.WriteString("\n")
-		}
+		})
+
 		output.WriteString(fmt.Sprintf("  }\n"))
 		output.WriteString("\n")
-	}
+	})

 	output.WriteString(`};
 export default backend;`)
--- a/v2/internal/bridge/bridge.go
+++ b/v2/internal/bridge/bridge.go
@@ -6,6 +6,8 @@ import (
 	"net/http"
 	"sync"

+	"github.com/wailsapp/wails/v2/internal/menumanager"
+
 	"github.com/wailsapp/wails/v2/internal/messagedispatcher"

 	"github.com/gorilla/websocket"
@@ -25,6 +27,12 @@ type Bridge struct {

 	ctx    context.Context
 	cancel context.CancelFunc
+
+	// Dialog client
+	dialog *messagedispatcher.DispatchClient
+
+	// Menus
+	menumanager *menumanager.Manager
 }

 func NewBridge(myLogger *logger.Logger) *Bridge {
@@ -44,13 +52,19 @@ func NewBridge(myLogger *logger.Logger) *Bridge {
 	return result
 }

-func (b *Bridge) Run(dispatcher *messagedispatcher.Dispatcher, bindings string, debug bool) error {
+func (b *Bridge) Run(dispatcher *messagedispatcher.Dispatcher, menumanager *menumanager.Manager, bindings string, debug bool) error {

 	// Ensure we cancel the context when we shutdown
 	defer b.cancel()

 	b.bindings = bindings
 	b.dispatcher = dispatcher
+	b.menumanager = menumanager
+
+	// Setup dialog handler
+	dialogClient := NewDialogClient(b.myLogger)
+	b.dialog = dispatcher.RegisterClient(dialogClient)
+	dialogClient.dispatcher = b.dialog

 	b.myLogger.Info("Bridge mode started.")

@@ -80,7 +94,7 @@ func (b *Bridge) wsBridgeHandler(w http.ResponseWriter, r *http.Request) {
 func (b *Bridge) startSession(conn *websocket.Conn) {

 	// Create a new session for this connection
-	s := newSession(conn, b.bindings, b.dispatcher, b.myLogger, b.ctx)
+	s := newSession(conn, b.menumanager, b.bindings, b.dispatcher, b.myLogger, b.ctx)

 	// Setup the close handler
 	conn.SetCloseHandler(func(int, string) error {
--- a/v2/internal/bridge/client.go
+++ b/v2/internal/bridge/client.go
@@ -1,19 +1,20 @@
 package bridge

 import (
-	"fmt"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/leaanthony/slicer"
 	"github.com/wailsapp/wails/v2/pkg/options/dialog"
-	"golang.org/x/sync/semaphore"
 )

 type BridgeClient struct {
-	session         *session
-	dialogSemaphore *semaphore.Weighted
+	session *session
+
+	// Tray menu cache to send to reconnecting clients
+	messageCache chan string
+}
+
+func NewBridgeClient() *BridgeClient {
+	return &BridgeClient{
+		messageCache: make(chan string, 100),
+	}
 }

 func (b BridgeClient) Quit() {
@@ -31,44 +32,15 @@ func (b BridgeClient) CallResult(message string) {
 }

 func (b BridgeClient) OpenDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
-	b.session.log.Info("OpenDialog unsupported in Bridge mode")
+	// Handled by dialog_client
 }

 func (b BridgeClient) SaveDialog(dialogOptions *dialog.SaveDialog, callbackID string) {
-	b.session.log.Info("SaveDialog unsupported in Bridge mode")
+	// Handled by dialog_client
 }

 func (b BridgeClient) MessageDialog(dialogOptions *dialog.MessageDialog, callbackID string) {
-
-	osa, err := exec.LookPath("osascript")
-	if err != nil {
-		b.session.log.Info("MessageDialog unavailable (osascript not found)")
-		return
-	}
-
-	var btns slicer.StringSlicer
-	defaultButton := ""
-	for index, btn := range dialogOptions.Buttons {
-		btns.Add(strconv.Quote(btn))
-		if btn == dialogOptions.DefaultButton {
-			defaultButton = fmt.Sprintf("default button %d", index+1)
-		}
-	}
-	buttons := "{" + btns.Join(",") + "}"
-	script := fmt.Sprintf("display dialog \"%s\" buttons %s %s with title \"%s\"", dialogOptions.Message, buttons, defaultButton, dialogOptions.Title)
-
-	b.session.log.Info("OSASCRIPT: %s", script)
-	go func() {
-		out, err := exec.Command(osa, "-e", script).Output()
-		if err != nil {
-			b.session.log.Error(err.Error())
-			return
-		}
-
-		b.session.log.Info(string(out))
-		buttonPressed := strings.TrimSpace(strings.TrimPrefix(string(out), "button returned:"))
-		b.session.client.DispatchMessage("DM" + callbackID + "|" + buttonPressed)
-	}()
+	// Handled by dialog_client
 }

 func (b BridgeClient) WindowSetTitle(title string) {
@@ -144,7 +116,7 @@ func (b BridgeClient) SetTrayMenu(trayMenuJSON string) {
 }

 func (b BridgeClient) UpdateTrayMenuLabel(trayMenuJSON string) {
-	b.session.sendMessage("TS" + trayMenuJSON)
+	b.session.sendMessage("TU" + trayMenuJSON)
 }

 func (b BridgeClient) UpdateContextMenu(contextMenuJSON string) {
--- a/v2/internal/bridge/dialog_client.go
+++ b/v2/internal/bridge/dialog_client.go
@@ -0,0 +1,141 @@
+package bridge
+
+import (
+	"fmt"
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
+
+	"github.com/wailsapp/wails/v2/internal/logger"
+
+	"github.com/leaanthony/slicer"
+	"github.com/wailsapp/wails/v2/pkg/options/dialog"
+)
+
+type DialogClient struct {
+	dispatcher *messagedispatcher.DispatchClient
+	log        *logger.Logger
+}
+
+func NewDialogClient(log *logger.Logger) *DialogClient {
+	return &DialogClient{
+		log: log,
+	}
+}
+
+func (d *DialogClient) Quit() {
+}
+
+func (d *DialogClient) NotifyEvent(message string) {
+}
+
+func (d *DialogClient) CallResult(message string) {
+}
+
+func (d *DialogClient) OpenDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
+}
+
+func (d *DialogClient) SaveDialog(dialogOptions *dialog.SaveDialog, callbackID string) {
+}
+
+func (d *DialogClient) MessageDialog(dialogOptions *dialog.MessageDialog, callbackID string) {
+
+	osa, err := exec.LookPath("osascript")
+	if err != nil {
+		d.log.Info("MessageDialog unavailable (osascript not found)")
+		return
+	}
+
+	var btns slicer.StringSlicer
+	defaultButton := ""
+	cancelButton := ""
+	for index, btn := range dialogOptions.Buttons {
+		btns.Add(strconv.Quote(btn))
+		if btn == dialogOptions.DefaultButton {
+			defaultButton = fmt.Sprintf("default button %d", index+1)
+		}
+		if btn == dialogOptions.CancelButton {
+			cancelButton = fmt.Sprintf("cancel button %d", index+1)
+		}
+	}
+	buttons := "{" + btns.Join(",") + "}"
+	script := fmt.Sprintf("display dialog \"%s\" buttons %s %s %s with title \"%s\"", dialogOptions.Message, buttons, defaultButton, cancelButton, dialogOptions.Title)
+	go func() {
+		out, err := exec.Command(osa, "-e", script).Output()
+		if err != nil {
+			// Assume user has pressed cancel button
+			if dialogOptions.CancelButton != "" {
+				d.dispatcher.DispatchMessage("DM" + callbackID + "|" + dialogOptions.CancelButton)
+				return
+			}
+			d.log.Error("Dialog had bad exit code. If this was a Cancel button, add 'CancelButton' to the dialog.MessageDialog struct. Error: %s", err.Error())
+			d.dispatcher.DispatchMessage("DM" + callbackID + "|error - check logs")
+			return
+		}
+
+		buttonPressed := strings.TrimSpace(strings.TrimPrefix(string(out), "button returned:"))
+		d.dispatcher.DispatchMessage("DM" + callbackID + "|" + buttonPressed)
+	}()
+}
+
+func (d *DialogClient) WindowSetTitle(title string) {
+}
+
+func (d *DialogClient) WindowShow() {
+}
+
+func (d *DialogClient) WindowHide() {
+}
+
+func (d *DialogClient) WindowCenter() {
+}
+
+func (d *DialogClient) WindowMaximise() {
+}
+
+func (d *DialogClient) WindowUnmaximise() {
+}
+
+func (d *DialogClient) WindowMinimise() {
+}
+
+func (d *DialogClient) WindowUnminimise() {
+}
+
+func (d *DialogClient) WindowPosition(x int, y int) {
+}
+
+func (d *DialogClient) WindowSize(width int, height int) {
+}
+
+func (d *DialogClient) WindowSetMinSize(width int, height int) {
+}
+
+func (d *DialogClient) WindowSetMaxSize(width int, height int) {
+}
+
+func (d *DialogClient) WindowFullscreen() {
+}
+
+func (d *DialogClient) WindowUnFullscreen() {
+}
+
+func (d *DialogClient) WindowSetColour(colour int) {
+}
+
+func (d *DialogClient) DarkModeEnabled(callbackID string) {
+}
+
+func (d *DialogClient) SetApplicationMenu(menuJSON string) {
+}
+
+func (d *DialogClient) SetTrayMenu(trayMenuJSON string) {
+}
+
+func (d *DialogClient) UpdateTrayMenuLabel(trayMenuJSON string) {
+}
+
+func (d *DialogClient) UpdateContextMenu(contextMenuJSON string) {
+}
--- a/v2/internal/bridge/session.go
+++ b/v2/internal/bridge/session.go
@@ -7,6 +7,8 @@ import (
 	"runtime"
 	"time"

+	"github.com/wailsapp/wails/v2/internal/menumanager"
+
 	"github.com/wailsapp/wails/v2/internal/messagedispatcher"

 	"github.com/gorilla/websocket"
@@ -35,16 +37,20 @@ type session struct {

 	// client
 	client *messagedispatcher.DispatchClient
+
+	// Menus
+	menumanager *menumanager.Manager
 }

-func newSession(conn *websocket.Conn, bindings string, dispatcher *messagedispatcher.Dispatcher, logger *logger.Logger, ctx context.Context) *session {
+func newSession(conn *websocket.Conn, menumanager *menumanager.Manager, bindings string, dispatcher *messagedispatcher.Dispatcher, logger *logger.Logger, ctx context.Context) *session {
 	result := &session{
-		conn:      conn,
-		bindings:  bindings,
-		log:       logger,
-		shutdown:  make(chan bool),
-		writeChan: make(chan []byte, 100),
-		ctx:       ctx,
+		conn:        conn,
+		bindings:    bindings,
+		log:         logger,
+		shutdown:    make(chan bool),
+		writeChan:   make(chan []byte, 100),
+		ctx:         ctx,
+		menumanager: menumanager,
 	}

 	result.client = dispatcher.RegisterClient(newBridgeClient(result))
@@ -88,6 +94,16 @@ func (s *session) start(firstSession bool) {

 	s.sendMessage("b" + bootstrapMessage)

+	// Send menus
+	traymenus, err := s.menumanager.GetTrayMenus()
+	if err != nil {
+		s.log.Error(err.Error())
+	}
+
+	for _, trayMenu := range traymenus {
+		s.sendMessage("TS" + trayMenu)
+	}
+
 	for {
 		messageType, buffer, err := s.conn.ReadMessage()
 		if messageType == -1 {
--- a/v2/internal/colour/colour.go
+++ b/v2/internal/colour/colour.go
@@ -0,0 +1,89 @@
+package colour
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/wzshiming/ctc"
+)
+
+func Col(col ctc.Color, text string) string {
+	return fmt.Sprintf("%s%s%s", col, text, ctc.Reset)
+}
+
+func Yellow(text string) string {
+	return Col(ctc.ForegroundBrightYellow, text)
+}
+
+func Red(text string) string {
+	return Col(ctc.ForegroundBrightRed, text)
+}
+
+func Blue(text string) string {
+	return Col(ctc.ForegroundBrightBlue, text)
+}
+
+func Green(text string) string {
+	return Col(ctc.ForegroundBrightGreen, text)
+}
+
+func Cyan(text string) string {
+	return Col(ctc.ForegroundBrightCyan, text)
+}
+
+func Magenta(text string) string {
+	return Col(ctc.ForegroundBrightMagenta, text)
+}
+
+func White(text string) string {
+	return Col(ctc.ForegroundBrightWhite, text)
+}
+
+func Black(text string) string {
+	return Col(ctc.ForegroundBrightBlack, text)
+}
+
+func DarkYellow(text string) string {
+	return Col(ctc.ForegroundYellow, text)
+}
+
+func DarkRed(text string) string {
+	return Col(ctc.ForegroundRed, text)
+}
+
+func DarkBlue(text string) string {
+	return Col(ctc.ForegroundBlue, text)
+}
+
+func DarkGreen(text string) string {
+	return Col(ctc.ForegroundGreen, text)
+}
+
+func DarkCyan(text string) string {
+	return Col(ctc.ForegroundCyan, text)
+}
+
+func DarkMagenta(text string) string {
+	return Col(ctc.ForegroundMagenta, text)
+}
+
+func DarkWhite(text string) string {
+	return Col(ctc.ForegroundWhite, text)
+}
+
+func DarkBlack(text string) string {
+	return Col(ctc.ForegroundBlack, text)
+}
+
+var rainbowCols = []func(string) string{Red, Yellow, Green, Cyan, Blue, Magenta}
+
+func Rainbow(text string) string {
+	var builder strings.Builder
+
+	for i := 0; i < len(text); i++ {
+		fn := rainbowCols[i%len(rainbowCols)]
+		builder.WriteString(fn(text[i : i+1]))
+	}
+
+	return builder.String()
+}
--- a/v2/internal/ffenestri/ffenestri_darwin.c
+++ b/v2/internal/ffenestri/ffenestri_darwin.c
@@ -498,31 +498,6 @@ void DestroyApplication(struct Application *app) {
 	Debug(app, "Finished Destroying Application");
 }

-// Quit will stop the cocoa application and free up all the memory
-// used by the application
-void Quit(struct Application *app) {
-	Debug(app, "Quit Called");
-	ON_MAIN_THREAD (
-		// Terminate app
-    	msg(app->application, s("stop:"), NULL);
-    	id fakeevent = msg(c("NSEvent"),
-                s("otherEventWithType:location:modifierFlags:timestamp:windowNumber:context:subtype:data1:data2:"),
-                15, // Type
-                msg(c("CGPoint"), s("init:x:y:"), 0, 0), // location
-                0, // flags
-                0, // timestamp
-                0, // window
-                NULL, // context
-                0, // subtype
-                0, // data1
-                0 // data2
-            );
-        msg(c("NSApp"), s("postEvent:atStart:"), fakeevent, true);
-//        msg(c(app->mainWindow), s("performClose:"))
-
-	);
-}
-
 // SetTitle sets the main window title to the given string
 void SetTitle(struct Application *app, const char *title) {
    // Guard against calling during shutdown
@@ -1837,6 +1812,16 @@ void Run(struct Application *app, int argc, char **argv) {
 	MEMFREE(internalCode);
 }

+// Quit will stop the cocoa application and free up all the memory
+// used by the application
+void Quit(struct Application *app) {
+	Debug(app, "Quit Called");
+    msg(app->application, s("stop:"), NULL);
+	ON_MAIN_THREAD (
+		// Terminate app by triggering a UI event
+    	SetSize(app, 0, 0);
+	);
+}

 void* NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel, int hideWindowOnClose) {

--- a/v2/internal/ffenestri/menu_darwin.c
+++ b/v2/internal/ffenestri/menu_darwin.c
@@ -180,151 +180,151 @@ id processAcceleratorKey(const char *key) {
        return str("");
    }

-    if( STREQ(key, "Backspace") ) {
+    if( STREQ(key, "backspace") ) {
        return strunicode(0x0008);
    }
-    if( STREQ(key, "Tab") ) {
+    if( STREQ(key, "tab") ) {
        return strunicode(0x0009);
    }
-    if( STREQ(key, "Return") ) {
+    if( STREQ(key, "return") ) {
        return strunicode(0x000d);
    }
-    if( STREQ(key, "Escape") ) {
+    if( STREQ(key, "escape") ) {
        return strunicode(0x001b);
    }
-    if( STREQ(key, "Left") ) {
+    if( STREQ(key, "left") ) {
        return strunicode(0x001c);
    }
-    if( STREQ(key, "Right") ) {
+    if( STREQ(key, "right") ) {
        return strunicode(0x001d);
    }
-    if( STREQ(key, "Up") ) {
+    if( STREQ(key, "up") ) {
        return strunicode(0x001e);
    }
-    if( STREQ(key, "Down") ) {
+    if( STREQ(key, "down") ) {
        return strunicode(0x001f);
    }
-    if( STREQ(key, "Space") ) {
+    if( STREQ(key, "space") ) {
        return strunicode(0x0020);
    }
-    if( STREQ(key, "Delete") ) {
+    if( STREQ(key, "delete") ) {
        return strunicode(0x007f);
    }
-    if( STREQ(key, "Home") ) {
+    if( STREQ(key, "home") ) {
        return strunicode(0x2196);
    }
-    if( STREQ(key, "End") ) {
+    if( STREQ(key, "end") ) {
        return strunicode(0x2198);
    }
-    if( STREQ(key, "Page Up") ) {
+    if( STREQ(key, "page up") ) {
        return strunicode(0x21de);
    }
-    if( STREQ(key, "Page Down") ) {
+    if( STREQ(key, "page down") ) {
        return strunicode(0x21df);
    }
-    if( STREQ(key, "F1") ) {
+    if( STREQ(key, "f1") ) {
        return strunicode(0xf704);
    }
-    if( STREQ(key, "F2") ) {
+    if( STREQ(key, "f2") ) {
        return strunicode(0xf705);
    }
-    if( STREQ(key, "F3") ) {
+    if( STREQ(key, "f3") ) {
        return strunicode(0xf706);
    }
-    if( STREQ(key, "F4") ) {
+    if( STREQ(key, "f4") ) {
        return strunicode(0xf707);
    }
-    if( STREQ(key, "F5") ) {
+    if( STREQ(key, "f5") ) {
        return strunicode(0xf708);
    }
-    if( STREQ(key, "F6") ) {
+    if( STREQ(key, "f6") ) {
        return strunicode(0xf709);
    }
-    if( STREQ(key, "F7") ) {
+    if( STREQ(key, "f7") ) {
        return strunicode(0xf70a);
    }
-    if( STREQ(key, "F8") ) {
+    if( STREQ(key, "f8") ) {
        return strunicode(0xf70b);
    }
-    if( STREQ(key, "F9") ) {
+    if( STREQ(key, "f9") ) {
        return strunicode(0xf70c);
    }
-    if( STREQ(key, "F10") ) {
+    if( STREQ(key, "f10") ) {
        return strunicode(0xf70d);
    }
-    if( STREQ(key, "F11") ) {
+    if( STREQ(key, "f11") ) {
        return strunicode(0xf70e);
    }
-    if( STREQ(key, "F12") ) {
+    if( STREQ(key, "f12") ) {
        return strunicode(0xf70f);
    }
-    if( STREQ(key, "F13") ) {
+    if( STREQ(key, "f13") ) {
        return strunicode(0xf710);
    }
-    if( STREQ(key, "F14") ) {
+    if( STREQ(key, "f14") ) {
        return strunicode(0xf711);
    }
-    if( STREQ(key, "F15") ) {
+    if( STREQ(key, "f15") ) {
        return strunicode(0xf712);
    }
-    if( STREQ(key, "F16") ) {
+    if( STREQ(key, "f16") ) {
        return strunicode(0xf713);
    }
-    if( STREQ(key, "F17") ) {
+    if( STREQ(key, "f17") ) {
        return strunicode(0xf714);
    }
-    if( STREQ(key, "F18") ) {
+    if( STREQ(key, "f18") ) {
        return strunicode(0xf715);
    }
-    if( STREQ(key, "F19") ) {
+    if( STREQ(key, "f19") ) {
        return strunicode(0xf716);
    }
-    if( STREQ(key, "F20") ) {
+    if( STREQ(key, "f20") ) {
        return strunicode(0xf717);
    }
-    if( STREQ(key, "F21") ) {
+    if( STREQ(key, "f21") ) {
        return strunicode(0xf718);
    }
-    if( STREQ(key, "F22") ) {
+    if( STREQ(key, "f22") ) {
        return strunicode(0xf719);
    }
-    if( STREQ(key, "F23") ) {
+    if( STREQ(key, "f23") ) {
        return strunicode(0xf71a);
    }
-    if( STREQ(key, "F24") ) {
+    if( STREQ(key, "f24") ) {
        return strunicode(0xf71b);
    }
-    if( STREQ(key, "F25") ) {
+    if( STREQ(key, "f25") ) {
        return strunicode(0xf71c);
    }
-    if( STREQ(key, "F26") ) {
+    if( STREQ(key, "f26") ) {
        return strunicode(0xf71d);
    }
-    if( STREQ(key, "F27") ) {
+    if( STREQ(key, "f27") ) {
        return strunicode(0xf71e);
    }
-    if( STREQ(key, "F28") ) {
+    if( STREQ(key, "f28") ) {
        return strunicode(0xf71f);
    }
-    if( STREQ(key, "F29") ) {
+    if( STREQ(key, "f29") ) {
        return strunicode(0xf720);
    }
-    if( STREQ(key, "F30") ) {
+    if( STREQ(key, "f30") ) {
        return strunicode(0xf721);
    }
-    if( STREQ(key, "F31") ) {
+    if( STREQ(key, "f31") ) {
        return strunicode(0xf722);
    }
-    if( STREQ(key, "F32") ) {
+    if( STREQ(key, "f32") ) {
        return strunicode(0xf723);
    }
-    if( STREQ(key, "F33") ) {
+    if( STREQ(key, "f33") ) {
        return strunicode(0xf724);
    }
-    if( STREQ(key, "F34") ) {
+    if( STREQ(key, "f34") ) {
        return strunicode(0xf725);
    }
-    if( STREQ(key, "F35") ) {
+    if( STREQ(key, "f35") ) {
        return strunicode(0xf726);
    }
 //  if( STREQ(key, "Insert") ) {
@@ -336,7 +336,7 @@ id processAcceleratorKey(const char *key) {
 //  if( STREQ(key, "ScrollLock") ) {
 //	return strunicode(0xf72f);
 //  }
-    if( STREQ(key, "NumLock") ) {
+    if( STREQ(key, "numLock") ) {
        return strunicode(0xf739);
    }

@@ -509,19 +509,19 @@ unsigned long parseModifiers(const char **modifiers) {
    int count = 0;
    while( thisModifier != NULL ) {
        // Determine flags
-        if( STREQ(thisModifier, "CmdOrCtrl") ) {
+        if( STREQ(thisModifier, "cmdorctrl") ) {
            result |= NSEventModifierFlagCommand;
        }
-        if( STREQ(thisModifier, "OptionOrAlt") ) {
+        if( STREQ(thisModifier, "optionoralt") ) {
            result |= NSEventModifierFlagOption;
        }
-        if( STREQ(thisModifier, "Shift") ) {
+        if( STREQ(thisModifier, "shift") ) {
            result |= NSEventModifierFlagShift;
        }
-        if( STREQ(thisModifier, "Super") ) {
+        if( STREQ(thisModifier, "super") ) {
            result |= NSEventModifierFlagCommand;
        }
-        if( STREQ(thisModifier, "Control") ) {
+        if( STREQ(thisModifier, "control") ) {
            result |= NSEventModifierFlagControl;
        }
        count++;
@@ -575,7 +575,7 @@ id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const c
    return item;
 }

-id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA) {
+id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage) {
    id item = ALLOC("NSMenuItem");

    // Create a MenuItemCallbackData
@@ -598,6 +598,9 @@ id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char
        id imageData = msg(data, s("initWithBase64EncodedString:options:"), str(image), 0);
        id nsimage = ALLOC("NSImage");
        msg(nsimage, s("initWithData:"), imageData);
+        if( templateImage ) {
+            msg(nsimage, s("template"), YES);
+        }
        msg(item, s("setImage:"), nsimage);
    }

@@ -740,6 +743,9 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
    const char *image = getJSONString(item, "Image");
    const char *fontName = getJSONString(item, "FontName");
    const char *RGBA = getJSONString(item, "RGBA");
+    bool templateImage = false;
+    getJSONBool(item, "MacTemplateImage", &templateImage);
+
    int fontSize = 12;
    getJSONInt(item, "FontSize", &fontSize);

@@ -775,7 +781,7 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
    if( type != NULL ) {

        if( STREQ(type->string_, "Text")) {
-            processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image, fontName, fontSize, RGBA);
+            processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image, fontName, fontSize, RGBA, templateImage);
        }
        else if ( STREQ(type->string_, "Separator")) {
            addSeparator(parentMenu);
--- a/v2/internal/ffenestri/menu_darwin.h
+++ b/v2/internal/ffenestri/menu_darwin.h
@@ -105,7 +105,7 @@ id processRadioMenuItem(Menu *menu, id parentmenu, const char *title, const char

 id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const char *menuid, bool disabled, bool checked, const char *key);

-id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA);
+id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage);
 void processMenuItem(Menu *menu, id parentMenu, JsonNode *item);
 void processMenuData(Menu *menu, JsonNode *menuData);

--- a/v2/internal/menumanager/processedMenu.go
+++ b/v2/internal/menumanager/processedMenu.go
@@ -2,6 +2,7 @@ package menumanager

 import (
 	"encoding/json"
+
 	"github.com/wailsapp/wails/v2/pkg/menu"
 	"github.com/wailsapp/wails/v2/pkg/menu/keys"
 )
@@ -34,7 +35,8 @@ type ProcessedMenuItem struct {
 	FontName string `json:",omitempty"`

 	// Image - base64 image data
-	Image string `json:",omitempty"`
+	Image            string `json:",omitempty"`
+	MacTemplateImage bool   `json:", omitempty"`

 	// Tooltip
 	Tooltip string `json:",omitempty"`
@@ -44,20 +46,21 @@ func NewProcessedMenuItem(menuItemMap *MenuItemMap, menuItem *menu.MenuItem) *Pr

 	ID := menuItemMap.menuItemToIDMap[menuItem]
 	result := &ProcessedMenuItem{
-		ID:          ID,
-		Label:       menuItem.Label,
-		Role:        menuItem.Role,
-		Accelerator: menuItem.Accelerator,
-		Type:        menuItem.Type,
-		Disabled:    menuItem.Disabled,
-		Hidden:      menuItem.Hidden,
-		Checked:     menuItem.Checked,
-		SubMenu:     nil,
-		RGBA:        menuItem.RGBA,
-		FontSize:    menuItem.FontSize,
-		FontName:    menuItem.FontName,
-		Image:       menuItem.Image,
-		Tooltip:     menuItem.Tooltip,
+		ID:               ID,
+		Label:            menuItem.Label,
+		Role:             menuItem.Role,
+		Accelerator:      menuItem.Accelerator,
+		Type:             menuItem.Type,
+		Disabled:         menuItem.Disabled,
+		Hidden:           menuItem.Hidden,
+		Checked:          menuItem.Checked,
+		SubMenu:          nil,
+		RGBA:             menuItem.RGBA,
+		FontSize:         menuItem.FontSize,
+		FontName:         menuItem.FontName,
+		Image:            menuItem.Image,
+		MacTemplateImage: menuItem.MacTemplateImage,
+		Tooltip:          menuItem.Tooltip,
 	}

 	if menuItem.SubMenu != nil {
--- a/v2/internal/process/process.go
+++ b/v2/internal/process/process.go
@@ -39,7 +39,12 @@ func (p *Process) Start() error {

 	go func(cmd *exec.Cmd, running *bool, logger *clilogger.CLILogger, exitChannel chan bool) {
 		logger.Println("Starting process (PID: %d)", cmd.Process.Pid)
-		cmd.Wait()
+		err := cmd.Wait()
+		if err != nil {
+			if err.Error() != "signal: killed" {
+				logger.Fatal("Fatal error from app: " + err.Error())
+			}
+		}
 		logger.Println("Exiting process (PID: %d)", cmd.Process.Pid)
 		*running = false
 		exitChannel <- true
--- a/v2/internal/runtime/js/runtime/bridge.js
+++ b/v2/internal/runtime/js/runtime/bridge.js
@@ -34,6 +34,9 @@
    function component_subscribe(component, store, callback) {
        component.$$.on_destroy.push(subscribe(store, callback));
    }
+    function action_destroyer(action_result) {
+        return action_result && is_function(action_result.destroy) ? action_result.destroy : noop;
+    }

    const is_client = typeof window !== 'undefined';
    let now = is_client
@@ -91,9 +94,16 @@
    function text(data) {
        return document.createTextNode(data);
    }
+    function space() {
+        return text(' ');
+    }
    function empty() {
        return text('');
    }
+    function listen(node, event, handler, options) {
+        node.addEventListener(event, handler, options);
+        return () => node.removeEventListener(event, handler, options);
+    }
    function attr(node, attribute, value) {
        if (value == null)
            node.removeAttribute(attribute);
@@ -179,6 +189,14 @@
    function set_current_component(component) {
        current_component = component;
    }
+    function get_current_component() {
+        if (!current_component)
+            throw new Error('Function called outside component initialization');
+        return current_component;
+    }
+    function onMount(fn) {
+        get_current_component().$$.on_mount.push(fn);
+    }

    const dirty_components = [];
    const binding_callbacks = [];
@@ -400,6 +418,12 @@
            }
        };
    }
+
+    const globals = (typeof window !== 'undefined'
+        ? window
+        : typeof globalThis !== 'undefined'
+            ? globalThis
+            : global);
    function create_component(block) {
        block && block.c();
    }
@@ -576,6 +600,15 @@
        return { set, update, subscribe };
    }

+    function log(message) {
+        // eslint-disable-next-line
+        console.log(
+            '%c wails bridge %c ' + message + ' ',
+            'background: #aa0000; color: #fff; border-radius: 3px 0px 0px 3px; padding: 1px; font-size: 0.7rem',
+            'background: #009900; color: #fff; border-radius: 0px 3px 3px 0px; padding: 1px; font-size: 0.7rem'
+        );
+    }
+
    /** Overlay */
    const overlayVisible = writable(false);

@@ -604,6 +637,19 @@
            return current;
        });
    }
+    function updateTrayLabel(tray) {
+        trays.update((current) => {
+            // Remove existing if it exists, else add
+            const index = current.findIndex(item => item.ID === tray.ID);
+            if ( index === -1 ) {
+                return log("ERROR: Attempted to update tray index ", tray.ID)
+            }
+            current[index].Label = tray.Label;
+            return current;
+        });
+    }
+
+    let selectedMenu = writable(null);

    function fade(node, { delay = 0, duration = 400, easing = identity } = {}) {
        const o = +getComputedStyle(node).opacity;
@@ -729,69 +775,12 @@
    	}
    }

-    /* TrayMenu.svelte generated by Svelte v3.32.2 */
+    /* Menu.svelte generated by Svelte v3.32.2 */

    function add_css$1() {
    	var style = element("style");
-    	style.id = "svelte-1vq8f40-style";
-    	style.textContent = ".tray-menu.svelte-1vq8f40{padding-left:0.5rem;padding-right:0.5rem;overflow:visible;font-size:14px}";
-    	append(document.head, style);
-    }
-
-    function create_fragment$1(ctx) {
-    	let span1;
-    	let span0;
-    	let t_value = /*tray*/ ctx[0].Label + "";
-    	let t;
-
-    	return {
-    		c() {
-    			span1 = element("span");
-    			span0 = element("span");
-    			t = text(t_value);
-    			attr(span0, "class", "label");
-    			attr(span1, "class", "tray-menu svelte-1vq8f40");
-    		},
-    		m(target, anchor) {
-    			insert(target, span1, anchor);
-    			append(span1, span0);
-    			append(span0, t);
-    		},
-    		p(ctx, [dirty]) {
-    			if (dirty & /*tray*/ 1 && t_value !== (t_value = /*tray*/ ctx[0].Label + "")) set_data(t, t_value);
-    		},
-    		i: noop,
-    		o: noop,
-    		d(detaching) {
-    			if (detaching) detach(span1);
-    		}
-    	};
-    }
-
-    function instance$1($$self, $$props, $$invalidate) {
-    	let { tray } = $$props;
-
-    	$$self.$$set = $$props => {
-    		if ("tray" in $$props) $$invalidate(0, tray = $$props.tray);
-    	};
-
-    	return [tray];
-    }
-
-    class TrayMenu extends SvelteComponent {
-    	constructor(options) {
-    		super();
-    		if (!document.getElementById("svelte-1vq8f40-style")) add_css$1();
-    		init(this, options, instance$1, create_fragment$1, safe_not_equal, { tray: 0 });
-    	}
-    }
-
-    /* Menubar.svelte generated by Svelte v3.32.2 */
-
-    function add_css$2() {
-    	var style = element("style");
-    	style.id = "svelte-iy5wor-style";
-    	style.textContent = ".tray-menus.svelte-iy5wor{display:flex;flex-direction:row;justify-content:flex-end}.wails-menubar.svelte-iy5wor{position:relative;display:block;top:0;height:2rem;width:100%;border-bottom:1px solid #b3b3b3;box-shadow:antiquewhite;box-shadow:0px 0px 10px 0px #33333360}";
+    	style.id = "svelte-1oysp7o-style";
+    	style.textContent = ".menu.svelte-1oysp7o.svelte-1oysp7o{padding:3px;background-color:#0008;color:#EEF;border-radius:5px;margin-top:5px;position:absolute;backdrop-filter:blur(3px) saturate(160%) contrast(45%) brightness(140%);border:1px solid rgb(88,88,88);box-shadow:0 0 1px rgb(146,146,148) inset}.menuitem.svelte-1oysp7o.svelte-1oysp7o{display:flex;align-items:center;padding:1px 5px}.menuitem.svelte-1oysp7o.svelte-1oysp7o:hover{display:flex;align-items:center;background-color:rgb(57,131,223);padding:1px 5px;border-radius:5px}.menuitem.svelte-1oysp7o img.svelte-1oysp7o{padding-right:5px}";
    	append(document.head, style);
    }

@@ -801,19 +790,456 @@
    	return child_ctx;
    }

-    // (11:0) {#if $menuVisible }
+    // (8:0) {#if !hidden}
    function create_if_block$1(ctx) {
    	let div;
-    	let span;
-    	let div_transition;
-    	let current;
-    	let each_value = /*$trays*/ ctx[1];
+    	let if_block = /*menu*/ ctx[0].Menu && create_if_block_1(ctx);
+
+    	return {
+    		c() {
+    			div = element("div");
+    			if (if_block) if_block.c();
+    			attr(div, "class", "menu svelte-1oysp7o");
+    		},
+    		m(target, anchor) {
+    			insert(target, div, anchor);
+    			if (if_block) if_block.m(div, null);
+    		},
+    		p(ctx, dirty) {
+    			if (/*menu*/ ctx[0].Menu) {
+    				if (if_block) {
+    					if_block.p(ctx, dirty);
+    				} else {
+    					if_block = create_if_block_1(ctx);
+    					if_block.c();
+    					if_block.m(div, null);
+    				}
+    			} else if (if_block) {
+    				if_block.d(1);
+    				if_block = null;
+    			}
+    		},
+    		d(detaching) {
+    			if (detaching) detach(div);
+    			if (if_block) if_block.d();
+    		}
+    	};
+    }
+
+    // (10:4) {#if menu.Menu }
+    function create_if_block_1(ctx) {
+    	let each_1_anchor;
+    	let each_value = /*menu*/ ctx[0].Menu.Items;
    	let each_blocks = [];

    	for (let i = 0; i < each_value.length; i += 1) {
    		each_blocks[i] = create_each_block(get_each_context(ctx, each_value, i));
    	}

+    	return {
+    		c() {
+    			for (let i = 0; i < each_blocks.length; i += 1) {
+    				each_blocks[i].c();
+    			}
+
+    			each_1_anchor = empty();
+    		},
+    		m(target, anchor) {
+    			for (let i = 0; i < each_blocks.length; i += 1) {
+    				each_blocks[i].m(target, anchor);
+    			}
+
+    			insert(target, each_1_anchor, anchor);
+    		},
+    		p(ctx, dirty) {
+    			if (dirty & /*menu*/ 1) {
+    				each_value = /*menu*/ ctx[0].Menu.Items;
+    				let i;
+
+    				for (i = 0; i < each_value.length; i += 1) {
+    					const child_ctx = get_each_context(ctx, each_value, i);
+
+    					if (each_blocks[i]) {
+    						each_blocks[i].p(child_ctx, dirty);
+    					} else {
+    						each_blocks[i] = create_each_block(child_ctx);
+    						each_blocks[i].c();
+    						each_blocks[i].m(each_1_anchor.parentNode, each_1_anchor);
+    					}
+    				}
+
+    				for (; i < each_blocks.length; i += 1) {
+    					each_blocks[i].d(1);
+    				}
+
+    				each_blocks.length = each_value.length;
+    			}
+    		},
+    		d(detaching) {
+    			destroy_each(each_blocks, detaching);
+    			if (detaching) detach(each_1_anchor);
+    		}
+    	};
+    }
+
+    // (13:12) {#if menuItem.Image }
+    function create_if_block_2(ctx) {
+    	let div;
+    	let img;
+    	let img_src_value;
+
+    	return {
+    		c() {
+    			div = element("div");
+    			img = element("img");
+    			attr(img, "alt", "");
+    			if (img.src !== (img_src_value = "data:image/png;base64," + /*menuItem*/ ctx[2].Image)) attr(img, "src", img_src_value);
+    			attr(img, "class", "svelte-1oysp7o");
+    		},
+    		m(target, anchor) {
+    			insert(target, div, anchor);
+    			append(div, img);
+    		},
+    		p(ctx, dirty) {
+    			if (dirty & /*menu*/ 1 && img.src !== (img_src_value = "data:image/png;base64," + /*menuItem*/ ctx[2].Image)) {
+    				attr(img, "src", img_src_value);
+    			}
+    		},
+    		d(detaching) {
+    			if (detaching) detach(div);
+    		}
+    	};
+    }
+
+    // (11:8) {#each menu.Menu.Items as menuItem}
+    function create_each_block(ctx) {
+    	let div1;
+    	let t0;
+    	let div0;
+    	let t1_value = /*menuItem*/ ctx[2].Label + "";
+    	let t1;
+    	let t2;
+    	let if_block = /*menuItem*/ ctx[2].Image && create_if_block_2(ctx);
+
+    	return {
+    		c() {
+    			div1 = element("div");
+    			if (if_block) if_block.c();
+    			t0 = space();
+    			div0 = element("div");
+    			t1 = text(t1_value);
+    			t2 = space();
+    			attr(div0, "class", "menulabel");
+    			attr(div1, "class", "menuitem svelte-1oysp7o");
+    		},
+    		m(target, anchor) {
+    			insert(target, div1, anchor);
+    			if (if_block) if_block.m(div1, null);
+    			append(div1, t0);
+    			append(div1, div0);
+    			append(div0, t1);
+    			append(div1, t2);
+    		},
+    		p(ctx, dirty) {
+    			if (/*menuItem*/ ctx[2].Image) {
+    				if (if_block) {
+    					if_block.p(ctx, dirty);
+    				} else {
+    					if_block = create_if_block_2(ctx);
+    					if_block.c();
+    					if_block.m(div1, t0);
+    				}
+    			} else if (if_block) {
+    				if_block.d(1);
+    				if_block = null;
+    			}
+
+    			if (dirty & /*menu*/ 1 && t1_value !== (t1_value = /*menuItem*/ ctx[2].Label + "")) set_data(t1, t1_value);
+    		},
+    		d(detaching) {
+    			if (detaching) detach(div1);
+    			if (if_block) if_block.d();
+    		}
+    	};
+    }
+
+    function create_fragment$1(ctx) {
+    	let if_block_anchor;
+    	let if_block = !/*hidden*/ ctx[1] && create_if_block$1(ctx);
+
+    	return {
+    		c() {
+    			if (if_block) if_block.c();
+    			if_block_anchor = empty();
+    		},
+    		m(target, anchor) {
+    			if (if_block) if_block.m(target, anchor);
+    			insert(target, if_block_anchor, anchor);
+    		},
+    		p(ctx, [dirty]) {
+    			if (!/*hidden*/ ctx[1]) {
+    				if (if_block) {
+    					if_block.p(ctx, dirty);
+    				} else {
+    					if_block = create_if_block$1(ctx);
+    					if_block.c();
+    					if_block.m(if_block_anchor.parentNode, if_block_anchor);
+    				}
+    			} else if (if_block) {
+    				if_block.d(1);
+    				if_block = null;
+    			}
+    		},
+    		i: noop,
+    		o: noop,
+    		d(detaching) {
+    			if (if_block) if_block.d(detaching);
+    			if (detaching) detach(if_block_anchor);
+    		}
+    	};
+    }
+
+    function instance$1($$self, $$props, $$invalidate) {
+    	let { menu } = $$props;
+    	let { hidden = true } = $$props;
+
+    	$$self.$$set = $$props => {
+    		if ("menu" in $$props) $$invalidate(0, menu = $$props.menu);
+    		if ("hidden" in $$props) $$invalidate(1, hidden = $$props.hidden);
+    	};
+
+    	return [menu, hidden];
+    }
+
+    class Menu extends SvelteComponent {
+    	constructor(options) {
+    		super();
+    		if (!document.getElementById("svelte-1oysp7o-style")) add_css$1();
+    		init(this, options, instance$1, create_fragment$1, safe_not_equal, { menu: 0, hidden: 1 });
+    	}
+    }
+
+    /* TrayMenu.svelte generated by Svelte v3.32.2 */
+
+    const { document: document_1 } = globals;
+
+    function add_css$2() {
+    	var style = element("style");
+    	style.id = "svelte-esze1k-style";
+    	style.textContent = ".tray-menu.svelte-esze1k{padding-left:0.5rem;padding-right:0.5rem;overflow:visible;font-size:14px}.label.svelte-esze1k{text-align:right;padding-right:10px}";
+    	append(document_1.head, style);
+    }
+
+    // (47:4) {#if tray.ProcessedMenu }
+    function create_if_block$2(ctx) {
+    	let menu;
+    	let current;
+
+    	menu = new Menu({
+    			props: {
+    				menu: /*tray*/ ctx[0].ProcessedMenu,
+    				hidden: /*hidden*/ ctx[1]
+    			}
+    		});
+
+    	return {
+    		c() {
+    			create_component(menu.$$.fragment);
+    		},
+    		m(target, anchor) {
+    			mount_component(menu, target, anchor);
+    			current = true;
+    		},
+    		p(ctx, dirty) {
+    			const menu_changes = {};
+    			if (dirty & /*tray*/ 1) menu_changes.menu = /*tray*/ ctx[0].ProcessedMenu;
+    			if (dirty & /*hidden*/ 2) menu_changes.hidden = /*hidden*/ ctx[1];
+    			menu.$set(menu_changes);
+    		},
+    		i(local) {
+    			if (current) return;
+    			transition_in(menu.$$.fragment, local);
+    			current = true;
+    		},
+    		o(local) {
+    			transition_out(menu.$$.fragment, local);
+    			current = false;
+    		},
+    		d(detaching) {
+    			destroy_component(menu, detaching);
+    		}
+    	};
+    }
+
+    function create_fragment$2(ctx) {
+    	let span1;
+    	let span0;
+    	let t0_value = /*tray*/ ctx[0].Label + "";
+    	let t0;
+    	let t1;
+    	let current;
+    	let mounted;
+    	let dispose;
+    	let if_block = /*tray*/ ctx[0].ProcessedMenu && create_if_block$2(ctx);
+
+    	return {
+    		c() {
+    			span1 = element("span");
+    			span0 = element("span");
+    			t0 = text(t0_value);
+    			t1 = space();
+    			if (if_block) if_block.c();
+    			attr(span0, "class", "label svelte-esze1k");
+    			attr(span1, "class", "tray-menu svelte-esze1k");
+    		},
+    		m(target, anchor) {
+    			insert(target, span1, anchor);
+    			append(span1, span0);
+    			append(span0, t0);
+    			append(span1, t1);
+    			if (if_block) if_block.m(span1, null);
+    			current = true;
+
+    			if (!mounted) {
+    				dispose = [
+    					listen(span0, "click", /*trayClicked*/ ctx[3]),
+    					action_destroyer(clickOutside.call(null, span1)),
+    					listen(span1, "click_outside", /*closeMenu*/ ctx[2])
+    				];
+
+    				mounted = true;
+    			}
+    		},
+    		p(ctx, [dirty]) {
+    			if ((!current || dirty & /*tray*/ 1) && t0_value !== (t0_value = /*tray*/ ctx[0].Label + "")) set_data(t0, t0_value);
+
+    			if (/*tray*/ ctx[0].ProcessedMenu) {
+    				if (if_block) {
+    					if_block.p(ctx, dirty);
+
+    					if (dirty & /*tray*/ 1) {
+    						transition_in(if_block, 1);
+    					}
+    				} else {
+    					if_block = create_if_block$2(ctx);
+    					if_block.c();
+    					transition_in(if_block, 1);
+    					if_block.m(span1, null);
+    				}
+    			} else if (if_block) {
+    				group_outros();
+
+    				transition_out(if_block, 1, 1, () => {
+    					if_block = null;
+    				});
+
+    				check_outros();
+    			}
+    		},
+    		i(local) {
+    			if (current) return;
+    			transition_in(if_block);
+    			current = true;
+    		},
+    		o(local) {
+    			transition_out(if_block);
+    			current = false;
+    		},
+    		d(detaching) {
+    			if (detaching) detach(span1);
+    			if (if_block) if_block.d();
+    			mounted = false;
+    			run_all(dispose);
+    		}
+    	};
+    }
+
+    function clickOutside(node) {
+    	const handleClick = event => {
+    		if (node && !node.contains(event.target) && !event.defaultPrevented) {
+    			node.dispatchEvent(new CustomEvent("click_outside", node));
+    		}
+    	};
+
+    	document.addEventListener("click", handleClick, true);
+
+    	return {
+    		destroy() {
+    			document.removeEventListener("click", handleClick, true);
+    		}
+    	};
+    }
+
+    function instance$2($$self, $$props, $$invalidate) {
+    	let hidden;
+    	let $selectedMenu;
+    	component_subscribe($$self, selectedMenu, $$value => $$invalidate(4, $selectedMenu = $$value));
+    	let { tray = null } = $$props;
+
+    	function closeMenu() {
+    		selectedMenu.set(null);
+    	}
+
+    	function trayClicked() {
+    		if ($selectedMenu !== tray) {
+    			selectedMenu.set(tray);
+    		} else {
+    			selectedMenu.set(null);
+    		}
+    	}
+
+    	$$self.$$set = $$props => {
+    		if ("tray" in $$props) $$invalidate(0, tray = $$props.tray);
+    	};
+
+    	$$self.$$.update = () => {
+    		if ($$self.$$.dirty & /*$selectedMenu, tray*/ 17) {
+    			$$invalidate(1, hidden = $selectedMenu !== tray);
+    		}
+    	};
+
+    	return [tray, hidden, closeMenu, trayClicked, $selectedMenu];
+    }
+
+    class TrayMenu extends SvelteComponent {
+    	constructor(options) {
+    		super();
+    		if (!document_1.getElementById("svelte-esze1k-style")) add_css$2();
+    		init(this, options, instance$2, create_fragment$2, safe_not_equal, { tray: 0 });
+    	}
+    }
+
+    /* Menubar.svelte generated by Svelte v3.32.2 */
+
+    function add_css$3() {
+    	var style = element("style");
+    	style.id = "svelte-1i0zb4n-style";
+    	style.textContent = ".tray-menus.svelte-1i0zb4n{display:flex;flex-direction:row;justify-content:flex-end}.wails-menubar.svelte-1i0zb4n{position:relative;display:block;top:0;height:2rem;width:100%;border-bottom:1px solid #b3b3b3;box-shadow:0 0 10px 0 #33333360}.time.svelte-1i0zb4n{padding-left:0.5rem;padding-right:1.5rem;overflow:visible;font-size:14px}";
+    	append(document.head, style);
+    }
+
+    function get_each_context$1(ctx, list, i) {
+    	const child_ctx = ctx.slice();
+    	child_ctx[8] = list[i];
+    	return child_ctx;
+    }
+
+    // (29:0) {#if $menuVisible }
+    function create_if_block$3(ctx) {
+    	let div;
+    	let span1;
+    	let t0;
+    	let span0;
+    	let t1;
+    	let div_transition;
+    	let current;
+    	let each_value = /*$trays*/ ctx[2];
+    	let each_blocks = [];
+
+    	for (let i = 0; i < each_value.length; i += 1) {
+    		each_blocks[i] = create_each_block$1(get_each_context$1(ctx, each_value, i));
+    	}
+
    	const out = i => transition_out(each_blocks[i], 1, 1, () => {
    		each_blocks[i] = null;
    	});
@@ -821,41 +1247,48 @@
    	return {
    		c() {
    			div = element("div");
-    			span = element("span");
+    			span1 = element("span");

    			for (let i = 0; i < each_blocks.length; i += 1) {
    				each_blocks[i].c();
    			}

-    			attr(span, "class", "tray-menus svelte-iy5wor");
-    			attr(div, "class", "wails-menubar svelte-iy5wor");
+    			t0 = space();
+    			span0 = element("span");
+    			t1 = text(/*dateTimeString*/ ctx[0]);
+    			attr(span0, "class", "time svelte-1i0zb4n");
+    			attr(span1, "class", "tray-menus svelte-1i0zb4n");
+    			attr(div, "class", "wails-menubar svelte-1i0zb4n");
    		},
    		m(target, anchor) {
    			insert(target, div, anchor);
-    			append(div, span);
+    			append(div, span1);

    			for (let i = 0; i < each_blocks.length; i += 1) {
-    				each_blocks[i].m(span, null);
+    				each_blocks[i].m(span1, null);
    			}

+    			append(span1, t0);
+    			append(span1, span0);
+    			append(span0, t1);
    			current = true;
    		},
    		p(ctx, dirty) {
-    			if (dirty & /*$trays*/ 2) {
-    				each_value = /*$trays*/ ctx[1];
+    			if (dirty & /*$trays*/ 4) {
+    				each_value = /*$trays*/ ctx[2];
    				let i;

    				for (i = 0; i < each_value.length; i += 1) {
-    					const child_ctx = get_each_context(ctx, each_value, i);
+    					const child_ctx = get_each_context$1(ctx, each_value, i);

    					if (each_blocks[i]) {
    						each_blocks[i].p(child_ctx, dirty);
    						transition_in(each_blocks[i], 1);
    					} else {
-    						each_blocks[i] = create_each_block(child_ctx);
+    						each_blocks[i] = create_each_block$1(child_ctx);
    						each_blocks[i].c();
    						transition_in(each_blocks[i], 1);
-    						each_blocks[i].m(span, null);
+    						each_blocks[i].m(span1, t0);
    					}
    				}

@@ -867,6 +1300,8 @@

    				check_outros();
    			}
+
+    			if (!current || dirty & /*dateTimeString*/ 1) set_data(t1, /*dateTimeString*/ ctx[0]);
    		},
    		i(local) {
    			if (current) return;
@@ -901,11 +1336,11 @@
    	};
    }

-    // (14:4) {#each $trays as tray}
-    function create_each_block(ctx) {
+    // (32:4) {#each $trays as tray}
+    function create_each_block$1(ctx) {
    	let traymenu;
    	let current;
-    	traymenu = new TrayMenu({ props: { tray: /*tray*/ ctx[2] } });
+    	traymenu = new TrayMenu({ props: { tray: /*tray*/ ctx[8] } });

    	return {
    		c() {
@@ -917,7 +1352,7 @@
    		},
    		p(ctx, dirty) {
    			const traymenu_changes = {};
-    			if (dirty & /*$trays*/ 2) traymenu_changes.tray = /*tray*/ ctx[2];
+    			if (dirty & /*$trays*/ 4) traymenu_changes.tray = /*tray*/ ctx[8];
    			traymenu.$set(traymenu_changes);
    		},
    		i(local) {
@@ -935,10 +1370,10 @@
    	};
    }

-    function create_fragment$2(ctx) {
+    function create_fragment$3(ctx) {
    	let if_block_anchor;
    	let current;
-    	let if_block = /*$menuVisible*/ ctx[0] && create_if_block$1(ctx);
+    	let if_block = /*$menuVisible*/ ctx[1] && create_if_block$3(ctx);

    	return {
    		c() {
@@ -951,15 +1386,15 @@
    			current = true;
    		},
    		p(ctx, [dirty]) {
-    			if (/*$menuVisible*/ ctx[0]) {
+    			if (/*$menuVisible*/ ctx[1]) {
    				if (if_block) {
    					if_block.p(ctx, dirty);

-    					if (dirty & /*$menuVisible*/ 1) {
+    					if (dirty & /*$menuVisible*/ 2) {
    						transition_in(if_block, 1);
    					}
    				} else {
-    					if_block = create_if_block$1(ctx);
+    					if_block = create_if_block$3(ctx);
    					if_block.c();
    					transition_in(if_block, 1);
    					if_block.m(if_block_anchor.parentNode, if_block_anchor);
@@ -990,19 +1425,65 @@
    	};
    }

-    function instance$2($$self, $$props, $$invalidate) {
+    function instance$3($$self, $$props, $$invalidate) {
+    	let day;
+    	let dom;
+    	let mon;
+    	let currentTime;
+    	let dateTimeString;
    	let $menuVisible;
    	let $trays;
-    	component_subscribe($$self, menuVisible, $$value => $$invalidate(0, $menuVisible = $$value));
-    	component_subscribe($$self, trays, $$value => $$invalidate(1, $trays = $$value));
-    	return [$menuVisible, $trays];
+    	component_subscribe($$self, menuVisible, $$value => $$invalidate(1, $menuVisible = $$value));
+    	component_subscribe($$self, trays, $$value => $$invalidate(2, $trays = $$value));
+    	let time = new Date();
+
+    	onMount(() => {
+    		const interval = setInterval(
+    			() => {
+    				$$invalidate(3, time = new Date());
+    			},
+    			1000
+    		);
+
+    		return () => {
+    			clearInterval(interval);
+    		};
+    	});
+
+    	$$self.$$.update = () => {
+    		if ($$self.$$.dirty & /*time*/ 8) {
+    			$$invalidate(4, day = time.toLocaleString("default", { weekday: "short" }));
+    		}
+
+    		if ($$self.$$.dirty & /*time*/ 8) {
+    			$$invalidate(5, dom = time.getDate());
+    		}
+
+    		if ($$self.$$.dirty & /*time*/ 8) {
+    			$$invalidate(6, mon = time.toLocaleString("default", { month: "short" }));
+    		}
+
+    		if ($$self.$$.dirty & /*time*/ 8) {
+    			$$invalidate(7, currentTime = time.toLocaleString("en-US", {
+    				hour: "numeric",
+    				minute: "numeric",
+    				hour12: true
+    			}).toLowerCase());
+    		}
+
+    		if ($$self.$$.dirty & /*day, dom, mon, currentTime*/ 240) {
+    			$$invalidate(0, dateTimeString = `${day} ${dom} ${mon} ${currentTime}`);
+    		}
+    	};
+
+    	return [dateTimeString, $menuVisible, $trays, time, day, dom, mon, currentTime];
    }

    class Menubar extends SvelteComponent {
    	constructor(options) {
    		super();
-    		if (!document.getElementById("svelte-iy5wor-style")) add_css$2();
-    		init(this, options, instance$2, create_fragment$2, safe_not_equal, {});
+    		if (!document.getElementById("svelte-1i0zb4n-style")) add_css$3();
+    		init(this, options, instance$3, create_fragment$3, safe_not_equal, {});
    	}
    }

@@ -1020,15 +1501,6 @@
    let callback = null;
    let connectTimer;

-    function log(message) {
-        // eslint-disable-next-line
-        console.log(
-            '%c wails bridge %c ' + message + ' ',
-            'background: #aa0000; color: #fff; border-radius: 3px 0px 0px 3px; padding: 1px; font-size: 0.7rem',
-            'background: #009900; color: #fff; border-radius: 0px 3px 3px 0px; padding: 1px; font-size: 0.7rem'
-        );
-    }
-
    function StartWebsocket(userCallback) {

        callback = userCallback;
@@ -1160,6 +1632,12 @@
                        let tray = JSON.parse(trayJSON);
                        setTray(tray);
                        break
+                    case 'U':
+                        // Update label
+                        const updateTrayLabelJSON = trayMessage.slice(1);
+                        let trayLabelData = JSON.parse(updateTrayLabelJSON);
+                        updateTrayLabel(trayLabelData);
+                        break
                    default:
                        log('Unknown tray message: ' + message.data);
                }
--- a/v2/internal/runtime/js/runtime/src/Menu.svelte
+++ b/v2/internal/runtime/js/runtime/src/Menu.svelte
@@ -2,17 +2,55 @@

    export let menu;

+    export let hidden = true;
 </script>

+{#if !hidden}
 <div class="menu">
-    {#each menu.Menu.Items as menuItem}
-        {#if menuItem.Image.length > 0}
-            <img alt="" src="data:image/png;base64,{menuItem.Image}"/>
-        {/if}
-    <span class="menuitem">{menuItem.Label}</span>
-    {/each}
+    {#if menu.Menu }
+        {#each menu.Menu.Items as menuItem}
+            <div class="menuitem">
+            {#if menuItem.Image }
+                <div><img alt="" src="data:image/png;base64,{menuItem.Image}"/></div>
+            {/if}
+            <div class="menulabel">{menuItem.Label}</div>
+            </div>
+        {/each}
+    {/if}
 </div>
+{/if}

 <style>

+    .menu {
+        padding: 3px;
+        background-color: #0008;
+        color: #EEF;
+        border-radius: 5px;
+        margin-top: 5px;
+        position: absolute;
+        backdrop-filter: blur(3px) saturate(160%) contrast(45%) brightness(140%);
+        border: 1px solid rgb(88,88,88);
+        box-shadow: 0 0 1px rgb(146,146,148) inset;
+
+    }
+
+    .menuitem {
+        display: flex;
+        align-items: center;
+        padding: 1px 5px;
+    }
+
+    .menuitem:hover {
+        display: flex;
+        align-items: center;
+        background-color: rgb(57,131,223);
+        padding: 1px 5px;
+        border-radius: 5px;
+    }
+
+    .menuitem img {
+        padding-right: 5px;
+    }
+
 </style>
--- a/v2/internal/runtime/js/runtime/src/Menubar.svelte
+++ b/v2/internal/runtime/js/runtime/src/Menubar.svelte
@@ -5,6 +5,24 @@

    import {trays} from './store'
    import TrayMenu from "./TrayMenu.svelte";
+    import {onMount} from "svelte";
+
+    let time = new Date();
+    $: day = time.toLocaleString("default", { weekday: "short" })
+    $: dom = time.getDate()
+    $: mon = time.toLocaleString("default", { month: "short" })
+    $: currentTime = time.toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true }).toLowerCase()
+    $: dateTimeString = `${day} ${dom} ${mon} ${currentTime}`
+
+    onMount(() => {
+        const interval = setInterval(() => {
+            time = new Date();
+        }, 1000);
+
+        return () => {
+            clearInterval(interval);
+        };
+    });

 </script>

@@ -12,8 +30,9 @@
    <div class="wails-menubar" transition:fade>
    <span class="tray-menus">
    {#each $trays as tray}
-        <TrayMenu {tray}></TrayMenu>
+        <TrayMenu {tray}/>
    {/each}
+    <span class="time">{dateTimeString}</span>
    </span>
    </div>
 {/if}
@@ -31,7 +50,12 @@
        height: 2rem;
        width: 100%;
        border-bottom: 1px solid #b3b3b3;
-        box-shadow: antiquewhite;
-        box-shadow: 0px 0px 10px 0px #33333360;
+        box-shadow: 0 0 10px 0 #33333360;
+    }
+    .time {
+        padding-left: 0.5rem;
+        padding-right: 1.5rem;
+        overflow: visible;
+        font-size: 14px;
    }
 </style>
--- a/v2/internal/runtime/js/runtime/src/TrayMenu.svelte
+++ b/v2/internal/runtime/js/runtime/src/TrayMenu.svelte
@@ -1,13 +1,52 @@
 <script>
    import Menu from "./Menu.svelte";
+    import { selectedMenu } from "./store";

-    export let tray;
+    export let tray = null;

+    $: hidden = $selectedMenu !== tray;
+
+    function closeMenu() {
+        selectedMenu.set(null);
+    }
+
+    function trayClicked() {
+        if ( $selectedMenu !== tray ) {
+            selectedMenu.set(tray);
+        } else {
+            selectedMenu.set(null);
+        }
+    }
+    // Source: https://svelte.dev/repl/0ace7a508bd843b798ae599940a91783?version=3.16.7
+    /** Dispatch event on click outside of node */
+    function clickOutside(node) {
+
+        const handleClick = event => {
+            if (node && !node.contains(event.target) && !event.defaultPrevented) {
+                node.dispatchEvent(
+                    new CustomEvent('click_outside', node)
+                )
+            }
+        }
+
+        document.addEventListener('click', handleClick, true);
+
+        return {
+            destroy() {
+                document.removeEventListener('click', handleClick, true);
+            }
+        }
+    }
 </script>

-<span class="tray-menu">
-    <span class="label">{tray.Label}</span>
-<!--    <Menu menu="{tray.ProcessedMenu}"/>-->
+<span class="tray-menu" use:clickOutside on:click_outside={closeMenu}>
+    <!--{#if tray.Image && tray.Image.length > 0}-->
+    <!--    <img alt="" src="data:image/png;base64,{tray.Image}"/>-->
+    <!--{/if}-->
+    <span class="label" on:click={trayClicked}>{tray.Label}</span>
+    {#if tray.ProcessedMenu }
+        <Menu menu="{tray.ProcessedMenu}" {hidden}/>
+    {/if}
 </span>

 <style>
@@ -18,4 +57,9 @@
        overflow: visible;
        font-size: 14px;
    }
+
+    .label {
+        text-align: right;
+        padding-right: 10px;
+    }
 </style>
--- a/v2/internal/runtime/js/runtime/src/log.js
+++ b/v2/internal/runtime/js/runtime/src/log.js
@@ -0,0 +1,9 @@
+
+export function log(message) {
+    // eslint-disable-next-line
+    console.log(
+        '%c wails bridge %c ' + message + ' ',
+        'background: #aa0000; color: #fff; border-radius: 3px 0px 0px 3px; padding: 1px; font-size: 0.7rem',
+        'background: #009900; color: #fff; border-radius: 0px 3px 3px 0px; padding: 1px; font-size: 0.7rem'
+    );
+}
--- a/v2/internal/runtime/js/runtime/src/package-lock.json
+++ b/v2/internal/runtime/js/runtime/src/package-lock.json
@@ -4,6 +4,32 @@
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.12.13"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "dev": true
+    },
+    "@babel/highlight": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
+      "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
    "@rollup/plugin-commonjs": {
      "version": "17.1.0",
      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz",
@@ -73,6 +99,15 @@
        "@types/node": "*"
      }
    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
    "balanced-match": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -89,12 +124,50 @@
        "concat-map": "0.0.1"
      }
    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
    "builtin-modules": {
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
      "dev": true
    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
    "commondir": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -113,6 +186,12 @@
      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
      "dev": true
    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
    "estree-walker": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
@@ -161,6 +240,12 @@
        "function-bind": "^1.1.1"
      }
    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
    "inflight": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -201,6 +286,40 @@
        "@types/estree": "*"
      }
    },
+    "jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
    "magic-string": {
      "version": "0.25.7",
      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
@@ -210,6 +329,12 @@
        "sourcemap-codec": "^1.4.4"
      }
    },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
    "minimatch": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -246,6 +371,15 @@
      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
      "dev": true
    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
    "require-relative": {
      "version": "0.8.7",
      "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz",
@@ -281,6 +415,18 @@
        "rollup-pluginutils": "^2.8.2"
      }
    },
+    "rollup-plugin-terser": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
+      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "jest-worker": "^26.2.1",
+        "serialize-javascript": "^4.0.0",
+        "terser": "^5.0.0"
+      }
+    },
    "rollup-pluginutils": {
      "version": "2.8.2",
      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
@@ -298,18 +444,77 @@
        }
      }
    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true
+    },
+    "serialize-javascript": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true
+    },
+    "source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
    "sourcemap-codec": {
      "version": "1.4.8",
      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
      "dev": true
    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
    "svelte": {
      "version": "3.32.2",
      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.32.2.tgz",
      "integrity": "sha512-Zxh1MQQl/+vnToKbU1Per+PoMN8Jb2MeKJcGxiOsCGR677hXw7jkMfbnNXq33+dxIzV/HfA4xtoSPJrqeB0VUg==",
      "dev": true
    },
+    "terser": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz",
+      "integrity": "sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.19"
+      }
+    },
    "wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
--- a/v2/internal/runtime/js/runtime/src/package.json
+++ b/v2/internal/runtime/js/runtime/src/package.json
@@ -5,7 +5,8 @@
  "main": "main.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "npx rollup -c"
+    "build": "npx rollup -c",
+    "watch": "npx rollup -c -w"
  },
  "author": "",
  "license": "ISC",
@@ -14,6 +15,7 @@
    "@rollup/plugin-node-resolve": "^11.1.1",
    "rollup": "^2.38.5",
    "rollup-plugin-svelte": "^7.1.0",
+    "rollup-plugin-terser": "^7.0.2",
    "svelte": "^3.32.2"
  }
 }
--- a/v2/internal/runtime/js/runtime/src/rollup.config.js
+++ b/v2/internal/runtime/js/runtime/src/rollup.config.js
@@ -1,6 +1,7 @@
 import resolve from '@rollup/plugin-node-resolve';
 // import commonjs from '@rollup/plugin-commonjs';
 import svelte from 'rollup-plugin-svelte';
+import { terser } from "rollup-plugin-terser";

 export default [
    // browser-friendly UMD build
@@ -28,6 +29,7 @@ export default [
            }),
            resolve({browser: true}), // so Rollup can find `ms`
            // commonjs() // so Rollup can convert `ms` to an ES module
+            // terser(),
        ]
    },

--- a/v2/internal/runtime/js/runtime/src/store.js
+++ b/v2/internal/runtime/js/runtime/src/store.js
@@ -1,5 +1,6 @@

 import { writable } from 'svelte/store';
+import {log} from "./log";

 /** Overlay */
 export const overlayVisible = writable(false);
@@ -36,4 +37,16 @@ export function setTray(tray) {
        return current;
    })
 }
+export function updateTrayLabel(tray) {
+    trays.update((current) => {
+        // Remove existing if it exists, else add
+        const index = current.findIndex(item => item.ID === tray.ID);
+        if ( index === -1 ) {
+            return log("ERROR: Attempted to update tray index ", tray.ID, "but it doesn't exist")
+        }
+        current[index].Label = tray.Label;
+        return current;
+    })
+}

+export let selectedMenu = writable(null);
--- a/v2/internal/runtime/js/runtime/src/websocket.js
+++ b/v2/internal/runtime/js/runtime/src/websocket.js
@@ -10,21 +10,13 @@ The lightweight framework for web-like apps
 /* jshint esversion: 6 */


-import {setTray, hideOverlay, showOverlay} from "./store";
+import {setTray, hideOverlay, showOverlay, updateTrayLabel} from "./store";
+import {log} from "./log";

 let websocket = null;
 let callback = null;
 let connectTimer;

-function log(message) {
-    // eslint-disable-next-line
-    console.log(
-        '%c wails bridge %c ' + message + ' ',
-        'background: #aa0000; color: #fff; border-radius: 3px 0px 0px 3px; padding: 1px; font-size: 0.7rem',
-        'background: #009900; color: #fff; border-radius: 0px 3px 3px 0px; padding: 1px; font-size: 0.7rem'
-    );
-}
-
 export function StartWebsocket(userCallback) {

    callback = userCallback;
@@ -156,6 +148,12 @@ function handleMessage(message) {
                    let tray = JSON.parse(trayJSON)
                    setTray(tray)
                    break
+                case 'U':
+                    // Update label
+                    const updateTrayLabelJSON = trayMessage.slice(1);
+                    let trayLabelData = JSON.parse(updateTrayLabelJSON)
+                    updateTrayLabel(trayLabelData)
+                    break
                default:
                    log('Unknown tray message: ' + message.data);
            }
--- a/v2/pkg/clilogger/clilogger.go
+++ b/v2/pkg/clilogger/clilogger.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"io"
 	"os"
+
+	"github.com/wailsapp/wails/v2/internal/colour"
 )

 // CLILogger is used by the cli
@@ -51,9 +53,9 @@ func (c *CLILogger) Println(message string, args ...interface{}) {
 // Fatal prints the given message then aborts
 func (c *CLILogger) Fatal(message string, args ...interface{}) {
 	temp := fmt.Sprintf(message, args...)
-	_, err := fmt.Fprintln(c.Writer, "FATAL: "+temp)
+	_, err := fmt.Fprintln(c.Writer, colour.Red("FATAL: "+temp))
 	if err != nil {
-		println("FATAL: ", err)
+		println(colour.Red("FATAL: " + err.Error()))
 	}
 	os.Exit(1)
 }
--- a/v2/pkg/menu/keys/keys.go
+++ b/v2/pkg/menu/keys/keys.go
@@ -1,5 +1,10 @@
 package keys

+import (
+	"fmt"
+	"strings"
+)
+
 // Modifier is actually a string
 type Modifier string

@@ -16,6 +21,23 @@ const (
 	ControlKey Modifier = "Control"
 )

+var modifierMap = map[string]Modifier{
+	"cmdorctrl":   CmdOrCtrlKey,
+	"optionoralt": OptionOrAltKey,
+	"shift":       ShiftKey,
+	"super":       SuperKey,
+	"ctrl":        ControlKey,
+}
+
+func parseModifier(text string) (*Modifier, error) {
+	result, valid := modifierMap[text]
+	if !valid {
+		return nil, fmt.Errorf("'%s' is not a valid modifier", text)
+	}
+
+	return &result, nil
+}
+
 // Accelerator holds the keyboard shortcut for a menu item
 type Accelerator struct {
 	Key       string
@@ -25,14 +47,14 @@ type Accelerator struct {
 // Key creates a standard key Accelerator
 func Key(key string) *Accelerator {
 	return &Accelerator{
-		Key: key,
+		Key: strings.ToLower(key),
 	}
 }

 // CmdOrCtrl creates a 'CmdOrCtrl' Accelerator
 func CmdOrCtrl(key string) *Accelerator {
 	return &Accelerator{
-		Key:       key,
+		Key:       strings.ToLower(key),
 		Modifiers: []Modifier{CmdOrCtrlKey},
 	}
 }
@@ -40,7 +62,7 @@ func CmdOrCtrl(key string) *Accelerator {
 // OptionOrAlt creates a 'OptionOrAlt' Accelerator
 func OptionOrAlt(key string) *Accelerator {
 	return &Accelerator{
-		Key:       key,
+		Key:       strings.ToLower(key),
 		Modifiers: []Modifier{OptionOrAltKey},
 	}
 }
@@ -48,7 +70,7 @@ func OptionOrAlt(key string) *Accelerator {
 // Shift creates a 'Shift' Accelerator
 func Shift(key string) *Accelerator {
 	return &Accelerator{
-		Key:       key,
+		Key:       strings.ToLower(key),
 		Modifiers: []Modifier{ShiftKey},
 	}
 }
@@ -56,7 +78,7 @@ func Shift(key string) *Accelerator {
 // Control creates a 'Control' Accelerator
 func Control(key string) *Accelerator {
 	return &Accelerator{
-		Key:       key,
+		Key:       strings.ToLower(key),
 		Modifiers: []Modifier{ControlKey},
 	}
 }
@@ -64,7 +86,7 @@ func Control(key string) *Accelerator {
 // Super creates a 'Super' Accelerator
 func Super(key string) *Accelerator {
 	return &Accelerator{
-		Key:       key,
+		Key:       strings.ToLower(key),
 		Modifiers: []Modifier{SuperKey},
 	}
 }
--- a/v2/pkg/menu/keys/parser.go
+++ b/v2/pkg/menu/keys/parser.go
@@ -0,0 +1,90 @@
+package keys
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/leaanthony/slicer"
+)
+
+var namedKeys = slicer.String([]string{"backspace", "tab", "return", "escape", "left", "right", "up", "down", "space", "delete", "home", "end", "page up", "page down", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", "f32", "f33", "f34", "f35", "numlock"})
+
+func parseKey(key string) (string, bool) {
+
+	// Lowercase!
+	key = strings.ToLower(key)
+
+	// Check special case
+	if key == "plus" {
+		return "+", true
+	}
+
+	// Handle named keys
+	if namedKeys.Contains(key) {
+		return key, true
+	}
+
+	// Check we only have a single character
+	if len(key) != 1 {
+		return "", false
+	}
+
+	runeKey := rune(key[0])
+
+	// This may be too inclusive
+	if strconv.IsPrint(runeKey) {
+		return key, true
+	}
+
+	return "", false
+
+}
+
+func Parse(shortcut string) (*Accelerator, error) {
+
+	var result Accelerator
+
+	// Split the shortcut by +
+	components := strings.Split(shortcut, "+")
+
+	// If we only have one it should be a key
+	// We require components
+	if len(components) == 0 {
+		return nil, fmt.Errorf("no components given to validateComponents")
+	}
+
+	// Keep track of modifiers we have processed
+	var modifiersProcessed slicer.StringSlicer
+
+	// Check components
+	for index, component := range components {
+
+		// If last component
+		if index == len(components)-1 {
+			processedkey, validKey := parseKey(component)
+			if !validKey {
+				return nil, fmt.Errorf("'%s' is not a valid key", component)
+			}
+			result.Key = processedkey
+			continue
+		}
+
+		// Not last component - needs to be modifier
+		lowercaseComponent := strings.ToLower(component)
+		thisModifier, valid := modifierMap[lowercaseComponent]
+		if !valid {
+			return nil, fmt.Errorf("'%s' is not a valid modifier", component)
+		}
+		// Needs to be unique
+		if modifiersProcessed.Contains(lowercaseComponent) {
+			return nil, fmt.Errorf("Modifier '%s' is defined twice for shortcut: %s", component, shortcut)
+		}
+
+		// Save this data
+		result.Modifiers = append(result.Modifiers, thisModifier)
+		modifiersProcessed.Add(lowercaseComponent)
+	}
+
+	return &result, nil
+}
--- a/v2/pkg/menu/keys/parser_test.go
+++ b/v2/pkg/menu/keys/parser_test.go
@@ -0,0 +1,38 @@
+package keys
+
+import (
+	"testing"
+
+	"github.com/matryer/is"
+)
+
+func TestParse(t *testing.T) {
+
+	i := is.New(t)
+
+	type args struct {
+		Input    string
+		Expected *Accelerator
+	}
+
+	gooddata := []args{
+		{"CmdOrCtrl+A", CmdOrCtrl("A")},
+		{"SHIFT+.", Shift(".")},
+		{"CTRL+plus", Control("+")},
+		{"CTRL+SHIFT+escApe", Combo("escape", ControlKey, ShiftKey)},
+		{";", Key(";")},
+		{"Super+Tab", Super("tab")},
+		{"OptionOrAlt+Page Down", OptionOrAlt("Page Down")},
+	}
+	for _, tt := range gooddata {
+		result, err := Parse(tt.Input)
+		i.NoErr(err)
+		i.Equal(result, tt.Expected)
+	}
+	baddata := []string{"CmdOrCrl+A", "SHIT+.", "CTL+plus", "CTRL+SHIF+esApe", "escap", "Sper+Tab", "OptionOrAlt"}
+	for _, d := range baddata {
+		result, err := Parse(d)
+		i.True(err != nil)
+		i.Equal(result, "")
+	}
+}
--- a/v2/pkg/menu/menuitem.go
+++ b/v2/pkg/menu/menuitem.go
@@ -1,8 +1,9 @@
 package menu

 import (
-	"github.com/wailsapp/wails/v2/pkg/menu/keys"
 	"sync"
+
+	"github.com/wailsapp/wails/v2/pkg/menu/keys"
 )

 // MenuItem represents a menuitem contained in a menu
@@ -38,6 +39,9 @@ type MenuItem struct {
 	// Image - base64 image data
 	Image string

+	// MacTemplateImage indicates that on a mac, this image is a template image
+	MacTemplateImage bool
+
 	// Tooltip
 	Tooltip string
Author	SHA1	Message	Date
Lea Anthony	98a4de8878	v2.0.0-alpha.31	2021-02-21 20:38:14 +11:00
Lea Anthony	5fe709f558	Trigger clean shutdown on Quit	2021-02-21 20:37:42 +11:00
Lea Anthony	5231a6893b	v2.0.0-alpha.30	2021-02-21 19:28:07 +11:00
Lea Anthony	74f3ce990f	Support loglevel flag in dev mode	2021-02-21 19:26:20 +11:00
Lea Anthony	998a913853	Hide dev warnings by default	2021-02-21 16:36:56 +11:00
Lea Anthony	964844835c	Better Wails update messaging	2021-02-21 06:12:19 +11:00
Lea Anthony	4e152bb849	v2.0.0-alpha.29	2021-02-21 05:56:11 +11:00
Lea Anthony	51133d098c	Slight refactor of backend module generation	2021-02-21 05:52:42 +11:00
Lea Anthony	d4191e7d1b	Support parsing keyboard shortcuts	2021-02-20 21:32:32 +11:00
Lea Anthony	9c273bc745	v2.0.0-alpha.28	2021-02-20 16:04:42 +11:00
Lea Anthony	c6f6ad6beb	Improved dev reload. Early abort for bad app. Don't reload if bad build.	2021-02-20 16:04:03 +11:00
Lea Anthony	4362a14459	Dev colours	2021-02-20 15:25:40 +11:00
Lea Anthony	0080e9e311	Gimme some colour	2021-02-20 15:14:20 +11:00
Lea Anthony	83d9297cac	v2.0.0-alpha.27	2021-02-20 14:51:38 +11:00
Lea Anthony	d8ad250608	Template Image support	2021-02-19 05:25:23 +11:00
Lea Anthony	eac8880f6d	Initial support for tray menus	2021-02-13 20:26:21 +11:00
Lea Anthony	f47100e71c	Sort generated methods to appease git diff.	2021-02-13 18:04:00 +11:00
Lea Anthony	9a81a57d13	Revert bootstrapping.	2021-02-12 15:08:54 +11:00
Lea Anthony	354429bc28	Support UpdateTrayLabel in dev mode. Small refactor.	2021-02-12 14:52:47 +11:00
Lea Anthony	99d4d9490c	Improved dialog support for dev mode	2021-02-12 14:50:58 +11:00