diff --git a/ansible/roles/osx/library/osx_defaults.py b/ansible/roles/osx/library/my_defaults.py
similarity index 100%
rename from ansible/roles/osx/library/osx_defaults.py
rename to ansible/roles/osx/library/my_defaults.py
diff --git a/ansible/roles/osx/tasks/main.yml b/ansible/roles/osx/tasks/main.yml
index b1650059..e937f68d 100644
--- a/ansible/roles/osx/tasks/main.yml
+++ b/ansible/roles/osx/tasks/main.yml
@@ -9,7 +9,7 @@
 - include: dock.yml
 
 - name: set OS X defaults
-  osx_defaults:
+  my_defaults:
     domain: "{{ item.domain | default(omit) }}"
     key: "{{ item.key }}"
     type: "{{ item.type }}"
diff --git a/ansible/roles/osx/vars/main.yml b/ansible/roles/osx/vars/main.yml
index bc8cdbc5..44dd29d8 100644
--- a/ansible/roles/osx/vars/main.yml
+++ b/ansible/roles/osx/vars/main.yml
@@ -27,7 +27,7 @@ osx_defaults:
   - # delay before keyboard repeat
     key: InitialKeyRepeat
     type: int
-    value: 15
+    value: 25
   - # set sidebar item size to small
     key: NSTableViewDefaultSizeMode
     type: int
@@ -106,16 +106,24 @@ osx_defaults:
   # Trackpad settings
   - domain: com.apple.driver.AppleBluetoothMultitouch.trackpad
     key: Clicking
-    type: bool
-    value: true
+    type: int
+    value: 1
   - domain: com.apple.driver.AppleBluetoothMultitouch.trackpad
-    key: DragLock
-    type: bool
-    value: true
+    key: TrackpadFourFingerVertSwipeGesture
+    type: int
+    value: 0
   - domain: com.apple.driver.AppleBluetoothMultitouch.trackpad
-    key: Dragging
-    type: bool
-    value: true
+    key: TrackpadThreeFingerDrag
+    type: int
+    value: 1
+  - domain: com.apple.driver.AppleBluetoothMultitouch.trackpad
+    key: TrackpadThreeFingerHorizSwipeGesture
+    type: int
+    value: 0
+  - domain: com.apple.driver.AppleBluetoothMultitouch.trackpad
+    key: TrackpadThreeFingerVertSwipeGesture
+    type: int
+    value: 0
 
   # Finder defaults
   - # don't ask when changing file extension
@@ -139,6 +147,12 @@ osx_defaults:
     type: bool
     value: true
 
+  - # set date format in menubar
+    domain: com.apple.menuextra.clock
+    key: DateFormat
+    type: string
+    value: h:mm
+
   - # no window shadows when capturing windows
     domain: com.apple.screencapture
     key: disable-shadow