diff --git a/Unity.gitignore b/Unity.gitignore
index 58cbc825..97dd4130 100644
--- a/Unity.gitignore
+++ b/Unity.gitignore
@@ -10,6 +10,12 @@
 /[Ll]ogs/
 /[Uu]ser[Ss]ettings/
 
+# Windows
+Thumbs.db
+
+# Mac
+.DS_Store
+
 # MemoryCaptures can get excessive in size.
 # They also could contain extremely sensitive data
 /[Mm]emoryCaptures/
@@ -20,14 +26,16 @@
 # Uncomment this line if you wish to ignore the asset store tools plugin
 # /[Aa]ssets/AssetStoreTools*
 
-# Autogenerated Jetbrains Rider plugin
+# Jetbrains Rider
 /[Aa]ssets/Plugins/Editor/JetBrains*
+.idea/
+*.DotSettings.user
 
-# Visual Studio cache directory
+# Visual Studio
 .vs/
 
-# Gradle cache directory
-.gradle/
+# Visual Studio Code
+.vscode/
 
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
@@ -60,13 +68,35 @@ sysinfo.txt
 *.aab
 *.unitypackage
 *.app
+.gradle/
 
 # Crashlytics generated file
 crashlytics-build.properties
 
-# Packed Addressables
-/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
+# Mono crash files
+mono_crash*
 
-# Temporary auto-generated Android Assets
-/[Aa]ssets/[Ss]treamingAssets/aa.meta
-/[Aa]ssets/[Ss]treamingAssets/aa/*
+# TestRunner generated files
+InitTestScene*.unity*
+
+# Addressables ignores for a default installation, before user customizations
+/ServerData
+/Assets/StreamingAssets/aa*
+/Assets/AddressableAssetsData/link.xml*
+# Unless you customize its settings, Addressables content builds will generate
+# addressables_content_state.bin files inside of platform-specific subfolders e.g.
+# /Assets/AddressableAssetsData/OSX/addressables_content_state.bin. Because there
+# is no common parent folder, it's not enough to just ignore the .bin files; we
+# have to ignore each platform folder. The Addressables team has been notified of
+# this issue.
+/Assets/AddressableAssetsData/Unknown*
+/Assets/AddressableAssetsData/Windows*
+/Assets/AddressableAssetsData/OSX*
+/Assets/AddressableAssetsData/Linux*
+/Assets/AddressableAssetsData/PS4*
+/Assets/AddressableAssetsData/Switch*
+/Assets/AddressableAssetsData/XboxOne*
+/Assets/AddressableAssetsData/WebGL*
+/Assets/AddressableAssetsData/iOS*
+/Assets/AddressableAssetsData/Android*
+/Assets/AddressableAssetsData/WindowsUniversal*