v0.23

Add new "shellScriptTitledButton" button type (#203 )
Add new "shellScriptTitledButton" button type
2026-10-31 10:28:36 +00:00 · 2019-08-19 12:34:52 +01:00 · 2019-08-14 10:59:27 +01:00 · 2019-08-11 15:46:08 +02:00 · 2019-08-11 15:29:37 +02:00 · 2019-08-11 15:25:44 +02:00
30 changed files with 2255 additions and 311 deletions
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+patreon: toxblh
+ko_fi: toxblh
@@ -18,6 +18,9 @@
 		36C2ECDD207C723B003CDA33 /* ParseConfigTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECDC207C723B003CDA33 /* ParseConfigTests.swift */; };
 		36C2ECDE207C82DE003CDA33 /* ItemsParsing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECDA207C3FE7003CDA33 /* ItemsParsing.swift */; };
 		36C2ECE0207CB1B0003CDA33 /* defaultPreset.json in Resources */ = {isa = PBXBuildFile; fileRef = 36C2ECDF207CB1B0003CDA33 /* defaultPreset.json */; };
+		4CC9FEDC22FDEA65001512EB /* AMR_ANSIEscapeHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC9FEDB22FDEA65001512EB /* AMR_ANSIEscapeHelper.m */; };
+		4CDC6E5022FCA93F0069ADD4 /* ShellScriptTouchBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CDC6E4F22FCA93F0069ADD4 /* ShellScriptTouchBarItem.swift */; };
+		4CFF5E5C22E623DD00BFB1EE /* YandexWeatherBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF5E5B22E623DD00BFB1EE /* YandexWeatherBarItem.swift */; };
 		60173D3E20C0031B002C305F /* LaunchAtLoginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 60173D3D20C0031B002C305F /* LaunchAtLoginController.m */; };
 		6027D1B92080E52A004FFDC7 /* BrightnessViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6027D1B72080E52A004FFDC7 /* BrightnessViewController.swift */; };
 		6027D1BA2080E52A004FFDC7 /* VolumeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6027D1B82080E52A004FFDC7 /* VolumeViewController.swift */; };
@@ -61,6 +64,7 @@
 		B0B17439207D6B590004B740 /* Vox.nowPlaying.scpt in Resources */ = {isa = PBXBuildFile; fileRef = B0B1742F207D6B590004B740 /* Vox.nowPlaying.scpt */; };
 		B0B1743A207D6B590004B740 /* iTunes.nowPlaying.scpt in Resources */ = {isa = PBXBuildFile; fileRef = B0B17430207D6B590004B740 /* iTunes.nowPlaying.scpt */; };
 		B0F3112520C9E35F0076BB88 /* SupportNSTouchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0F3112420C9E35F0076BB88 /* SupportNSTouchBar.swift */; };
+		B0F54A7A2295AC7D00B4C509 /* DarkModeBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0F54A792295AC7D00B4C509 /* DarkModeBarItem.swift */; };
 		B0F8771A207AC1EA00D6E430 /* TouchBarSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = B0F87719207AC1EA00D6E430 /* TouchBarSupport.m */; };
 /* End PBXBuildFile section */

@@ -90,6 +94,10 @@
 		36C2ECDA207C3FE7003CDA33 /* ItemsParsing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemsParsing.swift; sourceTree = "<group>"; };
 		36C2ECDC207C723B003CDA33 /* ParseConfigTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseConfigTests.swift; sourceTree = "<group>"; };
 		36C2ECDF207CB1B0003CDA33 /* defaultPreset.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = defaultPreset.json; sourceTree = "<group>"; };
+		4CC9FEDA22FDEA65001512EB /* AMR_ANSIEscapeHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AMR_ANSIEscapeHelper.h; sourceTree = "<group>"; };
+		4CC9FEDB22FDEA65001512EB /* AMR_ANSIEscapeHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AMR_ANSIEscapeHelper.m; sourceTree = "<group>"; };
+		4CDC6E4F22FCA93F0069ADD4 /* ShellScriptTouchBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShellScriptTouchBarItem.swift; sourceTree = "<group>"; };
+		4CFF5E5B22E623DD00BFB1EE /* YandexWeatherBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YandexWeatherBarItem.swift; sourceTree = "<group>"; };
 		60173D3C20C0031B002C305F /* LaunchAtLoginController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LaunchAtLoginController.h; sourceTree = "<group>"; };
 		60173D3D20C0031B002C305F /* LaunchAtLoginController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LaunchAtLoginController.m; sourceTree = "<group>"; };
 		6027D1B72080E52A004FFDC7 /* BrightnessViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrightnessViewController.swift; sourceTree = "<group>"; };
@@ -142,6 +150,7 @@
 		B0B1742F207D6B590004B740 /* Vox.nowPlaying.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vox.nowPlaying.scpt; sourceTree = "<group>"; };
 		B0B17430207D6B590004B740 /* iTunes.nowPlaying.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iTunes.nowPlaying.scpt; sourceTree = "<group>"; };
 		B0F3112420C9E35F0076BB88 /* SupportNSTouchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportNSTouchBar.swift; sourceTree = "<group>"; };
+		B0F54A792295AC7D00B4C509 /* DarkModeBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DarkModeBarItem.swift; sourceTree = "<group>"; };
 		B0F87719207AC1EA00D6E430 /* TouchBarSupport.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TouchBarSupport.m; sourceTree = "<group>"; };
 		B0F8771B207AC92700D6E430 /* TouchBarSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TouchBarSupport.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -218,6 +227,7 @@
 				B0A7E9A9205D6AA400EEF070 /* KeyPress.swift */,
 				B059D623205E04F3006E6B86 /* CustomButtonTouchBarItem.swift */,
 				36C2ECD8207B74B4003CDA33 /* AppleScriptTouchBarItem.swift */,
+				4CDC6E4F22FCA93F0069ADD4 /* ShellScriptTouchBarItem.swift */,
 				B059D621205E03F5006E6B86 /* TouchBarController.swift */,
 				36C2ECDA207C3FE7003CDA33 /* ItemsParsing.swift */,
 				B0008E542080286C003AD4DD /* SupportHelpers.swift */,
@@ -262,6 +272,8 @@
 		B0B1743B207D6ED40004B740 /* CBridge */ = {
 			isa = PBXGroup;
 			children = (
+				4CC9FEDA22FDEA65001512EB /* AMR_ANSIEscapeHelper.h */,
+				4CC9FEDB22FDEA65001512EB /* AMR_ANSIEscapeHelper.m */,
 				B059D629205E13E5006E6B86 /* TouchBarPrivateApi.h */,
 				B059D62A205F0E7D006E6B86 /* TouchBarPrivateApi-Bridging.h */,
 				B0F87719207AC1EA00D6E430 /* TouchBarSupport.m */,
@@ -292,7 +304,9 @@
 				36C2ECD6207B6DAE003CDA33 /* TimeTouchBarItem.swift */,
 				6027D1B82080E52A004FFDC7 /* VolumeViewController.swift */,
 				607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */,
+				4CFF5E5B22E623DD00BFB1EE /* YandexWeatherBarItem.swift */,
 				B08126F0217BE19000A98970 /* WidgetProtocol.swift */,
+				B0F54A792295AC7D00B4C509 /* DarkModeBarItem.swift */,
 			);
 			path = Widgets;
 			sourceTree = "<group>";
@@ -446,14 +460,17 @@
 				B0008E552080286C003AD4DD /* SupportHelpers.swift in Sources */,
 				6042B6A72083E03A00C525C8 /* AppScrubberTouchBarItem.swift in Sources */,
 				B082B253205C7D8000BC04DC /* AppDelegate.swift in Sources */,
+				B0F54A7A2295AC7D00B4C509 /* DarkModeBarItem.swift in Sources */,
 				B08126EF217BD0B900A98970 /* PomodoroBarItem.swift in Sources */,
 				B081732C213739FE005D4908 /* DnDBarItem.swift in Sources */,
 				60C44AFD20A373A100C0EC91 /* MusicBarItem.swift in Sources */,
 				B059D624205E04F3006E6B86 /* CustomButtonTouchBarItem.swift in Sources */,
 				60173D3E20C0031B002C305F /* LaunchAtLoginController.m in Sources */,
 				6027D1BA2080E52A004FFDC7 /* VolumeViewController.swift in Sources */,
+				4CDC6E5022FCA93F0069ADD4 /* ShellScriptTouchBarItem.swift in Sources */,
 				607EEA4B2087835F009DA5F0 /* WeatherBarItem.swift in Sources */,
 				B0F3112520C9E35F0076BB88 /* SupportNSTouchBar.swift in Sources */,
+				4CFF5E5C22E623DD00BFB1EE /* YandexWeatherBarItem.swift in Sources */,
 				6042B6AA2083E27000C525C8 /* DeprecatedCarbonAPI.c in Sources */,
 				B09EB1E4207C082000D5C1E0 /* HapticFeedback.swift in Sources */,
 				B08173272135F02B005D4908 /* NightShiftBarItem.swift in Sources */,
@@ -464,6 +481,7 @@
 				B0A7E9AA205D6AA400EEF070 /* KeyPress.swift in Sources */,
 				36C2ECD7207B6DAE003CDA33 /* TimeTouchBarItem.swift in Sources */,
 				607EEA4D2087A8DA009DA5F0 /* CurrencyBarItem.swift in Sources */,
+				4CC9FEDC22FDEA65001512EB /* AMR_ANSIEscapeHelper.m in Sources */,
 				6027D1B92080E52A004FFDC7 /* BrightnessViewController.swift in Sources */,
 				368EDDE720812A1D00E10953 /* ScrollViewItem.swift in Sources */,
 				B04B7BB72087398C00C835D0 /* BatteryBarItem.swift in Sources */,
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>BuildSystemType</key>
-	<string>Latest</string>
+	<string>Original</string>
 </dict>
 </plist>
@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "sun-icon-256.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "39857.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
    <dependencies>
        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
    </dependencies>
    <scenes>
        <!--Application-->
@@ -619,7 +619,7 @@
                                        <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                            <connections>
-                                                <action selector="toggleSourceList:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
+                                                <action selector="toggleSidebar:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
                                            </connections>
                                        </menuItem>
                                        <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
@@ -0,0 +1,326 @@
+//
+//  ANSIEscapeHelper.h
+//  AnsiColorsTest
+//
+//  Created by Ali Rantakari on 18.3.09.
+//
+//  Version 0.9.6
+//
+/*
+The MIT License
+
+Copyright (c) 2008-2009,2013 Ali Rantakari
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#import <Cocoa/Cocoa.h>
+
+
+#if !__has_feature(objc_arc)
+#warning "This code requires ARC to be enabled."
+#endif
+
+
+// dictionary keys for the SGR code dictionaries that the array
+// escapeCodesForString:cleanString: returns contains
+#define kAMRCodeDictKey_code           @"code"
+#define kAMRCodeDictKey_location       @"location"
+
+// dictionary keys for the string formatting attribute
+// dictionaries that the array attributesForString:cleanString:
+// returns contains
+#define kAMRAttrDictKey_range          @"range"
+#define kAMRAttrDictKey_attrName       @"attributeName"
+#define kAMRAttrDictKey_attrValue      @"attributeValue"
+
+
+/*!
+ @enum          AMR_SGRCode
+
+ @abstract      SGR (Select Graphic Rendition) ANSI control codes.
+ */
+typedef enum
+{
+    AMR_SGRCodeNoneOrInvalid =      -1,
+
+    AMR_SGRCodeAllReset =           0,
+
+    AMR_SGRCodeIntensityBold =      1,
+    AMR_SGRCodeIntensityFaint =     2,
+    AMR_SGRCodeIntensityNormal =    22,
+
+    AMR_SGRCodeItalicOn =           3,
+
+    AMR_SGRCodeUnderlineSingle =    4,
+    AMR_SGRCodeUnderlineDouble =    21,
+    AMR_SGRCodeUnderlineNone =      24,
+
+    AMR_SGRCodeFgBlack =            30,
+    AMR_SGRCodeFgRed =              31,
+    AMR_SGRCodeFgGreen =            32,
+    AMR_SGRCodeFgYellow =           33,
+    AMR_SGRCodeFgBlue =             34,
+    AMR_SGRCodeFgMagenta =          35,
+    AMR_SGRCodeFgCyan =             36,
+    AMR_SGRCodeFgWhite =            37,
+    AMR_SGRCodeFgReset =            39,
+
+    AMR_SGRCodeBgBlack =            40,
+    AMR_SGRCodeBgRed =              41,
+    AMR_SGRCodeBgGreen =            42,
+    AMR_SGRCodeBgYellow =           43,
+    AMR_SGRCodeBgBlue =             44,
+    AMR_SGRCodeBgMagenta =          45,
+    AMR_SGRCodeBgCyan =             46,
+    AMR_SGRCodeBgWhite =            47,
+    AMR_SGRCodeBgReset =            49,
+
+    AMR_SGRCodeFgBrightBlack =      90,
+    AMR_SGRCodeFgBrightRed =        91,
+    AMR_SGRCodeFgBrightGreen =      92,
+    AMR_SGRCodeFgBrightYellow =     93,
+    AMR_SGRCodeFgBrightBlue =       94,
+    AMR_SGRCodeFgBrightMagenta =    95,
+    AMR_SGRCodeFgBrightCyan =       96,
+    AMR_SGRCodeFgBrightWhite =      97,
+
+    AMR_SGRCodeBgBrightBlack =      100,
+    AMR_SGRCodeBgBrightRed =        101,
+    AMR_SGRCodeBgBrightGreen =      102,
+    AMR_SGRCodeBgBrightYellow =     103,
+    AMR_SGRCodeBgBrightBlue =       104,
+    AMR_SGRCodeBgBrightMagenta =    105,
+    AMR_SGRCodeBgBrightCyan =       106,
+    AMR_SGRCodeBgBrightWhite =      107
+} AMR_SGRCode;
+
+
+
+
+
+
+/*!
+ @class     AMR_ANSIEscapeHelper
+
+ @abstract  Contains helper methods for dealing with strings
+            that contain ANSI escape sequences for formatting (colors,
+            underlining, bold etc.)
+ */
+@interface AMR_ANSIEscapeHelper : NSObject
+
+/*!
+ @property      defaultStringColor
+
+ @abstract      The default color used when creating an attributed string (default is black).
+ */
+@property(copy) NSColor *defaultStringColor;
+
+
+/*!
+ @property      font
+
+ @abstract      The font to use when creating string formatting attribute values.
+ */
+@property(copy) NSFont *font;
+
+/*!
+ @property      ansiColors
+
+ @abstract      The colors to use for displaying ANSI colors.
+
+ @discussion    Keys in this dictionary should be NSNumber objects containing SGR code
+                values from the AMR_SGRCode enum. The corresponding values for these keys
+                should be NSColor objects. If this property is nil or if it doesn't
+                contain a key for a specific SGR code, the default color will be used
+                instead.
+ */
+@property(retain) NSMutableDictionary *ansiColors;
+
+
+/*!
+ @method        attributedStringWithANSIEscapedString:
+
+ @abstract      Returns an attributed string that corresponds both in contents
+                and formatting to a given string that contains ANSI escape
+                sequences.
+
+ @param aString         A String containing ANSI escape sequences
+
+ @result        An attributed string that mimics as closely as possible
+                the formatting of the given ANSI-escaped string.
+ */
+- (NSAttributedString*) attributedStringWithANSIEscapedString:(NSString*)aString;
+
+
+/*!
+ @method        ansiEscapedStringWithAttributedString:
+
+ @abstract      Returns a string containing ANSI escape sequences that corresponds
+                both in contents and formatting to a given attributed string.
+
+ @param aAttributedString       An attributed string
+
+ @result        A string that mimics as closely as possible
+                the formatting of the given attributed string with
+                ANSI escape sequences.
+ */
+- (NSString*) ansiEscapedStringWithAttributedString:(NSAttributedString*)aAttributedString;
+
+
+/*!
+ @method        escapeCodesForString:cleanString:
+
+ @abstract      Returns an array of SGR codes and their locations from a
+                string containing ANSI escape sequences as well as a "clean"
+                version of the string (i.e. one without the ANSI escape
+                sequences.)
+
+ @param aString         A String containing ANSI escape sequences
+ @param aCleanString    Upon return, contains a "clean" version of aString (i.e. aString
+                        without the ANSI escape sequences)
+
+ @result        An array of NSDictionary objects, each of which has
+                an NSNumber value for the key "code" (specifying an SGR code) and
+                another NSNumber value for the key "location" (specifying the
+                location of the code within aCleanString.)
+ */
+- (NSArray*) escapeCodesForString:(NSString*)aString cleanString:(NSString**)aCleanString;
+
+
+/*!
+ @method        ansiEscapedStringWithCodesAndLocations:cleanString:
+
+ @abstract      Returns a string containing ANSI escape codes for formatting based
+                on a string and an array of SGR codes and their locations within
+                the given string.
+
+ @param aCodesArray     An array of NSDictionary objects, each of which should have
+                        an NSNumber value for the key "code" (specifying an SGR
+                        code) and another NSNumber value for the key "location"
+                        (specifying the location of this SGR code in aCleanString.)
+ @param aCleanString    The string to which to insert the ANSI escape codes
+                        described in aCodesArray.
+
+ @result        A string containing ANSI escape sequences.
+ */
+- (NSString*) ansiEscapedStringWithCodesAndLocations:(NSArray*)aCodesArray cleanString:(NSString*)aCleanString;
+
+
+/*!
+ @method        attributesForString:cleanString:
+
+ @abstract      Convert ANSI escape sequences in a string to string formatting attributes.
+
+ @discussion    Given a string with some ANSI escape sequences in it, this method returns
+                attributes for formatting the specified string according to those ANSI
+                escape sequences as well as a "clean" (i.e. free of the escape sequences)
+                version of this string.
+
+ @param aString         A String containing ANSI escape sequences
+ @param aCleanString    Upon return, contains a "clean" version of aString (i.e. aString
+                        without the ANSI escape sequences.) Pass in NULL if you're not
+                        interested in this.
+
+ @result        An array containing NSDictionary objects, each of which has keys "range"
+                (an NSValue containing an NSRange, specifying the range for the
+                attribute within the "clean" version of aString), "attributeName" (an
+                NSString) and "attributeValue" (an NSObject). You may use these as
+                arguments for NSMutableAttributedString's methods for setting the
+                visual formatting.
+ */
+- (NSArray*) attributesForString:(NSString*)aString cleanString:(NSString**)aCleanString;
+
+
+/*!
+ @method        AMR_SGRCode:endsFormattingIntroducedByCode:
+
+ @abstract      Whether the occurrence of a given SGR code would end the formatting run
+                introduced by another SGR code.
+
+ @discussion    For example, AMR_SGRCodeFgReset, AMR_SGRCodeAllReset or any SGR code
+                specifying a foreground color would end the formatting run
+                introduced by a foreground color -specifying SGR code.
+
+ @param endCode     The SGR code to test as a candidate for ending the formatting run
+                    introduced by startCode
+ @param startCode   The SGR code that has introduced a formatting run
+
+ @result        YES if the occurrence of endCode would end the formatting run
+                introduced by startCode, NO otherwise.
+ */
+- (BOOL) AMR_SGRCode:(AMR_SGRCode)endCode endsFormattingIntroducedByCode:(AMR_SGRCode)startCode;
+
+
+/*!
+ @method        colorForSGRCode:
+
+ @abstract      Returns the color to use for displaying a specific ANSI color.
+
+ @discussion    This method first considers the values set in the ansiColors
+                property and only then the standard basic colors (NSColor's
+                redColor, blueColor etc.)
+
+ @param code    An SGR code that specifies an ANSI color.
+
+ @result        The color to use for displaying the ANSI color specified by code.
+ */
+- (NSColor*) colorForSGRCode:(AMR_SGRCode)code;
+
+
+/*!
+ @method        AMR_SGRCodeForColor:isForegroundColor:
+
+ @abstract      Returns a color SGR code that corresponds to a given color.
+
+ @discussion    This method matches colors to their equivalent SGR codes
+                by going through the colors specified in the ansiColors
+                dictionary, and if ansiColors is null or if a match is
+                not found there, by comparing the given color to the
+                standard basic colors (NSColor's redColor, blueColor
+                etc.) The comparison is done simply by checking for
+                equality.
+
+ @param aColor          The color to get a corresponding SGR code for
+ @param aForeground     Whether you want a foreground or background color code
+
+ @result        SGR code that corresponds with aColor.
+ */
+- (AMR_SGRCode) AMR_SGRCodeForColor:(NSColor*)aColor isForegroundColor:(BOOL)aForeground;
+
+
+/*!
+ @method        closestSGRCodeForColor:isForegroundColor:
+
+ @abstract      Returns a color SGR code that represents the closest ANSI
+                color to a given color.
+
+ @discussion    This method attempts to find the closest ANSI color to
+                aColor and return its SGR code.
+
+ @param color          The color to get a closest color SGR code match for
+ @param foreground     Whether you want a foreground or background color code
+
+ @result        SGR code for the ANSI color that is closest to aColor.
+ */
+- (AMR_SGRCode) closestSGRCodeForColor:(NSColor *)color isForegroundColor:(BOOL)foreground;
+
+
+
+@end
@@ -0,0 +1,996 @@
+//
+//  ANSIEscapeHelper.m
+//
+//  Created by Ali Rantakari on 18.3.09.
+
+/*
+The MIT License
+
+Copyright (c) 2008-2009,2013 Ali Rantakari
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+/*
+ todo:
+
+ - don't add useless "reset" escape codes to the string in
+   -ansiEscapedStringWithAttributedString:
+
+ */
+
+
+
+#import "AMR_ANSIEscapeHelper.h"
+
+
+// the CSI (Control Sequence Initiator) -- i.e. "escape sequence prefix".
+// (add your own CSI:Miami joke here)
+#define kANSIEscapeCSI          @"\033["
+
+// the end byte of an SGR (Select Graphic Rendition)
+// ANSI Escape Sequence
+#define kANSIEscapeSGREnd       @"m"
+
+
+// color definition helper macros
+#define kBrightColorBrightness  1.0
+#define kBrightColorSaturation  0.4
+#define kBrightColorAlpha       1.0
+#define kBrightColorWithHue(h)  [NSColor colorWithCalibratedHue:(h) saturation:kBrightColorSaturation brightness:kBrightColorBrightness alpha:kBrightColorAlpha]
+
+// default colors
+#define kDefaultANSIColorFgBlack    NSColor.blackColor
+#define kDefaultANSIColorFgRed      NSColor.redColor
+#define kDefaultANSIColorFgGreen    NSColor.greenColor
+#define kDefaultANSIColorFgYellow   NSColor.yellowColor
+#define kDefaultANSIColorFgBlue     NSColor.blueColor
+#define kDefaultANSIColorFgMagenta  NSColor.magentaColor
+#define kDefaultANSIColorFgCyan     NSColor.cyanColor
+#define kDefaultANSIColorFgWhite    NSColor.whiteColor
+
+#define kDefaultANSIColorFgBrightBlack      [NSColor colorWithCalibratedWhite:0.337 alpha:1.0]
+#define kDefaultANSIColorFgBrightRed        kBrightColorWithHue(1.0)
+#define kDefaultANSIColorFgBrightGreen      kBrightColorWithHue(1.0/3.0)
+#define kDefaultANSIColorFgBrightYellow     kBrightColorWithHue(1.0/6.0)
+#define kDefaultANSIColorFgBrightBlue       kBrightColorWithHue(2.0/3.0)
+#define kDefaultANSIColorFgBrightMagenta    kBrightColorWithHue(5.0/6.0)
+#define kDefaultANSIColorFgBrightCyan       kBrightColorWithHue(0.5)
+#define kDefaultANSIColorFgBrightWhite      NSColor.whiteColor
+
+#define kDefaultANSIColorBgBlack    NSColor.blackColor
+#define kDefaultANSIColorBgRed      NSColor.redColor
+#define kDefaultANSIColorBgGreen    NSColor.greenColor
+#define kDefaultANSIColorBgYellow   NSColor.yellowColor
+#define kDefaultANSIColorBgBlue     NSColor.blueColor
+#define kDefaultANSIColorBgMagenta  NSColor.magentaColor
+#define kDefaultANSIColorBgCyan     NSColor.cyanColor
+#define kDefaultANSIColorBgWhite    NSColor.whiteColor
+
+#define kDefaultANSIColorBgBrightBlack      kDefaultANSIColorFgBrightBlack
+#define kDefaultANSIColorBgBrightRed        kDefaultANSIColorFgBrightRed
+#define kDefaultANSIColorBgBrightGreen      kDefaultANSIColorFgBrightGreen
+#define kDefaultANSIColorBgBrightYellow     kDefaultANSIColorFgBrightYellow
+#define kDefaultANSIColorBgBrightBlue       kDefaultANSIColorFgBrightBlue
+#define kDefaultANSIColorBgBrightMagenta    kDefaultANSIColorFgBrightMagenta
+#define kDefaultANSIColorBgBrightCyan       kDefaultANSIColorFgBrightCyan
+#define kDefaultANSIColorBgBrightWhite      kDefaultANSIColorFgBrightWhite
+
+#define kDefaultFontSize [NSFont systemFontOfSize:NSFont.systemFontSize]
+#define kDefaultForegroundColor NSColor.blackColor
+
+// minimum weight for an NSFont for it to be considered bold
+#define kBoldFontMinWeight          9
+
+
+@implementation AMR_ANSIEscapeHelper
+
+- (id) init
+{
+    if (!(self = [super init]))
+        return nil;
+
+    self.ansiColors = [NSMutableDictionary dictionary];
+
+    return self;
+}
+
+
+
+- (NSAttributedString*) attributedStringWithANSIEscapedString:(NSString*)aString
+{
+    if (aString == nil)
+        return nil;
+
+    NSString *cleanString;
+    NSArray *attributesAndRanges = [self attributesForString:aString cleanString:&cleanString];
+    NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc]
+                                                   initWithString:cleanString
+                                                   attributes:@{
+                                                   NSFontAttributeName: self.font ?: kDefaultFontSize,
+                                                   NSForegroundColorAttributeName: self.defaultStringColor ?: kDefaultForegroundColor
+                                                   }];
+
+    for (NSDictionary *thisAttributeDict in attributesAndRanges)
+    {
+        [attributedString
+         addAttribute:thisAttributeDict[kAMRAttrDictKey_attrName]
+         value:thisAttributeDict[kAMRAttrDictKey_attrValue]
+         range:[thisAttributeDict[kAMRAttrDictKey_range] rangeValue]
+         ];
+    }
+
+    return attributedString;
+}
+
+
+
+- (NSString*) ansiEscapedStringWithAttributedString:(NSAttributedString*)aAttributedString
+{
+    NSMutableArray *codesAndLocations = [NSMutableArray array];
+
+    NSArray *attrNames = @[
+                          NSFontAttributeName, NSForegroundColorAttributeName,
+                          NSBackgroundColorAttributeName, NSUnderlineStyleAttributeName,
+                          ];
+
+    for (NSString *thisAttrName in attrNames)
+    {
+        NSRange limitRange = NSMakeRange(0, aAttributedString.length);
+        id attributeValue;
+        NSRange effectiveRange;
+
+        while (limitRange.length > 0)
+        {
+            attributeValue = [aAttributedString
+                              attribute:thisAttrName
+                              atIndex:limitRange.location
+                              longestEffectiveRange:&effectiveRange
+                              inRange:limitRange
+                              ];
+
+            AMR_SGRCode thisSGRCode = AMR_SGRCodeNoneOrInvalid;
+
+            if ([thisAttrName isEqualToString:NSForegroundColorAttributeName])
+            {
+                if (attributeValue != nil)
+                    thisSGRCode = [self closestSGRCodeForColor:attributeValue isForegroundColor:YES];
+                else
+                    thisSGRCode = AMR_SGRCodeFgReset;
+            }
+            else if ([thisAttrName isEqualToString:NSBackgroundColorAttributeName])
+            {
+                if (attributeValue != nil)
+                    thisSGRCode = [self closestSGRCodeForColor:attributeValue isForegroundColor:NO];
+                else
+                    thisSGRCode = AMR_SGRCodeBgReset;
+            }
+            else if ([thisAttrName isEqualToString:NSFontAttributeName])
+            {
+                // we currently only use NSFontAttributeName for bolding so
+                // here we assume that the formatting "type" in ANSI SGR
+                // terms is indeed intensity
+                if (attributeValue != nil)
+                    thisSGRCode = ([NSFontManager.sharedFontManager weightOfFont:attributeValue] >= kBoldFontMinWeight)
+                                    ? AMR_SGRCodeIntensityBold : AMR_SGRCodeIntensityNormal;
+                else
+                    thisSGRCode = AMR_SGRCodeIntensityNormal;
+            }
+            else if ([thisAttrName isEqualToString:NSUnderlineStyleAttributeName])
+            {
+                if (attributeValue != nil)
+                {
+                    if ([attributeValue intValue] == NSUnderlineStyleSingle)
+                        thisSGRCode = AMR_SGRCodeUnderlineSingle;
+                    else if ([attributeValue intValue] == NSUnderlineStyleDouble)
+                        thisSGRCode = AMR_SGRCodeUnderlineDouble;
+                    else
+                        thisSGRCode = AMR_SGRCodeUnderlineNone;
+                }
+                else
+                    thisSGRCode = AMR_SGRCodeUnderlineNone;
+            }
+
+            if (thisSGRCode != AMR_SGRCodeNoneOrInvalid)
+            {
+                [codesAndLocations addObject: @{
+                           kAMRCodeDictKey_code: @(thisSGRCode),
+                       kAMRCodeDictKey_location: @(effectiveRange.location),
+                 }];
+            }
+
+            limitRange = NSMakeRange(NSMaxRange(effectiveRange),
+                                     NSMaxRange(limitRange) - NSMaxRange(effectiveRange));
+        }
+    }
+
+    return [self ansiEscapedStringWithCodesAndLocations:codesAndLocations cleanString:aAttributedString.string];
+}
+
+
+- (NSArray*) escapeCodesForString:(NSString*)aString cleanString:(NSString**)aCleanString
+{
+    if (aString == nil)
+        return nil;
+    if (aString.length <= kANSIEscapeCSI.length)
+    {
+        if (aCleanString)
+            *aCleanString = aString.copy;
+        return @[];
+    }
+
+    NSString *cleanString = @"";
+
+    // find all escape sequence codes from aString and put them in this array
+    // along with their start locations within the "clean" version of aString
+    NSMutableArray *formatCodes = [NSMutableArray array];
+
+    NSUInteger aStringLength = aString.length;
+    NSUInteger coveredLength = 0;
+    NSRange searchRange = NSMakeRange(0,aStringLength);
+    NSRange thisEscapeSequenceRange;
+    do
+    {
+        thisEscapeSequenceRange = [aString rangeOfString:kANSIEscapeCSI options:NSLiteralSearch range:searchRange];
+        if (thisEscapeSequenceRange.location != NSNotFound)
+        {
+            // adjust range's length so that it encompasses the whole ANSI escape sequence
+            // and not just the Control Sequence Initiator (the "prefix") by finding the
+            // final byte of the control sequence (one that has an ASCII decimal value
+            // between 64 and 126.) at the same time, read all formatting codes from inside
+            // this escape sequence (there may be several, separated by semicolons.)
+            NSMutableArray *codes = [NSMutableArray array];
+            unsigned int code = 0;
+            unsigned int lengthAddition = 1;
+            NSUInteger thisIndex;
+            for (;;)
+            {
+                thisIndex = (NSMaxRange(thisEscapeSequenceRange)+lengthAddition-1);
+                if (thisIndex >= aStringLength)
+                    break;
+
+                unichar c = [aString characterAtIndex:thisIndex];
+
+                if (('0' <= c) && (c <= '9'))
+                {
+                    int digit = c - '0';
+                    code = (code == 0) ? digit : code*10+digit;
+                }
+
+                // ASCII decimal 109 is the SGR (Select Graphic Rendition) final byte
+                // ("m"). this means that the code value we've just read specifies formatting
+                // for the output; exactly what we're interested in.
+                if (c == 'm')
+                {
+                    [codes addObject:@(code)];
+                    break;
+                }
+                else if ((64 <= c) && (c <= 126)) // any other valid final byte
+                {
+                    [codes removeAllObjects];
+                    break;
+                }
+                else if (c == ';') // separates codes within the same sequence
+                {
+                    [codes addObject:@(code)];
+                    code = 0;
+                }
+
+                lengthAddition++;
+            }
+            thisEscapeSequenceRange.length += lengthAddition;
+
+            NSUInteger locationInCleanString = coveredLength+thisEscapeSequenceRange.location-searchRange.location;
+
+            for (NSNumber *codeToAdd in codes)
+            {
+                [formatCodes addObject: @{
+                     kAMRCodeDictKey_code: codeToAdd,
+                 kAMRCodeDictKey_location: @(locationInCleanString)
+                 }];
+            }
+
+            NSUInteger thisCoveredLength = thisEscapeSequenceRange.location-searchRange.location;
+            if (thisCoveredLength > 0)
+                cleanString = [cleanString stringByAppendingString:[aString substringWithRange:NSMakeRange(searchRange.location, thisCoveredLength)]];
+
+            coveredLength += thisCoveredLength;
+            searchRange.location = NSMaxRange(thisEscapeSequenceRange);
+            searchRange.length = aStringLength-searchRange.location;
+        }
+    }
+    while(thisEscapeSequenceRange.location != NSNotFound);
+
+    if (searchRange.length > 0)
+        cleanString = [cleanString stringByAppendingString:[aString substringWithRange:searchRange]];
+
+    if (aCleanString)
+        *aCleanString = cleanString;
+    return formatCodes;
+}
+
+
+
+
+- (NSString*) ansiEscapedStringWithCodesAndLocations:(NSArray*)aCodesArray cleanString:(NSString*)aCleanString
+{
+    NSMutableString* retStr = [NSMutableString stringWithCapacity:aCleanString.length];
+
+    NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:kAMRCodeDictKey_location ascending:YES];
+    NSArray *codesArray = [aCodesArray sortedArrayUsingDescriptors:@[sortDescriptor]];
+
+    NSUInteger aCleanStringIndex = 0;
+    NSUInteger aCleanStringLength = aCleanString.length;
+    for (NSDictionary *thisCodeDict in codesArray)
+    {
+        if (!(  thisCodeDict[kAMRCodeDictKey_code] &&
+                thisCodeDict[kAMRCodeDictKey_location]
+            ))
+            continue;
+
+        AMR_SGRCode thisCode = [thisCodeDict[kAMRCodeDictKey_code] unsignedIntValue];
+        NSUInteger formattingRunStartLocation = [thisCodeDict[kAMRCodeDictKey_location] unsignedIntegerValue];
+
+        if (formattingRunStartLocation > aCleanStringLength)
+            continue;
+
+        if (aCleanStringIndex < formattingRunStartLocation)
+            [retStr appendString:[aCleanString substringWithRange:NSMakeRange(aCleanStringIndex, formattingRunStartLocation-aCleanStringIndex)]];
+        [retStr appendFormat:@"%@%d%@", kANSIEscapeCSI, thisCode, kANSIEscapeSGREnd];
+
+        aCleanStringIndex = formattingRunStartLocation;
+    }
+
+    if (aCleanStringIndex < aCleanStringLength)
+        [retStr appendString:[aCleanString substringFromIndex:aCleanStringIndex]];
+
+    [retStr appendFormat:@"%@%d%@", kANSIEscapeCSI, AMR_SGRCodeAllReset, kANSIEscapeSGREnd];
+
+    return retStr;
+}
+
+
+
+
+
+- (NSArray*) attributesForString:(NSString*)aString cleanString:(NSString**)aCleanString
+{
+    if (aString == nil)
+        return nil;
+    if (aString.length <= kANSIEscapeCSI.length)
+    {
+        if (aCleanString)
+            *aCleanString = aString.copy;
+        return @[];
+    }
+
+    NSMutableArray *attrsAndRanges = [NSMutableArray array];
+
+    NSString *cleanString;
+    NSArray *formatCodes = [self escapeCodesForString:aString cleanString:&cleanString];
+
+    // go through all the found escape sequence codes and for each one, create
+    // the string formatting attribute name and value, find the next escape
+    // sequence that specifies the end of the formatting run started by
+    // the currently handled code, and generate a range from the difference
+    // in those codes' locations within the clean aString.
+    for (NSUInteger iCode = 0; iCode < formatCodes.count; iCode++)
+    {
+        NSDictionary *thisCodeDict = formatCodes[iCode];
+        AMR_SGRCode thisCode = [thisCodeDict[kAMRCodeDictKey_code] unsignedIntValue];
+        NSUInteger formattingRunStartLocation = [thisCodeDict[kAMRCodeDictKey_location] unsignedIntegerValue];
+
+        // the attributed string attribute name for the formatting run introduced
+        // by this code
+        NSString *thisAttributeName = nil;
+
+        // the attributed string attribute value for this formatting run introduced
+        // by this code
+        NSObject *thisAttributeValue = nil;
+
+        // set attribute name
+        switch(thisCode)
+        {
+            case AMR_SGRCodeFgBlack:
+            case AMR_SGRCodeFgRed:
+            case AMR_SGRCodeFgGreen:
+            case AMR_SGRCodeFgYellow:
+            case AMR_SGRCodeFgBlue:
+            case AMR_SGRCodeFgMagenta:
+            case AMR_SGRCodeFgCyan:
+            case AMR_SGRCodeFgWhite:
+            case AMR_SGRCodeFgBrightBlack:
+            case AMR_SGRCodeFgBrightRed:
+            case AMR_SGRCodeFgBrightGreen:
+            case AMR_SGRCodeFgBrightYellow:
+            case AMR_SGRCodeFgBrightBlue:
+            case AMR_SGRCodeFgBrightMagenta:
+            case AMR_SGRCodeFgBrightCyan:
+            case AMR_SGRCodeFgBrightWhite:
+                thisAttributeName = NSForegroundColorAttributeName;
+                break;
+            case AMR_SGRCodeBgBlack:
+            case AMR_SGRCodeBgRed:
+            case AMR_SGRCodeBgGreen:
+            case AMR_SGRCodeBgYellow:
+            case AMR_SGRCodeBgBlue:
+            case AMR_SGRCodeBgMagenta:
+            case AMR_SGRCodeBgCyan:
+            case AMR_SGRCodeBgWhite:
+            case AMR_SGRCodeBgBrightBlack:
+            case AMR_SGRCodeBgBrightRed:
+            case AMR_SGRCodeBgBrightGreen:
+            case AMR_SGRCodeBgBrightYellow:
+            case AMR_SGRCodeBgBrightBlue:
+            case AMR_SGRCodeBgBrightMagenta:
+            case AMR_SGRCodeBgBrightCyan:
+            case AMR_SGRCodeBgBrightWhite:
+                thisAttributeName = NSBackgroundColorAttributeName;
+                break;
+            case AMR_SGRCodeIntensityBold:
+            case AMR_SGRCodeIntensityNormal:
+            case AMR_SGRCodeIntensityFaint:
+                thisAttributeName = NSFontAttributeName;
+                break;
+            case AMR_SGRCodeUnderlineSingle:
+            case AMR_SGRCodeUnderlineDouble:
+            case AMR_SGRCodeUnderlineNone:
+                thisAttributeName = NSUnderlineStyleAttributeName;
+                break;
+            case AMR_SGRCodeAllReset:
+            case AMR_SGRCodeFgReset:
+            case AMR_SGRCodeBgReset:
+            case AMR_SGRCodeNoneOrInvalid:
+            case AMR_SGRCodeItalicOn:
+                continue;
+        }
+
+        // set attribute value
+        switch(thisCode)
+        {
+            case AMR_SGRCodeBgBlack:
+            case AMR_SGRCodeFgBlack:
+            case AMR_SGRCodeBgRed:
+            case AMR_SGRCodeFgRed:
+            case AMR_SGRCodeBgGreen:
+            case AMR_SGRCodeFgGreen:
+            case AMR_SGRCodeBgYellow:
+            case AMR_SGRCodeFgYellow:
+            case AMR_SGRCodeBgBlue:
+            case AMR_SGRCodeFgBlue:
+            case AMR_SGRCodeBgMagenta:
+            case AMR_SGRCodeFgMagenta:
+            case AMR_SGRCodeBgCyan:
+            case AMR_SGRCodeFgCyan:
+            case AMR_SGRCodeBgWhite:
+            case AMR_SGRCodeFgWhite:
+            case AMR_SGRCodeBgBrightBlack:
+            case AMR_SGRCodeFgBrightBlack:
+            case AMR_SGRCodeBgBrightRed:
+            case AMR_SGRCodeFgBrightRed:
+            case AMR_SGRCodeBgBrightGreen:
+            case AMR_SGRCodeFgBrightGreen:
+            case AMR_SGRCodeBgBrightYellow:
+            case AMR_SGRCodeFgBrightYellow:
+            case AMR_SGRCodeBgBrightBlue:
+            case AMR_SGRCodeFgBrightBlue:
+            case AMR_SGRCodeBgBrightMagenta:
+            case AMR_SGRCodeFgBrightMagenta:
+            case AMR_SGRCodeBgBrightCyan:
+            case AMR_SGRCodeFgBrightCyan:
+            case AMR_SGRCodeBgBrightWhite:
+            case AMR_SGRCodeFgBrightWhite:
+                thisAttributeValue = [self colorForSGRCode:thisCode];
+                break;
+            case AMR_SGRCodeIntensityBold:
+                {
+                NSFont *boldFont = [NSFontManager.sharedFontManager convertFont:self.font toHaveTrait:NSBoldFontMask];
+                thisAttributeValue = boldFont;
+                }
+                break;
+            case AMR_SGRCodeIntensityNormal:
+            case AMR_SGRCodeIntensityFaint:
+                {
+                NSFont *unboldFont = [NSFontManager.sharedFontManager convertFont:self.font toHaveTrait:NSUnboldFontMask];
+                thisAttributeValue = unboldFont;
+                }
+                break;
+            case AMR_SGRCodeUnderlineSingle:
+                thisAttributeValue = @(NSUnderlineStyleSingle);
+                break;
+            case AMR_SGRCodeUnderlineDouble:
+                thisAttributeValue = @(NSUnderlineStyleDouble);
+                break;
+            case AMR_SGRCodeUnderlineNone:
+                thisAttributeValue = @(NSUnderlineStyleNone);
+                break;
+            case AMR_SGRCodeAllReset:
+            case AMR_SGRCodeFgReset:
+            case AMR_SGRCodeBgReset:
+            case AMR_SGRCodeNoneOrInvalid:
+            case AMR_SGRCodeItalicOn:
+                break;
+        }
+
+
+        // find the next sequence that specifies the end of this formatting run
+        NSInteger formattingRunEndLocation = -1;
+        if (iCode < (formatCodes.count - 1))
+        {
+            NSDictionary *thisEndCodeCandidateDict;
+            unichar thisEndCodeCandidate;
+            for (NSUInteger iEndCode = iCode+1; iEndCode < formatCodes.count; iEndCode++)
+            {
+                thisEndCodeCandidateDict = formatCodes[iEndCode];
+                thisEndCodeCandidate = [thisEndCodeCandidateDict[kAMRCodeDictKey_code] unsignedIntValue];
+
+                if ([self AMR_SGRCode:thisEndCodeCandidate endsFormattingIntroducedByCode:thisCode])
+                {
+                    formattingRunEndLocation = [thisEndCodeCandidateDict[kAMRCodeDictKey_location] unsignedIntegerValue];
+                    break;
+                }
+            }
+        }
+        if (formattingRunEndLocation == -1)
+            formattingRunEndLocation = cleanString.length;
+        
+        if (thisAttributeName && thisAttributeValue)
+        {
+            [attrsAndRanges addObject:@{
+                kAMRAttrDictKey_range: [NSValue valueWithRange:NSMakeRange(formattingRunStartLocation, (formattingRunEndLocation-formattingRunStartLocation))],
+             kAMRAttrDictKey_attrName: thisAttributeName,
+            kAMRAttrDictKey_attrValue: thisAttributeValue,
+             }];
+        }
+    }
+
+    if (aCleanString)
+        *aCleanString = cleanString;
+    return attrsAndRanges;
+}
+
+
+
+
+
+- (BOOL) AMR_SGRCode:(AMR_SGRCode)endCode endsFormattingIntroducedByCode:(AMR_SGRCode)startCode
+{
+    switch(startCode)
+    {
+        case AMR_SGRCodeFgBlack:
+        case AMR_SGRCodeFgRed:
+        case AMR_SGRCodeFgGreen:
+        case AMR_SGRCodeFgYellow:
+        case AMR_SGRCodeFgBlue:
+        case AMR_SGRCodeFgMagenta:
+        case AMR_SGRCodeFgCyan:
+        case AMR_SGRCodeFgWhite:
+        case AMR_SGRCodeFgBrightBlack:
+        case AMR_SGRCodeFgBrightRed:
+        case AMR_SGRCodeFgBrightGreen:
+        case AMR_SGRCodeFgBrightYellow:
+        case AMR_SGRCodeFgBrightBlue:
+        case AMR_SGRCodeFgBrightMagenta:
+        case AMR_SGRCodeFgBrightCyan:
+        case AMR_SGRCodeFgBrightWhite:
+            return (endCode == AMR_SGRCodeAllReset || endCode == AMR_SGRCodeFgReset ||
+                    endCode == AMR_SGRCodeFgBlack || endCode == AMR_SGRCodeFgRed ||
+                    endCode == AMR_SGRCodeFgGreen || endCode == AMR_SGRCodeFgYellow ||
+                    endCode == AMR_SGRCodeFgBlue || endCode == AMR_SGRCodeFgMagenta ||
+                    endCode == AMR_SGRCodeFgCyan || endCode == AMR_SGRCodeFgWhite ||
+                    endCode == AMR_SGRCodeFgBrightBlack || endCode == AMR_SGRCodeFgBrightRed ||
+                    endCode == AMR_SGRCodeFgBrightGreen || endCode == AMR_SGRCodeFgBrightYellow ||
+                    endCode == AMR_SGRCodeFgBrightBlue || endCode == AMR_SGRCodeFgBrightMagenta ||
+                    endCode == AMR_SGRCodeFgBrightCyan || endCode == AMR_SGRCodeFgBrightWhite);
+        case AMR_SGRCodeBgBlack:
+        case AMR_SGRCodeBgRed:
+        case AMR_SGRCodeBgGreen:
+        case AMR_SGRCodeBgYellow:
+        case AMR_SGRCodeBgBlue:
+        case AMR_SGRCodeBgMagenta:
+        case AMR_SGRCodeBgCyan:
+        case AMR_SGRCodeBgWhite:
+        case AMR_SGRCodeBgBrightBlack:
+        case AMR_SGRCodeBgBrightRed:
+        case AMR_SGRCodeBgBrightGreen:
+        case AMR_SGRCodeBgBrightYellow:
+        case AMR_SGRCodeBgBrightBlue:
+        case AMR_SGRCodeBgBrightMagenta:
+        case AMR_SGRCodeBgBrightCyan:
+        case AMR_SGRCodeBgBrightWhite:
+            return (endCode == AMR_SGRCodeAllReset || endCode == AMR_SGRCodeBgReset ||
+                    endCode == AMR_SGRCodeBgBlack || endCode == AMR_SGRCodeBgRed ||
+                    endCode == AMR_SGRCodeBgGreen || endCode == AMR_SGRCodeBgYellow ||
+                    endCode == AMR_SGRCodeBgBlue || endCode == AMR_SGRCodeBgMagenta ||
+                    endCode == AMR_SGRCodeBgCyan || endCode == AMR_SGRCodeBgWhite ||
+                    endCode == AMR_SGRCodeBgBrightBlack || endCode == AMR_SGRCodeBgBrightRed ||
+                    endCode == AMR_SGRCodeBgBrightGreen || endCode == AMR_SGRCodeBgBrightYellow ||
+                    endCode == AMR_SGRCodeBgBrightBlue || endCode == AMR_SGRCodeBgBrightMagenta ||
+                    endCode == AMR_SGRCodeBgBrightCyan || endCode == AMR_SGRCodeBgBrightWhite);
+        case AMR_SGRCodeIntensityBold:
+        case AMR_SGRCodeIntensityNormal:
+            return (endCode == AMR_SGRCodeAllReset || endCode == AMR_SGRCodeIntensityNormal ||
+                    endCode == AMR_SGRCodeIntensityBold || endCode == AMR_SGRCodeIntensityFaint);
+        case AMR_SGRCodeUnderlineSingle:
+        case AMR_SGRCodeUnderlineDouble:
+            return (endCode == AMR_SGRCodeAllReset || endCode == AMR_SGRCodeUnderlineNone ||
+                    endCode == AMR_SGRCodeUnderlineSingle || endCode == AMR_SGRCodeUnderlineDouble);
+        case AMR_SGRCodeNoneOrInvalid:
+        case AMR_SGRCodeItalicOn:
+        case AMR_SGRCodeUnderlineNone:
+        case AMR_SGRCodeIntensityFaint:
+        case AMR_SGRCodeAllReset:
+        case AMR_SGRCodeBgReset:
+        case AMR_SGRCodeFgReset:
+            return NO;
+    }
+
+    return NO;
+}
+
+
+
+
+- (NSColor*) colorForSGRCode:(AMR_SGRCode)code
+{
+    if (self.ansiColors)
+    {
+        NSColor *preferredColor = self.ansiColors[@(code)];
+        if (preferredColor)
+            return preferredColor;
+    }
+
+    switch(code)
+    {
+        case AMR_SGRCodeFgBlack:
+            return kDefaultANSIColorFgBlack;
+        case AMR_SGRCodeFgRed:
+            return kDefaultANSIColorFgRed;
+        case AMR_SGRCodeFgGreen:
+            return kDefaultANSIColorFgGreen;
+        case AMR_SGRCodeFgYellow:
+            return kDefaultANSIColorFgYellow;
+        case AMR_SGRCodeFgBlue:
+            return kDefaultANSIColorFgBlue;
+        case AMR_SGRCodeFgMagenta:
+            return kDefaultANSIColorFgMagenta;
+        case AMR_SGRCodeFgCyan:
+            return kDefaultANSIColorFgCyan;
+        case AMR_SGRCodeFgWhite:
+            return kDefaultANSIColorFgWhite;
+        case AMR_SGRCodeFgBrightBlack:
+            return kDefaultANSIColorFgBrightBlack;
+        case AMR_SGRCodeFgBrightRed:
+            return kDefaultANSIColorFgBrightRed;
+        case AMR_SGRCodeFgBrightGreen:
+            return kDefaultANSIColorFgBrightGreen;
+        case AMR_SGRCodeFgBrightYellow:
+            return kDefaultANSIColorFgBrightYellow;
+        case AMR_SGRCodeFgBrightBlue:
+            return kDefaultANSIColorFgBrightBlue;
+        case AMR_SGRCodeFgBrightMagenta:
+            return kDefaultANSIColorFgBrightMagenta;
+        case AMR_SGRCodeFgBrightCyan:
+            return kDefaultANSIColorFgBrightCyan;
+        case AMR_SGRCodeFgBrightWhite:
+            return kDefaultANSIColorFgBrightWhite;
+        case AMR_SGRCodeBgBlack:
+            return kDefaultANSIColorBgBlack;
+        case AMR_SGRCodeBgRed:
+            return kDefaultANSIColorBgRed;
+        case AMR_SGRCodeBgGreen:
+            return kDefaultANSIColorBgGreen;
+        case AMR_SGRCodeBgYellow:
+            return kDefaultANSIColorBgYellow;
+        case AMR_SGRCodeBgBlue:
+            return kDefaultANSIColorBgBlue;
+        case AMR_SGRCodeBgMagenta:
+            return kDefaultANSIColorBgMagenta;
+        case AMR_SGRCodeBgCyan:
+            return kDefaultANSIColorBgCyan;
+        case AMR_SGRCodeBgWhite:
+            return kDefaultANSIColorBgWhite;
+        case AMR_SGRCodeBgBrightBlack:
+            return kDefaultANSIColorBgBrightBlack;
+        case AMR_SGRCodeBgBrightRed:
+            return kDefaultANSIColorBgBrightRed;
+        case AMR_SGRCodeBgBrightGreen:
+            return kDefaultANSIColorBgBrightGreen;
+        case AMR_SGRCodeBgBrightYellow:
+            return kDefaultANSIColorBgBrightYellow;
+        case AMR_SGRCodeBgBrightBlue:
+            return kDefaultANSIColorBgBrightBlue;
+        case AMR_SGRCodeBgBrightMagenta:
+            return kDefaultANSIColorBgBrightMagenta;
+        case AMR_SGRCodeBgBrightCyan:
+            return kDefaultANSIColorBgBrightCyan;
+        case AMR_SGRCodeBgBrightWhite:
+            return kDefaultANSIColorBgBrightWhite;
+        case AMR_SGRCodeNoneOrInvalid:
+        case AMR_SGRCodeItalicOn:
+        case AMR_SGRCodeUnderlineNone:
+        case AMR_SGRCodeIntensityFaint:
+        case AMR_SGRCodeAllReset:
+        case AMR_SGRCodeBgReset:
+        case AMR_SGRCodeFgReset:
+        case AMR_SGRCodeIntensityBold:
+        case AMR_SGRCodeIntensityNormal:
+        case AMR_SGRCodeUnderlineSingle:
+        case AMR_SGRCodeUnderlineDouble:
+            break;
+    }
+
+    return kDefaultANSIColorFgBlack;
+}
+
+
+- (AMR_SGRCode) AMR_SGRCodeForColor:(NSColor*)aColor isForegroundColor:(BOOL)aForeground
+{
+    if (self.ansiColors)
+    {
+        NSArray *codesForGivenColor = [self.ansiColors allKeysForObject:aColor];
+
+        if (codesForGivenColor != nil && 0 < codesForGivenColor.count)
+        {
+            for (NSNumber *thisCode in codesForGivenColor)
+            {
+                BOOL thisIsForegroundColor = (thisCode.intValue < 40);
+                if (aForeground == thisIsForegroundColor)
+                    return thisCode.intValue;
+            }
+        }
+    }
+
+    if (aForeground)
+    {
+        if ([aColor isEqual:kDefaultANSIColorFgBlack])
+            return AMR_SGRCodeFgBlack;
+        else if ([aColor isEqual:kDefaultANSIColorFgRed])
+            return AMR_SGRCodeFgRed;
+        else if ([aColor isEqual:kDefaultANSIColorFgGreen])
+            return AMR_SGRCodeFgGreen;
+        else if ([aColor isEqual:kDefaultANSIColorFgYellow])
+            return AMR_SGRCodeFgYellow;
+        else if ([aColor isEqual:kDefaultANSIColorFgBlue])
+            return AMR_SGRCodeFgBlue;
+        else if ([aColor isEqual:kDefaultANSIColorFgMagenta])
+            return AMR_SGRCodeFgMagenta;
+        else if ([aColor isEqual:kDefaultANSIColorFgCyan])
+            return AMR_SGRCodeFgCyan;
+        else if ([aColor isEqual:kDefaultANSIColorFgWhite])
+            return AMR_SGRCodeFgWhite;
+        else if ([aColor isEqual:kDefaultANSIColorFgBrightBlack])
+            return AMR_SGRCodeFgBrightBlack;
+        else if ([aColor isEqual:kDefaultANSIColorFgBrightRed])
+            return AMR_SGRCodeFgBrightRed;
+        else if ([aColor isEqual:kDefaultANSIColorFgBrightGreen])
+            return AMR_SGRCodeFgBrightGreen;
+        else if ([aColor isEqual:kDefaultANSIColorFgBrightYellow])
+            return AMR_SGRCodeFgBrightYellow;
+        else if ([aColor isEqual:kDefaultANSIColorFgBrightBlue])
+            return AMR_SGRCodeFgBrightBlue;
+        else if ([aColor isEqual:kDefaultANSIColorFgBrightMagenta])
+            return AMR_SGRCodeFgBrightMagenta;
+        else if ([aColor isEqual:kDefaultANSIColorFgBrightCyan])
+            return AMR_SGRCodeFgBrightCyan;
+        else if ([aColor isEqual:kDefaultANSIColorFgBrightWhite])
+            return AMR_SGRCodeFgBrightWhite;
+    }
+    else
+    {
+        if ([aColor isEqual:kDefaultANSIColorBgBlack])
+            return AMR_SGRCodeBgBlack;
+        else if ([aColor isEqual:kDefaultANSIColorBgRed])
+            return AMR_SGRCodeBgRed;
+        else if ([aColor isEqual:kDefaultANSIColorBgGreen])
+            return AMR_SGRCodeBgGreen;
+        else if ([aColor isEqual:kDefaultANSIColorBgYellow])
+            return AMR_SGRCodeBgYellow;
+        else if ([aColor isEqual:kDefaultANSIColorBgBlue])
+            return AMR_SGRCodeBgBlue;
+        else if ([aColor isEqual:kDefaultANSIColorBgMagenta])
+            return AMR_SGRCodeBgMagenta;
+        else if ([aColor isEqual:kDefaultANSIColorBgCyan])
+            return AMR_SGRCodeBgCyan;
+        else if ([aColor isEqual:kDefaultANSIColorBgWhite])
+            return AMR_SGRCodeBgWhite;
+        else if ([aColor isEqual:kDefaultANSIColorBgBrightBlack])
+            return AMR_SGRCodeBgBrightBlack;
+        else if ([aColor isEqual:kDefaultANSIColorBgBrightRed])
+            return AMR_SGRCodeBgBrightRed;
+        else if ([aColor isEqual:kDefaultANSIColorBgBrightGreen])
+            return AMR_SGRCodeBgBrightGreen;
+        else if ([aColor isEqual:kDefaultANSIColorBgBrightYellow])
+            return AMR_SGRCodeBgBrightYellow;
+        else if ([aColor isEqual:kDefaultANSIColorBgBrightBlue])
+            return AMR_SGRCodeBgBrightBlue;
+        else if ([aColor isEqual:kDefaultANSIColorBgBrightMagenta])
+            return AMR_SGRCodeBgBrightMagenta;
+        else if ([aColor isEqual:kDefaultANSIColorBgBrightCyan])
+            return AMR_SGRCodeBgBrightCyan;
+        else if ([aColor isEqual:kDefaultANSIColorBgBrightWhite])
+            return AMR_SGRCodeBgBrightWhite;
+    }
+
+    return AMR_SGRCodeNoneOrInvalid;
+}
+
+
+
+// helper struct typedef and a few functions for
+// -closestSGRCodeForColor:isForegroundColor:
+
+typedef struct {
+    CGFloat hue;
+    CGFloat saturation;
+    CGFloat brightness;
+} AMR_HSB;
+
+AMR_HSB makeHSB(CGFloat hue, CGFloat saturation, CGFloat brightness)
+{
+    AMR_HSB outHSB;
+    outHSB.hue = hue;
+    outHSB.saturation = saturation;
+    outHSB.brightness = brightness;
+    return outHSB;
+}
+
+AMR_HSB getHSBFromColor(NSColor *color)
+{
+    CGFloat hue = 0.0;
+    CGFloat saturation = 0.0;
+    CGFloat brightness = 0.0;
+    [[color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]
+        getHue:&hue
+        saturation:&saturation
+        brightness:&brightness
+        alpha:NULL
+        ];
+    return makeHSB(hue, saturation, brightness);
+}
+
+BOOL floatsEqual(CGFloat first, CGFloat second, CGFloat maxAbsError)
+{
+    return (fabs(first-second)) < maxAbsError;
+}
+
+#define MAX_HUE_FLOAT_EQUALITY_ABS_ERROR 0.000001
+
+- (AMR_SGRCode) closestSGRCodeForColor:(NSColor *)color isForegroundColor:(BOOL)foreground
+{
+    if (color == nil)
+        return AMR_SGRCodeNoneOrInvalid;
+
+    AMR_SGRCode closestColorSGRCode = [self AMR_SGRCodeForColor:color isForegroundColor:foreground];
+    if (closestColorSGRCode != AMR_SGRCodeNoneOrInvalid)
+        return closestColorSGRCode;
+
+    AMR_HSB givenColorHSB = getHSBFromColor(color);
+
+    CGFloat closestColorHueDiff = FLT_MAX;
+    CGFloat closestColorSaturationDiff = FLT_MAX;
+    CGFloat closestColorBrightnessDiff = FLT_MAX;
+
+    // (background SGR codes are +10 from foreground ones:)
+    NSUInteger AMR_SGRCodeShift = (foreground)?0:10;
+    NSArray *ansiFgColorCodes = @[
+    @(AMR_SGRCodeFgBlack+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgRed+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgGreen+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgYellow+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgBlue+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgMagenta+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgCyan+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgWhite+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgBrightBlack+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgBrightRed+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgBrightGreen+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgBrightYellow+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgBrightBlue+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgBrightMagenta+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgBrightCyan+AMR_SGRCodeShift),
+    @(AMR_SGRCodeFgBrightWhite+AMR_SGRCodeShift),
+    ];
+    for (NSNumber *thisSGRCodeNumber in ansiFgColorCodes)
+    {
+        AMR_SGRCode thisSGRCode = thisSGRCodeNumber.intValue;
+        NSColor *thisColor = [self colorForSGRCode:thisSGRCode];
+
+        AMR_HSB thisColorHSB = getHSBFromColor(thisColor);
+
+        CGFloat hueDiff = fabs(givenColorHSB.hue - thisColorHSB.hue);
+        CGFloat saturationDiff = fabs(givenColorHSB.saturation - thisColorHSB.saturation);
+        CGFloat brightnessDiff = fabs(givenColorHSB.brightness - thisColorHSB.brightness);
+
+        // comparison depends on hue, saturation and brightness
+        // (strictly in that order):
+
+        if (!floatsEqual(hueDiff, closestColorHueDiff, MAX_HUE_FLOAT_EQUALITY_ABS_ERROR))
+        {
+            if (hueDiff > closestColorHueDiff)
+                continue;
+            closestColorSGRCode = thisSGRCode;
+            closestColorHueDiff = hueDiff;
+            closestColorSaturationDiff = saturationDiff;
+            closestColorBrightnessDiff = brightnessDiff;
+            continue;
+        }
+
+        if (!floatsEqual(saturationDiff, closestColorSaturationDiff, MAX_HUE_FLOAT_EQUALITY_ABS_ERROR))
+        {
+            if (saturationDiff > closestColorSaturationDiff)
+                continue;
+            closestColorSGRCode = thisSGRCode;
+            closestColorHueDiff = hueDiff;
+            closestColorSaturationDiff = saturationDiff;
+            closestColorBrightnessDiff = brightnessDiff;
+            continue;
+        }
+
+        if (!floatsEqual(brightnessDiff, closestColorBrightnessDiff, MAX_HUE_FLOAT_EQUALITY_ABS_ERROR))
+        {
+            if (brightnessDiff > closestColorBrightnessDiff)
+                continue;
+            closestColorSGRCode = thisSGRCode;
+            closestColorHueDiff = hueDiff;
+            closestColorSaturationDiff = saturationDiff;
+            closestColorBrightnessDiff = brightnessDiff;
+            continue;
+        }
+
+        // If hue (especially hue!), saturation and brightness diffs all
+        // are equal to some other color, we need to prefer one or the
+        // other so we'll select the more 'distinctive' color of the
+        // two (this is *very* subjective, obviously). I basically just
+        // looked at the hue chart, went through all the points between
+        // our main ANSI colors and decided which side the middle point
+        // would lean on. (e.g. the purple color that is exactly between
+        // the blue and magenta ANSI colors looks more magenta than
+        // blue to me so I put magenta higher than blue in the list
+        // below.)
+        //
+        // subjective ordering of colors from most to least 'distinctive':
+        long colorDistinctivenessOrder[6] = {
+            AMR_SGRCodeFgRed+AMR_SGRCodeShift,
+            AMR_SGRCodeFgMagenta+AMR_SGRCodeShift,
+            AMR_SGRCodeFgBlue+AMR_SGRCodeShift,
+            AMR_SGRCodeFgGreen+AMR_SGRCodeShift,
+            AMR_SGRCodeFgCyan+AMR_SGRCodeShift,
+            AMR_SGRCodeFgYellow+AMR_SGRCodeShift
+            };
+        for (int i = 0; i < 6; i++)
+        {
+            if (colorDistinctivenessOrder[i] == closestColorSGRCode)
+                break;
+            else if (colorDistinctivenessOrder[i] == thisSGRCode)
+            {
+                closestColorSGRCode = thisSGRCode;
+                closestColorHueDiff = hueDiff;
+                closestColorSaturationDiff = saturationDiff;
+                closestColorBrightnessDiff = brightnessDiff;
+            }
+        }
+    }
+
+    return closestColorSGRCode;
+}
+
+
+
+@end
@@ -6,6 +6,7 @@
 //  Copyright © 2018 Anton Palgunov. All rights reserved.
 //

+#import "AMR_ANSIEscapeHelper.h"
 #import "TouchBarPrivateApi.h"
 #import "TouchBarSupport.h"
 #import "DeprecatedCarbonAPI.h"
@@ -10,11 +10,15 @@ import Cocoa

 class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
    var tapClosure: (() -> Void)?
-    var longTapClosure: (() -> Void)?
+    var longTapClosure: (() -> Void)? {
+        didSet {
+            longClick.isEnabled = longTapClosure != nil
+        }
+    }
+    
    private var button: NSButton!
-
-    private var singleClick: NSClickGestureRecognizer!
-    private var longClick: NSPressGestureRecognizer!
+    private var singleClick: HapticClickGestureRecognizer!
+    private var longClick: LongPressGestureRecognizer!

    init(identifier: NSTouchBarItem.Identifier, title: String) {
        attributedTitle = title.defaultTouchbarAttributedString
@@ -22,11 +26,12 @@ class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegat
        super.init(identifier: identifier)
        button = CustomHeightButton(title: title, target: nil, action: nil)

-        longClick = NSPressGestureRecognizer(target: self, action: #selector(handleGestureLong))
+        longClick = LongPressGestureRecognizer(target: self, action: #selector(handleGestureLong))
+        longClick.isEnabled = false
        longClick.allowedTouchTypes = .direct
        longClick.delegate = self

-        singleClick = NSClickGestureRecognizer(target: self, action: #selector(handleGestureSingle))
+        singleClick = HapticClickGestureRecognizer(target: self, action: #selector(handleGestureSingle))
        singleClick.allowedTouchTypes = .direct
        singleClick.delegate = self

@@ -80,6 +85,7 @@ class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegat
        if let color = backgroundColor {
            cell.isBordered = true
            button.bezelColor = color
+            button.bezelStyle = .rounded
            cell.backgroundColor = color
        } else {
            button.isBordered = isBordered
@@ -97,17 +103,17 @@ class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegat
    }

    func gestureRecognizer(_ gestureRecognizer: NSGestureRecognizer, shouldRequireFailureOf otherGestureRecognizer: NSGestureRecognizer) -> Bool {
-        if gestureRecognizer == singleClick && otherGestureRecognizer == longClick {
+        if gestureRecognizer == singleClick && otherGestureRecognizer == longClick
+            || gestureRecognizer == longClick && otherGestureRecognizer == singleClick // need it
+        {
            return false
        }
        return true
    }

    @objc func handleGestureSingle(gr: NSClickGestureRecognizer) {
-        let hf: HapticFeedback = HapticFeedback()
        switch gr.state {
        case .ended:
-            hf.tap(strong: 2)
            tapClosure?()
            break
        default:
@@ -116,17 +122,9 @@ class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegat
    }

    @objc func handleGestureLong(gr: NSPressGestureRecognizer) {
-        let hf: HapticFeedback = HapticFeedback()
        switch gr.state {
-        case .began:
-            if let closure = self.longTapClosure {
-                hf.tap(strong: 2)
-                closure()
-            } else if let closure = self.tapClosure {
-                hf.tap(strong: 6)
-                closure()
-                print("long click")
-            }
+        case .possible: // tiny hack because we're calling action manually
+            (self.longTapClosure ?? self.tapClosure)?()
            break
        default:
            break
@@ -160,6 +158,10 @@ class CustomButtonCell: NSButtonCell {
            }
        }
    }
+    
+    override func drawingRect(forBounds rect: NSRect) -> NSRect {
+        return rect // need that so content may better fit in button with very limited width
+    }

    required init(coder _: NSCoder) {
        fatalError("init(coder:) has not been implemented")
@@ -172,6 +174,67 @@ class CustomButtonCell: NSButtonCell {
    }
 }

+class HapticClickGestureRecognizer: NSClickGestureRecognizer {
+    override func touchesBegan(with event: NSEvent) {
+        HapticFeedback.shared.tap(strong: 2)
+        super.touchesBegan(with: event)
+    }
+    
+    override func touchesEnded(with event: NSEvent) {
+        HapticFeedback.shared.tap(strong: 1)
+        super.touchesEnded(with: event)
+    }
+}
+
+class LongPressGestureRecognizer: NSPressGestureRecognizer {
+    private let recognizeTimeout = 0.4
+    private var timer: Timer?
+    
+    override func touchesBegan(with event: NSEvent) {
+        timerInvalidate()
+        
+        let touches = event.touches(for: self.view!)
+        if touches.count == 1 { // to prevent it for built-in two/three-finger gestures
+            timer = Timer.scheduledTimer(timeInterval: recognizeTimeout, target: self, selector: #selector(self.onTimer), userInfo: nil, repeats: false)
+        }
+        
+        super.touchesBegan(with: event)
+    }
+    
+    override func touchesMoved(with event: NSEvent) {
+        timerInvalidate() // to prevent it for built-in two/three-finger gestures
+        super.touchesMoved(with: event)
+    }
+    
+    override func touchesCancelled(with event: NSEvent) {
+        timerInvalidate()
+        super.touchesCancelled(with: event)
+    }
+    
+    override func touchesEnded(with event: NSEvent) {
+        timerInvalidate()
+        super.touchesEnded(with: event)
+    }
+    
+    private func timerInvalidate() {
+        if let timer = timer {
+            timer.invalidate()
+            self.timer = nil
+        }
+    }
+    
+    @objc private func onTimer() {
+        if let target = self.target, let action = self.action {
+            target.performSelector(onMainThread: action, with: self, waitUntilDone: false)
+            HapticFeedback.shared.tap(strong: 6)
+        }
+    }
+    
+    deinit {
+        timerInvalidate()
+    }
+}
+
 extension String {
    var defaultTouchbarAttributedString: NSAttributedString {
        let attrTitle = NSMutableAttributedString(string: self, attributes: [.foregroundColor: NSColor.white, .font: NSFont.systemFont(ofSize: 15, weight: .regular), .baselineOffset: 1])
@@ -9,9 +9,23 @@
 import IOKit

 class HapticFeedback {
+    static let shared = HapticFeedback()
+    
+    // Here we have list of possible IDs for Haptic Generator Device. They are not constant
+    // To find deviceID, you will need IORegistryExplorer app from Additional Tools for Xcode dmg
+    // which you can download from https://developer.apple.com/download/more/?=Additional%20Tools
+    // Open IORegistryExplorer app, search for AppleMultitouchDevice and get "Multitouch ID"
+    // There should be programmatic way to get it but I can't find, no docs for macOS :(
+    private let possibleDeviceIDs: [UInt64] = [
+        0x200_0000_0100_0000, // MacBook Pro 2016/2017
+        0x300000080500000 // MacBook Pro 2019 (possibly 2018 as well)
+    ]
+    private var correctDeviceID: UInt64?
    private var actuatorRef: CFTypeRef?
-    private var deviceID: UInt64 = 0x200_0000_0100_0000
-    private var error: IOReturn = 0
+    
+    init() {
+        recreateDevice()
+    }

    // Don't know how to do strong is enum one of
    // 1 like back Click
@@ -25,31 +39,51 @@ class HapticFeedback {
    // you can get a plist `otool -s __TEXT __tpad_act_plist /System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/Current/MultitouchSupport|tail -n +3|awk -F'\t' '{print $2}'|xxd -r -p`

    func tap(strong: Int32) {
-        actuatorRef = MTActuatorCreateFromDeviceID(deviceID).takeRetainedValue()
-
-        guard actuatorRef != nil else {
-            print("guard actuatorRef == nil")
+        guard correctDeviceID != nil, actuatorRef != nil else {
+            print("guard actuatorRef == nil (no haptic device found?)")
            return
        }

-        error = MTActuatorOpen(actuatorRef!)
-        guard error == kIOReturnSuccess else {
+        var result: IOReturn
+        
+        result = MTActuatorOpen(actuatorRef!)
+        guard result == kIOReturnSuccess else {
            print("guard MTActuatorOpen")
+            recreateDevice()
            return
        }

-        error = MTActuatorActuate(actuatorRef!, strong, 0, 0.0, 0.0)
-        guard error == kIOReturnSuccess else {
+        result = MTActuatorActuate(actuatorRef!, strong, 0, 0, 0)
+        guard result == kIOReturnSuccess else {
            print("guard MTActuatorActuate")
            return
        }

-        error = MTActuatorClose(actuatorRef!)
-        guard error == kIOReturnSuccess else {
+        result = MTActuatorClose(actuatorRef!)
+        guard result == kIOReturnSuccess else {
            print("guard MTActuatorClose")
            return
        }
-
-        return
+    }
+    
+    private func recreateDevice() {
+        if let actuatorRef = actuatorRef {
+            MTActuatorClose(actuatorRef)
+            self.actuatorRef = nil // just in case %)
+        }
+        
+        if let correctDeviceID = correctDeviceID {
+            actuatorRef = MTActuatorCreateFromDeviceID(correctDeviceID).takeRetainedValue()
+        } else {
+            // Let's find our Haptic device
+            possibleDeviceIDs.forEach {(deviceID) in
+                guard correctDeviceID == nil else {return}
+                actuatorRef = MTActuatorCreateFromDeviceID(deviceID).takeRetainedValue()
+                
+                if actuatorRef != nil {
+                    correctDeviceID = deviceID
+                }
+            }
+        }
    }
 }
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.20</string>
+	<string>0.23</string>
 	<key>CFBundleVersion</key>
-	<string>178</string>
+	<string>275</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
@@ -179,6 +179,20 @@ class SupportedTypesHolder {
                parameters: [:]
            )
        },
+        
+        "yandexWeather": { decoder in
+            enum CodingKeys: String, CodingKey { case refreshInterval }
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval)
+            let action = try ActionType(from: decoder)
+            let longAction = try LongActionType(from: decoder)
+            return (
+                item: .yandexWeather(interval: interval ?? 1800.00),
+                action,
+                longAction,
+                parameters: [:]
+            )
+        },

        "currency": { decoder in
            enum CodingKeys: String, CodingKey { case refreshInterval; case from; case to; case full }
@@ -197,9 +211,12 @@ class SupportedTypesHolder {
            )
        },

-        "dock": { _ in
-            (
-                item: .dock(),
+        "dock": { decoder in
+            enum CodingKeys: String, CodingKey { case autoResize }
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            let autoResize = try container.decodeIfPresent(Bool.self, forKey: .autoResize) ?? false
+            return (
+                item: .dock(autoResize: autoResize),
                action: .none,
                longAction: .none,
                parameters: [:]
@@ -271,11 +288,12 @@ class SupportedTypesHolder {
        ) },

        "music": { decoder in
-            enum CodingKeys: String, CodingKey { case refreshInterval }
+            enum CodingKeys: String, CodingKey { case refreshInterval; case disableMarquee }
            let container = try decoder.container(keyedBy: CodingKeys.self)
            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval)
+            let disableMarquee = try container.decodeIfPresent(Bool.self, forKey: .disableMarquee)
            return (
-                item: .music(interval: interval ?? 1800.00),
+                item: .music(interval: interval ?? 5.0, disableMarquee: disableMarquee ?? false),
                action: .none,
                longAction: .none,
                parameters: [:]
@@ -325,20 +343,23 @@ class SupportedTypesHolder {
 enum ItemType: Decodable {
    case staticButton(title: String)
    case appleScriptTitledButton(source: SourceProtocol, refreshInterval: Double)
+    case shellScriptTitledButton(source: SourceProtocol, refreshInterval: Double)
    case timeButton(formatTemplate: String, timeZone: String?)
    case battery()
-    case dock()
+    case dock(autoResize: Bool)
    case volume()
    case brightness(refreshInterval: Double)
    case weather(interval: Double, units: String, api_key: String, icon_type: String)
+    case yandexWeather(interval: Double)
    case currency(interval: Double, from: String, to: String, full: Bool)
    case inputsource()
-    case music(interval: Double)
+    case music(interval: Double, disableMarquee: Bool)
    case groupBar(items: [BarItemDefinition])
    case nightShift()
    case dnd()
    case pomodoro(workTime: Double, restTime: Double)
-    case network()
+    case network(flip: Bool)
+    case darkMode()

    private enum CodingKeys: String, CodingKey {
        case type
@@ -359,17 +380,22 @@ enum ItemType: Decodable {
        case items
        case workTime
        case restTime
+        case flip
+        case autoResize
+        case disableMarquee
    }

    enum ItemTypeRaw: String, Decodable {
        case staticButton
        case appleScriptTitledButton
+        case shellScriptTitledButton
        case timeButton
        case battery
        case dock
        case volume
        case brightness
        case weather
+        case yandexWeather
        case currency
        case inputsource
        case music
@@ -378,6 +404,7 @@ enum ItemType: Decodable {
        case dnd
        case pomodoro
        case network
+        case darkMode
    }

    init(from decoder: Decoder) throws {
@@ -388,6 +415,11 @@ enum ItemType: Decodable {
            let source = try container.decode(Source.self, forKey: .source)
            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 1800.0
            self = .appleScriptTitledButton(source: source, refreshInterval: interval)
+            
+        case .shellScriptTitledButton:
+            let source = try container.decode(Source.self, forKey: .source)
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 1800.0
+            self = .shellScriptTitledButton(source: source, refreshInterval: interval)

        case .staticButton:
            let title = try container.decode(String.self, forKey: .title)
@@ -402,7 +434,8 @@ enum ItemType: Decodable {
            self = .battery()

        case .dock:
-            self = .dock()
+            let autoResize = try container.decodeIfPresent(Bool.self, forKey: .autoResize) ?? false
+            self = .dock(autoResize: autoResize)

        case .volume:
            self = .volume()
@@ -417,6 +450,10 @@ enum ItemType: Decodable {
            let api_key = try container.decodeIfPresent(String.self, forKey: .api_key) ?? "32c4256d09a4c52b38aecddba7a078f6"
            let icon_type = try container.decodeIfPresent(String.self, forKey: .icon_type) ?? "text"
            self = .weather(interval: interval, units: units, api_key: api_key, icon_type: icon_type)
+            
+        case .yandexWeather:
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 1800.0
+            self = .yandexWeather(interval: interval)

        case .currency:
            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 600.0
@@ -429,8 +466,9 @@ enum ItemType: Decodable {
            self = .inputsource()

        case .music:
-            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 1800.0
-            self = .music(interval: interval)
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 5.0
+            let disableMarquee = try container.decodeIfPresent(Bool.self, forKey: .disableMarquee) ?? false
+            self = .music(interval: interval, disableMarquee: disableMarquee)

        case .groupBar:
            let items = try container.decode([BarItemDefinition].self, forKey: .items)
@@ -446,9 +484,13 @@ enum ItemType: Decodable {
            let workTime = try container.decodeIfPresent(Double.self, forKey: .workTime) ?? 1500.0
            let restTime = try container.decodeIfPresent(Double.self, forKey: .restTime) ?? 600.0
            self = .pomodoro(workTime: workTime, restTime: restTime)
-            
+
        case .network:
-            self = .network()
+            let flip = try container.decodeIfPresent(Bool.self, forKey: .flip) ?? false
+            self = .network(flip: flip)
+
+        case .darkMode:
+            self = .darkMode()
        }
    }
 }
@@ -0,0 +1,76 @@
+//
+//  ShellScriptTouchBarItem.swift
+//  MTMR
+//
+//  Created by bobr on 08/08/2019.
+//  Copyright © 2019 Anton Palgunov. All rights reserved.
+//
+import Foundation
+
+class ShellScriptTouchBarItem: CustomButtonTouchBarItem {
+    private let interval: TimeInterval
+    private let source: String
+    private var forceHideConstraint: NSLayoutConstraint!
+    
+    init?(identifier: NSTouchBarItem.Identifier, source: SourceProtocol, interval: TimeInterval) {
+        self.interval = interval
+        self.source = source.string ?? "echo No \"source\""
+        super.init(identifier: identifier, title: "⏳")
+        
+        forceHideConstraint = view.widthAnchor.constraint(equalToConstant: 0)
+        
+        DispatchQueue.shellScriptQueue.async {
+            self.refreshAndSchedule()
+        }
+    }
+    
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func refreshAndSchedule() {
+        // Execute script and get result
+        let scriptResult = execute(source)
+        
+        // Apply returned text attributes (if they were returned) to our result string
+        let helper = AMR_ANSIEscapeHelper.init()
+        helper.defaultStringColor = NSColor.white
+        helper.font = "1".defaultTouchbarAttributedString.attribute(.font, at: 0, effectiveRange: nil) as? NSFont
+        let title = NSMutableAttributedString.init(attributedString: helper.attributedString(withANSIEscapedString: scriptResult) ?? NSAttributedString(string: ""))
+        title.addAttributes([.baselineOffset: 1], range: NSRange(location: 0, length: title.length))
+        let newBackgoundColor = title.attribute(.backgroundColor, at: 0, effectiveRange: nil) as? NSColor
+        
+        // Update UI
+        DispatchQueue.main.async { [weak self, newBackgoundColor] in
+            if (newBackgoundColor != self?.backgroundColor) { // performance optimization because of reinstallButton
+                self?.backgroundColor = newBackgoundColor
+            }
+            self?.attributedTitle = title
+            self?.forceHideConstraint.isActive = scriptResult == ""
+        }
+        
+        // Schedule next update
+        DispatchQueue.shellScriptQueue.asyncAfter(deadline: .now() + interval) { [weak self] in
+            self?.refreshAndSchedule()
+        }
+    }
+    
+    func execute(_ command: String) -> String {
+        let task = Process()
+        task.launchPath = "/bin/bash"
+        task.arguments = ["-c", command]
+        
+        let pipe = Pipe()
+        task.standardOutput = pipe
+        task.launch()
+        
+        let data = pipe.fileHandleForReading.readDataToEndOfFile()
+        let output: String = NSString(data: data, encoding: String.Encoding.utf8.rawValue) as String? ?? ""
+        
+        return output.replacingOccurrences(of: "\\n+$", with: "", options: .regularExpression)
+    }
+}
+
+extension DispatchQueue {
+    static let shellScriptQueue = DispatchQueue(label: "mtmr.shellscript")
+}
@@ -23,11 +23,13 @@ extension ItemType {
            return "com.toxblh.mtmr.staticButton."
        case .appleScriptTitledButton(source: _):
            return "com.toxblh.mtmr.appleScriptButton."
+        case .shellScriptTitledButton(source: _):
+            return "com.toxblh.mtmr.shellScriptButton."
        case .timeButton(formatTemplate: _, timeZone: _):
            return "com.toxblh.mtmr.timeButton."
        case .battery():
            return "com.toxblh.mtmr.battery."
-        case .dock():
+        case .dock(autoResize: _):
            return "com.toxblh.mtmr.dock"
        case .volume():
            return "com.toxblh.mtmr.volume"
@@ -35,6 +37,8 @@ extension ItemType {
            return "com.toxblh.mtmr.brightness"
        case .weather(interval: _, units: _, api_key: _, icon_type: _):
            return "com.toxblh.mtmr.weather"
+        case .yandexWeather(interval: _):
+            return "com.toxblh.mtmr.yandexWeather"
        case .currency(interval: _, from: _, to: _, full: _):
            return "com.toxblh.mtmr.currency"
        case .inputsource():
@@ -49,8 +53,10 @@ extension ItemType {
            return "com.toxblh.mtmr.dnd."
        case .pomodoro(interval: _):
            return PomodoroBarItem.identifier
-        case .network():
+        case .network(flip: _):
            return NetworkBarItem.identifier
+        case .darkMode(items: _):
+            return DarkModeBarItem.identifier
        }
    }
 }
@@ -247,12 +253,14 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
            barItem = CustomButtonTouchBarItem(identifier: identifier, title: title)
        case let .appleScriptTitledButton(source: source, refreshInterval: interval):
            barItem = AppleScriptTouchBarItem(identifier: identifier, source: source, interval: interval)
+        case let .shellScriptTitledButton(source: source, refreshInterval: interval):
+            barItem = ShellScriptTouchBarItem(identifier: identifier, source: source, interval: interval)
        case let .timeButton(formatTemplate: template, timeZone: timeZone):
            barItem = TimeTouchBarItem(identifier: identifier, formatTemplate: template, timeZone: timeZone)
        case .battery():
            barItem = BatteryBarItem(identifier: identifier)
-        case .dock:
-            barItem = AppScrubberTouchBarItem(identifier: identifier)
+        case let .dock(autoResize: autoResize):
+            barItem = AppScrubberTouchBarItem(identifier: identifier, autoResize: autoResize)
        case .volume:
            if case let .image(source)? = item.additionalParameters[.image] {
                barItem = VolumeViewController(identifier: identifier, image: source.image)
@@ -267,12 +275,14 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
            }
        case let .weather(interval: interval, units: units, api_key: api_key, icon_type: icon_type):
            barItem = WeatherBarItem(identifier: identifier, interval: interval, units: units, api_key: api_key, icon_type: icon_type)
+        case let .yandexWeather(interval: interval):
+            barItem = YandexWeatherBarItem(identifier: identifier, interval: interval)
        case let .currency(interval: interval, from: from, to: to, full: full):
            barItem = CurrencyBarItem(identifier: identifier, interval: interval, from: from, to: to, full: full)
        case .inputsource():
            barItem = InputSourceBarItem(identifier: identifier)
-        case let .music(interval: interval):
-            barItem = MusicBarItem(identifier: identifier, interval: interval)
+        case let .music(interval: interval, disableMarquee: disableMarquee):
+            barItem = MusicBarItem(identifier: identifier, interval: interval, disableMarquee: disableMarquee)
        case let .groupBar(items: items):
            barItem = GroupBarItem(identifier: identifier, items: items)
        case .nightShift():
@@ -281,8 +291,10 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
            barItem = DnDBarItem(identifier: identifier)
        case let .pomodoro(workTime: workTime, restTime: restTime):
            barItem = PomodoroBarItem(identifier: identifier, workTime: workTime, restTime: restTime)
-        case .network():
-            barItem = NetworkBarItem(identifier: identifier)
+        case let .network(flip: flip):
+            barItem = NetworkBarItem(identifier: identifier, flip: flip)
+        case .darkMode():
+            barItem = DarkModeBarItem(identifier: identifier)
        }

        if let action = self.action(forItem: item), let item = barItem as? CustomButtonTouchBarItem {
@@ -10,13 +10,13 @@ import Cocoa
 class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrubberDataSource {
    private var scrubber: NSScrubber!

-    private let hf: HapticFeedback = HapticFeedback()
-
    private var timer: Timer!
    private var ticks: Int = 0
    private let minTicks: Int = 5
    private let maxTicks: Int = 20
    private var lastSelected: Int = 0
+    private var autoResize: Bool = false
+    private var widthConstraint: NSLayoutConstraint?

    private var persistentAppIdentifiers: [String] = []
    private var runningAppsIdentifiers: [String] = []
@@ -27,17 +27,25 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub
    }

    private var applications: [DockItem] = []
+    
+    convenience override init(identifier: NSTouchBarItem.Identifier) {
+        self.init(identifier: identifier, autoResize: false)
+    }
+    
+    static var iconWidth = 36
+    static var spacingWidth = 2

-    override init(identifier: NSTouchBarItem.Identifier) {
+    init(identifier: NSTouchBarItem.Identifier, autoResize: Bool) {
        super.init(identifier: identifier)
-
+        self.autoResize = autoResize
+        
        scrubber = NSScrubber()
        scrubber.delegate = self
        scrubber.dataSource = self
        scrubber.mode = .free // .fixed
        let layout = NSScrubberFlowLayout()
-        layout.itemSize = NSSize(width: 36, height: 32)
-        layout.itemSpacing = 2
+        layout.itemSize = NSSize(width: AppScrubberTouchBarItem.iconWidth, height: 32)
+        layout.itemSpacing = CGFloat(AppScrubberTouchBarItem.spacingWidth)
        scrubber.scrubberLayout = layout
        scrubber.selectionBackgroundStyle = .roundedBackground
        scrubber.showsAdditionalContentIndicators = true
@@ -79,9 +87,22 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub
        applications = newApplications
        applications += getDockPersistentAppsList()
        scrubber.reloadData()
+        updateSize()

        scrubber.selectedIndex = index ?? 0
    }
+    
+    func updateSize() {
+        if self.autoResize {
+            if let constraint: NSLayoutConstraint = self.widthConstraint {
+                constraint.isActive = false
+                self.scrubber.removeConstraint(constraint)
+            }
+            let width = (AppScrubberTouchBarItem.iconWidth + AppScrubberTouchBarItem.spacingWidth) * self.applications.count - AppScrubberTouchBarItem.spacingWidth
+            self.widthConstraint = self.scrubber.widthAnchor.constraint(equalToConstant: CGFloat(width))
+            self.widthConstraint!.isActive = true
+        }
+    }

    public func numberOfItems(for _: NSScrubber) -> Int {
        return applications.count
@@ -125,12 +146,12 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub
        ticks += 1

        if ticks == minTicks {
-            hf.tap(strong: 2)
+            HapticFeedback.shared.tap(strong: 2)
        }

        if ticks > maxTicks {
            stopTimer()
-            hf.tap(strong: 6)
+            HapticFeedback.shared.tap(strong: 6)
        }
    }

@@ -161,7 +182,7 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub
            NSWorkspace.shared.openFile(bundleIdentifier!.replacingOccurrences(of: "file://", with: ""))
        } else {
            NSWorkspace.shared.launchApplication(withBundleIdentifier: bundleIdentifier!, options: [.default], additionalEventParamDescriptor: nil, launchIdentifier: nil)
-            hf.tap(strong: 6)
+            HapticFeedback.shared.tap(strong: 6)
        }
        updateRunningApplication()

@@ -180,7 +201,7 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub
                }
            }
        } else {
-            hf.tap(strong: 6)
+            HapticFeedback.shared.tap(strong: 6)
            if let index = self.persistentAppIdentifiers.index(of: bundleIdentifier!) {
                persistentAppIdentifiers.remove(at: index)
            } else {
@@ -123,8 +123,12 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
        }

        let regularFont = attributedTitle.attribute(.font, at: 0, effectiveRange: nil) as? NSFont ?? NSFont.systemFont(ofSize: 15)
-        let newTitle = NSMutableAttributedString(string: title as String, attributes: [.foregroundColor: color, .font: regularFont])
+        let newTitle = NSMutableAttributedString(string: title as String, attributes: [.foregroundColor: color, .font: regularFont, .baselineOffset: 1])
        newTitle.setAlignment(.center, range: NSRange(location: 0, length: title.count))
        attributedTitle = newTitle
    }
+    
+    deinit {
+        activity.invalidate()
+    }
 }
@@ -0,0 +1,57 @@
+import Foundation
+
+class DarkModeBarItem: CustomButtonTouchBarItem, Widget {
+    static var name: String = "darkmode"
+    static var identifier: String = "com.toxblh.mtmr.darkmode"
+
+    private var timer: Timer!
+
+    init(identifier: NSTouchBarItem.Identifier) {
+        super.init(identifier: identifier, title: "")
+        isBordered = false
+        setWidth(value: 24)
+
+        tapClosure = { [weak self] in self?.DarkModeToggle() }
+
+        timer = Timer.scheduledTimer(timeInterval: 3, target: self, selector: #selector(refresh), userInfo: nil, repeats: true)
+
+        refresh()
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    func DarkModeToggle() {
+        DarkMode.isEnabled = !DarkMode.isEnabled
+        refresh()
+    }
+
+    @objc func refresh() {
+        image = DarkMode.isEnabled ? #imageLiteral(resourceName: "dark-mode-on") : #imageLiteral(resourceName: "dark-mode-off")
+    }
+}
+
+
+struct DarkMode {
+    private static let prefix = "tell application \"System Events\" to tell appearance preferences to"
+
+    static var isEnabled: Bool {
+        get {
+            return UserDefaults.standard.string(forKey: "AppleInterfaceStyle") == "Dark"
+        }
+        set {
+            toggle(force: newValue)
+        }
+    }
+
+    static func toggle(force: Bool? = nil) {
+        let value = force.map(String.init) ?? "not dark mode"
+        runAppleScript("\(prefix) set dark mode to \(value)")
+    }
+}
+
+func runAppleScript(_ source: String) -> String? {
+    return NSAppleScript(source: source)?.executeAndReturnError(nil).stringValue
+}
+
@@ -10,21 +10,32 @@ import Cocoa
 import ScriptingBridge

 class MusicBarItem: CustomButtonTouchBarItem {
+    private enum Player: String {
+        case iTunes = "com.apple.iTunes"
+        case Spotify = "com.spotify.client"
+        case VOX = "com.coppertino.Vox"
+        case Chrome = "com.google.Chrome"
+        case Safari = "com.apple.Safari"
+    }
+    
+    private let playerBundleIdentifiers = [
+        Player.iTunes,
+        Player.Spotify,
+        Player.VOX,
+        Player.Chrome,
+        Player.Safari,
+    ]
+    
    private let interval: TimeInterval
+    private let disableMarquee: Bool
    private var songTitle: String?
    private var timer: Timer?
-    let buttonSize = NSSize(width: 21, height: 21)
+    private let iconSize = NSSize(width: 21, height: 21)

-    let playerBundleIdentifiers = [
-        "com.apple.iTunes",
-        "com.spotify.client",
-        "com.coppertino.Vox",
-        "com.google.Chrome",
-        "com.apple.Safari",
-    ]
-
-    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval) {
+    
+    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, disableMarquee: Bool) {
        self.interval = interval
+        self.disableMarquee = disableMarquee

        super.init(identifier: identifier, title: "⏳")
        isBordered = false
@@ -50,21 +61,21 @@ class MusicBarItem: CustomButtonTouchBarItem {

    @objc func playPause() {
        for ident in playerBundleIdentifiers {
-            if let musicPlayer = SBApplication(bundleIdentifier: ident) {
+            if let musicPlayer = SBApplication(bundleIdentifier: ident.rawValue) {
                if musicPlayer.isRunning {
-                    if musicPlayer.className == "SpotifyApplication" {
+                    if ident == .Spotify {
                        let mp = (musicPlayer as SpotifyApplication)
                        mp.playpause!()
                        return
-                    } else if musicPlayer.className == "ITunesApplication" {
+                    } else if ident == .iTunes {
                        let mp = (musicPlayer as iTunesApplication)
                        mp.playpause!()
                        return
-                    } else if musicPlayer.className == "VOXApplication" {
+                    } else if ident == .VOX {
                        let mp = (musicPlayer as VoxApplication)
                        mp.playpause!()
                        return
-                    } else if musicPlayer.className == "SafariApplication" {
+                    } else if ident == .Safari {
                        // You must enable the 'Allow JavaScript from Apple Events' option in Safari's Develop menu to use 'do JavaScript'.
                        let safariApplication = musicPlayer as SafariApplication
                        let safariWindows = safariApplication.windows?().compactMap({ $0 as? SafariWindow })
@@ -84,7 +95,7 @@ class MusicBarItem: CustomButtonTouchBarItem {
                            }
                        }
                    }
-                    //                    else if (musicPlayer.className == "GoogleChromeApplication") {
+                    //                    else if (ident == .Chrome) {
                    //                        let chromeApplication = musicPlayer as GoogleChromeApplication
                    //                        let chromeWindows = chromeApplication.windows?().compactMap({ $0 as? GoogleChromeWindow })
                    //                        for window in chromeWindows! {
@@ -111,24 +122,24 @@ class MusicBarItem: CustomButtonTouchBarItem {

    @objc func nextTrack() {
        for ident in playerBundleIdentifiers {
-            if let musicPlayer = SBApplication(bundleIdentifier: ident) {
+            if let musicPlayer = SBApplication(bundleIdentifier: ident.rawValue) {
                if musicPlayer.isRunning {
-                    if musicPlayer.className == "SpotifyApplication" {
+                    if ident == .Spotify {
                        let mp = (musicPlayer as SpotifyApplication)
                        mp.nextTrack!()
                        updatePlayer()
                        return
-                    } else if musicPlayer.className == "ITunesApplication" {
+                    } else if ident == .iTunes {
                        let mp = (musicPlayer as iTunesApplication)
                        mp.nextTrack!()
                        updatePlayer()
                        return
-                    } else if musicPlayer.className == "VOXApplication" {
+                    } else if ident == .VOX {
                        let mp = (musicPlayer as VoxApplication)
                        mp.next!()
                        updatePlayer()
                        return
-                    } else if musicPlayer.className == "SafariApplication" {
+                    } else if ident == .Safari {
                        // You must enable the 'Allow JavaScript from Apple Events' option in Safari's Develop menu to use 'do JavaScript'.
                        let safariApplication = musicPlayer as SafariApplication
                        let safariWindows = safariApplication.windows?().compactMap({ $0 as? SafariWindow })
@@ -170,16 +181,16 @@ class MusicBarItem: CustomButtonTouchBarItem {
        var titleUpdated = false

        for var ident in playerBundleIdentifiers {
-            if let musicPlayer = SBApplication(bundleIdentifier: ident) {
+            if let musicPlayer = SBApplication(bundleIdentifier: ident.rawValue) {
                if musicPlayer.isRunning {
                    var tempTitle = ""
-                    if musicPlayer.className == "SpotifyApplication" {
+                    if ident == .Spotify {
                        tempTitle = (musicPlayer as SpotifyApplication).title
-                    } else if musicPlayer.className == "ITunesApplication" {
+                    } else if ident == .iTunes {
                        tempTitle = (musicPlayer as iTunesApplication).title
-                    } else if musicPlayer.className == "VOXApplication" {
+                    } else if ident == .VOX {
                        tempTitle = (musicPlayer as VoxApplication).title
-                    } else if musicPlayer.className == "SafariApplication" {
+                    } else if ident == .Safari {
                        let safariApplication = musicPlayer as SafariApplication
                        let safariWindows = safariApplication.windows?().compactMap({ $0 as? SafariWindow })
                        for window in safariWindows! {
@@ -199,10 +210,7 @@ class MusicBarItem: CustomButtonTouchBarItem {
                                }
                            }
                        }
-                        if tempTitle == "" {
-                            ident = ""
-                        }
-                    } else if musicPlayer.className == "GoogleChromeApplication" {
+                    } else if ident == .Chrome {
                        let chromeApplication = musicPlayer as GoogleChromeApplication
                        let chromeWindows = chromeApplication.windows?().compactMap({ $0 as? GoogleChromeWindow })
                        for window in chromeWindows! {
@@ -222,9 +230,6 @@ class MusicBarItem: CustomButtonTouchBarItem {
                                }
                            }
                        }
-                        if tempTitle == "" {
-                            ident = ""
-                        }
                    }

                    if tempTitle == self.songTitle {
@@ -234,16 +239,22 @@ class MusicBarItem: CustomButtonTouchBarItem {
                    }

                    if let songTitle = self.songTitle?.ifNotEmpty {
-                        self.title = " " + songTitle + "     "
-                        titleUpdated = true
                        self.timer?.invalidate()
                        self.timer = nil
-                        self.timer = Timer.scheduledTimer(timeInterval: 0.25, target: self, selector: #selector(self.marquee), userInfo: nil, repeats: true)
+                        
+                        if (disableMarquee) {
+                            self.title = " " + songTitle
+                        } else {
+                            self.title = " " + songTitle + "     "
+                            self.timer = Timer.scheduledTimer(timeInterval: 0.25, target: self, selector: #selector(self.marquee), userInfo: nil, repeats: true)
+                        }
+                        
+                        titleUpdated = true
                    }
-                    if let ident = ident.ifNotEmpty,
-                        let appPath = NSWorkspace.shared.absolutePathForApplication(withBundleIdentifier: ident) {
+                    if let _ = tempTitle.ifNotEmpty,
+                        let appPath = NSWorkspace.shared.absolutePathForApplication(withBundleIdentifier: ident.rawValue) {
                        let image = NSWorkspace.shared.icon(forFile: appPath)
-                        image.size = self.buttonSize
+                        image.size = self.iconSize
                        self.image = image
                        iconUpdated = true
                    }
@@ -12,7 +12,10 @@ class NetworkBarItem: CustomButtonTouchBarItem, Widget {
    static var name: String = "network"
    static var identifier: String = "com.toxblh.mtmr.network"
    
-    init(identifier: NSTouchBarItem.Identifier) {
+    private let flip: Bool
+    
+    init(identifier: NSTouchBarItem.Identifier, flip: Bool = false) {
+        self.flip = flip
        super.init(identifier: identifier, title: " ")
        startMonitoringProcess()
    }
@@ -95,34 +98,49 @@ class NetworkBarItem: CustomButtonTouchBarItem, Widget {
        return humanText
    }
    
-    func setTitle(up: String, down: String) {
-        let titleFont = NSFont.monospacedDigitSystemFont(ofSize: 12, weight: NSFont.Weight.light)
-        
-        let newTitle = NSMutableAttributedString(
-            string: "↓",
-            attributes: [
-                NSAttributedString.Key.foregroundColor: NSColor.red,
-                NSAttributedString.Key.font: titleFont,
-            ])
-        
-        newTitle.append(NSMutableAttributedString(
-            string: down,
-            attributes: [
-                NSAttributedString.Key.font: titleFont
-            ]))
-        
-        newTitle.append(NSMutableAttributedString(
-            string: "\n↑",
+    func appendUpSpeed(appendString: NSMutableAttributedString, up: String, titleFont: NSFont, newStr: Bool = false) {
+        appendString.append(NSMutableAttributedString(
+            string: newStr ? "\n↑" : "↑",
            attributes: [
                NSAttributedString.Key.foregroundColor: NSColor.blue,
                NSAttributedString.Key.font: titleFont,
-            ]))
+                ]))
        
-        newTitle.append(NSMutableAttributedString(
+        appendString.append(NSMutableAttributedString(
            string: up,
            attributes: [
                NSAttributedString.Key.font: titleFont,
-            ]))
+                ]))
+    }
+    
+    func appendDownSpeed(appendString: NSMutableAttributedString, down: String, titleFont: NSFont, newStr: Bool = false) {
+        appendString.append(NSMutableAttributedString(
+            string: newStr ? "\n↓" : "↓",
+            attributes: [
+                NSAttributedString.Key.foregroundColor: NSColor.red,
+                NSAttributedString.Key.font: titleFont,
+                ]))
+            
+            appendString.append(NSMutableAttributedString(
+                string: down,
+                attributes: [
+                    NSAttributedString.Key.font: titleFont
+                ]))
+    }
+    
+    func setTitle(up: String, down: String) {
+        let titleFont = NSFont.monospacedDigitSystemFont(ofSize: 12, weight: NSFont.Weight.light)
+        
+        let newTitle: NSMutableAttributedString = NSMutableAttributedString(string: "")
+        
+        if (self.flip) {
+            appendUpSpeed(appendString: newTitle, up: up, titleFont: titleFont)
+            appendDownSpeed(appendString: newTitle, down: down, titleFont: titleFont, newStr: true)
+        } else {
+            appendDownSpeed(appendString: newTitle, down: down, titleFont: titleFont)
+            appendUpSpeed(appendString: newTitle, up: up, titleFont: titleFont, newStr: true)
+        }
+        
        
        self.attributedTitle = newTitle
    }
@@ -135,4 +135,8 @@ class WeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
 //        print("inside didChangeAuthorization ");
        updateWeather()
    }
+    
+    deinit {
+        activity.invalidate()
+    }
 }
@@ -0,0 +1,149 @@
+//
+//  YandexWeatherBarItem.swift
+//  MTMR
+//
+//  Created by bobrosoft on 22/07/2019.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+import Cocoa
+import CoreLocation
+
+class YandexWeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
+    private let activity: NSBackgroundActivityScheduler
+    private let unitsStr = "°C"
+    private let iconsSource = ["Ясно": "☀️", "Малооблачно": "🌤", "Облачно с прояснениями": "⛅️", "Пасмурно": "☁️", "Небольшой дождь": "🌦", "Дождь": "🌧", "Ливень": "⛈", "Гроза": "🌩", "Дождь со снегом": "☔️", "Небольшой снег": "❄️", "Снег": "🌨", "Туман": "🌫"]
+    private var location: CLLocation!
+    private var prevLocation: CLLocation!
+    private var manager: CLLocationManager!
+    
+    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval) {
+        activity = NSBackgroundActivityScheduler(identifier: "\(identifier.rawValue).updatecheck")
+        activity.interval = interval
+        
+        super.init(identifier: identifier, title: "⏳")
+        
+        let status = CLLocationManager.authorizationStatus()
+        if status == .restricted || status == .denied {
+            print("User permission not given")
+            return
+        }
+        
+        if !CLLocationManager.locationServicesEnabled() {
+            print("Location services not enabled")
+            return
+        }
+        
+        activity.repeats = true
+        activity.qualityOfService = .utility
+        activity.schedule { (completion: NSBackgroundActivityScheduler.CompletionHandler) in
+            self.updateWeather()
+            completion(NSBackgroundActivityScheduler.Result.finished)
+        }
+        updateWeather()
+        
+        manager = CLLocationManager()
+        manager.delegate = self
+        manager.desiredAccuracy = kCLLocationAccuracyHundredMeters
+        manager.startUpdatingLocation()
+        
+        tapClosure = tapClosure ?? defaultTapAction
+    }
+    
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc func updateWeather() {
+        var urlRequest = URLRequest(url: URL(string: getWeatherUrl())!)
+        urlRequest.addValue("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.100 Safari/537.36", forHTTPHeaderField: "user-agent") // important for the right format
+        
+        let task = URLSession.shared.dataTask(with: urlRequest) { data, _, error in
+            guard error == nil, let response = data?.utf8string else {
+                return
+            }
+//            print(response)
+            
+            var matches: [[String]]
+            var temperature: String?
+            matches = response.matchingStrings(regex: "fact__temp.*?temp__value.*?>(.*?)<")
+            temperature = matches.first?.item(at: 1)
+            
+            var icon: String?
+            matches = response.matchingStrings(regex: "link__condition.*?>(.*?)<")
+            icon = matches.first?.item(at: 1)
+            if let _ = icon, let test = self.iconsSource[icon!] {
+                icon = test
+            }
+            
+            if temperature != nil {
+                DispatchQueue.main.async {
+                    self.setWeather(text: "\(icon ?? "?") \(temperature!)\(self.unitsStr)")
+                }
+            }
+        }
+        
+        task.resume()
+    }
+    
+    func getWeatherUrl() -> String {
+        if location != nil {
+            return "https://yandex.ru/pogoda/?lat=\(location.coordinate.latitude)&lon=\(location.coordinate.longitude)"
+        } else {
+            return "https://yandex.ru/pogoda/" // Yandex will try to determine your location by default
+        }
+    }
+    
+    func setWeather(text: String) {
+        title = text
+    }
+    
+    func defaultTapAction() {
+        print(getWeatherUrl())
+        if let url = URL(string: getWeatherUrl()) {
+            NSWorkspace.shared.open(url)
+        }
+    }
+    
+    func locationManager(_: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        let lastLocation = locations.last!
+        location = lastLocation
+        if prevLocation == nil {
+            updateWeather()
+        }
+        prevLocation = lastLocation
+    }
+    
+    func locationManager(_: CLLocationManager, didFailWithError error: Error) {
+        print(error)
+    }
+    
+    func locationManager(_: CLLocationManager, didChangeAuthorization _: CLAuthorizationStatus) {
+        updateWeather()
+    }
+    
+    deinit {
+        activity.invalidate()
+    }
+}
+
+extension String {
+    func matchingStrings(regex: String) -> [[String]] {
+        guard let regex = try? NSRegularExpression(pattern: regex, options: []) else { return [] }
+        let nsString = self as NSString
+        let results  = regex.matches(in: self, options: [], range: NSMakeRange(0, nsString.length))
+        return results.map { result in
+            (0..<result.numberOfRanges).map {
+                result.range(at: $0).location != NSNotFound
+                    ? nsString.substring(with: result.range(at: $0))
+                    : ""
+            }
+        }
+    }
+}
+
+extension Array {
+    func item(at index: Int) -> Element? {
+        return indices.contains(index) ? self[index] : nil
+    }
+}
@@ -1,82 +1,89 @@
 [
-  { "type": "escape", "align": "left" },
-  { "type": "exitTouchbar", "width": 44, "align": "left" },
-  { "type": "brightnessDown", "width": 44, "align": "left" },
  {
-    "type": "brightness",
-    "width": 60,
-    "align": "left",
-    "image": {
-      "base64":
-        "iVBORw0KGgoAAAANSUhEUgAAAIAAAACAAQMAAAD58POIAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExURffLOPfLNyaSVzUAAAACdFJOU/kBxOqnWgAAAbJJREFUSMfVljtyhDAQBVulQCFH4CgcDR1NR9ERFBKoeA5GfGddtkNvwFINFKP5tED22+Zxwviv6QVKfIEc/iNoF5gkpLIeYI8SUp4PsAUJiekADQntF6isQjvxCTrhAJlFqMMBeIH9BMsD7DAb2BhvYbIyNAOCZIWqYKGTpDZJFQu9EKVd44RxQRq3IrULWD62C8wSssWUZEsR0k6wcDOrJZmoBpMKI+s5qkBQCQOUJADVOECdOsDS0gDbsgHMfT4rVwHSrZQFIN5ABka8BgDgAeZ+BztBgvUEnSgVlhNsTFJjvoF5HAZorBpdYKAiSRbqNyBIUr6AjZMdPwO72R40MElS+wZUWA+wQ6LAYkFvdIhkmA+wQSDDdIAGAZ6A34H0x0fca11gBZZsIHSIfnE/5+NjCn/OuiuUB+/aunZwDeNayjXdTpDN0wlY+r1PfWu75nfj8RogN2JuCN2Y5qgMwTI0wGPUnQw6Qarx0sVNKA5Mn6VUL22lIbZoYitDbPmlvocc9Umfl2D7adz1reC3pF8av4m+DCenp/ndZuG3E7fhuC3pH2+vnz8V3MfE+bnxBTXuuIMTrLWHAAAAAElFTkSuQmCC"
-    }
+    "type": "escape",
+    "width": 64,
+    "align": "left"
  },
-  { "type": "brightnessUp", "width": 44, "align": "left" },
-  // --- iTunes ---
+  {
+    "type": "dnd",
+    "align": "left",
+    "width": 38
+  },
+  { "type": "brightnessDown", "width": 32, "bordered": false, "align": "left" },
+  { "type": "brightnessUp", "width": 32, "bordered": false, "align": "left" },
+
+  // Spotify
  {
    "type": "appleScriptTitledButton",
    "source": {
-      "inline":
-        "if application \"iTunes\" is running then\rtell application \"iTunes\"\rif player state is playing then\rreturn (get artist of current track) & \" – \" & (get name of current track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
+      "inline": "if application \"Spotify\" is running then\rtell application \"Spotify\"\rif player state is playing then\rreturn (get artist of current track) & \" – \" & (get name of current track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
    },
    "action": "appleScript",
    "actionAppleScript": {
-      "inline":
-        "if application \"iTunes\" is running then\rtell application \"iTunes\"\rif player state is playing then\rnext track\rend if\rend tell\rend if\r"
+      "inline": "if application \"Spotify\" is running then\rtell application \"Spotify\"\rif player state is playing then\rnext track\rend if\rend tell\rend if\r"
    },
    "refreshInterval": 1,
    "image": {
-      "base64":
-        "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"
+      "base64": "iVBORw0KGgoAAAANSUhEUgAAAEAAAABABAMAAABYR2ztAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAYUExURUdwTB3WXx3UXh3VXx7XYBkXFRpVLRyURmIaeAQAAAAEdFJOUwDDO3fSqUUkAAABbklEQVRIx61VbW6DMAztoAeYNA7ApB6gkzhAWS24wIAL0HABaK6/pHFNEhy8TXu/kPzkPD/8cTj8K7KPAqB+K5NhQPCUrABCXe7HOUYYZxgVRLiG8RfY4DUgFFtC7cffAfZTFBwBdhWEKfgEq4ocEjgj4ZQifO6/QG9kkETp1dDeVWfRKx3XYSW0LoqY5kCElXDrQkyeCCuh6WL0M4nIWQIyzqixdfKU1koFDKvyCA8NJMzU4xiD+b4kfHRpsIyKc6hBwjVptFHVY51EMAINNDFGJITKDNQcdpX74Hz0CQ3rY5qwMp4EIxrlafzrsYZ2Veb0DkRgfNCUok4Y1fqEijfyi2b8RE9beWqa48Y/uvCNMcH9btfUi+/CGLR1vhL6Zz9N/vBlaCU+7lwY/cmJ67Ryen/2tj23PLqJBodZH8vgj544vOL4pxfI5acrSFxi8hrkU9TSKr78ZpnL50A8KPJJEo+afBblwyqf5j/iGys5j6ScrST2AAAAAElFTkSuQmCC"
    }
  },
-  // --- Spotify ---
-  // {
-  //   "type": "appleScriptTitledButton",
-  //   "source": {
-  //     "inline":
-  //       "if application \"Spotify\" is running then\rtell application \"Spotify\"\rif player state is playing then\rreturn (get artist of current track) & \" – \" & (get name of current track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
-  //   },
-  //   "action": "appleScript",
-  //   "actionAppleScript": {
-  //     "inline":
-  //       "if application \"Spotify\" is running then\rtell application \"Spotify\"\rif player state is playing then\rnext track\rend if\rend tell\rend if\r"
-  //   },
-  //   "refreshInterval": 1,
-  //   "image": {
-  //     "base64":
-  //       "iVBORw0KGgoAAAANSUhEUgAAAEAAAABABAMAAABYR2ztAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAYUExURUdwTB3WXx3UXh3VXx7XYBkXFRpVLRyURmIaeAQAAAAEdFJOUwDDO3fSqUUkAAABbklEQVRIx61VbW6DMAztoAeYNA7ApB6gkzhAWS24wIAL0HABaK6/pHFNEhy8TXu/kPzkPD/8cTj8K7KPAqB+K5NhQPCUrABCXe7HOUYYZxgVRLiG8RfY4DUgFFtC7cffAfZTFBwBdhWEKfgEq4ocEjgj4ZQifO6/QG9kkETp1dDeVWfRKx3XYSW0LoqY5kCElXDrQkyeCCuh6WL0M4nIWQIyzqixdfKU1koFDKvyCA8NJMzU4xiD+b4kfHRpsIyKc6hBwjVptFHVY51EMAINNDFGJITKDNQcdpX74Hz0CQ3rY5qwMp4EIxrlafzrsYZ2Veb0DkRgfNCUok4Y1fqEijfyi2b8RE9beWqa48Y/uvCNMcH9btfUi+/CGLR1vhL6Zz9N/vBlaCU+7lwY/cmJ67Ryen/2tj23PLqJBodZH8vgj544vOL4pxfI5acrSFxi8hrkU9TSKr78ZpnL50A8KPJJEo+afBblwyqf5j/iGys5j6ScrST2AAAAAElFTkSuQmCC"
-  //   }
-  // },
-  // --- VOX ---
-  // {
-  //   "type": "appleScriptTitledButton",
-  //   "source": {
-  //     "inline":
-  //       "if application \"VOX\" is running then\rtell application \"VOX\"\rif player state is 1 then\rreturn (get artist) & \" – \" & (get track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
-  //   },
-  //   "action": "appleScript",
-  //   "actionAppleScript": {
-  //     "inline":
-  //       "if application \"VOX\" is running then\rtell application \"VOX\"\rif player state is 1 then\rnext\rend if\rend tell\rend if\r"
-  //   },
-  //   "refreshInterval": 1,
-  //   "image": {
-  //     "base64":
-  //       "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAADAUExURUdwTHd7gqeqtKClrd/k7n+Di7e7xI6TnNHX4cPI0Xp9hJibpOfs9u/1/vX7/rq/yZiborK3wEpOUxgYFlFXYiIhHycpLD9ESjI0NgsLCj09O4SKk19lcbBkALhoAHJ3gT8rAzMvJJugqKhcAL5xAOSxB4I/AJ5SAGpweXuAiZJJAG8zAeXr9WNiYM+NANqeAMd9APHACfr9/e7JPrO5w6mrsA4bKC0gCHhtTyAYBFcpAZduKK2JP/fost/Eb5SUlFFfi9AAAAASdFJOUwDJE9FgWjb+/vyHppTXtbn9mDupvZ0AAAdoSURBVFjDlZcLQ6O6FoWrtgI+Owl5EGgp2DrEgnV6wD4c7f//V3ftAE7nzOj17NGxpayPtXfSZGcw+CjOh1c3N9eIm5ur4fngv8Xp8KZE+F2U5bq8GZ5+WU5qP6jzsRdTeF7e1AEoN8Ovya/LMsg9mxZJErpIksJarwnK8nr4FblfQ52EDOH0zL1KUuvVfnn9eTVOryCPoVZQuGj/FOApMAhx9Uktzq/L2ksT3FuQhIVVVVRVRa+SogA1KbzgExPD0s/xdBOmKdOqODR95IdEaZba0LAkbfzyg0rA/pgekxZKV4cmtxXTEmFUEufNodIKYJjLkcbf9UEM90mqZJU3qeJRxDkXAv/hlbJNXkmVJjCBNP5CGPq1TZSyiWB5XomIi+woRBSJKj8YUVgFQ4E//FMfQM8s40VTyIhDpLVRNIJKaWLwSNqm4mEMl/YPwrkP/9AbER+UkxtWbbcvLrbbkBlCcDa23BABHn4bi1PSM2a1PFgZwbwJty+TybSLyeRlyxQlIuNY6FgpDKd/PB+uXP2tFHEheCtvhW3Q65dtiEyQRixMrBjG4uo4gTpNFApvU9Kr6sWp77qY3BFj8lLBBJdpykOLwaqPkgioAEnFi1RCz7Z3uJ2U37sgCBB3W5ZJLm0VJQmVIXgfgSAvQpYK1ACDx7bTOT2dlA8uWsYEl0EQ3KDUKcOECvqRCGgGpApXf9M/PNx3QQwyMZ9uGWZWiGelsFAHvQFUMEx4WAku2HZC+k6+vF/ip0U4wmSrBJcFZgss9xZuYYAlWhaGC1PhMb1++R6EaAl3lRFcFUI5C7duDlAFwpCzSogsfCH93fdWvm+jRYCASs5fwkyIinGsVrBAc2FYxwVLlKhgQG3n8+kv/WwjhNhsZvveQ5+EqrhKWOHVlMNtgyUkhHkpdPjy1CZA+pl4bkOIfWcBQ/EEC1xWWmKxsi6HussA9WUwQBV0BmbPz3y32+x2nD8/z/okpvM5LAjGeEg51JiFtQeAEqHhWUIGJq0B0m9mLjYdgSxMnQVhGHIIkcP5YNjEAGjJJDfF5AnzzRnY/9K3hP3SjSUAk0oLzaQOwyJGEb41FgWVuOIymHYZCKfPGFaxzBHEcQ5cYrXD3LHNt8E3WkdDbpBY8vMdMHsW0Jui9v26MCDAggNMAfgZoghGdIDbPMXewY0RWfHzqQMsN2QgC/MAkVcZWZi1DuYAJJlQBlVM0vx2cDZOw4QAPEt/AcTzDgkkh3w8Hh8SPZvtKIc2haefKapo2mE4G5x5nQOuLQA0jwggCcAqF1SFnZQEwEwCwGZ0P+sAXQqa69gBJvgeLCUBhMS6arSWogV0NWwB2gHG5KAggDYO0OXQATghJP4QIPsFiJHCEYB2YgBE5gBzNxEyjVHYcOxKKDfquRE6u39wFXh6dADJaccG4HLsANIIEb89PnaEvSYLG2kYAG0G+3YMnh4fDxbfe4wkAS47gAAyShsA2iSWUgsiYHfJMCF2ZKDVA9AkET4WbhgvB6OxxeoiuZZRVT/2BFjQfOemMX53qNn+e5fA42OtAOCYiYXNR4PznL4LJoLA1G8rQjjCTCmxc9+GzU4oNXvonr9avTUZPc7QdyHH0j4mgIqQVZQHq1VvAgRKf7MRKISZPWAG0ONXq1Vg6WYahMIbYz24pJ6ECYIyf7EiBBGm3/da0c6KX/ifTnv9P74iu66G3iUAI4+KoCNpeNS8rha9ifnkfmlcLO+n816+WL3mEVVcY2ew4xEtqsgBjUWEQkWsfFssWhdgPM0xoBg8iKl2JF8s3kpngCtMo3jsNljkUDAmYQFVWC9+tAgHeQ93AR/8WKw9d6MMWWFdBn0OJsJsjERZLn4QomOsWmmrpk9Kn0eYxpGiMfBG7dZ0FrcW8B2N1PoV9zkEUehn1b2hy68lxg/F0owVaXzW7Y0j6kwZuiqhUIaW8M54F9Olcq0irF0R1vAkfTdAFmwaKhjDUgfCur39n+NwF9ZrFhnMWm5YiM737L0/GHkxtYD4RKIWILz1+jf86/Vv69I4fSTRTNojAxgIdPUgCE7VjXhzhHAEJ1/nUUSl4qTHKeDyuMnCycCzjiCwyUYsWK9fofzhxIC8rtcBi2SlqPeEnu7/rekGwcutwhTHhKoYHlWvEa8u6FVN17D/Or3Ncfu/Wu5R7I2bmNECRiYYRpuaYtKiBa+0u0j9K7aguMFZZvTvVvUCFuoce5ygSmA9xlcRDR8iyzaZqVq50Coc1zBw8WezfBEfmqBGX+8QXLs1HY9tV3aMMeQSp4A6aP6qdx4aNHyMWnxBHbpwzTIW9vadkGTf/1BPdYhxsqrR7zuGoD4/6pp+iKVkaY3zWGxHHx55TuJxXZa1RSmwIyAyeoGVlf4wG9CBLD755Nx1ehHHub9e+3lBpxUh+0DuuO4ef/H5AXR0gkpg+EofjQed1ej8VsTuEk6T8cno/54cRyc2zms3Bcr+4Esvazz9C/IOYWlESNseoWtU3n5V3tYCDEA8tAce5j3enFyc/scT/Pno4qSLi9HHhf8f8eOIRf9lFswAAAAASUVORK5CYII="
-  //   }
-  // },
-  { "type": "previous", "width": 44 },
-  { "type": "play", "width": 44 },
-  { "type": "next", "width": 44 },
-  { "type": "weather", "icon_type": "images", "units": "metric" },
-  { "type": "currency", "from": "BTC", "to": "USD" },
-  { "type": "sleep", "width": 44 },
-  { "type": "mute", "width": 40, "align": "right" },
-  { "type": "volumeDown", "width": 34, "align": "right" },
-  { "type": "volume", "width": 60, "align": "right" },
-  { "type": "volumeUp", "width": 34, "align": "right" },
-  { "type": "inputsource", "align": "right" },
-  { "type": "battery", "align": "right", "bordered": false },
-  { "type": "timeButton", "align": "right", "bordered": false  }
+
+  // iTunes
+  {
+    "type": "appleScriptTitledButton",
+    "source": {
+      "inline": "if application \"iTunes\" is running then\rtell application \"iTunes\"\rif player state is playing then\rreturn (get artist of current track) & \" – \" & (get name of current track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
+    },
+    "action": "appleScript",
+    "actionAppleScript": {
+      "inline": "if application \"iTunes\" is running then\rtell application \"iTunes\"\rif player state is playing then\rnext track\rend if\rend tell\rend if\r"
+    },
+    "longAction": "appleScript",
+    "longActionAppleScript": {
+      "inline": "if application \"iTunes\" is running then\rtell application \"iTunes\"\rif player state is playing then\rprev track\rend if\rend tell\rend if\r"
+    },
+    "refreshInterval": 2,
+    "image": {
+      "base64": "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"
+    }
+  },
+  { "type": "displaySleep", "width": 40, "align": "right", "bordered": false },
+  {
+    "type": "weather",
+    "align": "right",
+    "icon_type": "images",
+    "api_key": "ca93a0bb8cdb428552660d83249e4bc9",
+    "bordered": false
+  },
+  {
+    "type": "volumeDown",
+    "bordered": false,
+    "align": "right",
+    "width": 28
+  },
+  {
+    "type": "volumeUp",
+    "bordered": false,
+    "align": "right",
+    "width": 28
+  },
+  {
+    "type": "play",
+    "align": "right",
+    "width": 38
+  },
+  {
+    "type": "battery",
+    "align": "right",
+    "bordered": false
+  },
+  {
+    "type": "timeButton",
+    "formatTemplate": "HH:mm",
+    "align": "right",
+    "bordered": false,
+    "longAction": "shellScript",
+    "longExecutablePath": "/usr/bin/pmset",
+    "longShellArguments": ["sleepnow"]
+  }
 ]
@@ -1,38 +1,67 @@
-<p align="center"><img src="Resources/logo.png" width="120"></p>
+# My touchbar. My rules. [![GitHub release](https://img.shields.io/github/release/toxblh/MTMR.svg)](https://github.com/Toxblh/MTMR/releases) [![license](https://img.shields.io/github/license/Toxblh/MTMR.svg)](https://github.com/Toxblh/MTMR/blob/master/LICENSE)![minimal system requirements](https://img.shields.io/badge/required-macOS%2010.12.2-blue.svg) ![travis](https://travis-ci.org/Toxblh/MTMR.svg?branch=master)

-# My TouchBar. My rules
+<img src="Resources/logo.png" align="right"
+     title="MTMR by Toxblh" width="110" height="110">

-*The TouchBar Customization App for your MacBook Pro*
+_The TouchBar Customization App for your MacBook Pro_

-[![GitHub release](https://img.shields.io/github/release/toxblh/MTMR.svg)](https://github.com/Toxblh/MTMR/releases)
-[![license](https://img.shields.io/github/license/Toxblh/MTMR.svg)](https://github.com/Toxblh/MTMR/blob/master/LICENSE) [![Total downloads](https://img.shields.io/github/downloads/Toxblh/MTMR/total.svg)](https://github.com/Toxblh/MTMR/releases/latest) ![minimal system requirements](https://img.shields.io/badge/required-macOS%2010.12.2-blue.svg) ![travis](https://travis-ci.org/Toxblh/MTMR.svg?branch=master)
+My idea is to create a platform for creating plugins to customize the TouchBar. I very much like BTT and having a full custom TouchBar (my BTT preset), and I wanted to create it. It's my first Swift project for MacOS :)
+
+**Share your presets [here](https://github.com/Toxblh/MTMR-presets)**

 <p align="center">
-    <img src="Resources/TouchBar-v0.8.1.png">
+  <img src="./Resources/aaaaa-acc6-17fee7572ed0.png" alt="Mackbook with touchbar" width="800">
 </p>

-**MTMR** Community:
-[<img height="24px" src="https://github.com/discourse/DiscourseMobile/raw/master/icon.png" /> Discourse](https://forum.mtmr.app)
-[<img height="24px" src="https://camo.githubusercontent.com/88f53948f291c54736bf08f5fd7b037a848dfc62/68747470733a2f2f646973636f72646170702e636f6d2f6173736574732f30376463613830613130326434313439653937333664346231363263666636662e69636f"> Discord](https://discord.gg/CmNcDuQ)
-[<img height="24px" src="https://telegram.org/img/t_logo.png" /> Telegram](https://t.me/joinchat/AmVYGg8vW38c13_3MxdE_g)
+<p align="center">
+<a href="https://discord.gg/CmNcDuQ"><img height="20px" src="https://camo.githubusercontent.com/88f53948f291c54736bf08f5fd7b037a848dfc62/68747470733a2f2f646973636f72646170702e636f6d2f6173736574732f30376463613830613130326434313439653937333664346231363263666636662e69636f"> Discord</a>
+<a href="https://t.me/joinchat/AmVYGg8vW38c13_3MxdE_g"><img height="20px" src="https://telegram.org/img/t_logo.png" /> Telegram</a>
+</p>

-<a href="https://www.paypal.me/toxblh/10" title="Donate via Paypal"><img height="32px" src="Resources/support_paypal.svg" alt="PayPal donate button" /></a>
-<a href="https://www.buymeacoffee.com/toxblh" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" height="32px" ></a>
-<a href="https://www.patreon.com/bePatron?u=9900748"><img height="32px"  src="https://c5.patreon.com/external/logo/become_a_patron_button.png" srcset="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png 2x"></a>
-[<img src="https://d1qb2nb5cznatu.cloudfront.net/startups/i/854859-e299e139ab7f79855c0bc589f10b0ec6-medium_jpg.jpg?buster=1453074480" height="32px" /> Become a backer](https://opencollective.com/MTMR#backer)
-[<img src="https://d1qb2nb5cznatu.cloudfront.net/startups/i/854859-e299e139ab7f79855c0bc589f10b0ec6-medium_jpg.jpg?buster=1453074480" height="32px" /> Become a sponsor](https://opencollective.com/MTMR#sponsor)
-
-
-My idea is to create a platform for creating plugins to customize the TouchBar. I very much like BTT and having a full custom TouchBar (my [BTT preset](https://github.com/Toxblh/btt-touchbar-preset)), and I wanted to create it. It's my first Swift project for MacOS :)
-
-#### Share your presets [here](https://github.com/Toxblh/MTMR-presets)
+<p align="center"><a href="https://www.paypal.me/toxblh/10" title="Donate via Paypal"><img height="36px" src="Resources/support_paypal.svg" alt="PayPal donate button" /></a>
+<a href="https://www.buymeacoffee.com/toxblh" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" height="36px" ></a>
+<a href="https://www.patreon.com/bePatron?u=9900748"><img height="36px"  src="https://c5.patreon.com/external/logo/become_a_patron_button.png" srcset="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png 2x"></a>
+<a href="https://www.producthunt.com/posts/my-touchbar-my-rules-mtmr">
+    <img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=my-touchbar-my-rules-mtmr&theme=light" alt="My TouchBar My Rules (MTMR)" height="36px" style="max-width:100%">
+</a></p>

 ## Installation
- Download lastest [release](https://github.com/Toxblh/MTMR/releases) from github
+
+- Download lastest [release](https://github.com/Toxblh/MTMR/releases) (.dmg) from github
 - Or via Homebrew `brew cask install mtmr`
+- [Dario Prski](https://medium.com/@urdigitalpulse) has written a [fantastic article on medium](https://medium.com/@urdigitalpulse/customise-your-macbook-pro-touch-bar-966998e606b5) that goes into more detail on installing MTMR
+
+**On first install** you need to allow access for MTMR in Accessibility otherwise buttons like <kbd>Esc</kbd>, <kbd>Volume</kbd>, <kbd>Brightness</kbd> and other system keys won't work
+
+<p align="center">
+<img width="450" alt="screenshot 2019-02-24 at 23 19 20" src="https://user-images.githubusercontent.com/2198153/53307057-2b078200-388c-11e9-8212-8c2b1aff0aa6.png">
+</p>
+
+<p align="center">
+🍏→ System Preferences → Security and Privacy → tab Privacy → Accessibility → MTMR
+</p>
+
+## Examples
+
+- [@Toxblh preset](Resources/toxblh.json)
+- [@ReDetection preset](Resources/ReDetection.json)
+- [@luongvo209 preset](Resources/luongvo209.json)
+- [aadi_vs_anand preset](Resources/aadi_vs_anand.json)
+
+<p align="center">
+  <img src="./Resources/Artboard.png" alt="Presets for touchbar" width="800">
+</p>
+
+## Customization
+
+MTMR preferences are stored under `~/Library/Application\ Support/MTMR/items.json`.
+
+The pre-installed configuration contains less or more than you'll probably want, try to configure:

 ## Built-in button types:
+
 > Buttons
+
 - escape
 - exitTouchbar
 - brightnessUp
@@ -44,27 +73,40 @@ My idea is to create a platform for creating plugins to customize the TouchBar.
 - mute

 > Native Plugins
+
+- timeButton
 - battery
 - currency
 - weather
+- yandexWeather
 - inputsource
 - music (tap for pause, longTap for next)
 - dock (half-long click to open app, full-long click to kill app)
 - nightShift
 - dnd (Don't disturb)
+- darkMode
 - pomodoro
 - network

 > Media Keys
+
 - previous
 - play
 - next

 > AppleScript plugins
+
 - sleep
 - displaySleep

+> Custom buttons
+
+- staticButton
+- appleScriptTitledButton
+- shellScriptTitledButton
+
 ## Gestures on central part:
+
 - two finger slide: change you Volume
 - three finger slide: change you Brightness

@@ -74,14 +116,18 @@ My idea is to create a platform for creating plugins to customize the TouchBar.
 - volume

 ### You can also make custom buttons using these types
- `staticButton`
+
+#### `staticButton`
+
 ```json
 "type": "staticButton",
 "title": "esc",
 ```

- `appleScriptTitledButton`
+#### `appleScriptTitledButton`
+
 ```js
+  {
    "type": "appleScriptTitledButton",
    "refreshInterval": 60, //optional
    "source": {
@@ -90,38 +136,67 @@ My idea is to create a platform for creating plugins to customize the TouchBar.
      "inline": "tell application \"Finder\"\rmake new Finder window\rset target of front window to path to home folder as string\ractivate\rend tell",
      // or
      "base64": "StringInbase64"
-    },
+    }
+  }
 ```

- `timeButton`
+#### `shellScriptTitledButton`
+> Note: script may return also colors using escape sequences (read more here https://misc.flogisoft.com/bash/tip_colors_and_formatting)
+> Only "16 Colors" mode supported atm. If background color returned, button will pick it up as own background color.
+
+Example of "CPU load" button which also changes color based on load value.
 ```js
-  "type": "timeButton",
-  "formatTemplate": "HH:mm" //optional
+{
+  "type": "shellScriptTitledButton",
+  "width": 80,
+  "refreshInterval": 2,
+  "source": {
+    "inline": "top -l 2 -n 0 -F | egrep -o ' \\d*\\.\\d+% idle' | tail -1 | awk -F% '{p = 100 - $1; if (p > 30) c = \"\\033[33m\"; if (p > 70) c = \"\\033[30;43m\"; printf \"%s%4.1f%%\\n\", c, p}'"
+  },
+  "action": "appleScript",
+  "actionAppleScript": {
+    "inline": "activate application \"Activity Monitor\"\rtell application \"System Events\"\r\ttell process \"Activity Monitor\"\r\t\ttell radio button \"CPU\" of radio group 1 of group 2 of toolbar 1 of window 1 to perform action \"AXPress\"\r\tend tell\rend tell"
+  },
+  "align": "right",
+  "image": {
+    "base64":
+    "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAA/1BMVEUAAADaACbYACfYACfjABzXACjYACfXACjYACfYACfYACfYACfdACLYACfXACjYACfVACv/AADXACjYACfYACfXACjYACfXACjaACXYACfYACfVACvYACfYACfZACbZACbYACfYACfZACb/AADYACfYACfVACrXACjVACu/AEDYACfYACfYACfXACjXACjYACfXACjYACfYACfYACfXACjYACfXACjYACfYACfZACbYACfYACfMADPYACfYACfYACfYACfYACfZACbXACjYACfYACfRAC7XACjYACfZACbWACnXACjXACjYACfTACzZACb/AADYACfYACfYACcAAAA+zneGAAAAU3RSTlMAItK+CVPjh3xUxPwPiGDQGAMtSKmN3Vk+wPQG/e26oIJBnwJCdiuAHgTmw+6BX+IgfaqLUvKOW8VKnagK+vBwYrhlc/urCznvhSyUbOEXPAFjGh/ektAAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH4ggWETQWgEDcSgAAAqVJREFUWMPtl4ly2jAQhsUNNlcw5r4SICEHLSQhCQRyX73T/u//LpUlLIyxbMAznWmn/0ywo5U+27tr7ZoQuwLBUJidRKIxPhKLRtgxHAoGiLfiQIKdKFCTxjGpQmEDCSC+BiAFpNlJBsgaxyyQYQNpIPUf8AcAOzktD+iaoQJQNI5FoMAGdCCv5XZclpfKFXiqUi5Jllf1mvdyQzW96gigd4h6o+mhRp1O0x3vvwa1VSWeqrZU1Jyeogy01ggSVQsoO/i/gjq9/u6u+2LDXq2jshqLHNCgdsCVwO0NILdi0oDmuoAmoImhQDzFRPNnb36L7U43NVfc2EH2D9h5t9OePyIF5IU9uIhvkyN7iiXmQUIOj8x/lB6f0bTaQ3ZA+9iaNCH2Lpg6btsBIRJOpJl0E9ABTvof5kqEGeCjMaN/AnRMgM5XJcI2J1J1gf6S48Tb2Ae6JkAjdgmAeJ1XAOJ1Xg8wGJ6elXwAzkeGjy62BgxG3MuXnoCIkmEq8EQyAUPgajyhPxJAga9SIiRqzwMOuAbGZDrDjQRgKkpiqiPgFphM74B7d4BKy2cyy1RcBvSodUb/HiSAIl+VlEfh8cm4wvPL9nnw+gbc+kkkUVioO95etwe8PBuP8vQoBzg7UQAe5t7syZwoCaMA3AN30wlzh3MYJYkkADeYTckYuJYlkiSVBeCKZtSY/gxlqezlxEt+pdFg6zBesPXn1ih8Aj5vkAels9PhYCkPsl++kg0AQu4dyuqmugIQm+qS5Nv6N+D7wm7d1skPc4xu666Fhd6BxU6r+jub8tNaWNxK29EhsdpR/sVn7FlLm0txPdgni+JrFNd3p+K67MQtyrsp3w2G7xbHd5Plv83z3Wj6b3V9N9ssFv7afaa//ZPn3wD4/vje8PP/N7TebS0hgZhEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDE3OjUyOjIyKzAyOjAwc2qUYAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQxNzo1MjoyMiswMjowMAI3LNwAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC"
+  },
+  "bordered": false
+}
 ```

 ## Groups
+
 ```js
 {
-"type": "group",
-"align": "center",
-"bordered": true,
-"title": "stats",
-"items": [
-    { "type": "play" }, { "type": "mute" }, ...]
+  "type": "group",
+  "align": "center",
+  "bordered": true,
+  "title": "stats",
+  "items": [
+    { "type": "play" },
+    { "type": "mute" }, 
+    ...
+  ]
 }
 ```

 To close a group, use the button:
+
 ```
 {
-"type": "close",
-"width": 64
+  "type": "close",
+  "width": 64
 },
 ```

 ## Native plugins
+
 #### `timeButton`
+
 > Attention! Works not all: https://en.wikipedia.org/wiki/List_of_time_zone_abbreviations
+
 ```js
 {
  "type": "timeButton",
@@ -131,7 +206,12 @@ To close a group, use the button:
 ```

 #### `weather`
-> Provider: https://openweathermap.org Need allowance location service
+
+> Provider: https://openweathermap.org \
+> Note: you need to register on https://openweathermap.org to get your API key \
+> Note: you may need to wait for near 20 mins until your API key will be activated by Openweathermap \
+> Note: you need to allow using "Location Services" in your Mac OS "Security & Privacy" settings for MTMR
+
 ```js
  "type": "weather",
  "refreshInterval": 600, // in seconds
@@ -140,8 +220,20 @@ To close a group, use the button:
  "api_key": "" // you can get the key on openweather
 ```

+#### `yandexWeather` (experimental)
+
+> Provider: https://yandex.ru/pogoda. One click to open up weather forecast in your browser. \
+> Note: you need to allow using "Location Services" in your Mac OS "Security & Privacy" settings for MTMR
+
+```js
+  "type": "yandexWeather",
+  "refreshInterval": 600 // in seconds
+```
+
 #### `currency`
+
 > Provider: https://coinbase.com
+
 ```js
  "type": "currency",
  "refreshInterval": 600, // in seconds
@@ -152,49 +244,71 @@ To close a group, use the button:
 ```

 #### `music`
+
 ```js
 {
  "type": "music",
  "align": "center",
-  "width": 80,
-  "bordered": false,
-  "refreshInterval": 2, // in seconds
+  "width": 80, // Optional
+  "bordered": false, // Optional
+  "refreshInterval": 2, // in seconds. Optional. Default 5 seconds
+  "disableMarquee": true // to disable marquee effect. Optional. Default false
 },
 ```

 #### `pomodoro`
+
 > Pomodoro plugin. One click to start the work timer, longclick to start the rest timer. Click in progress for reset.
+
 ```js
 {
  "type": "pomodoro",
  "workTime": 1200, // set time work in seconds. Default 1500 (25 min)
-  "restTime": 600, // set time rest in seconds. Default 300 (5 min)
+  "restTime": 600 // set time rest in seconds. Default 300 (5 min)
 },
 ```

 #### `network`
+
 > Network plugin. The plugin to show usage a network
+
 ```js
 {
  "type": "network",
+  "flip": true
+},
+```
+
+#### `dock`
+
+> Dock plugin
+
+```js
+{
+  "type": "dock",
+  "autoResize": true
 },
 ```

 ## Actions:
+
 - `hidKey`
-> https://github.com/aosm/IOHIDFamily/blob/master/IOHIDSystem/IOKit/hidsystem/ev_keymap.h use only numbers
+  > https://github.com/aosm/IOHIDFamily/blob/master/IOHIDSystem/IOKit/hidsystem/ev_keymap.h use only numbers
+
 ```json
 "action": "hidKey",
 "keycode": 53,
 ```

 - `keyPress`
+
 ```json
 "action": "keyPress",
 "keycode": 1,
 ```

 - `appleScript`
+
 ```js
 "action": "appleScript",
 "actionAppleScript": {
@@ -204,6 +318,7 @@ To close a group, use the button:
 ```

 - `shellScript`
+
 ```js
 "action": "shellScript",
 "executablePath": "/usr/bin/pmset",
@@ -212,13 +327,16 @@ To close a group, use the button:
 ```

 - `openUrl`
+
 ```js
 "action": "openUrl",
 "url": "https://google.com",
 ```

 ## LongActions
+
 If you want to longPress for some operations, it is similar to the configuration for Actions but with additional parameters, for example:
+
 ```js
 "longAction": "hidKey",
 "longKeycode": 53,
@@ -234,79 +352,25 @@ If you want to longPress for some operations, it is similar to the configuration
 ## Additional parameters:

 - `width` restrict how much room a particular button will take
+
 ```json
  "width": 34
 ```

 - `align` can stick the item to the side. default is center
+
 ```js
  "align": "left" // "left", "right" or "center"
 ```

 - `bordered` you can do button without border
+
 ```js
  "bordered": "false" // "true" or "false"
 ```

-## Example configuration:
-```json
-[
-  { "type": "escape", "width": 110 },
-  { "type": "exitTouchbar", "align": "left" },
-  {
-    "type": "brightnessUp",
-    "align": "left",
-    "width": 36
-  },
-  {
-    "type": "staticButton",
-    "align": "left",
-    "title": "🔆",
-    "action": "keyPress",
-    "keycode": 113,
-    "width": 36
-  },
-
-  {
-    "type": "appleScriptTitledButton",
-    "source": {
-      "filePath": "/Users/toxblh/Library/Application Support/MTMR/iTunes.nowPlaying.scpt"
-    },
-    "refreshInterval": 1
-  },
- {
-    "type": "staticButton",
-    "align": "left",
-    "image": { "base64" : "%base64Finder%"},
-    "action": "appleScript",
-    "actionAppleScript": {
-        "inline": "tell application \"Finder\"\rmake new Finder window\rset target of front window to path to home folder as string\ractivate\rend tell"
-    },
-    "width": 36
-  },
-  {
-    "type": "appleScriptTitledButton",
-    "source": {
-      "inline": "if application \"Safari\" is running then\r\ttell application \"Safari\"\r\t\trepeat with t in tabs of windows\r\t\t\ttell t\r\t\t\t\tif URL starts with \"https:\/\/music.yandex.ru\" and name does not end with \"на Яндекс.Музыке\" then\r\t\t\t\t\treturn name of t as text\r\t\t\t\tend if\r\t\t\tend tell\r\t\tend repeat\r\tend tell\rend if\rreturn \"\""
-    },
-    "refreshInterval": 1
-  },
-  { "type": "previous", "width": 36, "align": "right" },
-  { "type": "play", "width": 36, "align": "right" },
-  { "type": "next", "width": 36, "align": "right" },
-  { "type": "sleep", "width": 36 , "align": "right"},
-  { "type": "displaySleep", "align": "right" },
-  { "type": "weather", "refreshInterval": 1800, "width": 70, "align": "right" },
-  { "type": "volumeDown", "width": 36 , "align": "right"},
-  { "type": "volumeUp", "width": 36 , "align": "right"},
-  { "type": "battery", "refreshInterval": 60 , "align": "right"},
-  { "type": "appleScriptTitledButton", "refreshInterval": 1800, "source": { "filePath": "/Users/redetection/Library/Application Support/MTMR/Weather.scpt"} , "align": "right"},
-  { "type": "timeButton", "formatTemplate": "HH:mm", "width": 64, "align": "right" }
-]
-```
-
-
 ### Roadmap
+
 - [x] Create the first prototype with TouchBar in Storyboard
 - [x] Put in stripe menu on startup the application
 - [x] Find how to simulate real buttons like brightness, volume, night shift and etc.
@@ -328,6 +392,7 @@ If you want to longPress for some operations, it is similar to the configuration
 - [ ] Import config from BTT

 Settings:
+
 - [ ] Interface for plugins and export like presets
 - [x] Startup at login
 - [ ] Show on/off in Dock
@@ -335,20 +400,8 @@ Settings:
 - [ ] On/off Haptic Feedback

 Maybe:
- [ ] Refactoring the application on packages (AppleScript, JavaScript? and Swift?)

-### Author's presets
-[@Toxblh preset](Resources/toxblh.json)
-
-[@ReDetection preset](Resources/ReDetection.json)
-
-### User's presets
-[@luongvo209 preset](Resources/luongvo209.json)
-![](Resources/luongvo209.png)
-
-[aadi_vs_anand preset](Resources/aadi_vs_anand.json)
-![](Resources/aadi_vs_anand1.png)
-![](Resources/aadi_vs_anand2.png)
+- [ ] Refactoring the application into packages (AppleScript, JavaScript? and Swift?)

 ## Credits
Author	SHA1	Message	Date
toxblh	a110e00b9c	v0.23	2019-08-19 12:34:52 +01:00
Anton Palgunov	12137c6732	Add new "shellScriptTitledButton" button type (#203 ) Add new "shellScriptTitledButton" button type	2019-08-14 10:59:27 +01:00
bobrosoft	36d1028af1	ShellScriptTouchBarItem: performance optimization	2019-08-11 15:46:08 +02:00
bobrosoft	77f56df144	README: remove duplicate "timeButton" description	2019-08-11 15:29:37 +02:00
bobrosoft	80b56779fb	Add new "shellScriptTitledButton" button type	2019-08-11 15:25:44 +02:00
Anton Palgunov	580f0275fc	CustomButtonTouchBarItem: recognise longPress in more expected m… (#202 ) CustomButtonTouchBarItem: recognise longPress in more expected manner without long wait and requirement to release the button	2019-08-09 16:03:38 +01:00
bobrosoft	168b629810	CustomButtonTouchBarItem: fix time interval constant	2019-08-06 16:51:40 +02:00
bobrosoft	2d64c091e3	fix: need to properly stop periodic timer/activity on destroy to eliminate possible memory leaks	2019-08-06 16:37:57 +02:00
bobrosoft	63e3de7313	CustomButtonTouchBarItem: try to fix strange app hanging (attempt 2)	2019-08-06 15:03:01 +02:00
bobrosoft	229c55c367	CustomButtonTouchBarItem: try to fix strange app hanging	2019-08-02 14:50:55 +02:00
bobrosoft	11530ef180	CustomButtonTouchBarItem: recognise longPress in more expected manner without long wait and requirement to release the button	2019-08-01 12:25:59 +02:00
toxblh	96f26ab7f7	upd info	2019-07-29 12:16:07 +01:00
Anton Palgunov	95271dba0e	HapticFeedback: fix broken haptic for Release builds + refactori… (#198 ) HapticFeedback: fix broken haptic for Release builds + refactoring	2019-07-28 00:17:18 +01:00
bobrosoft	67aaa2abf4	CurrencyBarItem: fix text vertical alignment	2019-07-27 18:10:48 +02:00
bobrosoft	58e4160649	HapticFeedback: fix broken haptic for Release builds + refactoring	2019-07-27 13:05:02 +02:00
toxblh	77846d0436	v0.22	2019-07-26 13:37:49 +01:00
Anton Palgunov	bc66b375d3	Merge pull request #195 from bobrosoft/master README: add "yandexWeather" to the list of "Native Plugins" on top	2019-07-23 16:31:06 +01:00
bobrosoft	ce8004641d	README: add "yandexWeather" to the list of "Native Plugins" on top	2019-07-23 18:54:07 +04:00
Anton Palgunov	155e48a693	Add new "yandexWeather" widget (#194 ) Add new "yandexWeather" widget	2019-07-23 14:41:17 +01:00
bobrosoft	76a7d59fe5	README: add "experimental" flag to yandexWeather widget	2019-07-23 17:11:13 +04:00
bobrosoft	6a85bea5b5	Add new "yandexWeather" widget	2019-07-23 17:07:47 +04:00
Anton Palgunov	000b825ec9	Merge pull request #193 from bobrosoft:master MusicBarItem: fix for latest macOS + add "disableMarquee" param	2019-07-23 13:36:28 +01:00
bobrosoft	3432e24a55	MusicBarItem: add support for "disableMarquee" param	2019-07-18 18:29:08 +04:00
bobrosoft	705d0a64b5	MusicBarItem: fix for latest macOS	2019-07-17 17:42:03 +04:00
Anton Palgunov	9f0944b06b	HapticFeedback: fix recovery from the long sleep (#192 ) HapticFeedback: fix recovery from the long sleep	2019-07-17 09:27:26 +01:00
bobrosoft	efc52293a8	HapticFeedback: fix recovery from the long sleep (minor comment changes)	2019-07-17 12:21:51 +04:00
bobrosoft	7b853b5d47	HapticFeedback: fix recovery from the long sleep	2019-07-17 12:17:35 +04:00
Anton Palgunov	439246e85b	CustomButtonTouchBarItem: add better haptic feedback right when… (#188 ) CustomButtonTouchBarItem: add better haptic feedback right when button been touched	2019-07-15 12:57:50 +01:00
bobrosoft	c254ee430d	CustomButtonTouchBarItem: add better haptic feedback right when button been touched	2019-07-12 17:39:10 +04:00
toxblh	cfcda6e46f	upd CFBundleVersion	2019-07-11 17:51:13 +01:00
toxblh	144ff9cf79	v0.21.1	2019-07-11 17:49:15 +01:00
Anton Palgunov	91a4e5bded	Fix HapticFeedback for new MacBook models (#187 ) Fix HapticFeedback for new MacBook models	2019-07-11 17:40:37 +01:00
bobrosoft	68dfcddb29	Fix HapticFeedback for new MacBook models	2019-07-11 20:16:34 +04:00
Anton Palgunov	82ec231700	README: add more details on how to setup "weather" plugin (#186 ) README: add more details on how to setup "weather" plugin	2019-07-09 19:27:42 +01:00
Vladimir Tolstikov	ed261c2349	README: add more details on how to setup "weather" plugin	2019-07-09 22:25:00 +04:00
Anton Palgunov	f06d1f4329	Create FUNDING.yml	2019-05-23 14:16:25 +01:00
toxblh	3dabd598f4	upd Readme	2019-05-22 22:52:49 +01:00
Anton Palgunov	0a09ea7117	Merge pull request #169 from FinHorsley:patch-1 improved readme	2019-05-22 22:48:51 +01:00
toxblh	02cf911336	move ss.png to Resources	2019-05-22 22:47:58 +01:00
toxblh	d831069025	Merge remote-tracking branch 'origin/master' into pr/FinHorsley/169-2	2019-05-22 22:44:57 +01:00
toxblh	33206ab457	update standart preset for first install	2019-05-22 22:44:21 +01:00
toxblh	c6c808369f	Edited Readme. Also updated paths	2019-05-22 22:44:01 +01:00
toxblh	cbad06ac07	Move files to correct folder.	2019-05-22 22:43:44 +01:00
toxblh	64171d5c51	merge	2019-05-22 18:26:24 +01:00
toxblh	5504e5d640	#171 Added DarkMode button v0.21	2019-05-22 18:25:18 +01:00
Anton Palgunov	164295820b	Merge pull request #167 from willsunnn:master Added an additional option for the dock to automatically resize	2019-05-15 17:04:52 +01:00
toxblh	ae469bb92a	add Readme info	2019-05-15 17:01:06 +01:00
toxblh	57b5129135	info.plist	2019-05-15 16:57:40 +01:00
toxblh	7cc72de66f	merge master	2019-05-15 16:56:53 +01:00
toxblh	2e5db4ffa0	revert project settings	2019-05-15 16:55:44 +01:00
toxblh	8a73fe01e4	Revert "#154 .cghidEventTap -> .cgAnnotatedSessionEventTap" This reverts commit `5a8117ac7f`.	2019-05-15 16:40:09 +01:00
toxblh	5fbb2bafc6	Revert "Fix #164 " This reverts commit `40fa61fcb5`.	2019-05-15 16:39:52 +01:00
toxblh	5b6b6dfa56	Revert "fixed tests" This reverts commit `7c9dd26eb0`.	2019-05-15 16:39:32 +01:00
FinHorsley	65e5a52383	shadow to images	2019-05-15 14:44:15 +01:00
FinHorsley	03304bd030	Add files via upload	2019-05-15 14:43:17 +01:00
FinHorsley	f264425ba7	Update README.md	2019-05-13 20:56:21 +01:00
FinHorsley	c377b9494c	Update README.md	2019-05-13 20:54:43 +01:00
FinHorsley	f5b36ec012	Update README.md	2019-05-13 20:48:01 +01:00
FinHorsley	999c4cf6e2	Update README.md	2019-05-13 20:38:30 +01:00
FinHorsley	b8d5d0a8a5	Update README.md	2019-05-13 20:35:36 +01:00
FinHorsley	6bb5aade07	Update README.md	2019-05-13 20:35:17 +01:00
FinHorsley	b6bcc31456	Update README.md	2019-05-13 20:34:01 +01:00
FinHorsley	9d09646742	Update README.md	2019-05-13 20:32:53 +01:00
FinHorsley	55f988e393	Update README.md	2019-05-13 20:32:26 +01:00
FinHorsley	2f4cf9e5f6	Update README.md	2019-05-13 20:31:46 +01:00
FinHorsley	327d38e47d	Update README.md	2019-05-13 20:30:35 +01:00
FinHorsley	cd380b289d	Update README.md	2019-05-13 20:26:41 +01:00
FinHorsley	6a26b2f5ca	Update README.md	2019-05-13 20:24:31 +01:00
FinHorsley	d7186aac18	Update README.md	2019-05-13 20:23:43 +01:00
FinHorsley	cef07dc965	Update README.md	2019-05-13 20:22:45 +01:00
FinHorsley	471c0c5d57	Update README.md	2019-05-13 20:16:56 +01:00
FinHorsley	5b93525806	Add files via upload	2019-05-13 20:00:31 +01:00
FinHorsley	b87bc632ab	Delete some.png	2019-05-13 20:00:10 +01:00
FinHorsley	1763a24942	Add files via upload	2019-05-13 19:57:41 +01:00
FinHorsley	627e6951c1	Update README.md	2019-05-13 18:20:28 +01:00
FinHorsley	918054df78	Update README.md	2019-05-13 18:17:17 +01:00
FinHorsley	25fb0d4f04	center things	2019-05-13 18:06:21 +01:00
FinHorsley	61a357ffc3	Update README.md	2019-05-13 18:01:41 +01:00
FinHorsley	f4116a95df	Update README.md	2019-05-13 18:00:03 +01:00
FinHorsley	c952505c1c	Update README.md	2019-05-13 17:57:50 +01:00
FinHorsley	f10b58b996	Update README.md	2019-05-13 17:56:34 +01:00
FinHorsley	88a8ae3ae8	Add files via upload	2019-05-13 17:55:43 +01:00
FinHorsley	d783448567	Update README.md	2019-05-13 17:36:55 +01:00
FinHorsley	595ae165d3	Update README.md	2019-05-13 17:32:55 +01:00
FinHorsley	da406713dd	Update README.md	2019-05-13 17:32:01 +01:00
FinHorsley	938b83f37e	Update README.md	2019-05-13 17:31:40 +01:00
FinHorsley	a8a085df1e	Update README.md	2019-05-13 17:30:43 +01:00
FinHorsley	b188f45c8e	Update README.md	2019-05-13 17:30:14 +01:00
FinHorsley	3319c5d45a	Update README.md	2019-05-13 17:27:51 +01:00
FinHorsley	6174d14925	Update README.md	2019-05-13 17:27:06 +01:00
FinHorsley	c8197239d7	Update README.md	2019-05-13 17:25:51 +01:00
FinHorsley	d2854e3dae	Update README.md	2019-05-13 17:24:28 +01:00
FinHorsley	4f9c3258ae	Add files via upload	2019-05-13 17:22:26 +01:00
FinHorsley	dfeda1e874	Update README.md	2019-05-13 17:20:40 +01:00
FinHorsley	82f82039ae	Update readme Bit of a refresh	2019-05-13 17:19:39 +01:00
willsunnn	324c3f711e	Fixed a bug where the dock would not change size after the first time due to conflicting constraints	2019-05-09 22:39:47 -07:00
willsunnn	a81d6fc595	Made the dock resize when Apps are removed	2019-05-09 22:20:45 -07:00
willsunnn	3bde1fe4b1	Created and passed the autoResize parameter to the dock widget	2019-05-09 22:04:10 -07:00
toxblh	7c9dd26eb0	fixed tests	2019-05-09 22:19:21 +01:00
toxblh	40fa61fcb5	Fix #164	2019-05-09 22:14:48 +01:00
toxblh	5a8117ac7f	#154 .cghidEventTap -> .cgAnnotatedSessionEventTap	2019-05-07 10:37:29 +01:00
toxblh	a606767ddc	Revert "migration to swift 5" This reverts commit `4497c7102c`.	2019-04-02 17:10:18 +01:00
toxblh	6badc37dc3	Merge branch 'master' of https://github.com/Toxblh/MTMR	2019-04-02 17:07:27 +01:00
toxblh	4497c7102c	migration to swift 5	2019-04-02 17:07:23 +01:00
Anton Palgunov	b6c6bb945b	Update README.md	2019-03-28 13:30:16 +00:00
Anton Palgunov	3e399d14c2	Update README.md	2019-03-27 10:58:41 +00:00
toxblh	624c8ac6d8	upd readme	2019-03-21 21:52:55 +00:00
toxblh	ea68ce33c1	Merge branch 'master' of https://github.com/Toxblh/MTMR	2019-03-21 21:52:01 +00:00
toxblh	744ea067db	v0.20.1	2019-03-21 21:51:05 +00:00
toxblh	8064ab759c	test old build type. try resolve #155	2019-03-21 21:50:38 +00:00
toxblh	556c28df85	flip param for network	2019-03-21 21:49:34 +00:00
Anton Palgunov	e68f930efa	Update README.md	2019-03-21 12:26:29 +00:00
Anton Palgunov	647ac0ba20	Update README.md	2019-03-03 14:37:56 +00:00
Anton Palgunov	780a8ba81e	Update README.md	2019-02-25 09:20:08 +00:00
Anton Palgunov	71f5030fa6	spellchecking	2019-02-24 23:37:58 +00:00
Anton Palgunov	f435c0b530	Troubleshooting in Readme	2019-02-24 23:34:56 +00:00