diff --git a/Clockify/ToggleAction.cs b/Clockify/ToggleAction.cs
index adb31e0..2989cc7 100644
--- a/Clockify/ToggleAction.cs
+++ b/Clockify/ToggleAction.cs
@@ -113,9 +113,11 @@ private string CreateTimerText(string timerTime)
         {
             return _settings.TitleFormat
                             .ToLower()
+                            .Replace("{workspacename}", _settings.WorkspaceName)
                             .Replace("{projectname}", _settings.ProjectName)
                             .Replace("{taskname}", _settings.TaskName)
                             .Replace("{timername}", _settings.TimerName)
+                            .Replace("{clientname}", _settings.ClientName)
                             .Replace("{timer}", timerTime);
         }
 
diff --git a/README.md b/README.md
index c791b86..c3dbde5 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,11 @@ Until the plugin is available in the [Stream Deck Store](https://apps.elgato.com
   - **Client Name:** *(optional)* Set the client name assigned to the specified project
   - **Title Format:** *(optional)* Specify the format for the title to be displayed on the button.
     - This can include any of:
+      - `{workspaceName}` : The workspace name
       - `{projectName}` : The project name
       - `{taskName}` : The task name 
-      - `{timerName}` : The timer name 
+      - `{timerName}` : The timer name
+      - `{clientName}` : The client name
       - `{timer}` : The current timer value when running. Blank when not running
   - **Server Url:** *(required)* Change from the *default* URL to the API URL of your own/company instance